diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-10-25 17:13:46 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-10-31 17:25:23 +0100 |
commit | 7491cd4c22601eb0c3bedfea740f2aec3b8372ed (patch) | |
tree | e5b8c3adf9e17e9abf3c028ea163ee7840659826 /src/tools | |
parent | peer: store total number of peers instead of iterating (diff) | |
download | wireguard-monolithic-historical-7491cd4c22601eb0c3bedfea740f2aec3b8372ed.tar.xz wireguard-monolithic-historical-7491cd4c22601eb0c3bedfea740f2aec3b8372ed.zip |
global: infuriating kernel iterator style
One types:
for (i = 0 ...
So one should also type:
for_each_obj (obj ...
But the upstream kernel style guidelines are insane, and so we must
instead do:
for_each_obj(obj ...
Ugly, but one must choose his battles wisely.
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/config.c | 2 | ||||
-rw-r--r-- | src/tools/ipc.c | 4 | ||||
-rw-r--r-- | src/tools/show.c | 28 | ||||
-rw-r--r-- | src/tools/showconf.c | 4 |
4 files changed, 19 insertions, 19 deletions
diff --git a/src/tools/config.c b/src/tools/config.c index ec16e26..8fe3e1c 100644 --- a/src/tools/config.c +++ b/src/tools/config.c @@ -384,7 +384,7 @@ bool config_read_init(struct config_ctx *ctx, bool append) struct wgdevice *config_read_finish(struct config_ctx *ctx) { struct wgpeer *peer; - for_each_wgpeer (ctx->device, peer) { + for_each_wgpeer(ctx->device, peer) { if (key_is_zero(peer->public_key)) { fprintf(stderr, "A peer is missing a public key\n"); goto err; diff --git a/src/tools/ipc.c b/src/tools/ipc.c index 72bbd38..66a5720 100644 --- a/src/tools/ipc.c +++ b/src/tools/ipc.c @@ -227,7 +227,7 @@ static int userspace_set_device(struct wgdevice *dev) if (dev->flags & WGDEVICE_REPLACE_PEERS) fprintf(f, "replace_peers=true\n"); - for_each_wgpeer (dev, peer) { + for_each_wgpeer(dev, peer) { key_to_hex(hex, peer->public_key); fprintf(f, "public_key=%s\n", hex); if (peer->flags & WGPEER_REMOVE_ME) { @@ -255,7 +255,7 @@ static int userspace_set_device(struct wgdevice *dev) fprintf(f, "persistent_keepalive_interval=%u\n", peer->persistent_keepalive_interval); if (peer->flags & WGPEER_REPLACE_ALLOWEDIPS) fprintf(f, "replace_allowed_ips=true\n"); - for_each_wgallowedip (peer, allowedip) { + for_each_wgallowedip(peer, allowedip) { if (allowedip->family == AF_INET) { if (!inet_ntop(AF_INET, &allowedip->ip4, ip, INET6_ADDRSTRLEN)) continue; diff --git a/src/tools/show.c b/src/tools/show.c index 4203494..d315ee8 100644 --- a/src/tools/show.c +++ b/src/tools/show.c @@ -43,14 +43,14 @@ static void sort_peers(struct wgdevice *device) size_t peer_count = 0, i = 0; struct wgpeer *peer, **peers; - for_each_wgpeer (device, peer) + for_each_wgpeer(device, peer) ++peer_count; if (!peer_count) return; peers = calloc(peer_count, sizeof(struct wgpeer *)); if (!peers) return; - for_each_wgpeer (device, peer) + for_each_wgpeer(device, peer) peers[i++] = peer; qsort(peers, peer_count, sizeof(struct wgpeer *), peer_cmp); device->first_peer = peers[0]; @@ -208,7 +208,7 @@ static void pretty_print(struct wgdevice *device) sort_peers(device); terminal_printf("\n"); } - for_each_wgpeer (device, peer) { + for_each_wgpeer(device, peer) { terminal_printf(TERMINAL_FG_YELLOW TERMINAL_BOLD "peer" TERMINAL_RESET ": " TERMINAL_FG_YELLOW "%s" TERMINAL_RESET "\n", key(peer->public_key)); if (!key_is_zero(peer->preshared_key)) terminal_printf(" " TERMINAL_BOLD "preshared key" TERMINAL_RESET ": %s\n", masked_key(peer->preshared_key)); @@ -216,7 +216,7 @@ static void pretty_print(struct wgdevice *device) terminal_printf(" " TERMINAL_BOLD "endpoint" TERMINAL_RESET ": %s\n", endpoint(&peer->endpoint.addr)); terminal_printf(" " TERMINAL_BOLD "allowed ips" TERMINAL_RESET ": "); if (peer->first_allowedip) { - for_each_wgallowedip (peer, allowedip) + for_each_wgallowedip(peer, allowedip) terminal_printf("%s" TERMINAL_FG_CYAN "/" TERMINAL_RESET "%u%s", ip(allowedip), allowedip->cidr, allowedip->next_allowedip ? ", " : "\n"); } else terminal_printf("(none)\n"); @@ -248,7 +248,7 @@ static void dump_print(struct wgdevice *device, bool with_interface) printf("0x%x\n", device->fwmark); else printf("off\n"); - for_each_wgpeer (device, peer) { + for_each_wgpeer(device, peer) { if (with_interface) printf("%s\t", device->name); printf("%s\t", key(peer->public_key)); @@ -258,7 +258,7 @@ static void dump_print(struct wgdevice *device, bool with_interface) else printf("(none)\t"); if (peer->first_allowedip) { - for_each_wgallowedip (peer, allowedip) + for_each_wgallowedip(peer, allowedip) printf("%s/%u%c", ip(allowedip), allowedip->cidr, allowedip->next_allowedip ? ',' : '\t'); } else printf("(none)\t"); @@ -297,7 +297,7 @@ static bool ugly_print(struct wgdevice *device, const char *param, bool with_int } else if (!strcmp(param, "endpoints")) { if (with_interface) printf("%s\t", device->name); - for_each_wgpeer (device, peer) { + for_each_wgpeer(device, peer) { printf("%s\t", key(peer->public_key)); if (peer->endpoint.addr.sa_family == AF_INET || peer->endpoint.addr.sa_family == AF_INET6) printf("%s\n", endpoint(&peer->endpoint.addr)); @@ -305,30 +305,30 @@ static bool ugly_print(struct wgdevice *device, const char *param, bool with_int printf("(none)\n"); } } else if (!strcmp(param, "allowed-ips")) { - for_each_wgpeer (device, peer) { + for_each_wgpeer(device, peer) { if (with_interface) printf("%s\t", device->name); printf("%s\t", key(peer->public_key)); if (peer->first_allowedip) { - for_each_wgallowedip (peer, allowedip) + for_each_wgallowedip(peer, allowedip) printf("%s/%u%c", ip(allowedip), allowedip->cidr, allowedip->next_allowedip ? ' ' : '\n'); } else printf("(none)\n"); } } else if (!strcmp(param, "latest-handshakes")) { - for_each_wgpeer (device, peer) { + for_each_wgpeer(device, peer) { if (with_interface) printf("%s\t", device->name); printf("%s\t%llu\n", key(peer->public_key), (unsigned long long)peer->last_handshake_time.tv_sec); } } else if (!strcmp(param, "transfer")) { - for_each_wgpeer (device, peer) { + for_each_wgpeer(device, peer) { if (with_interface) printf("%s\t", device->name); printf("%s\t%" PRIu64 "\t%" PRIu64 "\n", key(peer->public_key), (uint64_t)peer->rx_bytes, (uint64_t)peer->tx_bytes); } } else if (!strcmp(param, "persistent-keepalive")) { - for_each_wgpeer (device, peer) { + for_each_wgpeer(device, peer) { if (with_interface) printf("%s\t", device->name); if (peer->persistent_keepalive_interval) @@ -337,14 +337,14 @@ static bool ugly_print(struct wgdevice *device, const char *param, bool with_int printf("%s\toff\n", key(peer->public_key)); } } else if (!strcmp(param, "preshared-keys")) { - for_each_wgpeer (device, peer) { + for_each_wgpeer(device, peer) { if (with_interface) printf("%s\t", device->name); printf("%s\t", key(peer->public_key)); printf("%s\n", key(peer->preshared_key)); } } else if (!strcmp(param, "peers")) { - for_each_wgpeer (device, peer) { + for_each_wgpeer(device, peer) { if (with_interface) printf("%s\t", device->name); printf("%s\n", key(peer->public_key)); diff --git a/src/tools/showconf.c b/src/tools/showconf.c index 51f9a6f..adc3789 100644 --- a/src/tools/showconf.c +++ b/src/tools/showconf.c @@ -43,7 +43,7 @@ int showconf_main(int argc, char *argv[]) printf("PrivateKey = %s\n", base64); } printf("\n"); - for_each_wgpeer (device, peer) { + for_each_wgpeer(device, peer) { key_to_base64(base64, peer->public_key); printf("[Peer]\nPublicKey = %s\n", base64); if (!key_is_zero(peer->preshared_key)) { @@ -52,7 +52,7 @@ int showconf_main(int argc, char *argv[]) } if (peer->first_allowedip) printf("AllowedIPs = "); - for_each_wgallowedip (peer, allowedip) { + for_each_wgallowedip(peer, allowedip) { if (allowedip->family == AF_INET) { if (!inet_ntop(AF_INET, &allowedip->ip4, ip, INET6_ADDRSTRLEN)) continue; |