From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Tue, 16 Sep 2014 19:45:56 +0000 (+0200)
Subject: fall back to central bind if reuseport bind fails; improves #1715
X-Git-Tag: auth-3.4.0-rc2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed3afdfc8f4bb84521f081d10fed128e91ec90b3;p=thirdparty%2Fpdns.git

fall back to central bind if reuseport bind fails; improves #1715
---

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 550244387e..c7e89e19ba 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -256,7 +256,12 @@ void *qthread(void *number)
   // other than the first one.
   if( number != NULL && NS->canReusePort() ) {
     L<<Logger::Notice<<"Starting new listen thread on the same IPs/ports using SO_REUSEPORT"<<endl;
-    NS = new UDPNameserver( true );
+    try {
+      NS = new UDPNameserver( true );
+    } catch(PDNSException &e) {
+      L<<Logger::Error<<"Unable to reuse port, falling back to original bind"<<endl;
+      NS = N;
+    }
   }
 
   for(;;) {
diff --git a/pdns/nameserver.cc b/pdns/nameserver.cc
index 98ce853ccc..10331802df 100644
--- a/pdns/nameserver.cc
+++ b/pdns/nameserver.cc
@@ -135,12 +135,13 @@ void UDPNameserver::bindIPv4()
         g_localaddresses.push_back(locala);
 
     if(::bind(s, (sockaddr*)&locala, locala.getSocklen()) < 0) {
+      string binderror = strerror(errno);
       close(s);
       if( errno == EADDRNOTAVAIL && ! ::arg().mustDo("local-address-nonexist-fail") ) {
         L<<Logger::Error<<"IPv4 Address " << localname << " does not exist on this server - skipping UDP bind" << endl;
         continue;
       } else {
-        L<<Logger::Error<<"binding UDP socket to '"+locala.toStringWithPort()+": "<<strerror(errno)<<endl;
+        L<<Logger::Error<<"binding UDP socket to '"+locala.toStringWithPort()+"': "<<binderror<<endl;
         throw PDNSException("Unable to bind to UDP socket");
       }
     }