CN-JS-HuiBai/SingboxForPanel
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Tailscale endpoint using wrong source IP with advertise_routes

Browse Source
This commit is contained in:
世界
2026-01-04 22:13:29 +08:00
parent 7fa7d4f0a9
commit 6fdf27a701
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
protocol/tailscale/endpoint.go
View File

@@ -341,26 +341,42 @@ func (t *Endpoint) DialContext(ctx context.Context, network string, destination
} }
return N.DialSerial(ctx, t, network, destination, destinationAddresses) return N.DialSerial(ctx, t, network, destination, destinationAddresses)
} }
addr := tcpip.FullAddress{ addr4, addr6 := t.server.TailscaleIPs()
remoteAddr := tcpip.FullAddress{
NIC: 1, NIC: 1,
Port: destination.Port, Port: destination.Port,
Addr: addressFromAddr(destination.Addr), Addr: addressFromAddr(destination.Addr),
} }
var localAddr tcpip.FullAddress
var networkProtocol tcpip.NetworkProtocolNumber var networkProtocol tcpip.NetworkProtocolNumber
if destination.IsIPv4() { if destination.IsIPv4() {
if !addr4.IsValid() {
return nil, E.New("missing Tailscale IPv4 address")
}
networkProtocol = header.IPv4ProtocolNumber networkProtocol = header.IPv4ProtocolNumber
localAddr = tcpip.FullAddress{
NIC: 1,
Addr: addressFromAddr(addr4),
}
} else { } else {
if !addr6.IsValid() {
return nil, E.New("missing Tailscale IPv6 address")
}
networkProtocol = header.IPv6ProtocolNumber networkProtocol = header.IPv6ProtocolNumber
localAddr = tcpip.FullAddress{
NIC: 1,
Addr: addressFromAddr(addr6),
}
} }
switch N.NetworkName(network) { switch N.NetworkName(network) {
case N.NetworkTCP: case N.NetworkTCP:
tcpConn, err := gonet.DialContextTCP(ctx, t.stack, addr, networkProtocol) tcpConn, err := gonet.DialTCPWithBind(ctx, t.stack, localAddr, remoteAddr, networkProtocol)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return tcpConn, nil return tcpConn, nil
case N.NetworkUDP: case N.NetworkUDP:
udpConn, err := gonet.DialUDP(t.stack, nil, &addr, networkProtocol) udpConn, err := gonet.DialUDP(t.stack, &localAddr, &remoteAddr, networkProtocol)
if err != nil { if err != nil {
return nil, err return nil, err
} }