tcp: close netstack.GTCPConn where approp

Author: ignoramous

intra/tcp.go

@@ -187,17 +187,16 @@ func (h *tcpHandler) Proxy(gconn *netstack.GTCPConn, src, target netip.AddrPort)
 	}
 
 	if isAnyBasePid(pids) { // see udp.go:Connect
-		if target.IsValid() && h.resolver.IsDnsAddr(target) {
+		// handshake; since we assume a duplex-stream from here on
+		if _, err := gconn.Establish(); err != nil {
+			log.E("tcp: %s connect1 err %v; %s => %s for %s", cid, err, src, target, uid)
+			clos(gconn)
+			h.queueSummary(smm.done(err))
+			return deny // == !open
+		}
+		if h.dnsOverride(gconn, target, uid) {
 			// SocketSummary not sent; x.DNSSummary supercedes it
-			if _, err := gconn.Establish(); err != nil {
-				clos(gconn)
-				h.queueSummary(smm.done(err))
-				return deny // == !open
-			}
-			// conn closed by the resolver
-			core.Gx(h.proto+".dns", func() {
-				h.resolver.Serve(h.proto, gconn, uid)
-			})
+			// conn closed by resolver
 			return allow
 		} // else not a dns request
 	} // if ipn.Exit then let it connect as-is (aka exit)
@@ -240,7 +239,7 @@ func (h *tcpHandler) Proxy(gconn *netstack.GTCPConn, src, target netip.AddrPort)
 }
 
 // handle connects to the target via the proxy, and pipes data between the src, target; thread-safe.
-func (h *tcpHandler) handle(px ipn.Proxy, src net.Conn, boundSrc, target netip.AddrPort, smm *SocketSummary) (err error) {
+func (h *tcpHandler) handle(px ipn.Proxy, src *netstack.GTCPConn, boundSrc, target netip.AddrPort, smm *SocketSummary) (err error) {
 	var pc protect.Conn
 	var dst net.Conn
 
@@ -283,15 +282,16 @@ func (h *tcpHandler) handle(px ipn.Proxy, src net.Conn, boundSrc, target netip.A
 	smm.RPID = ipn.ViaID(px)
 
 	if err != nil {
-		clos(pc)
+		clos(src, pc)
 		log.W("tcp: err dialing %s proxy(%s) to dst(%v) for %s: %v",
 			smm.ID, px.ID(), target, smm.UID, err)
 		return err
 	}
 
-	gconn := src.(*netstack.GTCPConn)
-	if _, err := gconn.Establish(); err != nil {
-		clos(pc)
+	if _, err := src.Establish(); err != nil {
+		log.E("tcp: %s connect2 err %v; %s => %s for %s",
+			smm.ID, err, src.LocalAddr(), target, smm.UID)
+		clos(src, pc)
 		return err
 	}