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

fix: small changes after review

Browse source
This commit is contained in:
Mark Puha 2025-06-14 15:16:15 +02:00
parent 66de01f211
commit 04afe0f0f3
3 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/ipc-freebsd.h
View file

@ -435,24 +435,24 @@ static int kernel_set_device(struct wgdevice *dev)
nvlist_add_number(nvl_device, "h3", dev->underload_packet_magic_header); nvlist_add_number(nvl_device, "h3", dev->underload_packet_magic_header);
if (dev->flags & WGDEVICE_HAS_H4) if (dev->flags & WGDEVICE_HAS_H4)
nvlist_add_number(nvl_device, "h4", dev->transport_packet_magic_header); nvlist_add_number(nvl_device, "h4", dev->transport_packet_magic_header);
if (dev->flags & WGDEVICE_HAS_I1) if (dev->flags & WGDEVICE_HAS_I1)
nvlist_add_binary(nvl_device, "i1", dev->i1, strlen(dev->i1) + 1); nvlist_add_binary(nvl_device, "i1", dev->i1, strlen(dev->i1) + 1);
if (dev->flags & WGDEVICE_HAS_I2) if (dev->flags & WGDEVICE_HAS_I2)
nvlist_add_binary(nvl_device, "i2", dev->i2, strlen(dev->i2) + 1); nvlist_add_binary(nvl_device, "i2", dev->i2, strlen(dev->i2) + 1);
if (dev->flags & WGDEVICE_HAS_I3) if (dev->flags & WGDEVICE_HAS_I3)
nvlist_add_binary(nvl_device, "i3", dev->i3, strlen(dev->i3) + 1); nvlist_add_binary(nvl_device, "i3", dev->i3, strlen(dev->i3) + 1);
if (dev->flags & WGDEVICE_HAS_I4) if (dev->flags & WGDEVICE_HAS_I4)
nvlist_add_binary(nvl_device, "i4", dev->i4, strlen(dev->i4) + 1); nvlist_add_binary(nvl_device, "i4", dev->i4, strlen(dev->i4) + 1);
if (dev->flags & WGDEVICE_HAS_I5) if (dev->flags & WGDEVICE_HAS_I5)
nvlist_add_binary(nvl_device, "i5", dev->i5, strlen(dev->i5) + 1); nvlist_add_binary(nvl_device, "i5", dev->i5, strlen(dev->i5) + 1);
if (dev->flags & WGDEVICE_HAS_J1) if (dev->flags & WGDEVICE_HAS_J1)
nvlist_add_binary(nvl_device, "j1", dev->j1, strlen(dev->j1) + 1); nvlist_add_binary(nvl_device, "j1", dev->j1, strlen(dev->j1) + 1);
if (dev->flags & WGDEVICE_HAS_J2) if (dev->flags & WGDEVICE_HAS_J2)
nvlist_add_binary(nvl_device, "j2", dev->j2, strlen(dev->j2) + 1); nvlist_add_binary(nvl_device, "j2", dev->j2, strlen(dev->j2) + 1);
if (dev->flags & WGDEVICE_HAS_J3) if (dev->flags & WGDEVICE_HAS_J3)
nvlist_add_binary(nvl_device, "j3", dev->j3, strlen(dev->j3) + 1); nvlist_add_binary(nvl_device, "j3", dev->j3, strlen(dev->j3) + 1);
if (dev->flags & WGDEVICE_HAS_ITIME) if (dev->flags & WGDEVICE_HAS_ITIME)
nvlist_add_number(nvl_device, "itime", dev->itime); nvlist_add_number(nvl_device, "itime", dev->itime);
if (dev->flags & WGDEVICE_HAS_FWMARK) if (dev->flags & WGDEVICE_HAS_FWMARK)
nvlist_add_number(nvl_device, "user-cookie", dev->fwmark); nvlist_add_number(nvl_device, "user-cookie", dev->fwmark);
if (dev->flags & WGDEVICE_REPLACE_PEERS) if (dev->flags & WGDEVICE_REPLACE_PEERS)

18
src/ipc-openbsd.h
View file

@ -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) 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; wg_iface->i_flags |= WGDEVICE_HAS_I1;
} }
if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_I2) 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; wg_iface->i_flags |= WGDEVICE_HAS_I2;
} }
if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_I3) 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; wg_iface->i_flags |= WGDEVICE_HAS_I3;
} }
if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_I4) 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; wg_iface->i_flags |= WGDEVICE_HAS_I4;
} }
if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_I5) 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; wg_iface->i_flags |= WGDEVICE_HAS_I5;
} }
if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_J1) 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; wg_iface->i_flags |= WGDEVICE_HAS_J1;
} }
if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_J2) 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; wg_iface->i_flags |= WGDEVICE_HAS_J2;
} }
if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_J3) 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; wg_iface->i_flags |= WGDEVICE_HAS_J3;
} }
if (wg_iface->i_flags & WG_INTERFACE_DEVICE_HAS_ITIME) 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; wg_iface->i_flags |= WGDEVICE_HAS_ITIME;
} }

2
src/showconf.c
View file

@ -81,7 +81,7 @@ int showconf_main(int argc, const char *argv[])
if (device->flags & WGDEVICE_HAS_J3) if (device->flags & WGDEVICE_HAS_J3)
printf("J3 = %s\n", device->j3); printf("J3 = %s\n", device->j3);
if (device->flags & WGDEVICE_HAS_ITIME) if (device->flags & WGDEVICE_HAS_ITIME)
printf("Itime = %d\n", device->itime); printf("Itime = %u\n", device->itime);
printf("\n"); printf("\n");
for_each_wgpeer(device, peer) { for_each_wgpeer(device, peer) {