fix some problems for testing

Author: NNdroid

application_test.go

@@ -794,7 +794,6 @@ func TestUpdatePeerSettingsIPAddr(t *testing.T) {
 		})
 		ts.NoError(err)
 	})
-
 }
 
 func TestDisableVPNInterface(t *testing.T) {

service/tunnel.go

@@ -279,14 +279,7 @@ func (t *Tunnel) HandleReadPackets(packets []*vpn.Packet) {
 			// from the internet via NAT, not our own p2p initiative to the
 			// same peer). Subnet check is local to this side — no cross-side
 			// dependency on the client's awl subnet.
-			var srcFromInternet bool
-			if packet.IsIPv6 {
-				if t.awlSubnet6 != nil {
-					srcFromInternet = !t.awlSubnet6.Contains(packet.Src)
-				}
-			} else {
-				srcFromInternet = !t.awlSubnet.Contains(packet.Src)
-			}
+			srcFromInternet := !t.isAWLSubnet(packet.Src, packet.IsIPv6)
 
 			if vpnPeer.weAllowUsingAsExitNode.Load() && t.vpnGatewayServerEnabled && srcFromInternet {
 				packet.GatewayDir = vpn.GatewayDirReturn
@@ -319,14 +312,7 @@ func (t *Tunnel) HandleReadPackets(packets []*vpn.Packet) {
 
 		// VPN gateway client mode: forward non-local packets to the gateway peer.
 		if t.vpnGatewayClientEnabled && t.vpnGatewayPeer != nil {
-			var isAWLSubnet bool
-			if packet.IsIPv6 {
-				if t.awlSubnet6 != nil {
-					isAWLSubnet = t.awlSubnet6.Contains(packet.Dst)
-				}
-			} else {
-				isAWLSubnet = t.awlSubnet.Contains(packet.Dst)
-			}
+			isAWLSubnet := t.isAWLSubnet(packet.Dst, packet.IsIPv6)
 
 			if isNonRoutableIP(packet.Dst) || isAWLSubnet {
 				continue
@@ -362,6 +348,16 @@ func (t *Tunnel) makeTunnelStream(ctx context.Context, peerID peer.ID) (network.
 	return stream, nil
 }
 
+func (t *Tunnel) isAWLSubnet(ip net.IP, isIPv6 bool) bool {
+	if isIPv6 {
+		if t.awlSubnet6 != nil {
+			return t.awlSubnet6.Contains(ip)
+		}
+		return false
+	}
+	return t.awlSubnet.Contains(ip)
+}
+
 type VpnPeer struct {
 	peerID                 peer.ID
 	localIP                atomic.Pointer[net.IP]

vpn/netstate/vpn_hostnet_integration_test.go

@@ -49,8 +49,9 @@ import (
 )
 
 const (
-	testTunIf     = "awl0"
-	testAwlSubnet = "10.66.0.0/16"
+	testTunIf      = "awl0"
+	testAwlSubnet  = "10.66.0.0/16"
+	testAwlSubnet6 = "fd00:66::/48"
 	ipForwardPath = "/proc/sys/net/ipv4/ip_forward"
 )
 
@@ -65,7 +66,7 @@ func TestGatewayHostNetNATLifecycle(t *testing.T) {
 	before := snapshotNet(t)
 
 	mgr := NewManager()
-	require.NoError(t, mgr.EnableServerNAT(testAwlSubnet, testTunIf))
+	require.NoError(t, mgr.EnableServerNAT(testAwlSubnet, testAwlSubnet6, testTunIf))
 	require.True(t, mgr.ServerNATActive())
 
 	assertNATApplied(t)
@@ -97,13 +98,13 @@ func TestGatewayHostNetNATIdempotentResetup(t *testing.T) {
 	before := snapshotNet(t)
 
 	mgr1 := NewManager()
-	require.NoError(t, mgr1.EnableServerNAT(testAwlSubnet, testTunIf))
+	require.NoError(t, mgr1.EnableServerNAT(testAwlSubnet, testAwlSubnet6, testTunIf))
 	applied1 := snapshotNet(t)
 
 	// Second manager over the live state of the first — simulates a leftover
 	// from a process that was killed before teardown ran.
 	mgr2 := NewManager()
-	require.NoError(t, mgr2.EnableServerNAT(testAwlSubnet, testTunIf),
+	require.NoError(t, mgr2.EnableServerNAT(testAwlSubnet, testAwlSubnet6, testTunIf),
 		"re-setup over leftover state must succeed (cleanupStaleNAT)")
 	applied2 := snapshotNet(t)
 
@@ -126,7 +127,7 @@ func TestGatewayHostNetNATPreservesExistingIPForward(t *testing.T) {
 	}
 
 	mgr := NewManager()
-	require.NoError(t, mgr.EnableServerNAT(testAwlSubnet, testTunIf))
+	require.NoError(t, mgr.EnableServerNAT(testAwlSubnet, testAwlSubnet6, testTunIf))
 	require.Equal(t, "1", readForward(t))
 
 	require.NoError(t, mgr.DisableServerNAT())