mirrors/dae
1
0
Fork 0
mirror of https://github.com/daeuniverse/dae.git synced 2024-12-31 19:52:05 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix: should probe wan interface after network online

Browse Source
This commit is contained in:
mzz2017 2023-03-27 12:33:07 +08:00
parent 13154d8cea
commit 97a4e956fe
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cmd/run.go
View File

@ -3,6 +3,7 @@ package cmd
import (
"fmt"
"github.com/daeuniverse/dae/cmd/internal"
"github.com/daeuniverse/dae/common"
"github.com/daeuniverse/dae/common/subscription"
"github.com/daeuniverse/dae/config"
"github.com/daeuniverse/dae/control"
@ -275,6 +276,10 @@ func newControlPlane(log *logrus.Logger, bpf interface{}, dnsCache map[string]*c
log.Warnln("No interface to bind.")
}
if err = preprocessWanInterfaceAuto(conf); err != nil {
return nil, err
}
c, err = control.NewControlPlane(
log,
bpf,
@ -295,6 +300,24 @@ func newControlPlane(log *logrus.Logger, bpf interface{}, dnsCache map[string]*c
return c, nil
}
func preprocessWanInterfaceAuto(params *config.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
}
func readConfig(cfgFile string) (conf *config.Config, includes []string, err error) {
merger := config.NewMerger(cfgFile)
sections, includes, err := merger.Merge()

21
config/patch.go
View File

@ -6,8 +6,6 @@
package config
import (
"fmt"
"github.com/daeuniverse/dae/common"
"github.com/daeuniverse/dae/common/consts"
)
@ -15,7 +13,6 @@ type patch func(params *Config) error
var patches = []patch{
patchEmptyDns,
patchWanInterfaceAuto,
}
func patchEmptyDns(params *Config) error {
@ -27,21 +24,3 @@ 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
}