mirrors/dae
1
0
Fork 0
mirror of https://github.com/daeuniverse/dae.git synced 2024-12-22 21:44:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix: bad connectivity check of dns(udp) caused by #80 (#155)

Browse Source
This commit is contained in:
mzz 2023-06-25 22:04:43 +08:00 committed by GitHub
parent c578f2af36
commit 5508c372c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
component/outbound/dialer/connectivity_check.go
View File

@ -10,7 +10,6 @@ import (
"context"
"errors"
"fmt"
"github.com/daeuniverse/dae/common"
"io"
"net"
"net/http"
@ -22,6 +21,8 @@ import (
"sync"
"time"
"github.com/daeuniverse/dae/common"
"github.com/daeuniverse/dae/common/consts"
"github.com/daeuniverse/dae/common/netutils"
"github.com/mzz2017/softwind/netproxy"
@ -236,6 +237,7 @@ type CheckDnsOptionRaw struct {
mu sync.Mutex
Raw []string
ResolverNetwork string
Somark uint32
}
func (c *CheckDnsOptionRaw) Option() (opt *CheckDnsOption, err error) {
@ -319,6 +321,14 @@ func (d *Dialer) aliveBackground() {
return d.HttpCheck(ctx, opt.Url, opt.Ip6, opt.Method, tcpSomark)
},
}
tcpNetwork := netproxy.MagicNetwork{
Network: "tcp",
Mark: d.CheckDnsOptionRaw.Somark,
}.Encode()
udpNetwork := netproxy.MagicNetwork{
Network: "udp",
Mark: d.CheckDnsOptionRaw.Somark,
}.Encode()
tcp4CheckDnsOpt := &CheckOption{
networkType: &NetworkType{
L4Proto: consts.L4ProtoStr_TCP,
@ -338,7 +348,7 @@ func (d *Dialer) aliveBackground() {
}).Debugln("Skip check due to no DNS record.")
return false, nil
}
return d.DnsCheck(ctx, netip.AddrPortFrom(opt.Ip4, opt.DnsPort), d.CheckDnsOptionRaw.ResolverNetwork)
return d.DnsCheck(ctx, netip.AddrPortFrom(opt.Ip4, opt.DnsPort), tcpNetwork)
},
}
tcp6CheckDnsOpt := &CheckOption{
@ -360,7 +370,7 @@ func (d *Dialer) aliveBackground() {
}).Debugln("Skip check due to no DNS record.")
return false, nil
}
return d.DnsCheck(ctx, netip.AddrPortFrom(opt.Ip6, opt.DnsPort), d.CheckDnsOptionRaw.ResolverNetwork)
return d.DnsCheck(ctx, netip.AddrPortFrom(opt.Ip6, opt.DnsPort), tcpNetwork)
},
}
udp4CheckDnsOpt := &CheckOption{
@ -381,7 +391,7 @@ func (d *Dialer) aliveBackground() {
}).Debugln("Skip check due to no DNS record.")
return false, nil
}
return d.DnsCheck(ctx, netip.AddrPortFrom(opt.Ip4, opt.DnsPort), d.CheckDnsOptionRaw.ResolverNetwork)
return d.DnsCheck(ctx, netip.AddrPortFrom(opt.Ip4, opt.DnsPort), udpNetwork)
},
}
udp6CheckDnsOpt := &CheckOption{
@ -402,7 +412,7 @@ func (d *Dialer) aliveBackground() {
}).Debugln("Skip check due to no DNS record.")
return false, nil
}
return d.DnsCheck(ctx, netip.AddrPortFrom(opt.Ip6, opt.DnsPort), d.CheckDnsOptionRaw.ResolverNetwork)
return d.DnsCheck(ctx, netip.AddrPortFrom(opt.Ip6, opt.DnsPort), udpNetwork)
},
}
var CheckOpts = []*CheckOption{

1
control/control_plane.go
View File

@ -239,6 +239,7 @@ func NewControlPlane(
CheckDnsOptionRaw: dialer.CheckDnsOptionRaw{
Raw: global.UdpCheckDns,
ResolverNetwork: common.MagicNetwork("udp", global.SoMarkFromDae),
Somark: global.SoMarkFromDae,
},
CheckInterval: global.CheckInterval,
CheckTolerance: global.CheckTolerance,