summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sasyncd
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2013-03-11 17:40:09 +0000
committerderaadt <deraadt@openbsd.org>2013-03-11 17:40:09 +0000
commit62e3c2528255beec34fe0acd77e74b042a0926c6 (patch)
tree1c7e4070f2f682e9d9017be26794ca4197437d0e /usr.sbin/sasyncd
parentWhen binding a lease, check for and clear out any 'zombie' routes (diff)
downloadwireguard-openbsd-62e3c2528255beec34fe0acd77e74b042a0926c6.tar.xz
wireguard-openbsd-62e3c2528255beec34fe0acd77e74b042a0926c6.zip
handle ECONNABORTED errors from accept(). In many code blocks they can be
ignored silently and without aborting, much like EINTR and EWOULDBLOCK are. ok's from various maintainers of these directories...
Diffstat (limited to 'usr.sbin/sasyncd')
-rw-r--r--usr.sbin/sasyncd/net.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/sasyncd/net.c b/usr.sbin/sasyncd/net.c
index 911b7cd1e3d..9f6e15bc58e 100644
--- a/usr.sbin/sasyncd/net.c
+++ b/usr.sbin/sasyncd/net.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: net.c,v 1.19 2012/04/15 03:25:27 jsg Exp $ */
+/* $OpenBSD: net.c,v 1.20 2013/03/11 17:40:11 deraadt Exp $ */
/*
* Copyright (c) 2005 Håkan Olsson. All rights reserved.
@@ -511,7 +511,8 @@ net_accept(int accept_socket)
"socket, closing.");
close(s);
}
- } else
+ } else if (errno != EWOULDBLOCK && errno != EINTR &&
+ errno != ECONNABORTED)
log_err("net: accept()");
}