nilaway: dialers/tunnel,dialers/desync

celzero · Oct 24, 2024 · 4f43cdb · 4f43cdb
1 parent 211c607
commit 4f43cdb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/intra/dialers/ips.go b/intra/dialers/ips.go
@@ -16,14 +16,15 @@ import (
 )
 
 const (
-	errNilConn    = net.UnknownNetworkError("nil connection")
-	errNoConn     = net.UnknownNetworkError("no connection")
-	errNoSysConn  = net.UnknownNetworkError("no sys connection")
-	errNoIps      = net.UnknownNetworkError("no ips")
-	errNoEch      = net.UnknownNetworkError("no ech")
-	errNoDialer   = net.UnknownNetworkError("no dialer")
-	errNoRetrier  = net.UnknownNetworkError("no retrier")
-	errNoListener = net.UnknownNetworkError("no listener")
+	errNilConn      = net.UnknownNetworkError("nil connection")
+	errNoConn       = net.UnknownNetworkError("no connection")
+	errNoSysConn    = net.UnknownNetworkError("no sys connection")
+	errNoDesyncConn = net.UnknownNetworkError("no desync connection")
+	errNoIps        = net.UnknownNetworkError("no ips")
+	errNoEch        = net.UnknownNetworkError("no ech")
+	errNoDialer     = net.UnknownNetworkError("no dialer")
+	errNoRetrier    = net.UnknownNetworkError("no retrier")
+	errNoListener   = net.UnknownNetworkError("no listener")
 )
 
 var ipm ipmap.IPMap = ipmap.NewIPMap()

diff --git a/intra/dialers/split_and_desync.go b/intra/dialers/split_and_desync.go
@@ -197,6 +197,9 @@ func desyncWithTraceroute(d *protect.RDial, local, remote netip.AddrPort) (*over
 	if err != nil {
 		return nil, err
 	}
+	if oc == nil { // nilaway
+		return nil, errNoDesyncConn
+	}
 
 	var msgBuf [probeSize]byte
 

diff --git a/tunnel/dialer.go b/tunnel/dialer.go
@@ -56,9 +56,12 @@ func (t *gtunnel) DialBind(network, local, remote string) (protect.Conn, error)
 	laddr, _ := fulladdr(local)      // stack must allow spoofing
 	switch network {
 	case "tcp", "tcp4", "tcp6":
-		if taddr == nil {
+		if taddr == nil { // todo: error?
 			taddr = &tcpip.FullAddress{}
 		}
+		if laddr == nil { // ok
+			laddr = &tcpip.FullAddress{}
+		}
 		return gonet.DialTCPWithBind(t.ctx, t.stack, *laddr, *taddr, proto)
 	case "udp", "udp4", "udp6":
 		return gonet.DialUDP(t.stack, laddr, taddr, proto)