diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2021-10-15 17:21:25 +0000 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2021-10-27 19:04:36 +0200 |
| commit | 5975ae1d414b95096a37eae27b0a5144bb17cd29 (patch) | |
| tree | 2a585fefd8f1e639c61bb066c132a69f62f962a5 | |
| parent | version: official: remove stutter (diff) | |
| download | wireguard-windows-5975ae1d414b95096a37eae27b0a5144bb17cd29.tar.xz wireguard-windows-5975ae1d414b95096a37eae27b0a5144bb17cd29.zip | |
embeddable-dll-service: update for new wgnt API
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | embeddable-dll-service/build.bat | 2 | ||||
| -rw-r--r-- | embeddable-dll-service/csharp/TunnelDll/Driver.cs | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/embeddable-dll-service/build.bat b/embeddable-dll-service/build.bat index 0135b054..db8c7738 100644 --- a/embeddable-dll-service/build.bat +++ b/embeddable-dll-service/build.bat @@ -22,8 +22,6 @@ if exist ..\.deps\prepared goto :build call :build_plat x86 i686 386 || goto :error call :build_plat amd64 x86_64 amd64 || goto :error call :build_plat arm64 aarch64 arm64 || goto :error - rem Uncomment when cgo is implemented: - rem call :build_plat arm armv7 arm || goto :error :success echo [+] Success diff --git a/embeddable-dll-service/csharp/TunnelDll/Driver.cs b/embeddable-dll-service/csharp/TunnelDll/Driver.cs index ecb097df..f3543972 100644 --- a/embeddable-dll-service/csharp/TunnelDll/Driver.cs +++ b/embeddable-dll-service/csharp/TunnelDll/Driver.cs @@ -13,14 +13,12 @@ namespace Tunnel public class Driver { [DllImport("wireguard.dll", EntryPoint = "WireGuardOpenAdapter", CallingConvention = CallingConvention.StdCall, SetLastError = true)] - private static extern IntPtr openAdapter([MarshalAs(UnmanagedType.LPWStr)] string pool, [MarshalAs(UnmanagedType.LPWStr)] string name); - [DllImport("wireguard.dll", EntryPoint = "WireGuardFreeAdapter", CallingConvention = CallingConvention.StdCall)] + private static extern IntPtr openAdapter([MarshalAs(UnmanagedType.LPWStr)] string name); + [DllImport("wireguard.dll", EntryPoint = "WireGuardCloseAdapter", CallingConvention = CallingConvention.StdCall)] private static extern void freeAdapter(IntPtr adapter); [DllImport("wireguard.dll", EntryPoint = "WireGuardGetConfiguration", CallingConvention = CallingConvention.StdCall, SetLastError = true)] private static extern bool getConfiguration(IntPtr adapter, byte[] iface, ref UInt32 bytes); - private const string defaultPool = "WireGuard"; - public class Adapter { private IntPtr _handle; @@ -28,7 +26,7 @@ namespace Tunnel public Adapter(string name) { _lastGetGuess = 1024; - _handle = openAdapter(defaultPool, name); + _handle = openAdapter(name); if (_handle == IntPtr.Zero) throw new Win32Exception(); } @@ -200,7 +198,7 @@ namespace Tunnel HasEndpoint = 1 << 3, ReplaceAllowedIPs = 1 << 5, Remove = 1 << 6, - Update = 1 << 7 + UpdateOnly = 1 << 7 }; [StructLayout(LayoutKind.Sequential, Pack = 8, Size = 136)] |