Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set SOREUSEADDR as well as SOREUSEPORT on DHCP sockets when both available.

Browse Source
This commit is contained in:
Simon Kelley
2013-08-14 15:53:57 +01:00
parent f086d39641
commit ffbad34b31
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dhcp.c
View File

@@ -70,15 +70,15 @@ static int make_fd(int port)
support it. This handles the introduction of REUSEPORT on Linux. */ support it. This handles the introduction of REUSEPORT on Linux. */
if (option_bool(OPT_NOWILD) || option_bool(OPT_CLEVERBIND)) if (option_bool(OPT_NOWILD) || option_bool(OPT_CLEVERBIND))
{ {
int rc = -1, porterr = 0; int rc = 0;
#ifdef SO_REUSEPORT #ifdef SO_REUSEPORT
if ((rc = setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &oneopt, sizeof(oneopt))) == -1 && if ((rc = setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &oneopt, sizeof(oneopt))) == -1 &&
errno != ENOPROTOOPT) errno == ENOPROTOOPT)
porterr = 1; rc = 0;
#endif #endif
if (rc == -1 && !porterr) if (rc != -1)
rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &oneopt, sizeof(oneopt)); rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &oneopt, sizeof(oneopt));
if (rc == -1) if (rc == -1)

8
src/dhcp6.c
View File

@@ -55,15 +55,15 @@ void dhcp6_init(void)
support it. This handles the introduction of REUSEPORT on Linux. */ support it. This handles the introduction of REUSEPORT on Linux. */
if (option_bool(OPT_NOWILD) || option_bool(OPT_CLEVERBIND)) if (option_bool(OPT_NOWILD) || option_bool(OPT_CLEVERBIND))
{ {
int rc = -1, porterr = 0; int rc = 0;
#ifdef SO_REUSEPORT #ifdef SO_REUSEPORT
if ((rc = setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &oneopt, sizeof(oneopt))) == -1 && if ((rc = setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &oneopt, sizeof(oneopt))) == -1 &&
errno != ENOPROTOOPT) errno == ENOPROTOOPT)
porterr = 1; rc = 0;
#endif #endif
if (rc == -1 && !porterr) if (rc != -1)
rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &oneopt, sizeof(oneopt)); rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &oneopt, sizeof(oneopt));
if (rc == -1) if (rc == -1)