From: Aki Tuomi <cmouse@desteem.org>
Date: Thu, 21 May 2015 19:52:09 +0000 (+0300)
Subject: Emit warning when socket timestamps cannot be enabled
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~79^2~10^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2539%2Fhead;p=thirdparty%2Fpdns.git

Emit warning when socket timestamps cannot be enabled
---

diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc
index 94d7f3fdca..b72e55e2e4 100644
--- a/pdns/dnsdist.cc
+++ b/pdns/dnsdist.cc
@@ -1002,7 +1002,9 @@ try
     //if(g_vm.count("bind-non-local"))
     bindAny(local.sin4.sin_family, cs->udpFD);
 
-    //    setSocketTimestamps(cs->udpFD);
+    //    if (!setSocketTimestamps(cs->udpFD))
+    //      L<<Logger::Warning<<"Unable to enable timestamp reporting for socket"<<endl;
+
 
     if(IsAnyAddress(local)) {
       int one=1;
diff --git a/pdns/misc.cc b/pdns/misc.cc
index 8d3a8b4ba2..a05d5652a8 100644
--- a/pdns/misc.cc
+++ b/pdns/misc.cc
@@ -913,13 +913,13 @@ uint32_t burtle(const unsigned char* k, uint32_t length, uint32_t initval)
   return c;
 }
 
-void setSocketTimestamps(int fd)
+bool setSocketTimestamps(int fd)
 {
 #ifdef SO_TIMESTAMP
   int on=1;
-  if (setsockopt(fd, SOL_SOCKET, SO_TIMESTAMP, (char*)&on, sizeof(on)) < 0 )
-    ; // L<<Logger::Error<<"Unable to enable timestamp reporting for socket"<<endl;
+  return setsockopt(fd, SOL_SOCKET, SO_TIMESTAMP, (char*)&on, sizeof(on)) == 0;
 #endif
+  return true; // we pretend this happened.
 }
 
 uint32_t pdns_strtoui(const char *nptr, char **endptr, int base)
diff --git a/pdns/misc.hh b/pdns/misc.hh
index 99632853d5..056bcb6096 100644
--- a/pdns/misc.hh
+++ b/pdns/misc.hh
@@ -544,7 +544,7 @@ unsigned int getFilenumLimit(bool hardOrSoft=0);
 void setFilenumLimit(unsigned int lim);
 bool readFileIfThere(const char* fname, std::string* line);
 uint32_t burtle(const unsigned char* k, uint32_t lengh, uint32_t init);
-void setSocketTimestamps(int fd);
+bool setSocketTimestamps(int fd);
 
 //! Sets the socket into blocking mode.
 bool setBlocking( int sock );
diff --git a/pdns/nameserver.cc b/pdns/nameserver.cc
index a844766c45..7cd2e4a0c6 100644
--- a/pdns/nameserver.cc
+++ b/pdns/nameserver.cc
@@ -118,7 +118,8 @@ void UDPNameserver::bindIPv4()
     if(localname=="0.0.0.0")
       setsockopt(s, IPPROTO_IP, GEN_IP_PKTINFO, &one, sizeof(one));
 
-    setSocketTimestamps(s);
+    if (!setSocketTimestamps(s))
+      L<<Logger::Warning<<"Unable to enable timestamp reporting for socket"<<endl;
 
 #ifdef SO_REUSEPORT
     if( d_can_reuseport )
@@ -223,7 +224,8 @@ void UDPNameserver::bindIPv6()
       setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(one));      // if this fails, we report an error in tcpreceiver too
     }
 
-    setSocketTimestamps(s);
+    if (setSocketTimestamps(s))
+      L<<Logger::Warning<<"Unable to enable timestamp reporting for socket"<<endl;
 
 #ifdef SO_REUSEPORT
     if( d_can_reuseport )
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 7ae2b40801..7fb870fc59 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1183,7 +1183,8 @@ void makeUDPServerSockets()
     if(fd < 0) {
       throw PDNSException("Making a UDP server socket for resolver: "+netstringerror());
     }
-    setSocketTimestamps(fd);
+    if (!setSocketTimestamps(fd))
+      L<<Logger::Warning<<"Unable to enable timestamp reporting for socket"<<endl;
 
     if(IsAnyAddress(sin)) {
       setsockopt(fd, IPPROTO_IP, GEN_IP_PKTINFO, &one, sizeof(one));     // linux supports this, so why not - might fail on other systems