ipn: log socket keepalive status

Author: ignoramous

intra/ipn/auto.go

@@ -295,9 +295,9 @@ func (h *auto) dial(network, laddr, raddr string) (protect.Conn, error) {
 	} else {
 		h.exp.Put(raddr, who)
 	}
-	maybeKeepAlive(c)
-	logei(err)("proxy: auto: w(%d) pin(%t/%d), dial(%s) %s; err? %v",
-		who, recent, previdx, network, raddr, err)
+	kaenabled := maybeKeepAlive(c)
+	logei(err)("proxy: auto: w(%d) pin(%t/%d), dial(%s) %s, ka? %t; err? %v",
+		who, recent, previdx, network, raddr, kaenabled, err)
 	return c, err
 }
 
@@ -547,12 +547,22 @@ func (*auto) announceIfHealthy(p Proxy, network, local string) (net.PacketConn,
 	return p.Dialer().Announce(network, local)
 }
 
-func maybeKeepAlive(c net.Conn) {
+func maybeKeepAlive(c net.Conn) (keepingalive bool) {
+	keepingalive, _ = maybeKeepAlive2(c)
+	return
+}
+
+func maybeKeepAlive2(c net.Conn) (keepingalive, ok bool) {
 	if settings.GetDialerOpts().LowerKeepAlive {
-		// adjust TCP keepalive config if c is a TCPConn
-		core.SetKeepAliveConfigSockOpt(c)
-	} else {
-		// disable TCP keepalive config if c is a TCPConn
-		core.DisableKeepAlive(c)
+		// adjust socket's keepalive config
+		lowered := core.SetKeepAliveConfigSockOpt(c)
+		keepingalive = lowered
+		ok = lowered
+		return
 	}
+	// disable socket keepalive
+	disabled := core.DisableKeepAlive(c)
+	keepingalive = !disabled
+	ok = disabled
+	return
 }

intra/ipn/base.go

@@ -119,8 +119,9 @@ func (h *base) dial(network, local, remote string) (c protect.Conn, err error) {
 	}
 	defer localDialStatus(h.status, err)
 
-	maybeKeepAlive(c)
-	log.I("proxy: base: dial(%s) to %s=>%s (via %s); err? %v", network, local, remote, who, err)
+	kaenabled := maybeKeepAlive(c)
+	log.I("proxy: base: dial(%s) to %s=>%s (via %s), ka? %t; err? %v",
+		network, local, remote, who, kaenabled, err)
 	return
 }
 

intra/ipn/exit.go

@@ -94,8 +94,9 @@ func (h *exit) dial(network, local, remote string) (protect.Conn, error) {
 	c, err := localDialStrat(h.outbound, network, local, remote)
 	defer localDialStatus(h.status, err)
 
-	maybeKeepAlive(c)
-	log.I("proxy: exit: dial(%s) %s => %s; err? %v", network, local, remote, err)
+	kaenabled := maybeKeepAlive(c)
+	log.I("proxy: exit: dial(%s) %s => %s, ka? %t; err? %v",
+		network, local, remote, kaenabled, err)
 	return c, err
 }
 

intra/ipn/exit64.go

@@ -96,9 +96,9 @@ func (h *exit64) dial(network, local, remote string) (protect.Conn, error) {
 	c, err := localDialStrat(h.outbound, network, local64, addr64)
 	defer localDialStatus(h.status, err)
 
-	maybeKeepAlive(c)
-	log.I("proxy: exit64: dial(%s) %s via %s to %s; err? %v",
-		network, local64, remote, addr64, err)
+	kaenabled := maybeKeepAlive(c)
+	log.I("proxy: exit64: dial(%s) %s via %s to %s, ka? %t; err? %v",
+		network, local64, remote, addr64, kaenabled, err)
 
 	return c, err
 }