udp: skip h3 proxying for rpnwin

Author: ignoramous

intra/common.go

@@ -790,6 +790,13 @@ func (h *baseHandler) flowing(smm *FlowSummary) {
 	h.listener.Flowing(smm.postMark())
 }
 
+func maybeH3(addr netip.AddrPort) bool {
+	if !addr.IsValid() {
+		return false
+	}
+	return addr.Port() == 443 || addr.Port() == 80
+}
+
 func conn2str(a net.Conn, b net.Conn) string {
 	ar := a.RemoteAddr()
 	br := b.RemoteAddr()

intra/ipn/proxies.go

@@ -1474,6 +1474,10 @@ func isRPN(id string) bool {
 	return strings.Contains(id, RPN) // RPN is a suffix
 }
 
+func DontProxyH3(id string) bool {
+	return strings.Contains(id, RpnWin)
+}
+
 func isWG(id string) bool {
 	return strings.HasPrefix(id, WG) || strings.HasPrefix(id, WGFAST)
 }

intra/tcp.go

@@ -161,7 +161,7 @@ func (h *tcpHandler) ReverseProxy(gconn *netstack.GTCPConn, in net.Conn, to, fro
 	cid, uid, _, pids := h.judge(fm)
 	smm := tcpSummary(cid, uid, to.Addr(), from.Addr())
 
-	if settings.Debug {
+	if log.Verbose {
 		log.V("tcp: %s [%s]: reverse: %s => %s; pids: %v", cid, uid, from, to, pids)
 	}
 
@@ -314,7 +314,7 @@ func (h *tcpHandler) Proxy(gconn *netstack.GTCPConn, src, target netip.AddrPort)
 		} // else not a dns request
 	} // if ipn.Exit then let it connect as-is (aka exit)
 
-	if settings.Debug {
+	if log.Verbose {
 		log.V("tcp: %s proxying %s => %s [%v] (excluded: %v) for %s; pids: %s; localnat64? %t / happyeye? %t",
 			cid, src, target, actualTargets, excluded, uid, pids, targetIsLocalNat64, happyeyeballs)
 	}
@@ -402,7 +402,7 @@ func (h *tcpHandler) handle(px ipn.Proxy, gconn *netstack.GTCPConn, src, target
 
 	start := time.Now()
 
-	if settings.Debug {
+	if log.Verbose {
 		log.V("tcp: %s dial %s: attempt(eim? %t / fwd? %t / canfwd? %t):  %s [%s [%s]] => %s for %s",
 			smm.ID, pid, eim, portfwd, canportfwd, src, gconn.LocalAddr(), bindAddr, targetstr, smm.UID)
 	}

intra/udp.go

@@ -95,7 +95,7 @@ func (h *udpHandler) ReverseProxy(gconn *netstack.GUDPConn, in net.Conn, to, fro
 	cid, uid, _, pids := h.judge(fm)
 	smm := udpSummary(cid, uid, to.Addr(), from.Addr())
 
-	if settings.Debug {
+	if log.Verbose {
 		log.V("udp: %s [%s]: reverse: %s => %s; pids: %v", cid, uid, from, to, pids)
 	}
 
@@ -295,15 +295,15 @@ func (h *udpHandler) Connect(gconn *netstack.GUDPConn, src, target netip.AddrPor
 	canportfwd := portfwd
 	if mux {
 		if muxpid := h.mux.pid(src); len(muxpid) > 0 && containsPid(pids, muxpid) {
-			if settings.Debug {
+			if log.Debug {
 				log.D("udp: connect: %s [%s] mux: %s => %s using muxed-pid %s; all pids %s",
 					cid, uid, src, target, muxpid, pids)
 			}
 			pids = []string{muxpid}
 		} // else: mxr will dial this conn with a different pid
 	}
 
-	if settings.Debug {
+	if log.Verbose {
 		log.V("udp: connect: %s [%s] proxying %s => %s [%v]; pids: %s, mux? %t / fwd? %t / localnat64? %t",
 			cid, uid, src, target, actualTargets, pids, mux, canportfwd, targetIsLocalNat64)
 	}
@@ -339,13 +339,18 @@ func (h *udpHandler) Connect(gconn *netstack.GUDPConn, src, target netip.AddrPor
 			continue
 		}
 
+		if maybeH3(dstipp) && ipn.DontProxyH3(pxid) {
+			errs = log.WE("udp: connect: #%d: %s [%s] proxy(%s) no h3 to dst(%s)", i, cid, uid, pxid, dstipp)
+			continue
+		}
+
 		pxid = smm.PID
 		canportfwd = portfwd && ipn.Remote(pxid)
 
 		if mux { // mux is not supported by all proxies (few like Exit, Base, WG support it)
 			pc, err = h.mux.associate(cid, pxid, uid, src, selectedTarget, px.Dialer().Announce, vendor(dmx), canportfwd)
 		} else {
-			if settings.Debug {
+			if log.Verbose {
 				log.VV("udp: connect: #%d: attempt: %s [%s] proxy(%s) to dst(%s); mux? %t / fwd? %t",
 					i, cid, uid, pxid, selectedTarget, mux, canportfwd)
 			}