fix merge conflicts

coadler · coadler · commit f163acc9cee6 · 2023-04-18T18:19:48.000-05:00
diff --git a/ipn/localapi/localapi.go b/ipn/localapi/localapi.go
@@ -683,7 +683,7 @@ func (h *Handler) serveDebugPortmap(w http.ResponseWriter, r *http.Request) {
 		logf("portmapping changed.")
 		logf("have mapping: %v", c.HaveMapping())
 
-		if ext, ok := c.GetCachedMappingOrStartCreatingOne(); ok {
+		if ext, ok := c.GetCachedMappingOrStartCreatingOne(ctx); ok {
 			logf("cb: mapping: %v", ext)
 			select {
 			case done <- true:
@@ -738,7 +738,7 @@ func (h *Handler) serveDebugPortmap(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if ext, ok := c.GetCachedMappingOrStartCreatingOne(); ok {
+	if ext, ok := c.GetCachedMappingOrStartCreatingOne(ctx); ok {
 		logf("mapping: %v", ext)
 	} else {
 		logf("no mapping")
diff --git a/tsnet/tsnet.go b/tsnet/tsnet.go
@@ -28,6 +28,7 @@ import (
 	"time"
 
 	"golang.org/x/exp/slices"
+	"gvisor.dev/gvisor/pkg/tcpip"
 	"tailscale.com/client/tailscale"
 	"tailscale.com/control/controlclient"
 	"tailscale.com/envknob"
@@ -739,12 +740,12 @@ func (s *Server) getTCPHandlerForFunnelFlow(src netip.AddrPort, dstPort uint16)
 	return ln.handle
 }
 
-func (s *Server) getTCPHandlerForFlow(src, dst netip.AddrPort) (handler func(net.Conn), intercept bool) {
+func (s *Server) getTCPHandlerForFlow(src, dst netip.AddrPort) (handler func(net.Conn), opts []tcpip.SettableSocketOption, intercept bool) {
 	ln, ok := s.listenerForDstAddr("tcp", dst, false)
 	if !ok {
-		return nil, true // don't handle, don't forward to localhost
+		return nil, nil, true // don't handle, don't forward to localhost
 	}
-	return ln.handle, true
+	return ln.handle, nil, true
 }
 
 func (s *Server) getUDPHandlerForFlow(src, dst netip.AddrPort) (handler func(nettype.ConnPacketConn), intercept bool) {
