mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

Add runtime detection of SO_REUSEPORT, use it instead of dup() if available.

Browse Source
This commit is contained in:
Witold Kręcicki
2018-08-23 09:42:30 +02:00
parent 89b1817211
commit bd024eee57
5 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/isc/unix/socket.c
View File

@@ -4584,13 +4584,21 @@ isc_socket_bind(isc_socket_t *sock0, const isc_sockaddr_t *sockaddr,
goto bind_socket;
#endif
if ((options & ISC_SOCKET_REUSEADDRESS) != 0 &&
isc_sockaddr_getport(sockaddr) != (in_port_t)0 &&
setsockopt(sock->fd, SOL_SOCKET, SO_REUSEADDR, (void *)&on,
isc_sockaddr_getport(sockaddr) != (in_port_t)0) {
if (setsockopt(sock->fd, SOL_SOCKET, SO_REUSEADDR, (void *)&on,
sizeof(on)) < 0) {
UNEXPECTED_ERROR(__FILE__, __LINE__,
UNEXPECTED_ERROR(__FILE__, __LINE__,
"setsockopt(%d) %s", sock->fd,
isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL,
ISC_MSG_FAILED, "failed"));
}
if (setsockopt(sock->fd, SOL_SOCKET, SO_REUSEPORT, (void *)&on,
sizeof(on)) < 0) {
UNEXPECTED_ERROR(__FILE__, __LINE__,
"setsockopt(%d) %s", sock->fd,
isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL,
ISC_MSG_FAILED, "failed"));
}
/* Press on... */
}
#ifdef AF_UNIX
@@ -5449,6 +5457,38 @@ isc_socket_getfd(isc_socket_t *socket0) {
return ((short) sock->fd);
}
static isc_once_t hasreuseport_once = ISC_ONCE_INIT;
static bool hasreuseport = false;
static void
init_hasreuseport() {
#ifdef SO_REUSEPORT
int sock, yes = 1;
sock = socket(AF_INET, SOCK_DGRAM, 0);
if (sock < 0) {
close(sock);
return;
} else if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&yes,
sizeof(yes)) < 0) {
close(sock);
return;
} else if (setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, (void *)&yes,
sizeof(yes)) < 0) {
close(sock);
return;
}
hasreuseport = true;
#endif
}
bool
isc_socket_hasreuseport() {
RUNTIME_CHECK(isc_once_do(&hasreuseport_once, init_hasreuseport)
== ISC_R_SUCCESS);
return (hasreuseport);
}
#if defined(HAVE_LIBXML2) || defined(HAVE_JSON)
static const char *
_socktype(isc_sockettype_t type)