diff options
| author | Rafael Zalamena <rzalamena@cvs.openbsd.org> | 2016-08-08 16:52:16 +0000 |
|---|---|---|
| committer | Rafael Zalamena <rzalamena@cvs.openbsd.org> | 2016-08-08 16:52:16 +0000 |
| commit | 85da94603dcd63f34425160d9c6f20883ef3f20b (patch) | |
| tree | 5d49a8e3025de456186ee3f48dd019ed9a60eca4 /usr.sbin | |
| parent | bb2b77456933f1c4bacf5f2aea1bfe5cef39071d (diff) | |
Create socket with SOCK_NONBLOCK instead of using fcntl() without the
proper flag handling.
ok reyk@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/switchd/switchd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/switchd/switchd.c b/usr.sbin/switchd/switchd.c index 902e9793bef..b3ef9127db5 100644 --- a/usr.sbin/switchd/switchd.c +++ b/usr.sbin/switchd/switchd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: switchd.c,v 1.6 2016/07/22 09:31:33 reyk Exp $ */ +/* $OpenBSD: switchd.c,v 1.7 2016/08/08 16:52:15 rzalamena Exp $ */ /* * Copyright (c) 2013-2016 Reyk Floeter <reyk@openbsd.org> @@ -217,7 +217,8 @@ switchd_socket(struct sockaddr *sock, int reuseport) int s = -1, val; struct linger lng; - if ((s = socket(sock->sa_family, SOCK_STREAM, IPPROTO_TCP)) == -1) + if ((s = socket(sock->sa_family, SOCK_STREAM | SOCK_NONBLOCK, + IPPROTO_TCP)) == -1) goto bad; /* @@ -232,8 +233,6 @@ switchd_socket(struct sockaddr *sock, int reuseport) sizeof(int)) == -1) goto bad; } - if (fcntl(s, F_SETFL, O_NONBLOCK) == -1) - goto bad; /* * TCP options |