void/amneziawg-tools
2
0
Fork 0
mirror of https://github.com/amnezia-vpn/amneziawg-tools.git synced 2025-08-02 01:22:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: add s3, s4

Browse source
This commit is contained in:
Mark Puha 2025-07-03 16:32:35 +02:00
parent b1f5d05e93
commit eb30bd6f6e
13 changed files with 165 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/embeddable-wg-library/wireguard.c
View file

@ -53,6 +53,8 @@ enum wgdevice_attribute {
WGDEVICE_A_JMAX,
WGDEVICE_A_S1,
WGDEVICE_A_S2,
WGDEVICE_A_S3,
WGDEVICE_A_S4,
WGDEVICE_A_H1,
WGDEVICE_A_H2,
WGDEVICE_A_H3,

22
src/config.c
View file

@ -566,6 +566,14 @@ static bool process_line(struct config_ctx *ctx, const char *line)
ret = parse_uint16(&ctx->device->response_packet_junk_size, "S2", value);
if (ret)
ctx->device->flags |= WGDEVICE_HAS_S2;
} else if (key_match("S3")) {
ret = parse_uint16(&ctx->device->cookie_reply_packet_junk_size, "S3", value);
if (ret)
ctx->device->flags |= WGDEVICE_HAS_S3;
} else if (key_match("S4")) {
ret = parse_uint16(&ctx->device->transport_packet_junk_size, "S4", value);
if (ret)
ctx->device->flags |= WGDEVICE_HAS_S4;
} else if (key_match("H1")) {
ret = parse_uint32(&ctx->device->init_packet_magic_header, "H1", value);
if (ret)
@ -837,6 +845,20 @@ struct wgdevice *config_read_cmd(const char *argv[], int argc)
device->flags |= WGDEVICE_HAS_S2;
argv += 2;
argc -= 2;
} else if (!strcmp(argv[0], "s3") && argc >= 2 && !peer) {
if (!parse_uint16(&device->cookie_reply_packet_junk_size, "s3", argv[1]))
goto error;
device->flags |= WGDEVICE_HAS_S3;
argv += 2;
argc -= 2;
} else if (!strcmp(argv[0], "s4") && argc >= 2 && !peer) {
if (!parse_uint16(&device->transport_packet_junk_size, "s4", argv[1]))
goto error;
device->flags |= WGDEVICE_HAS_S4;
argv += 2;
argc -= 2;
} else if (!strcmp(argv[0], "h1") && argc >= 2 && !peer) {
if (!parse_uint32(&device->init_packet_magic_header, "h1", argv[1]))
goto error;

30
src/containers.h
View file

@ -87,19 +87,21 @@ enum {
WGDEVICE_HAS_JMAX = 1U << 7,
WGDEVICE_HAS_S1 = 1U << 8,
WGDEVICE_HAS_S2 = 1U << 9,
WGDEVICE_HAS_H1 = 1U << 10,
WGDEVICE_HAS_H2 = 1U << 11,
WGDEVICE_HAS_H3 = 1U << 12,
WGDEVICE_HAS_H4 = 1U << 13,
WGDEVICE_HAS_I1 = 1U << 14,
WGDEVICE_HAS_I2 = 1U << 15,
WGDEVICE_HAS_I3 = 1U << 16,
WGDEVICE_HAS_I4 = 1U << 17,
WGDEVICE_HAS_I5 = 1U << 18,
WGDEVICE_HAS_J1 = 1U << 19,
WGDEVICE_HAS_J2 = 1U << 20,
WGDEVICE_HAS_J3 = 1U << 21,
WGDEVICE_HAS_ITIME = 1U << 22
WGDEVICE_HAS_S3 = 1U << 10,
WGDEVICE_HAS_S4 = 1U << 11,
WGDEVICE_HAS_H1 = 1U << 12,
WGDEVICE_HAS_H2 = 1U << 12,
WGDEVICE_HAS_H3 = 1U << 13,
WGDEVICE_HAS_H4 = 1U << 14,
WGDEVICE_HAS_I1 = 1U << 15,
WGDEVICE_HAS_I2 = 1U << 16,
WGDEVICE_HAS_I3 = 1U << 17,
WGDEVICE_HAS_I4 = 1U << 18,
WGDEVICE_HAS_I5 = 1U << 19,
WGDEVICE_HAS_J1 = 1U << 20,
WGDEVICE_HAS_J2 = 1U << 21,
WGDEVICE_HAS_J3 = 1U << 22,
WGDEVICE_HAS_ITIME = 1U << 23
};
struct wgdevice {
@ -121,6 +123,8 @@ struct wgdevice {
uint16_t junk_packet_max_size;
uint16_t init_packet_junk_size;
uint16_t response_packet_junk_size;
uint16_t cookie_reply_packet_junk_size;
uint16_t transport_packet_junk_size;
uint32_t init_packet_magic_header;
uint32_t response_packet_magic_header;
uint32_t underload_packet_magic_header;

18
src/ipc-freebsd.h
View file

@ -126,6 +126,20 @@ static int kernel_get_device(struct wgdevice **device, const char *ifname)
dev->flags |= WGDEVICE_HAS_S2;
}
}
if (nvlist_exists_number(nvl_device, "s3")) {
number = nvlist_get_number(nvl_device, "s3");
if (number <= UINT16_MAX){
dev->cookie_reply_packet_junk_size = number;
dev->flags |= WGDEVICE_HAS_S3;
}
}
if (nvlist_exists_number(nvl_device, "s4")) {
number = nvlist_get_number(nvl_device, "s4");
if (number <= UINT16_MAX){
dev->transport_packet_junk_size = number;
dev->flags |= WGDEVICE_HAS_S4;
}
}
if (nvlist_exists_number(nvl_device, "h1")) {
number = nvlist_get_number(nvl_device, "h1");
if (number <= UINT32_MAX){
@ -427,6 +441,10 @@ static int kernel_set_device(struct wgdevice *dev)
nvlist_add_number(nvl_device, "s1", dev->init_packet_junk_size);
if (dev->flags & WGDEVICE_HAS_S2)
nvlist_add_number(nvl_device, "s2", dev->response_packet_junk_size);
if (dev->flags & WGDEVICE_HAS_S3)
nvlist_add_number(nvl_device, "s3", dev->cookie_reply_packet_junk_size);
if (dev->flags & WGDEVICE_HAS_S4)
nvlist_add_number(nvl_device, "s4", dev->transport_packet_junk_size);
if (dev->flags & WGDEVICE_HAS_H1)
nvlist_add_number(nvl_device, "h1", dev->init_packet_magic_header);
if (dev->flags & WGDEVICE_HAS_H2)

16
src/ipc-linux.h
View file

@ -173,6 +173,10 @@ again:
mnl_attr_put_u16(nlh, WGDEVICE_A_S1, dev->init_packet_junk_size);
if (dev->flags & WGDEVICE_HAS_S2)
mnl_attr_put_u16(nlh, WGDEVICE_A_S2, dev->response_packet_junk_size);
if (dev->flags & WGDEVICE_HAS_S3)
mnl_attr_put_u16(nlh, WGDEVICE_A_S3, dev->cookie_reply_packet_junk_size);
if (dev->flags & WGDEVICE_HAS_S4)
mnl_attr_put_u16(nlh, WGDEVICE_A_S4, dev->transport_packet_junk_size);
if (dev->flags & WGDEVICE_HAS_H1)
mnl_attr_put_u32(nlh, WGDEVICE_A_H1, dev->init_packet_magic_header);
if (dev->flags & WGDEVICE_HAS_H2)
@ -556,6 +560,18 @@ static int parse_device(const struct nlattr *attr, void *data)
device->flags |= WGDEVICE_HAS_S2;
}
break;
case WGDEVICE_A_S3:
if (!mnl_attr_validate(attr, MNL_TYPE_U16)) {
device->cookie_reply_packet_junk_size = mnl_attr_get_u16(attr);
device->flags |= WGDEVICE_HAS_S3;
}
break;
case WGDEVICE_A_S4:
if (!mnl_attr_validate(attr, MNL_TYPE_U16)) {
device->transport_packet_junk_size = mnl_attr_get_u16(attr);
device->flags |= WGDEVICE_HAS_S4;
}
break;
case WGDEVICE_A_H1:
if (!mnl_attr_validate(attr, MNL_TYPE_U32)) {
device->init_packet_magic_header = mnl_attr_get_u32(attr);

20
src/ipc-openbsd.h
View file

@ -135,6 +135,16 @@ static int kernel_get_device(struct wgdevice **device, const char *iface)
dev->flags |= WGDEVICE_HAS_S2;
}
if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_S3) {
dev->cookie_reply_packet_junk_size = wg_iface->i_cookie_reply_packet_junk_size;
dev->flags |= WGDEVICE_HAS_S3;
}
if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_S4) {
dev->transport_packet_junk_size = wg_iface->i_transport_packet_junk_size;
dev->flags |= WGDEVICE_HAS_S4;
}
if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_H1) {
dev->init_packet_magic_header = wg_iface->i_init_packet_magic_header;
dev->flags |= WGDEVICE_HAS_H1;
@ -346,6 +356,16 @@ static int kernel_set_device(struct wgdevice *dev)
wg_iface->i_flags |= WG_INTERFACE_DEVICE_HAS_S2;
}
if (dev->flags & WGDEVICE_HAS_S3) {
wg_iface->i_cookie_reply_packet_junk_size = dev->cookie_reply_packet_junk_size;
wg_iface->i_flags |= WG_INTERFACE_DEVICE_HAS_S3;
}
if (dev->flags & WGDEVICE_HAS_S4) {
wg_iface->i_transport_packet_junk_size = dev->transport_packet_junk_size;
wg_iface->i_flags |= WG_INTERFACE_DEVICE_HAS_S4;
}
if (dev->flags & WGDEVICE_HAS_H1) {
wg_iface->i_init_packet_magic_header = dev->init_packet_magic_header;
wg_iface->i_flags |= WG_INTERFACE_DEVICE_HAS_H1;

10
src/ipc-uapi.h
View file

@ -61,6 +61,10 @@ static int userspace_set_device(struct wgdevice *dev)
fprintf(f, "s1=%u\n", dev->init_packet_junk_size);
if (dev->flags & WGDEVICE_HAS_S2)
fprintf(f, "s2=%u\n", dev->response_packet_junk_size);
if (dev->flags & WGDEVICE_HAS_S3)
fprintf(f, "s3=%u\n", dev->cookie_reply_packet_junk_size);
if (dev->flags & WGDEVICE_HAS_S4)
fprintf(f, "s4=%u\n", dev->transport_packet_junk_size);
if (dev->flags & WGDEVICE_HAS_H1)
fprintf(f, "h1=%u\n", dev->init_packet_magic_header);
if (dev->flags & WGDEVICE_HAS_H2)
@ -244,6 +248,12 @@ static int userspace_get_device(struct wgdevice **out, const char *iface)
} else if(!peer && !strcmp(key, "s2")) {
dev->response_packet_junk_size = NUM(0xffffU);
dev->flags |= WGDEVICE_HAS_S2;
} else if(!peer && !strcmp(key, "s3")) {
dev->cookie_reply_packet_junk_size = NUM(0xffffU);
dev->flags |= WGDEVICE_HAS_S3;
} else if(!peer && !strcmp(key, "s4")) {
dev->transport_packet_junk_size = NUM(0xffffU);
dev->flags |= WGDEVICE_HAS_S4;
} else if(!peer && !strcmp(key, "h1")) {
dev->init_packet_magic_header = NUM(0xffffffffU);
dev->flags |= WGDEVICE_HAS_H1;

16
src/ipc-windows.h
View file

@ -283,6 +283,14 @@ static int kernel_get_device(struct wgdevice **device, const char *iface)
dev->response_packet_junk_size = wg_iface->ResponsePacketJunkSize;
dev->flags |= WGDEVICE_HAS_S2;
}
if (wg_iface->Flags & WG_IOCTL_INTERFACE_S3) {
dev->cookie_reply_packet_junk_size = wg_iface->CookieReplyPacketJunkSize;
dev->flags |= WGDEVICE_HAS_S3;
}
if (wg_iface->Flags & WG_IOCTL_INTERFACE_S4) {
dev->transport_packet_junk_size = wg_iface->TransportPacketJunkSize;
dev->flags |= WGDEVICE_HAS_S4;
}
if (wg_iface->Flags & WG_IOCTL_INTERFACE_H1) {
dev->init_packet_magic_header = wg_iface->InitPacketMagicHeader;
dev->flags |= WGDEVICE_HAS_H1;
@ -507,6 +515,14 @@ static int kernel_set_device(struct wgdevice *dev)
wg_iface->ResponsePacketJunkSize = dev->response_packet_junk_size;
wg_iface->Flags |= WG_IOCTL_INTERFACE_S2;
}
if (dev->flags & WGDEVICE_HAS_S3) {
wg_iface->CookieReplyPacketJunkSize = dev->cookie_reply_packet_junk_size;
wg_iface->Flags |= WG_IOCTL_INTERFACE_S3;
}
if (dev->flags & WGDEVICE_HAS_S4) {
wg_iface->TransportPacketJunkSize = dev->transport_packet_junk_size;
wg_iface->Flags |= WG_IOCTL_INTERFACE_S4;
}
if (dev->flags & WGDEVICE_HAS_H1) {
wg_iface->InitPacketMagicHeader = dev->init_packet_magic_header;

4
src/show.c
View file

@ -230,6 +230,10 @@ static void pretty_print(struct wgdevice *device)
terminal_printf(" " TERMINAL_BOLD "s1" TERMINAL_RESET ": %u\n", device->init_packet_junk_size);
if (device->response_packet_junk_size)
terminal_printf(" " TERMINAL_BOLD "s2" TERMINAL_RESET ": %u\n", device->response_packet_junk_size);
if (device->cookie_reply_packet_junk_size)
terminal_printf(" " TERMINAL_BOLD "s3" TERMINAL_RESET ": %u\n", device->cookie_reply_packet_junk_size);
if (device->transport_packet_junk_size)
terminal_printf(" " TERMINAL_BOLD "s4" TERMINAL_RESET ": %u\n", device->transport_packet_junk_size);
if (device->init_packet_magic_header)
terminal_printf(" " TERMINAL_BOLD "h1" TERMINAL_RESET ": %u\n", device->init_packet_magic_header);
if (device->response_packet_magic_header)

4
src/showconf.c
View file

@ -56,6 +56,10 @@ int showconf_main(int argc, const char *argv[])
printf("S1 = %u\n", device->init_packet_junk_size);
if (device->flags & WGDEVICE_HAS_S2)
printf("S2 = %u\n", device->response_packet_junk_size);
if (device->flags & WGDEVICE_HAS_S3)
printf("S3 = %u\n", device->cookie_reply_packet_junk_size);
if (device->flags & WGDEVICE_HAS_S4)
printf("S4 = %u\n", device->transport_packet_junk_size);
if (device->flags & WGDEVICE_HAS_H1)
printf("H1 = %u\n", device->init_packet_magic_header);
if (device->flags & WGDEVICE_HAS_H2)

2
src/uapi/linux/linux/wireguard.h
View file

@ -193,6 +193,8 @@ enum wgdevice_attribute {
WGDEVICE_A_JMAX,
WGDEVICE_A_S1,
WGDEVICE_A_S2,
WGDEVICE_A_S3,
WGDEVICE_A_S4,
WGDEVICE_A_H1,
WGDEVICE_A_H2,
WGDEVICE_A_H3,

30
src/uapi/openbsd/net/if_wg.h
View file

@ -77,19 +77,21 @@ struct wg_peer_io {
#define WG_INTERFACE_DEVICE_HAS_JMAX (1 << 7)
#define WG_INTERFACE_DEVICE_HAS_S1 (1 << 8)
#define WG_INTERFACE_DEVICE_HAS_S2 (1 << 9)
#define WG_INTERFACE_DEVICE_HAS_H1 (1 << 10)
#define WG_INTERFACE_DEVICE_HAS_H2 (1 << 11)
#define WG_INTERFACE_DEVICE_HAS_H3 (1 << 12)
#define WG_INTERFACE_DEVICE_HAS_H4 (1 << 13)
#define WG_INTERFACE_DEVICE_HAS_I1 (1 << 14)
#define WG_INTERFACE_DEVICE_HAS_I2 (1 << 15)
#define WG_INTERFACE_DEVICE_HAS_I3 (1 << 16)
#define WG_INTERFACE_DEVICE_HAS_I4 (1 << 17)
#define WG_INTERFACE_DEVICE_HAS_I5 (1 << 18)
#define WG_INTERFACE_DEVICE_HAS_J1 (1 << 19)
#define WG_INTERFACE_DEVICE_HAS_J2 (1 << 20)
#define WG_INTERFACE_DEVICE_HAS_J3 (1 << 21)
#define WG_INTERFACE_DEVICE_HAS_ITIME (1 << 22)
#define WG_INTERFACE_DEVICE_HAS_S3 (1 << 10)
#define WG_INTERFACE_DEVICE_HAS_S4 (1 << 11)
#define WG_INTERFACE_DEVICE_HAS_H1 (1 << 12)
#define WG_INTERFACE_DEVICE_HAS_H2 (1 << 13)
#define WG_INTERFACE_DEVICE_HAS_H3 (1 << 14)
#define WG_INTERFACE_DEVICE_HAS_H4 (1 << 15)
#define WG_INTERFACE_DEVICE_HAS_I1 (1 << 16)
#define WG_INTERFACE_DEVICE_HAS_I2 (1 << 17)
#define WG_INTERFACE_DEVICE_HAS_I3 (1 << 18)
#define WG_INTERFACE_DEVICE_HAS_I4 (1 << 19)
#define WG_INTERFACE_DEVICE_HAS_I5 (1 << 20)
#define WG_INTERFACE_DEVICE_HAS_J1 (1 << 21)
#define WG_INTERFACE_DEVICE_HAS_J2 (1 << 22)
#define WG_INTERFACE_DEVICE_HAS_J3 (1 << 23)
#define WG_INTERFACE_DEVICE_HAS_ITIME (1 << 24)
struct wg_interface_io {
uint16_t i_flags;
@ -105,6 +107,8 @@ struct wg_interface_io {
uint16_t i_junk_packet_max_size;
uint16_t i_init_packet_junk_size;
uint16_t i_response_packet_junk_size;
uint16_t i_cookie_reply_packet_junk_size;
uint16_t i_transport_packet_junk_size;
uint32_t i_init_packet_magic_header;
uint32_t i_response_packet_magic_header;
uint32_t i_underload_packet_magic_header;

30
src/uapi/windows/wireguard.h
View file

@ -63,19 +63,21 @@ typedef enum
WG_IOCTL_INTERFACE_JMAX = 1 << 7,
WG_IOCTL_INTERFACE_S1 = 1 << 8,
WG_IOCTL_INTERFACE_S2 = 1 << 9,
WG_IOCTL_INTERFACE_H1 = 1 << 10,
WG_IOCTL_INTERFACE_H2 = 1 << 11,
WG_IOCTL_INTERFACE_H3 = 1 << 12,
WG_IOCTL_INTERFACE_H4 = 1 << 13,
WG_IOCTL_INTERFACE_I1 = 1U << 14,
WG_IOCTL_INTERFACE_I2 = 1U << 15,
WG_IOCTL_INTERFACE_I3 = 1U << 16,
WG_IOCTL_INTERFACE_I4 = 1U << 17,
WG_IOCTL_INTERFACE_I5 = 1U << 18,
WG_IOCTL_INTERFACE_J1 = 1U << 19,
WG_IOCTL_INTERFACE_J2 = 1U << 20,
WG_IOCTL_INTERFACE_J3 = 1U << 21,
WG_IOCTL_INTERFACE_ITIME = 1U << 22
WG_IOCTL_INTERFACE_S3 = 1 << 10,
WG_IOCTL_INTERFACE_S4 = 1 << 11,
WG_IOCTL_INTERFACE_H1 = 1 << 12,
WG_IOCTL_INTERFACE_H2 = 1 << 12,
WG_IOCTL_INTERFACE_H3 = 1 << 13,
WG_IOCTL_INTERFACE_H4 = 1 << 14,
WG_IOCTL_INTERFACE_I1 = 1U << 15,
WG_IOCTL_INTERFACE_I2 = 1U << 16,
WG_IOCTL_INTERFACE_I3 = 1U << 17,
WG_IOCTL_INTERFACE_I4 = 1U << 18,
WG_IOCTL_INTERFACE_I5 = 1U << 19,
WG_IOCTL_INTERFACE_J1 = 1U << 20,
WG_IOCTL_INTERFACE_J2 = 1U << 21,
WG_IOCTL_INTERFACE_J3 = 1U << 22,
WG_IOCTL_INTERFACE_ITIME = 1U << 23
} WG_IOCTL_INTERFACE_FLAG;
typedef struct _WG_IOCTL_INTERFACE
@ -90,6 +92,8 @@ typedef struct _WG_IOCTL_INTERFACE
USHORT JunkPacketMaxSize;
USHORT InitPacketJunkSize;
USHORT ResponsePacketJunkSize;
USHORT CookieReplyPacketJunkSize;
USHORT TransportPacketJunkSize;
ULONG InitPacketMagicHeader;
ULONG ResponsePacketMagicHeader;
ULONG UnderloadPacketMagicHeader;