mirrors/dae
1
0
Fork 0
mirror of https://github.com/daeuniverse/dae.git synced 2025-07-04 15:27:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

feat: allow tcp_check_url and udp_check_dns are not double stack

Browse Source
This commit is contained in:
mzz2017
2023-02-13 02:40:34 +08:00
parent affb49d85b
commit 0b5263c89b
5 changed files with 66 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,7 +115,7 @@ func ParseTcpCheckOption(ctx context.Context, rawURL string) (opt *TcpCheckOptio
if err != nil {
return nil, err
}
ip46, err := netutils.ParseIp46(ctx, SymmetricDirect, systemDns, u.Hostname(), true, false)
ip46, err := netutils.ParseIp46(ctx, SymmetricDirect, systemDns, u.Hostname(), false)
if err != nil {
return nil, err
}
@ -150,7 +150,7 @@ func ParseCheckDnsOption(ctx context.Context, dnsHostPort string) (opt *CheckDns
if err != nil {
return nil, fmt.Errorf("bad port: %v", err)
}
ip46, err := netutils.ParseIp46(ctx, SymmetricDirect, systemDns, host, true, false)
ip46, err := netutils.ParseIp46(ctx, SymmetricDirect, systemDns, host, false)
if err != nil {
return nil, err
}
@ -205,7 +205,7 @@ func (c *CheckDnsOptionRaw) Option() (opt *CheckDnsOption, err error) {
type CheckOption struct {
networkType *NetworkType
CheckFunc func(ctx context.Context) (ok bool, err error)
CheckFunc func(ctx context.Context, typ *NetworkType) (ok bool, err error)
}
func (d *Dialer) ActivateCheck() {
@ -227,11 +227,18 @@ func (d *Dialer) aliveBackground() {
IpVersion: consts.IpVersionStr_4,
IsDns: false,
},
CheckFunc: func(ctx context.Context) (ok bool, err error) {
CheckFunc: func(ctx context.Context, typ *NetworkType) (ok bool, err error) {
opt, err := d.TcpCheckOptionRaw.Option()
if err != nil {
return false, err
}
if !opt.Ip4.IsValid() {
d.Log.WithFields(logrus.Fields{
"link": d.TcpCheckOptionRaw.Raw,
"network": typ.String(),
}).Debugln("Skip check due to no record.")
return false, nil
}
return d.HttpCheck(ctx, opt.Url, opt.Ip4)
},
}
@ -241,11 +248,18 @@ func (d *Dialer) aliveBackground() {
IpVersion: consts.IpVersionStr_6,
IsDns: false,
},
CheckFunc: func(ctx context.Context) (ok bool, err error) {
CheckFunc: func(ctx context.Context, typ *NetworkType) (ok bool, err error) {
opt, err := d.TcpCheckOptionRaw.Option()
if err != nil {
return false, err
}
if !opt.Ip6.IsValid() {
d.Log.WithFields(logrus.Fields{
"link": d.TcpCheckOptionRaw.Raw,
"network": typ.String(),
}).Debugln("Skip check due to no record.")
return false, nil
}
return d.HttpCheck(ctx, opt.Url, opt.Ip6)
},
}
@ -255,11 +269,18 @@ func (d *Dialer) aliveBackground() {
IpVersion: consts.IpVersionStr_4,
IsDns: true,
},
CheckFunc: func(ctx context.Context) (ok bool, err error) {
CheckFunc: func(ctx context.Context, typ *NetworkType) (ok bool, err error) {
opt, err := d.CheckDnsOptionRaw.Option()
if err != nil {
return false, err
}
if !opt.Ip4.IsValid() {
d.Log.WithFields(logrus.Fields{
"link": d.CheckDnsOptionRaw.Raw,
"network": typ.String(),
}).Debugln("Skip check due to no record.")
return false, nil
}
return d.DnsCheck(ctx, netip.AddrPortFrom(opt.Ip4, opt.DnsPort), true)
},
}
@ -269,11 +290,18 @@ func (d *Dialer) aliveBackground() {
IpVersion: consts.IpVersionStr_6,
IsDns: true,
},
CheckFunc: func(ctx context.Context) (ok bool, err error) {
CheckFunc: func(ctx context.Context, typ *NetworkType) (ok bool, err error) {
opt, err := d.CheckDnsOptionRaw.Option()
if err != nil {
return false, err
}
if !opt.Ip6.IsValid() {
d.Log.WithFields(logrus.Fields{
"link": d.CheckDnsOptionRaw.Raw,
"network": typ.String(),
}).Debugln("Skip check due to no record.")
return false, nil
}
return d.DnsCheck(ctx, netip.AddrPortFrom(opt.Ip6, opt.DnsPort), true)
},
}
@ -283,11 +311,18 @@ func (d *Dialer) aliveBackground() {
IpVersion: consts.IpVersionStr_4,
IsDns: true,
},
CheckFunc: func(ctx context.Context) (ok bool, err error) {
CheckFunc: func(ctx context.Context, typ *NetworkType) (ok bool, err error) {
opt, err := d.CheckDnsOptionRaw.Option()
if err != nil {
return false, err
}
if !opt.Ip4.IsValid() {
d.Log.WithFields(logrus.Fields{
"link": d.CheckDnsOptionRaw.Raw,
"network": typ.String(),
}).Debugln("Skip check due to no record.")
return false, nil
}
return d.DnsCheck(ctx, netip.AddrPortFrom(opt.Ip4, opt.DnsPort), false)
},
}
@ -297,11 +332,18 @@ func (d *Dialer) aliveBackground() {
IpVersion: consts.IpVersionStr_6,
IsDns: true,
},
CheckFunc: func(ctx context.Context) (ok bool, err error) {
CheckFunc: func(ctx context.Context, typ *NetworkType) (ok bool, err error) {
opt, err := d.CheckDnsOptionRaw.Option()
if err != nil {
return false, err
}
if !opt.Ip6.IsValid() {
d.Log.WithFields(logrus.Fields{
"link": d.CheckDnsOptionRaw.Raw,
"network": typ.String(),
}).Debugln("Skip check due to no record.")
return false, nil
}
return d.DnsCheck(ctx, netip.AddrPortFrom(opt.Ip6, opt.DnsPort), false)
},
}
@ -401,7 +443,7 @@ func (d *Dialer) Check(timeout time.Duration,
start := time.Now()
// Calc latency.
collection := d.mustGetCollection(opts.networkType)
if ok, err = opts.CheckFunc(ctx); ok && err == nil {
if ok, err = opts.CheckFunc(ctx, opts.networkType); ok && err == nil {
// No error.
latency := time.Since(start)
latencies10 := d.mustGetCollection(opts.networkType).Latencies10