Commit 4bb0f104 authored by Mark Andrews's avatar Mark Andrews

2189. [bug] Handle socket() returning EINTR. [RT #15949]

parent 68df4d65
2189. [bug] Handle socket() returning EINTR. [RT #15949]
2188. [contrib] queryperf: autoconf changes to make the search for
libresolv or libbind more robust. [RT #16299]
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: socket.c,v 1.271 2007/04/02 02:03:55 marka Exp $ */
/* $Id: socket.c,v 1.272 2007/05/21 01:55:10 marka Exp $ */
/*! \file */
......@@ -1475,6 +1475,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
#endif
char strbuf[ISC_STRERRORSIZE];
const char *err = "socket";
int try = 0;
REQUIRE(VALID_MANAGER(manager));
REQUIRE(socketp != NULL && *socketp == NULL);
......@@ -1484,6 +1485,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
return (result);
sock->pf = pf;
again:
switch (type) {
case isc_sockettype_udp:
sock->fd = socket(pf, SOCK_DGRAM, IPPROTO_UDP);
......@@ -1498,6 +1500,8 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
INSIST(type != isc_sockettype_fdwatch);
break;
}
if (sock->fd == -1 && errno == EINTR && try++ < 42)
goto again;
#ifdef F_DUPFD
/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment