From 04afe0f0f337cf2b9311273717e9301e2e645b7c Mon Sep 17 00:00:00 2001 From: Mark Puha Date: Sat, 14 Jun 2025 15:16:15 +0200 Subject: [PATCH] fix: small changes after review --- src/ipc-freebsd.h | 36 ++++++++++++++++++------------------ src/ipc-openbsd.h | 18 +++++++++--------- src/showconf.c | 2 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/ipc-freebsd.h b/src/ipc-freebsd.h index f07b5dd..8f16964 100644 --- a/src/ipc-freebsd.h +++ b/src/ipc-freebsd.h @@ -435,24 +435,24 @@ static int kernel_set_device(struct wgdevice *dev) nvlist_add_number(nvl_device, "h3", dev->underload_packet_magic_header); if (dev->flags & WGDEVICE_HAS_H4) nvlist_add_number(nvl_device, "h4", dev->transport_packet_magic_header); - if (dev->flags & WGDEVICE_HAS_I1) - nvlist_add_binary(nvl_device, "i1", dev->i1, strlen(dev->i1) + 1); - if (dev->flags & WGDEVICE_HAS_I2) - nvlist_add_binary(nvl_device, "i2", dev->i2, strlen(dev->i2) + 1); - if (dev->flags & WGDEVICE_HAS_I3) - nvlist_add_binary(nvl_device, "i3", dev->i3, strlen(dev->i3) + 1); - if (dev->flags & WGDEVICE_HAS_I4) - nvlist_add_binary(nvl_device, "i4", dev->i4, strlen(dev->i4) + 1); - if (dev->flags & WGDEVICE_HAS_I5) - nvlist_add_binary(nvl_device, "i5", dev->i5, strlen(dev->i5) + 1); - if (dev->flags & WGDEVICE_HAS_J1) - nvlist_add_binary(nvl_device, "j1", dev->j1, strlen(dev->j1) + 1); - if (dev->flags & WGDEVICE_HAS_J2) - nvlist_add_binary(nvl_device, "j2", dev->j2, strlen(dev->j2) + 1); - if (dev->flags & WGDEVICE_HAS_J3) - nvlist_add_binary(nvl_device, "j3", dev->j3, strlen(dev->j3) + 1); - if (dev->flags & WGDEVICE_HAS_ITIME) - nvlist_add_number(nvl_device, "itime", dev->itime); + if (dev->flags & WGDEVICE_HAS_I1) + nvlist_add_binary(nvl_device, "i1", dev->i1, strlen(dev->i1) + 1); + if (dev->flags & WGDEVICE_HAS_I2) + nvlist_add_binary(nvl_device, "i2", dev->i2, strlen(dev->i2) + 1); + if (dev->flags & WGDEVICE_HAS_I3) + nvlist_add_binary(nvl_device, "i3", dev->i3, strlen(dev->i3) + 1); + if (dev->flags & WGDEVICE_HAS_I4) + nvlist_add_binary(nvl_device, "i4", dev->i4, strlen(dev->i4) + 1); + if (dev->flags & WGDEVICE_HAS_I5) + nvlist_add_binary(nvl_device, "i5", dev->i5, strlen(dev->i5) + 1); + if (dev->flags & WGDEVICE_HAS_J1) + nvlist_add_binary(nvl_device, "j1", dev->j1, strlen(dev->j1) + 1); + if (dev->flags & WGDEVICE_HAS_J2) + nvlist_add_binary(nvl_device, "j2", dev->j2, strlen(dev->j2) + 1); + if (dev->flags & WGDEVICE_HAS_J3) + nvlist_add_binary(nvl_device, "j3", dev->j3, strlen(dev->j3) + 1); + if (dev->flags & WGDEVICE_HAS_ITIME) + nvlist_add_number(nvl_device, "itime", dev->itime); if (dev->flags & WGDEVICE_HAS_FWMARK) nvlist_add_number(nvl_device, "user-cookie", dev->fwmark); if (dev->flags & WGDEVICE_REPLACE_PEERS) diff --git a/src/ipc-openbsd.h b/src/ipc-openbsd.h index c0f1e7b..7f3151f 100644 --- a/src/ipc-openbsd.h +++ b/src/ipc-openbsd.h @@ -157,55 +157,55 @@ static int kernel_get_device(struct wgdevice **device, const char *iface) if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_I1) { - wg_iface->i_i1 = strdup(dev->i1); + dev->i1 = strdup(wg_iface->i_i1); wg_iface->i_flags |= WGDEVICE_HAS_I1; } if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_I2) { - wg_iface->i_i2 = strdup(dev->i2); + dev->i2 = strdup(wg_iface->i_i2); wg_iface->i_flags |= WGDEVICE_HAS_I2; } if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_I3) { - wg_iface->i_i3 = strdup(dev->i3); + dev->i3 = strdup(wg_iface->i_i3); wg_iface->i_flags |= WGDEVICE_HAS_I3; } if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_I4) { - wg_iface->i_i4 = strdup(dev->i4); + dev->i4 = strdup(wg_iface->i_i4); wg_iface->i_flags |= WGDEVICE_HAS_I4; } if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_I5) { - wg_iface->i_i5 = strdup(dev->i5); + dev->i5 = strdup(wg_iface->i_i5); wg_iface->i_flags |= WGDEVICE_HAS_I5; } if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_J1) { - wg_iface->i_j1 = strdup(dev->j1); + dev->j1 = strdup(wg_iface->i_j1); wg_iface->i_flags |= WGDEVICE_HAS_J1; } if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_J2) { - wg_iface->i_j2 = strdup(dev->j2); + dev->j2 = strdup(wg_iface->i_j2); wg_iface->i_flags |= WGDEVICE_HAS_J2; } if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_J3) { - wg_iface->i_j3 = strdup(dev->j3); + dev->j3 = strdup(wg_iface->i_j3); wg_iface->i_flags |= WGDEVICE_HAS_J3; } if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_ITIME) { - wg_iface->i_itime = dev->itime; + dev->itime = wg_iface->i_itime ; wg_iface->i_flags |= WGDEVICE_HAS_ITIME; } diff --git a/src/showconf.c b/src/showconf.c index 5aba185..70a5eec 100644 --- a/src/showconf.c +++ b/src/showconf.c @@ -81,7 +81,7 @@ int showconf_main(int argc, const char *argv[]) if (device->flags & WGDEVICE_HAS_J3) printf("J3 = %s\n", device->j3); if (device->flags & WGDEVICE_HAS_ITIME) - printf("Itime = %d\n", device->itime); + printf("Itime = %u\n", device->itime); printf("\n"); for_each_wgpeer(device, peer) {