Module Name: src
Committed By: martin
Date: Mon Aug 13 12:05:25 UTC 2018
Modified Files:
src/external/bsd/bind/dist/lib/isc/unix [netbsd-8]: socket.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #972):
external/bsd/bind/dist/lib/isc/unix/socket.c: revision 1.23
make ENOBUFS a soft error (from roy@)
To generate a diff of this commit:
cvs rdiff -u -r1.20.6.1 -r1.20.6.2 \
src/external/bsd/bind/dist/lib/isc/unix/socket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/lib/isc/unix/socket.c
diff -u src/external/bsd/bind/dist/lib/isc/unix/socket.c:1.20.6.1 src/external/bsd/bind/dist/lib/isc/unix/socket.c:1.20.6.2
--- src/external/bsd/bind/dist/lib/isc/unix/socket.c:1.20.6.1 Wed Jun 21 18:03:47 2017
+++ src/external/bsd/bind/dist/lib/isc/unix/socket.c Mon Aug 13 12:05:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.c,v 1.20.6.1 2017/06/21 18:03:47 snj Exp $ */
+/* $NetBSD: socket.c,v 1.20.6.2 2018/08/13 12:05:25 martin Exp $ */
/*
* Copyright (C) 2004-2016 Internet Systems Consortium, Inc. ("ISC")
@@ -257,6 +257,7 @@ typedef enum { poll_idle, poll_active, p
#define SOFT_ERROR(e) ((e) == EAGAIN || \
(e) == EWOULDBLOCK || \
(e) == EINTR || \
+ (e) == ENOBUFS || \
(e) == 0)
#define DLVL(x) ISC_LOGCATEGORY_GENERAL, ISC_LOGMODULE_SOCKET, ISC_LOG_DEBUG(x)
@@ -1916,7 +1917,7 @@ doio_recv(isc__socket_t *sock, isc_socke
SOFT_OR_HARD(EHOSTDOWN, ISC_R_HOSTDOWN);
/* HPUX 11.11 can return EADDRNOTAVAIL. */
SOFT_OR_HARD(EADDRNOTAVAIL, ISC_R_ADDRNOTAVAIL);
- ALWAYS_HARD(ENOBUFS, ISC_R_NORESOURCES);
+ SOFT_OR_HARD(ENOBUFS, ISC_R_NORESOURCES);
/* Should never get this one but it was seen. */
#ifdef ENOPROTOOPT
SOFT_OR_HARD(ENOPROTOOPT, ISC_R_HOSTUNREACH);
@@ -2112,7 +2113,7 @@ doio_send(isc__socket_t *sock, isc_socke
ALWAYS_HARD(EHOSTDOWN, ISC_R_HOSTUNREACH);
#endif
ALWAYS_HARD(ENETUNREACH, ISC_R_NETUNREACH);
- ALWAYS_HARD(ENOBUFS, ISC_R_NORESOURCES);
+ SOFT_OR_HARD(ENOBUFS, ISC_R_NORESOURCES);
ALWAYS_HARD(EPERM, ISC_R_HOSTUNREACH);
ALWAYS_HARD(EPIPE, ISC_R_NOTCONNECTED);
ALWAYS_HARD(ECONNRESET, ISC_R_CONNECTIONRESET);
