mirrors/dae
1
0
Fork 0
mirror of https://github.com/daeuniverse/dae.git synced 2025-07-12 08:49:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix: preprocess wan_interface 'auto' before ebpf program loading to avoid to fail to insert filter

Browse Source
This commit is contained in:
mzz2017
2023-03-26 12:54:12 +08:00
parent 1bbb93fcfa
commit ae618e6c6e
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
config/patch.go
View File

@ -6,6 +6,8 @@
package config
import (
"fmt"
"github.com/daeuniverse/dae/common"
"github.com/daeuniverse/dae/common/consts"
)
@ -13,6 +15,7 @@ type patch func(params *Config) error
var patches = []patch{
patchEmptyDns,
patchWanInterfaceAuto,
}
func patchEmptyDns(params *Config) error {
@ -24,3 +27,21 @@ func patchEmptyDns(params *Config) error {
}
return nil
}
func patchWanInterfaceAuto(params *Config) error {
// preprocess "auto".
ifs := make([]string, 0, len(params.Global.WanInterface)+2)
for _, ifname := range params.Global.WanInterface {
if ifname == "auto" {
defaultIfs, err := common.GetDefaultIfnames()
if err != nil {
return fmt.Errorf("failed to convert 'auto': %w", err)
}
ifs = append(ifs, defaultIfs...)
} else {
ifs = append(ifs, ifname)
}
}
params.Global.WanInterface = common.Deduplicate(ifs)
return nil
}

14
control/control_plane.go
View File

@ -203,20 +203,6 @@ func NewControlPlane(
}
}
// Bind to WAN
// preprocess "auto".
ifs := make([]string, 0, len(global.WanInterface)+2)
for _, ifname := range global.WanInterface {
if ifname == "auto" {
defaultIfs, err := common.GetDefaultIfnames()
if err != nil {
return nil, fmt.Errorf("failed to convert 'auto': %w", err)
}
ifs = append(ifs, defaultIfs...)
} else {
ifs = append(ifs, ifname)
}
}
global.WanInterface = common.Deduplicate(ifs)
if len(global.WanInterface) > 0 {
if err = core.setupSkPidMonitor(); err != nil {
return nil, err