Merge tag 'v1.9.4' into multiport

1.9.4 Release
2025-12-16 11:58:27 +01:00 · 2024-09-13 10:17:59 -04:00
parent 6b78e9cdb3 ab81b62ea0
commit dabce8a1b4
83 changed files with 2056 additions and 2755 deletions
--- a/firewall/packet.go
+++ b/firewall/packet.go
@@ -4,8 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	mathrand "math/rand"
-
-	"github.com/slackhq/nebula/iputil"
+	"net/netip"
 )

 type m map[string]interface{}
@@ -21,8 +20,8 @@ const (
 )

 type Packet struct {
-	LocalIP    iputil.VpnIp
-	RemoteIP   iputil.VpnIp
+	LocalIP    netip.Addr
+	RemoteIP   netip.Addr
 	LocalPort  uint16
 	RemotePort uint16
 	Protocol   uint8