ipn/wg,ipn/proxies: m refactor proxy pinning logic

Author: ignoramous

intra/dnsx/alg.go

@@ -1800,8 +1800,8 @@ func ChooseHealthyProxy(who string, ipps []netip.AddrPort, pids []string, px ipn
 			errs = append(errs, err)
 		}
 	}
-	logeif(!foundProxy)("%s: proxy for %s(%d); choosing %s among %v; errs? %v",
-		who, cipp, len(ipps), pid, pids, core.JoinErr(errs...))
+	logeif(!foundProxy)("%s: proxy for %s [among %v]; choosing %s among %v; errs? %v",
+		who, cipp, ipps, pid, pids, core.JoinErr(errs...))
 	return
 }
 

intra/ipn/proxies.go

@@ -430,17 +430,17 @@ func (px *proxifier) ProxyTo(ipp netip.AddrPort, uid string, pids []string) (_ P
 	if len(pids) == 1 { // there's no other pid to choose from
 		// skip hasroute, as there is only one pid to route to
 		p, err := px.pinID(uid, ipp, pids[0]) // repin
-		// alwaysPin is set to true, so return p even if err is not nil
-		if alwaysPin && p != nil {
-			err = nil
-		}
 		if err != nil || p == nil {
 			err = core.OneErr(err, errProxyNotFound)
 			stalledSec = px.stall(uid + ippstr)
 		}
 		logev(err)("proxy: pin: %s+%s; pin pid0: %s (stalled? %ds); err? %v",
 			uid, ippstr, pids[0], stalledSec, err)
-		return p, err
+		// alwaysPin is set to true, so wipe out err; return p, even if err is not nil
+		if alwaysPin && p != nil {
+			return p, nil
+		}
+		return nil, err
 	}
 
 	var lopinned string

intra/ipn/wg/wgconn.go

@@ -260,7 +260,7 @@ func (s *StdNetBind) Open(uport uint16) ([]conn.ReceiveFunc, uint16, error) {
 	var tries int
 
 	if s.ipv4 != nil || s.ipv6 != nil {
-		log.W("wg: bind: %s already open", s.id)
+		log.W("wg: bind: %s already open at :%d", s.id, uport)
 		return nil, 0, conn.ErrBindAlreadyOpen
 	}
 
@@ -302,8 +302,8 @@ again:
 		fns = append(fns, s.makeReceiveFn(ipv6))
 	}
 
-	log.I("wg: bind: %s opened port(%d) for v4? %t v6? %t",
-		s.id, port, ipv4 != nil, ipv6 != nil)
+	log.I("wg: bind: %s opened port(requested %d => using %d) for v4? %t v6? %t",
+		s.id, uport, port, ipv4 != nil, ipv6 != nil)
 	if len(fns) == 0 {
 		return nil, 0, syscall.EAFNOSUPPORT
 	}