diff options
| author |   pyr <pyr@openbsd.org> | 2007-01-12 17:12:58 +0000 |
|---|---|---|
| committer | pyr <pyr@openbsd.org> | 2007-01-12 17:12:58 +0000 |
| commit | 3b2f90cff516c61c92328dead4896e6dec1132aa (patch) | |
| tree | f63f2b920e2eb2dfd196324bf79bd8ab6dfc73c2 | |
| parent | use an u_int16_t for flags, the u_int8_t was getting too small. (diff) | |
| download | wireguard-openbsd-3b2f90cff516c61c92328dead4896e6dec1132aa.tar.xz wireguard-openbsd-3b2f90cff516c61c92328dead4896e6dec1132aa.zip | |
spacing
| -rw-r--r-- | usr.sbin/hoststated/check_icmp.c | 8 | ||||
| -rw-r--r-- | usr.sbin/relayd/check_icmp.c | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/usr.sbin/hoststated/check_icmp.c b/usr.sbin/hoststated/check_icmp.c index e44c70c2c1b..f4167359a0e 100644 --- a/usr.sbin/hoststated/check_icmp.c +++ b/usr.sbin/hoststated/check_icmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: check_icmp.c,v 1.10 2007/01/11 18:05:08 reyk Exp $ */ +/* $OpenBSD: check_icmp.c,v 1.11 2007/01/12 17:12:58 pyr Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -191,7 +191,8 @@ send_icmp(int s, short event, void *arg) TAILQ_FOREACH(host, &table->hosts, entry) { if (host->flags & (F_DISABLE | F_CHECK_SENT)) continue; - if (((struct sockaddr *)&host->ss)->sa_family != cie->af) + if (((struct sockaddr *)&host->ss)->sa_family != + cie->af) continue; i++; to = (struct sockaddr *)&host->ss; @@ -252,7 +253,8 @@ recv_icmp(int s, short event, void *arg) bzero(&packet, sizeof(packet)); bzero(&ss, sizeof(ss)); - r = recvfrom(s, packet, sizeof(packet), 0, (struct sockaddr *)&ss, &slen); + r = recvfrom(s, packet, sizeof(packet), 0, + (struct sockaddr *)&ss, &slen); if (r == -1 || r != ICMP_BUF_SIZE) { if (r == -1 && errno != EAGAIN && errno != EINTR) log_debug("recv_icmp: receive error"); diff --git a/usr.sbin/relayd/check_icmp.c b/usr.sbin/relayd/check_icmp.c index e44c70c2c1b..f4167359a0e 100644 --- a/usr.sbin/relayd/check_icmp.c +++ b/usr.sbin/relayd/check_icmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: check_icmp.c,v 1.10 2007/01/11 18:05:08 reyk Exp $ */ +/* $OpenBSD: check_icmp.c,v 1.11 2007/01/12 17:12:58 pyr Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -191,7 +191,8 @@ send_icmp(int s, short event, void *arg) TAILQ_FOREACH(host, &table->hosts, entry) { if (host->flags & (F_DISABLE | F_CHECK_SENT)) continue; - if (((struct sockaddr *)&host->ss)->sa_family != cie->af) + if (((struct sockaddr *)&host->ss)->sa_family != + cie->af) continue; i++; to = (struct sockaddr *)&host->ss; @@ -252,7 +253,8 @@ recv_icmp(int s, short event, void *arg) bzero(&packet, sizeof(packet)); bzero(&ss, sizeof(ss)); - r = recvfrom(s, packet, sizeof(packet), 0, (struct sockaddr *)&ss, &slen); + r = recvfrom(s, packet, sizeof(packet), 0, + (struct sockaddr *)&ss, &slen); if (r == -1 || r != ICMP_BUF_SIZE) { if (r == -1 && errno != EAGAIN && errno != EINTR) log_debug("recv_icmp: receive error"); |