general: add global setting interface

This commit is contained in:
nadoo committed 2018-08-20 22:23:00 +08:00
1 parent edd5964a1e
commit 8daa7784b0
8 files changed
+45 -26

No files matched your search

+1
View File
@@ -36,6 +36,7 @@ func NewConfFromFile(ruleFile string) (*Config, error) {
f.StringVar(&p.StrategyConfig.CheckWebSite, "checkwebsite", "www.apple.com", "proxy check HTTP(NOT HTTPS) website address, format: HOST[:PORT], default port: 80")
// TODO: change to checkinterval
f.IntVar(&p.StrategyConfig.CheckInterval, "checkduration", 30, "proxy check interval(seconds)")
f.StringVar(&p.StrategyConfig.IntFace, "interface", "", "source ip or source interface")
f.StringSliceUniqVar(&p.DNSServers, "dnsserver", nil, "remote dns server")
f.StringVar(&p.IPSet, "ipset", "", "ipset name")
+5 -5
View File
@@ -25,20 +25,20 @@ func NewDialer(rules []*Config, gDialer proxy.Dialer) *Dialer {
rd := &Dialer{gDialer: gDialer}
for _, r := range rules {
sDialer := strategy.NewDialer(r.Forward, &r.StrategyConfig)
rd.dialers = append(rd.dialers, sDialer)
sd := strategy.NewDialer(r.Forward, &r.StrategyConfig)
rd.dialers = append(rd.dialers, sd)
for _, domain := range r.Domain {
rd.domainMap.Store(strings.ToLower(domain), sDialer)
rd.domainMap.Store(strings.ToLower(domain), sd)
}
for _, ip := range r.IP {
rd.ipMap.Store(ip, sDialer)
rd.ipMap.Store(ip, sd)
}
for _, s := range r.CIDR {
if _, cidr, err := net.ParseCIDR(s); err == nil {
rd.cidrMap.Store(cidr, sDialer)
rd.cidrMap.Store(cidr, sd)
}
}
}