From f394d011c31fd34c086ac3760dffbea635da54fe Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 19 Oct 2021 12:33:07 -0600 Subject: driver: PEER_UPDATE is supposed to be UPDATE_ONLY Signed-off-by: Jason A. Donenfeld --- README.md | 2 +- api/configuration.c | 2 +- api/wireguard.h | 2 +- driver/ioctl.c | 2 +- driver/ioctl.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fe87a9b..cfe7a9d 100644 --- a/README.md +++ b/README.md @@ -287,7 +287,7 @@ These values may be or'd together. |`WIREGUARD_PEER_HAS_ENDPOINT`|The Endpoint field is set.| |`WIREGUARD_PEER_REPLACE_ALLOWED_IPS`|Remove all allowed IPs before adding new ones (unused on get).| |`WIREGUARD_PEER_REMOVE`|Remove specified peer (unused on get).| -|`WIREGUARD_PEER_UPDATE`|Do not add a new peer (unused on get).| +|`WIREGUARD_PEER_UPDATE_ONLY`|Do not add a new peer (unused on get).| ### Function: `WireGuardSetConfiguration` - sets configuration of adapter. diff --git a/api/configuration.c b/api/configuration.c index 5bd0030..bbde418 100644 --- a/api/configuration.c +++ b/api/configuration.c @@ -120,7 +120,7 @@ static_assert( WG_IOCTL_PEER_REPLACE_ALLOWED_IPS == WIREGUARD_PEER_REPLACE_ALLOWED_IPS, "PEER_REPLACE_ALLOWED_IPS flag mismatch"); static_assert(WG_IOCTL_PEER_REMOVE == WIREGUARD_PEER_REMOVE, "PEER_REMOVE flag mismatch"); -static_assert(WG_IOCTL_PEER_UPDATE == WIREGUARD_PEER_UPDATE, "PEER_UPDATE flag mismatch"); +static_assert(WG_IOCTL_PEER_UPDATE_ONLY == WIREGUARD_PEER_UPDATE_ONLY, "PEER_UPDATE_ONLY flag mismatch"); static_assert(sizeof(WG_IOCTL_ALLOWED_IP) == sizeof(WIREGUARD_ALLOWED_IP), "Allowed IP struct mismatch"); static_assert( offsetof(WG_IOCTL_ALLOWED_IP, AddressFamily) == offsetof(WIREGUARD_ALLOWED_IP, AddressFamily), diff --git a/api/wireguard.h b/api/wireguard.h index ce562fa..61d9c3d 100644 --- a/api/wireguard.h +++ b/api/wireguard.h @@ -229,7 +229,7 @@ typedef enum WIREGUARD_PEER_HAS_ENDPOINT = 1 << 3, /**< The Endpoint field is set */ WIREGUARD_PEER_REPLACE_ALLOWED_IPS = 1 << 5, /**< Remove all allowed IPs before adding new ones */ WIREGUARD_PEER_REMOVE = 1 << 6, /**< Remove specified peer */ - WIREGUARD_PEER_UPDATE = 1 << 7 /**< Do not add a new peer */ + WIREGUARD_PEER_UPDATE_ONLY = 1 << 7 /**< Do not add a new peer */ } WIREGUARD_PEER_FLAG; typedef struct _WIREGUARD_PEER WIREGUARD_PEER; diff --git a/driver/ioctl.c b/driver/ioctl.c index 061be2a..abd7637 100644 --- a/driver/ioctl.c +++ b/driver/ioctl.c @@ -286,7 +286,7 @@ SetPeer(_Inout_ WG_DEVICE *Wg, _Inout_ CONST volatile WG_IOCTL_PEER **UnsafeIoct if (!Peer) { /* Peer doesn't exist yet. Add a new one. */ - if (IoctlPeer.Flags & (WG_IOCTL_PEER_REMOVE | WG_IOCTL_PEER_UPDATE)) + if (IoctlPeer.Flags & (WG_IOCTL_PEER_REMOVE | WG_IOCTL_PEER_UPDATE_ONLY)) goto cleanupStack; /* The peer is new, so there aren't allowed IPs to remove. */ diff --git a/driver/ioctl.h b/driver/ioctl.h index 4675c39..4166cb0 100644 --- a/driver/ioctl.h +++ b/driver/ioctl.h @@ -42,7 +42,7 @@ typedef enum WG_IOCTL_PEER_HAS_PROTOCOL_VERSION = 1 << 4, WG_IOCTL_PEER_REPLACE_ALLOWED_IPS = 1 << 5, WG_IOCTL_PEER_REMOVE = 1 << 6, - WG_IOCTL_PEER_UPDATE = 1 << 7 + WG_IOCTL_PEER_UPDATE_ONLY = 1 << 7 } WG_IOCTL_PEER_FLAG; typedef __declspec(align(8)) struct _WG_IOCTL_PEER -- cgit v1.2.3-59-g8ed1b