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

fix: should allow fallbacking ip version if dialing domain (#164)

Browse Source
This commit is contained in:
mzz
2023-06-29 22:30:33 +08:00
committed by GitHub
parent 1a9afb0913
commit 0bac1c6ecb
6 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
control/control_plane.go
View File

@ -248,19 +248,30 @@ func NewControlPlane(
TlsImplementation: global.TlsImplementation,
UtlsImitate: global.UtlsImitate,
}
// Dial mode.
dialMode, err := consts.ParseDialMode(global.DialMode)
if err != nil {
return nil, err
}
sniffingTimeout := global.SniffingTimeout
if dialMode == consts.DialMode_Ip {
sniffingTimeout = 0
}
disableKernelAliveCallback := dialMode != consts.DialMode_Ip
outbounds := []*outbound.DialerGroup{
outbound.NewDialerGroup(option, consts.OutboundDirect.String(),
[]*dialer.Dialer{dialer.NewDirectDialer(option, true)},
outbound.DialerSelectionPolicy{
Policy: consts.DialerSelectionPolicy_Fixed,
FixedIndex: 0,
}, core.OutboundAliveChangeCallback(0)),
}, core.outboundAliveChangeCallback(0, disableKernelAliveCallback)),
outbound.NewDialerGroup(option, consts.OutboundBlock.String(),
[]*dialer.Dialer{dialer.NewBlockDialer(option, func() { /*Dialer Outbound*/ })},
outbound.DialerSelectionPolicy{
Policy: consts.DialerSelectionPolicy_Fixed,
FixedIndex: 0,
}, core.OutboundAliveChangeCallback(1)),
}, core.outboundAliveChangeCallback(1, disableKernelAliveCallback)),
}
// Filter out groups.
@ -290,7 +301,8 @@ func NewControlPlane(
log.Infoln("\t<Empty>")
}
// Create dialer group and append it to outbounds.
dialerGroup := outbound.NewDialerGroup(option, group.Name, dialers, *policy, core.OutboundAliveChangeCallback(uint8(len(outbounds))))
dialerGroup := outbound.NewDialerGroup(option, group.Name, dialers, *policy,
core.outboundAliveChangeCallback(uint8(len(outbounds)), disableKernelAliveCallback))
outbounds = append(outbounds, dialerGroup)
}
@ -339,16 +351,7 @@ func NewControlPlane(
return nil, fmt.Errorf("RoutingMatcherBuilder.BuildUserspace: %w", err)
}
/// Dial mode.
dialMode, err := consts.ParseDialMode(global.DialMode)
if err != nil {
return nil, err
}
sniffingTimeout := global.SniffingTimeout
if dialMode == consts.DialMode_Ip {
sniffingTimeout = 0
}
// New control plane.
ctx, cancel := context.WithCancel(context.Background())
plane := &ControlPlane{
log: log,
@ -553,7 +556,7 @@ func (c *ControlPlane) dnsUpstreamReadyCallback(dnsUpstream *dns.Upstream) (err
return nil
}
func (c *ControlPlane) ChooseDialTarget(outbound consts.OutboundIndex, dst netip.AddrPort, domain string) (dialTarget string, shouldReroute bool) {
func (c *ControlPlane) ChooseDialTarget(outbound consts.OutboundIndex, dst netip.AddrPort, domain string) (dialTarget string, shouldReroute bool, dialIp bool) {
dialMode := consts.DialMode_Ip
if !outbound.IsReserved() && domain != "" {
@ -601,6 +604,7 @@ func (c *ControlPlane) ChooseDialTarget(outbound consts.OutboundIndex, dst netip
switch dialMode {
case consts.DialMode_Ip:
dialTarget = dst.String()
dialIp = true
case consts.DialMode_Domain:
if strings.HasPrefix(domain, "[") && strings.HasSuffix(domain, "]") {
// Sniffed domain may be like `[2606:4700:20::681a:d1f]`. We should remove the brackets.
@ -609,6 +613,7 @@ func (c *ControlPlane) ChooseDialTarget(outbound consts.OutboundIndex, dst netip
if _, err := netip.ParseAddr(domain); err == nil {
// domain is IPv4 or IPv6 (has colon)
dialTarget = net.JoinHostPort(domain, strconv.Itoa(int(dst.Port())))
dialIp = true
} else if _, _, err := net.SplitHostPort(domain); err == nil {
// domain is already domain:port
@ -622,7 +627,7 @@ func (c *ControlPlane) ChooseDialTarget(outbound consts.OutboundIndex, dst netip
"to": dialTarget,
}).Debugln("Rewrite dial target to domain")
}
return dialTarget, shouldReroute
return dialTarget, shouldReroute, dialIp
}
type Listener struct {
@ -852,7 +857,8 @@ func (c *ControlPlane) chooseBestDnsDialer(
return nil, fmt.Errorf("bad outbound index: %v", outboundIndex)
}
dialerGroup := c.outbounds[outboundIndex]
d, latency, err := dialerGroup.Select(&networkType)
// DNS always dial IP.
d, latency, err := dialerGroup.Select(&networkType, true)
if err != nil {
continue
}