diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-11-03 12:34:19 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-11-03 12:34:19 +0100 |
| commit | 8963f7258ebe5889399f77e89d7ebd08f57c0733 (patch) | |
| tree | 28ff5b610d1b182d78ca5d2fa5266a3ae418a8a7 | |
| parent | api: use 'open' name since caller must close handle (diff) | |
| download | wintun-8963f7258ebe5889399f77e89d7ebd08f57c0733.tar.xz wintun-8963f7258ebe5889399f77e89d7ebd08f57c0733.zip | |
api: remove guid getter
The iphlpapi takes both LUIDs and GUIDs but prefers LUIDs, so exposing
the NET_LUID makes sense. However, we were previously exposing the
configuration GUID, rather than the net GUID, which is confusing, so
just make it all go away.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | api/adapter.c | 6 | ||||
| -rw-r--r-- | api/exports.def | 1 | ||||
| -rw-r--r-- | api/wintun.h | 9 | ||||
| -rw-r--r-- | example/example.c | 7 |
4 files changed, 2 insertions, 21 deletions
diff --git a/api/adapter.c b/api/adapter.c index 3db3174..bab0502 100644 --- a/api/adapter.c +++ b/api/adapter.c @@ -767,12 +767,6 @@ cleanupDeviceRegKey: } void WINAPI -WintunGetAdapterGUID(_In_ const WINTUN_ADAPTER *Adapter, _Out_ GUID *Guid) -{ - memcpy(Guid, &Adapter->CfgInstanceID, sizeof(GUID)); -} - -void WINAPI WintunGetAdapterLUID(_In_ const WINTUN_ADAPTER *Adapter, _Out_ NET_LUID *Luid) { Luid->Info.Reserved = 0; diff --git a/api/exports.def b/api/exports.def index 10c82c2..53c2300 100644 --- a/api/exports.def +++ b/api/exports.def @@ -9,7 +9,6 @@ EXPORTS WintunFreeAdapter WintunGetAdapter WintunOpenAdapterDeviceObject - WintunGetAdapterGUID WintunGetAdapterLUID WintunGetAdapterName WintunGetReadWaitEvent diff --git a/api/wintun.h b/api/wintun.h index 353c1e9..62816b9 100644 --- a/api/wintun.h +++ b/api/wintun.h @@ -150,15 +150,6 @@ typedef WINTUN_STATUS( WINAPI *WINTUN_OPEN_ADAPTER_DEVICE_OBJECT_FUNC)(_In_ WINTUN_ADAPTER_HANDLE Adapter, _Out_ HANDLE *Handle); /** - * Returns the GUID of the adapter. - * - * @param Adapter Adapter handle obtained with WintunGetAdapter or WintunCreateAdapter - * - * @param Guid Pointer to GUID to receive adapter ID. - */ -typedef void(WINAPI *WINTUN_GET_ADAPTER_GUID_FUNC)(_In_ WINTUN_ADAPTER_HANDLE Adapter, _Out_ GUID *Guid); - -/** * Returns the LUID of the adapter. * * @param Adapter Adapter handle obtained with WintunGetAdapter or WintunCreateAdapter diff --git a/example/example.c b/example/example.c index ad919c9..b5297e1 100644 --- a/example/example.c +++ b/example/example.c @@ -19,7 +19,6 @@ static WINTUN_ENUM_ADAPTERS_FUNC WintunEnumAdapters; static WINTUN_FREE_ADAPTER_FUNC WintunFreeAdapter;
static WINTUN_GET_ADAPTER_FUNC WintunGetAdapter;
static WINTUN_OPEN_ADAPTER_DEVICE_OBJECT_FUNC WintunOpenAdapterDeviceObject;
-static WINTUN_GET_ADAPTER_GUID_FUNC WintunGetAdapterGUID;
static WINTUN_GET_ADAPTER_LUID_FUNC WintunGetAdapterLUID;
static WINTUN_GET_ADAPTER_NAME_FUNC WintunGetAdapterName;
static WINTUN_SET_ADAPTER_NAME_FUNC WintunSetAdapterName;
@@ -258,11 +257,9 @@ InitializeWintun(void) return NULL;
#define X(Name, Type) ((Name = (Type)GetProcAddress(Wintun, #Name)) == NULL)
if (X(WintunCreateAdapter, WINTUN_CREATE_ADAPTER_FUNC) || X(WintunDeleteAdapter, WINTUN_DELETE_ADAPTER_FUNC) ||
- X(WintunDeletePoolDriver, WINTUN_DELETE_POOL_DRIVER_FUNC) ||
- X(WintunEnumAdapters, WINTUN_ENUM_ADAPTERS_FUNC) || X(WintunFreeAdapter, WINTUN_FREE_ADAPTER_FUNC) ||
- X(WintunGetAdapter, WINTUN_GET_ADAPTER_FUNC) ||
+ X(WintunDeletePoolDriver, WINTUN_DELETE_POOL_DRIVER_FUNC) || X(WintunEnumAdapters, WINTUN_ENUM_ADAPTERS_FUNC) ||
+ X(WintunFreeAdapter, WINTUN_FREE_ADAPTER_FUNC) || X(WintunGetAdapter, WINTUN_GET_ADAPTER_FUNC) ||
X(WintunOpenAdapterDeviceObject, WINTUN_OPEN_ADAPTER_DEVICE_OBJECT_FUNC) ||
- X(WintunGetAdapterGUID, WINTUN_GET_ADAPTER_GUID_FUNC) ||
X(WintunGetAdapterLUID, WINTUN_GET_ADAPTER_LUID_FUNC) ||
X(WintunGetAdapterName, WINTUN_GET_ADAPTER_NAME_FUNC) ||
X(WintunSetAdapterName, WINTUN_SET_ADAPTER_NAME_FUNC) || X(WintunGetVersion, WINTUN_GET_VERSION_FUNC) ||
|