From 6747b3ebd9094494d81f0cb8f6d563288af4dc0b Mon Sep 17 00:00:00 2001 From: Mark Puha Date: Sat, 9 Sep 2023 14:31:41 +0200 Subject: [PATCH] minor modifications --- src/containers.h | 5 +++-- src/showconf.c | 18 +++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/containers.h b/src/containers.h index 2dee2da..20f8781 100644 --- a/src/containers.h +++ b/src/containers.h @@ -94,6 +94,9 @@ struct wgdevice { uint32_t fwmark; uint16_t listen_port; + + struct wgpeer *first_peer, *last_peer; + uint16_t junk_packet_count; uint16_t junk_packet_min_size; uint16_t junk_packet_max_size; @@ -103,8 +106,6 @@ struct wgdevice { uint32_t response_packet_magic_header; uint32_t underload_packet_magic_header; uint32_t transport_packet_magic_header; - - struct wgpeer *first_peer, *last_peer; }; #define for_each_wgpeer(__dev, __peer) for ((__peer) = (__dev)->first_peer; (__peer); (__peer) = (__peer)->next_peer) diff --git a/src/showconf.c b/src/showconf.c index 1caf2cf..a66b6eb 100644 --- a/src/showconf.c +++ b/src/showconf.c @@ -47,23 +47,23 @@ int showconf_main(int argc, const char *argv[]) printf("PrivateKey = %s\n", base64); } if (device->flags & WGDEVICE_HAS_JC) - printf("Jc = %u", device->junk_packet_count); + printf("Jc = %u\n", device->junk_packet_count); if (device->flags & WGDEVICE_HAS_JMIN) - printf("Jmin = %u", device->junk_packet_min_size); + printf("Jmin = %u\n", device->junk_packet_min_size); if (device->flags & WGDEVICE_HAS_JMAX) - printf("Jmax = %u", device->junk_packet_max_size); + printf("Jmax = %u\n", device->junk_packet_max_size); if (device->flags & WGDEVICE_HAS_S1) - printf("S1 = %u", device->init_packet_junk_size); + printf("S1 = %u\n", device->init_packet_junk_size); if (device->flags & WGDEVICE_HAS_S2) - printf("S2 = %u", device->response_packet_junk_size); + printf("S2 = %u\n", device->response_packet_junk_size); if (device->flags & WGDEVICE_HAS_H1) - printf("H1 = %u", device->init_packet_magic_header); + printf("H1 = %u\n", device->init_packet_magic_header); if (device->flags & WGDEVICE_HAS_H2) - printf("H2 = %u", device->response_packet_magic_header); + printf("H2 = %u\n", device->response_packet_magic_header); if (device->flags & WGDEVICE_HAS_H3) - printf("H3 = %u", device->underload_packet_magic_header); + printf("H3 = %u\n", device->underload_packet_magic_header); if (device->flags & WGDEVICE_HAS_H4) - printf("H4 = %u", device->transport_packet_magic_header); + printf("H4 = %u\n", device->transport_packet_magic_header); printf("\n"); for_each_wgpeer(device, peer) {