netstack: m Up and Rev handlers api change

Author: ignoramous

intra/netstack/netstack.go

@@ -10,6 +10,7 @@ import (
 	"errors"
 	"fmt"
 	"net/netip"
+	"strconv"
 
 	"github.com/celzero/firestack/intra/core"
 	"github.com/celzero/firestack/intra/log"
@@ -29,8 +30,9 @@ const nicfwd = false
 const mustAddIfAddrs = false
 
 // ref: github.com/brewlin/net-protocol/blob/ec64e5f899/internal/endpoint/endpoint.go#L20
-func Up(who string, s *stack.Stack, ep stack.LinkEndpoint, h GConnHandler) (tcpip.NICID, error) {
+func Up(s *stack.Stack, ep SeamlessEndpoint, h GConnHandler) (tcpip.NICID, error) {
 	nic := tcpip.NICID(settings.NICID)
+	who := strconv.Itoa(ep.Stat().Fd)
 
 	// fetch existing routes before adding removing nic, which wipes out routes
 	existingroutes := s.GetRouteTable()

intra/netstack/rev.go

@@ -10,6 +10,7 @@ import (
 	"context"
 	"net"
 	"net/netip"
+	"strconv"
 	"sync/atomic"
 
 	"github.com/celzero/firestack/intra/core"
@@ -51,7 +52,8 @@ var _ GTCPConnHandler = (*revtcp)(nil)
 var _ GUDPConnHandler = (*revudp)(nil)
 var _ GICMPHandler = (*revicmp)(nil)
 
-func NewReverseGConnHandler(id string, pctx context.Context, to *stack.Stack, of tcpip.NICID, ep stack.LinkEndpoint, via GConnHandler) *gconnhandler {
+func NewReverseGConnHandler(pctx context.Context, to *stack.Stack, of tcpip.NICID, ep SeamlessEndpoint, via GConnHandler) *gconnhandler {
+	id := strconv.Itoa(ep.Stat().Fd)
 	h := &gconnhandler{
 		tcp:  newReverseTCP(id, to, of, via.TCP()),
 		udp:  newReverseUDP(id, to, of, via.UDP()),

tunnel/tunnel.go

@@ -29,7 +29,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"strconv"
 	"sync"
 	"sync/atomic"
 	"syscall"
@@ -182,21 +181,19 @@ func NewGTunnel(pctx context.Context, fd, mtu int, l3 string, hdl netstack.GConn
 		return nil, nil, eerr
 	}
 
+	var nic tcpip.NICID
 	if l3 != settings.IP46 {
+		l3 = settings.IP46 // always dual-stack
 		log.W("tun: new netstack(%d) l3 is %s needed %s", fd, l3, settings.IP46)
 	}
 	netstack.Route(stack, l3)
-
-	who := strconv.Itoa(ep.Stat().Fd)
-
-	var nic tcpip.NICID
 	// Enabled() may temporarily return false when Up() is in progress.
-	if nic, err = netstack.Up(who, stack, ep, hdl); err != nil { // attach new endpoint
+	if nic, err = netstack.Up(stack, ep, hdl); err != nil { // attach new endpoint
 		done()
 		return nil, nil, err
 	}
 
-	rev = netstack.NewReverseGConnHandler(who, ctx, stack, nic, ep, hdl)
+	rev = netstack.NewReverseGConnHandler(ctx, stack, nic, ep, hdl)
 
 	log.I("tun: new netstack(%d) up; fd(%d=>%d), mtu(%d)", nic, fd, myfd, mtu)