diff --git a/client/resources.rc b/client/resources.rc index cd8a28284..ac411245e 100644 --- a/client/resources.rc +++ b/client/resources.rc @@ -6,4 +6,4 @@ #define EXPAND(x) STRINGIZE(x) CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST manifest.xml 7 ICON ui/netbird.ico -wireguard.dll RCDATA wireguard.dll +wintun.dll RCDATA wintun.dll diff --git a/client/wireguard_nt.sh b/client/wireguard_nt.sh index 9f381fd97..9671c75b5 100644 --- a/client/wireguard_nt.sh +++ b/client/wireguard_nt.sh @@ -4,14 +4,14 @@ ldir=$PWD tmp_dir_path=$ldir/.distfiles winnt=wireguard-nt.zip download_file_path=$tmp_dir_path/$winnt -download_url=https://download.wireguard.com/wireguard-nt/wireguard-nt-0.10.1.zip -download_sha=772c0b1463d8d2212716f43f06f4594d880dea4f735165bd68e388fc41b81605 +download_url=https://www.wintun.net/builds/wintun-0.14.1.zip +download_sha=07c256185d6ee3652e09fa55c0b673e2624b565e02c4b9091c79ca7d2f24ef51 function resources_windows(){ cmd=$1 arch=$2 out=$3 - docker run -i --rm -v $PWD:$PWD -w $PWD mstorsjo/llvm-mingw:latest $cmd -O coff -c 65001 -I $tmp_dir_path/wireguard-nt/bin/$arch -i resources.rc -o $out + docker run -i --rm -v $PWD:$PWD -w $PWD mstorsjo/llvm-mingw:latest $cmd -O coff -c 65001 -I $tmp_dir_path/wintun/bin/$arch -i resources.rc -o $out } mkdir -p $tmp_dir_path diff --git a/iface/tun_windows.go b/iface/tun_windows.go index 912529f5a..b621f8c70 100644 --- a/iface/tun_windows.go +++ b/iface/tun_windows.go @@ -37,11 +37,11 @@ func (c *tunDevice) Create() error { // createWithUserspace Creates a new WireGuard interface, using wireguard-go userspace implementation func (c *tunDevice) createWithUserspace() (NetInterface, error) { - dll := windows.NewLazyDLL("wintun.dll") - err := dll.Load() - if err != nil { - return nil, err - } + /* dll := windows.NewLazyDLL("wintun.dll") + err := dll.Load() + if err != nil { + return nil, err + }*/ tunIface, err := tun.CreateTUN(c.name, c.mtu) if err != nil { return nil, err diff --git a/iface/wintun.dll b/iface/wintun.dll deleted file mode 100644 index aee04e77b..000000000 Binary files a/iface/wintun.dll and /dev/null differ