diff options
| author |   deraadt <deraadt@openbsd.org> | 2019-06-28 13:32:41 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2019-06-28 13:32:41 +0000 |
| commit | df69c215c7c66baf660f3f65414fd34796c96152 (patch) | |
| tree | 0255639162b24c4a2f761a274e32b69c2256fd45 /usr.sbin/relayd | |
| parent | miniroot prototype disklabels should attempt to contain accurate (diff) | |
| download | wireguard-openbsd-df69c215c7c66baf660f3f65414fd34796c96152.tar.xz wireguard-openbsd-df69c215c7c66baf660f3f65414fd34796c96152.zip | |
When system calls indicate an error they return -1, not some arbitrary
value < 0. errno is only updated in this case. Change all (most?)
callers of syscalls to follow this better, and let's see if this strictness
helps us in the future.
Diffstat (limited to 'usr.sbin/relayd')
| -rw-r--r-- | usr.sbin/relayd/check_icmp.c | 4 | ||||
| -rw-r--r-- | usr.sbin/relayd/parse.y | 4 | ||||
| -rw-r--r-- | usr.sbin/relayd/relay.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/relayd/check_icmp.c b/usr.sbin/relayd/check_icmp.c index 1b2557c25fc..3d251b28651 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.47 2017/07/12 22:57:40 jca Exp $ */ +/* $OpenBSD: check_icmp.c,v 1.48 2019/06/28 13:32:50 deraadt Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -52,7 +52,7 @@ icmp_setup(struct relayd *env, struct ctl_icmp_event *cie, int af) if (af == AF_INET6) proto = IPPROTO_ICMPV6; - if ((cie->s = socket(af, SOCK_RAW | SOCK_NONBLOCK, proto)) < 0) + if ((cie->s = socket(af, SOCK_RAW | SOCK_NONBLOCK, proto)) == -1) fatal("%s: socket", __func__); val = ICMP_RCVBUF_SIZE; if (setsockopt(cie->s, SOL_SOCKET, SO_RCVBUF, &val, sizeof(val)) == -1) diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y index 6cdbba67d5f..0d46ae20095 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.238 2019/05/31 15:25:57 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.239 2019/06/28 13:32:50 deraadt Exp $ */ /* * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -3385,7 +3385,7 @@ is_if_in_group(const char *ifname, const char *groupname) int s; int ret = 0; - if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) + if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) err(1, "socket"); memset(&ifgr, 0, sizeof(ifgr)); diff --git a/usr.sbin/relayd/relay.c b/usr.sbin/relayd/relay.c index 7ec8f0ec41a..864d9104fbe 100644 --- a/usr.sbin/relayd/relay.c +++ b/usr.sbin/relayd/relay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relay.c,v 1.248 2019/06/26 12:13:47 reyk Exp $ */ +/* $OpenBSD: relay.c,v 1.249 2019/06/28 13:32:50 deraadt Exp $ */ /* * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -2504,7 +2504,7 @@ relay_tls_readcb(int fd, short event, void *arg) ret = tls_read(cre->tls, rbuf, howmuch); if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT) { goto retry; - } else if (ret < 0) { + } else if (ret == -1) { what |= EVBUFFER_ERROR; goto err; } @@ -2563,7 +2563,7 @@ relay_tls_writecb(int fd, short event, void *arg) EVBUFFER_LENGTH(bufev->output)); if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT) { goto retry; - } else if (ret < 0) { + } else if (ret == -1) { what |= EVBUFFER_ERROR; goto err; } |