 @@ -1,14 +1,14 @@
-/*	$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")
  * Copyright (C) 1998-2003  Internet Software Consortium.
+ *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
  * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
  * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
 @@ -247,26 +247,27 @@ typedef enum { poll_idle, poll_active, p
 #endif
 /*%
  * Define what the possible "soft" errors can be.  These are non-fatal returns
  * of various network related functions, like recv() and so on.
+ *
  * For some reason, BSDI (and perhaps others) will sometimes return <0
  * from recv() but will have errno==0.  This is broken, but we have to
  * work around it here.
  */
 #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)
 /*!<
  * DLVL(90)  --  Function entry/exit and other tracing.
  * DLVL(70)  --  Socket "correctness" -- including returning of events, etc.
  * DLVL(60)  --  Socket data send/receive
  * DLVL(50)  --  Event tracing, including receiving/sending completion events.
  * DLVL(20)  --  Socket creation/destruction.
  */
 #define TRACE_LEVEL		90
 #define CORRECTNESS_LEVEL	70
 @@ -1906,27 +1907,27 @@ doio_recv(isc__socket_t *sock, isc_socke
 	if (recv_errno == _system) { \
 		dev->result = _isc; \
 		inc_stats(sock->manager->stats, \
 			  sock->statsindex[STATID_RECVFAIL]); \
 		return (DOIO_HARD); \
+	}
 		SOFT_OR_HARD(ECONNREFUSED, ISC_R_CONNREFUSED);
 		SOFT_OR_HARD(ENETUNREACH, ISC_R_NETUNREACH);
 		SOFT_OR_HARD(EHOSTUNREACH, ISC_R_HOSTUNREACH);
 		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);
 #endif
 		/*
 		 * HPUX returns EPROTO and EINVAL on receiving some ICMP/ICMPv6
 		 * errors.
 		 */
 #ifdef EPROTO
 		SOFT_OR_HARD(EPROTO, ISC_R_HOSTUNREACH);
 #endif
 		SOFT_OR_HARD(EINVAL, ISC_R_HOSTUNREACH);
 @@ -2102,27 +2103,27 @@ doio_send(isc__socket_t *sock, isc_socke
 			  sock->statsindex[STATID_SENDFAIL]); \
 		return (DOIO_HARD); \
+	}
 		SOFT_OR_HARD(ECONNREFUSED, ISC_R_CONNREFUSED);
 		ALWAYS_HARD(EACCES, ISC_R_NOPERM);
 		ALWAYS_HARD(EAFNOSUPPORT, ISC_R_ADDRNOTAVAIL);
 		ALWAYS_HARD(EADDRNOTAVAIL, ISC_R_ADDRNOTAVAIL);
 		ALWAYS_HARD(EHOSTUNREACH, ISC_R_HOSTUNREACH);
 #ifdef EHOSTDOWN
 		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);
 #undef SOFT_OR_HARD
 #undef ALWAYS_HARD
 		/*
 		 * The other error types depend on whether or not the
 		 * socket is UDP or TCP.  If it is UDP, some errors
 		 * that we expect to be fatal under TCP are merely
 		 * annoying, and are really soft errors.
+		 *