From 10c65efeb037a1264c200d643daef0c8be5981ea Mon Sep 17 00:00:00 2001 From: Mark Puha Date: Fri, 29 Sep 2023 11:48:15 +0200 Subject: [PATCH] naming convention fix --- src/ipc-freebsd.h | 54 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/ipc-freebsd.h b/src/ipc-freebsd.h index 2c4f7cc..1acddc4 100644 --- a/src/ipc-freebsd.h +++ b/src/ipc-freebsd.h @@ -91,64 +91,64 @@ static int kernel_get_device(struct wgdevice **device, const char *ifname) dev->flags |= WGDEVICE_HAS_LISTEN_PORT; } } - if (nvlist_exists_number(nvl_device, "junk_packet_count")) { - number = nvlist_get_number(nvl_device, "junk_packet_count"); + if (nvlist_exists_number(nvl_device, "jc")) { + number = nvlist_get_number(nvl_device, "jc"); if (number <= UINT16_MAX){ dev->junk_packet_count = number; dev->flags |= WGDEVICE_HAS_JC; } } - if (nvlist_exists_number(nvl_device, "junk_packet_min_size")) { - number = nvlist_get_number(nvl_device, "junk_packet_min_size"); + if (nvlist_exists_number(nvl_device, "jmin")) { + number = nvlist_get_number(nvl_device, "jmin"); if (number <= UINT16_MAX){ dev->junk_packet_min_size = number; dev->flags |= WGDEVICE_HAS_JMIN; } } - if (nvlist_exists_number(nvl_device, "junk_packet_max_size")) { - number = nvlist_get_number(nvl_device, "junk_packet_max_size"); + if (nvlist_exists_number(nvl_device, "jmax")) { + number = nvlist_get_number(nvl_device, "jmax"); if (number <= UINT16_MAX){ dev->junk_packet_max_size = number; dev->flags |= WGDEVICE_HAS_JMAX; } } - if (nvlist_exists_number(nvl_device, "init_packet_junk_size")) { - number = nvlist_get_number(nvl_device, "init_packet_junk_size"); + if (nvlist_exists_number(nvl_device, "s1")) { + number = nvlist_get_number(nvl_device, "s1"); if (number <= UINT16_MAX){ dev->init_packet_junk_size = number; dev->flags |= WGDEVICE_HAS_S1; } } - if (nvlist_exists_number(nvl_device, "response_packet_junk_size")) { - number = nvlist_get_number(nvl_device, "response_packet_junk_size"); + if (nvlist_exists_number(nvl_device, "s2")) { + number = nvlist_get_number(nvl_device, "s2"); if (number <= UINT16_MAX){ dev->response_packet_junk_size = number; dev->flags |= WGDEVICE_HAS_S2; } } - if (nvlist_exists_number(nvl_device, "init_packet_magic_header")) { - number = nvlist_get_number(nvl_device, "init_packet_magic_header"); + if (nvlist_exists_number(nvl_device, "h1")) { + number = nvlist_get_number(nvl_device, "h1"); if (number <= UINT32_MAX){ dev->init_packet_magic_header = number; dev->flags |= WGDEVICE_HAS_H1; } } - if (nvlist_exists_number(nvl_device, "response_packet_magic_header")) { - number = nvlist_get_number(nvl_device, "response_packet_magic_header"); + if (nvlist_exists_number(nvl_device, "h2")) { + number = nvlist_get_number(nvl_device, "h2"); if (number <= UINT32_MAX){ dev->response_packet_magic_header = number; dev->flags |= WGDEVICE_HAS_H2; } } - if (nvlist_exists_number(nvl_device, "underload_packet_magic_header")) { - number = nvlist_get_number(nvl_device, "underload_packet_magic_header"); + if (nvlist_exists_number(nvl_device, "h3")) { + number = nvlist_get_number(nvl_device, "h3"); if (number <= UINT32_MAX){ dev->underload_packet_magic_header = number; dev->flags |= WGDEVICE_HAS_H3; } } - if (nvlist_exists_number(nvl_device, "transport_packet_magic_header")) { - number = nvlist_get_number(nvl_device, "transport_packet_magic_header"); + if (nvlist_exists_number(nvl_device, "h4")) { + number = nvlist_get_number(nvl_device, "h4"); if (number <= UINT32_MAX){ dev->transport_packet_magic_header = number; dev->flags |= WGDEVICE_HAS_H4; @@ -337,23 +337,23 @@ static int kernel_set_device(struct wgdevice *dev) if (dev->flags & WGDEVICE_HAS_LISTEN_PORT) nvlist_add_number(nvl_device, "listen-port", dev->listen_port); if (dev->flags & WGDEVICE_HAS_JC) - nvlist_add_number(nvl_device, "junk_packet_count", dev->junk_packet_count); + nvlist_add_number(nvl_device, "jc", dev->junk_packet_count); if (dev->flags & WGDEVICE_HAS_JMIN) - nvlist_add_number(nvl_device, "junk_packet_min_size", dev->junk_packet_min_size); + nvlist_add_number(nvl_device, "jmin", dev->junk_packet_min_size); if (dev->flags & WGDEVICE_HAS_JMAX) - nvlist_add_number(nvl_device, "junk_packet_max_size", dev->junk_packet_max_size); + nvlist_add_number(nvl_device, "jmax", dev->junk_packet_max_size); if (dev->flags & WGDEVICE_HAS_S1) - nvlist_add_number(nvl_device, "init_packet_junk_size", dev->init_packet_junk_size); + nvlist_add_number(nvl_device, "s1", dev->init_packet_junk_size); if (dev->flags & WGDEVICE_HAS_S2) - nvlist_add_number(nvl_device, "response_packet_junk_size", dev->response_packet_junk_size); + nvlist_add_number(nvl_device, "s2", dev->response_packet_junk_size); if (dev->flags & WGDEVICE_HAS_H1) - nvlist_add_number(nvl_device, "init_packet_magic_header", dev->init_packet_magic_header); + nvlist_add_number(nvl_device, "h1", dev->init_packet_magic_header); if (dev->flags & WGDEVICE_HAS_H2) - nvlist_add_number(nvl_device, "response_packet_magic_header", dev->response_packet_magic_header); + nvlist_add_number(nvl_device, "h2", dev->response_packet_magic_header); if (dev->flags & WGDEVICE_HAS_H3) - nvlist_add_number(nvl_device, "underload_packet_magic_header", dev->underload_packet_magic_header); + nvlist_add_number(nvl_device, "h3", dev->underload_packet_magic_header); if (dev->flags & WGDEVICE_HAS_H4) - nvlist_add_number(nvl_device, "transport_packet_magic_header", dev->transport_packet_magic_header); + nvlist_add_number(nvl_device, "h4", dev->transport_packet_magic_header); if (dev->flags & WGDEVICE_HAS_FWMARK) nvlist_add_number(nvl_device, "user-cookie", dev->fwmark); if (dev->flags & WGDEVICE_REPLACE_PEERS)