From 38ac0821aa84f80c6a58a322492f3b0ce2d40feb Mon Sep 17 00:00:00 2001 From: Chris Hofstaedtler Date: Mon, 15 Jan 2018 20:38:42 +0100 Subject: [PATCH] Fix macOS build: Use IPPROTO_TCP instead of SOL_TCP --- pdns/dnsdist.cc | 8 ++++---- pdns/pdns_recursor.cc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc index afd0e9d7a..dfe52c501 100644 --- a/pdns/dnsdist.cc +++ b/pdns/dnsdist.cc @@ -2239,7 +2239,7 @@ try SSetsockopt(cs->tcpFD, SOL_SOCKET, SO_REUSEADDR, 1); #ifdef TCP_DEFER_ACCEPT - SSetsockopt(cs->tcpFD, SOL_TCP,TCP_DEFER_ACCEPT, 1); + SSetsockopt(cs->tcpFD, IPPROTO_TCP, TCP_DEFER_ACCEPT, 1); #endif if (std::get<3>(local) > 0) { #ifdef TCP_FASTOPEN @@ -2342,7 +2342,7 @@ try cs->tcpFD = SSocket(cs->local.sin4.sin_family, SOCK_STREAM, 0); SSetsockopt(cs->tcpFD, SOL_SOCKET, SO_REUSEADDR, 1); #ifdef TCP_DEFER_ACCEPT - SSetsockopt(cs->tcpFD, SOL_TCP,TCP_DEFER_ACCEPT, 1); + SSetsockopt(cs->tcpFD, IPPROTO_TCP, TCP_DEFER_ACCEPT, 1); #endif if (std::get<3>(dcLocal) > 0) { #ifdef TCP_FASTOPEN @@ -2398,11 +2398,11 @@ try cs->tcpFD = SSocket(cs->local.sin4.sin_family, SOCK_STREAM, 0); SSetsockopt(cs->tcpFD, SOL_SOCKET, SO_REUSEADDR, 1); #ifdef TCP_DEFER_ACCEPT - SSetsockopt(cs->tcpFD, SOL_TCP,TCP_DEFER_ACCEPT, 1); + SSetsockopt(cs->tcpFD, IPPROTO_TCP, TCP_DEFER_ACCEPT, 1); #endif if (frontend->d_tcpFastOpenQueueSize > 0) { #ifdef TCP_FASTOPEN - SSetsockopt(cs->tcpFD, SOL_TCP, TCP_FASTOPEN, frontend->d_tcpFastOpenQueueSize); + SSetsockopt(cs->tcpFD, IPPROTO_TCP, TCP_FASTOPEN, frontend->d_tcpFastOpenQueueSize); #else warnlog("TCP Fast Open has been configured on local address '%s' but is not supported", cs->local.toStringWithPort()); #endif diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc index db8084825..d96a64be9 100644 --- a/pdns/pdns_recursor.cc +++ b/pdns/pdns_recursor.cc @@ -1917,7 +1917,7 @@ static void makeTCPServerSockets(unsigned int threadId) } #ifdef TCP_DEFER_ACCEPT - if(setsockopt(fd, SOL_TCP, TCP_DEFER_ACCEPT, &tmp, sizeof tmp) >= 0) { + if(setsockopt(fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &tmp, sizeof tmp) >= 0) { if(i==locals.begin()) L<