Changeset 812

Timestamp:

04/30/2006 02:55:38 PM (3 years ago)

Author:

ahu

Message:

implement 'netstringerror', to be called to report network errors

Location:

trunk/pdns/pdns

Files:

• misc.cc (modified) (1 diff)
• misc.hh (modified) (1 diff)
• pdns_recursor.cc (modified) (1 diff)

trunk/pdns/pdns/misc.cc

@@ -329 +329 @@
 }
 
+#ifdef WIN32
+string netstringerror()
+{
+  char buf[512];
+  int err=WSAGetLastError();
+  if(FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL, err,
+                     0, buf, sizeof(buf)-1, NULL)) {
+    return string(buf);
+  }
+  else {
+    return strerror(err);
+  }
+}
+#else
+string netstringerror()
+{
+  return stringerror();
+}
+#endif
+
 void cleanSlashes(string &str)
 {

trunk/pdns/pdns/misc.hh

@@ -150 +150 @@
 string U32ToIP(uint32_t);
 string stringerror();
+string netstringerror();
 string itoa(int i);
 string uitoa(unsigned int i);

trunk/pdns/pdns/pdns_recursor.cc

@@ -827 +827 @@
     
     int fd=socket(sin.sin4.sin_family, SOCK_DGRAM,0);
-    if(fd<0) 
-      throw AhuException("Making a UDP server socket for resolver: "+stringerror());
+    if(fd < 0) {
+      throw AhuException("Making a UDP server socket for resolver: "+netstringerror());
+    }
 
     setReceiveBuffer(fd, 200000);