From f28a657a1d8798df533f61e498f4f697a86193a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Papp?= <zoltan.pmail@gmail.com>
Date: Mon, 8 Jul 2024 17:08:54 +0200
Subject: [PATCH] extend wginterface func with windows related things

---
 iface/iface.go                | 20 --------------------
 iface/iface_moc.go            | 31 ++++++++++++++++---------------
 iface/iwginterface.go         | 32 ++++++++++++++++++++++++++++++++
 iface/iwginterface_windows.go | 31 +++++++++++++++++++++++++++++++
 4 files changed, 79 insertions(+), 35 deletions(-)
 create mode 100644 iface/iwginterface.go
 create mode 100644 iface/iwginterface_windows.go

diff --git a/iface/iface.go b/iface/iface.go
index 448a47763..928077a3d 100644
--- a/iface/iface.go
+++ b/iface/iface.go
@@ -17,26 +17,6 @@ const (
 	DefaultWgPort = 51820
 )
 
-type IWGIface interface {
-	Create() error
-	CreateOnAndroid(routeRange []string, ip string, domains []string) error
-	IsUserspaceBind() bool
-	Name() string
-	Address() WGAddress
-	ToInterface() *net.Interface
-	Up() (*bind.UniversalUDPMuxDefault, error)
-	UpdateAddr(newAddr string) error
-	UpdatePeer(peerKey string, allowedIps string, keepAlive time.Duration, endpoint *net.UDPAddr, preSharedKey *wgtypes.Key) error
-	RemovePeer(peerKey string) error
-	AddAllowedIP(peerKey string, allowedIP string) error
-	RemoveAllowedIP(peerKey string, allowedIP string) error
-	Close() error
-	SetFilter(filter PacketFilter) error
-	GetFilter() PacketFilter
-	GetDevice() *DeviceWrapper
-	GetStats(peerKey string) (WGStats, error)
-}
-
 // WGIface represents a interface instance
 type WGIface struct {
 	tun           wgTunDevice
diff --git a/iface/iface_moc.go b/iface/iface_moc.go
index 179c5fae4..e56a69c69 100644
--- a/iface/iface_moc.go
+++ b/iface/iface_moc.go
@@ -10,21 +10,22 @@ import (
 )
 
 type MockWGIface struct {
-	IsUserspaceBindFunc func() bool
-	NameFunc            func() string
-	AddressFunc         func() WGAddress
-	ToInterfaceFunc     func() *net.Interface
-	UpFunc              func() (*bind.UniversalUDPMuxDefault, error)
-	UpdateAddrFunc      func(newAddr string) error
-	UpdatePeerFunc      func(peerKey string, allowedIps string, keepAlive time.Duration, endpoint *net.UDPAddr, preSharedKey *wgtypes.Key) error
-	RemovePeerFunc      func(peerKey string) error
-	AddAllowedIPFunc    func(peerKey string, allowedIP string) error
-	RemoveAllowedIPFunc func(peerKey string, allowedIP string) error
-	CloseFunc           func() error
-	SetFilterFunc       func(filter PacketFilter) error
-	GetFilterFunc       func() PacketFilter
-	GetDeviceFunc       func() *DeviceWrapper
-	GetStatsFunc        func(peerKey string) (WGStats, error)
+	IsUserspaceBindFunc        func() bool
+	NameFunc                   func() string
+	AddressFunc                func() WGAddress
+	ToInterfaceFunc            func() *net.Interface
+	UpFunc                     func() (*bind.UniversalUDPMuxDefault, error)
+	UpdateAddrFunc             func(newAddr string) error
+	UpdatePeerFunc             func(peerKey string, allowedIps string, keepAlive time.Duration, endpoint *net.UDPAddr, preSharedKey *wgtypes.Key) error
+	RemovePeerFunc             func(peerKey string) error
+	AddAllowedIPFunc           func(peerKey string, allowedIP string) error
+	RemoveAllowedIPFunc        func(peerKey string, allowedIP string) error
+	CloseFunc                  func() error
+	SetFilterFunc              func(filter PacketFilter) error
+	GetFilterFunc              func() PacketFilter
+	GetDeviceFunc              func() *DeviceWrapper
+	GetStatsFunc               func(peerKey string) (WGStats, error)
+	GetInterfaceGUIDStringFunc func() (string, error)
 }
 
 func (m *MockWGIface) Create() error {
diff --git a/iface/iwginterface.go b/iface/iwginterface.go
new file mode 100644
index 000000000..501f51d2b
--- /dev/null
+++ b/iface/iwginterface.go
@@ -0,0 +1,32 @@
+//go:build !windows
+
+package iface
+
+import (
+	"net"
+	"time"
+
+	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+
+	"github.com/netbirdio/netbird/iface/bind"
+)
+
+type IWGIface interface {
+	Create() error
+	CreateOnAndroid(routeRange []string, ip string, domains []string) error
+	IsUserspaceBind() bool
+	Name() string
+	Address() WGAddress
+	ToInterface() *net.Interface
+	Up() (*bind.UniversalUDPMuxDefault, error)
+	UpdateAddr(newAddr string) error
+	UpdatePeer(peerKey string, allowedIps string, keepAlive time.Duration, endpoint *net.UDPAddr, preSharedKey *wgtypes.Key) error
+	RemovePeer(peerKey string) error
+	AddAllowedIP(peerKey string, allowedIP string) error
+	RemoveAllowedIP(peerKey string, allowedIP string) error
+	Close() error
+	SetFilter(filter PacketFilter) error
+	GetFilter() PacketFilter
+	GetDevice() *DeviceWrapper
+	GetStats(peerKey string) (WGStats, error)
+}
diff --git a/iface/iwginterface_windows.go b/iface/iwginterface_windows.go
new file mode 100644
index 000000000..b5053474e
--- /dev/null
+++ b/iface/iwginterface_windows.go
@@ -0,0 +1,31 @@
+package iface
+
+import (
+	"net"
+	"time"
+
+	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+
+	"github.com/netbirdio/netbird/iface/bind"
+)
+
+type IWGIface interface {
+	Create() error
+	CreateOnAndroid(routeRange []string, ip string, domains []string) error
+	IsUserspaceBind() bool
+	Name() string
+	Address() WGAddress
+	ToInterface() *net.Interface
+	Up() (*bind.UniversalUDPMuxDefault, error)
+	UpdateAddr(newAddr string) error
+	UpdatePeer(peerKey string, allowedIps string, keepAlive time.Duration, endpoint *net.UDPAddr, preSharedKey *wgtypes.Key) error
+	RemovePeer(peerKey string) error
+	AddAllowedIP(peerKey string, allowedIP string) error
+	RemoveAllowedIP(peerKey string, allowedIP string) error
+	Close() error
+	SetFilter(filter PacketFilter) error
+	GetFilter() PacketFilter
+	GetDevice() *DeviceWrapper
+	GetStats(peerKey string) (WGStats, error)
+	GetInterfaceGUIDString() (string, error)
+}