Changeset 361 for trunk

Timestamp:

Oct 19, 2011, 12:14:06 AM (13 years ago)

Author:

katerina

Message:

Fix for ticket #268 (Insufficient server-side debugging information for IPv6).

File:

• trunk/src/sh_calls.c (modified) (3 diffs)

trunk/src/sh_calls.c

@@ -34 +34 @@
 #include <signal.h>
 #include <sys/socket.h>
+#include <netdb.h>
 #include <netinet/in.h>
 
@@ -57 +58 @@
 #undef  FIL__
 #define FIL__  _("sh_calls.c")
+
+extern int flag_err_debug;
 
 char aud_err_message[64];
@@ -236 +239 @@
   errno = error;
 
+  if (flag_err_debug == SL_TRUE)
+    {
+      char ipbuf[SH_IP_BUF];
+      char buf[SH_BUFSIZE];
+#if defined(USE_IPVX)
+      sl_strlcpy(errbuf, _("Address family: "), sizeof(errbuf));
+      sl_strlcat(errbuf, 
+                 (ss.ss_family == AF_INET6) ? _("AF_INET6") : _("AF_INET"),
+                 sizeof(errbuf));
+      getnameinfo((struct sockaddr *)&ss, my_addrlen,
+                  ipbuf, sizeof(ipbuf), NULL, 0, NI_NUMERICHOST);
+#else
+      struct sockaddr_in sa;
+      char * p;
+      memcpy(&(sa), (struct sockaddr_in*)&ss, sizeof(struct sockaddr_in));
+      p = inet_ntoa(sa.sin_addr);
+      sl_strlcpy(ipbuf, p, sizeof(ipbuf));
+      sl_strlcpy(errbuf, _("Address family: AF_INET"), sizeof(errbuf));
+#endif
+      sl_strlcpy(buf, _("Address: "), sizeof(buf));
+      sl_strlcat(buf, ipbuf, sizeof(buf));
+      sh_error_handle (SH_ERR_ALL, FIL__, __LINE__, 0, MSG_E_SUBGEN,
+                       errbuf, _("retry_accept"));
+      sh_error_handle (SH_ERR_ALL, FIL__, __LINE__, 0, MSG_E_SUBGEN,
+                       buf, _("retry_accept"));
+    }
+
   sh_ipvx_save(serv_addr, ss.ss_family, (struct sockaddr *) &ss);
+
+  if (flag_err_debug == SL_TRUE)
+    {
+      char ipbuf[SH_IP_BUF];
+      char ipbuf2[SH_IP_BUF];
+      char buf[SH_BUFSIZE];
+#if defined(USE_IPVX)
+      int len = (serv_addr->ss_family == AF_INET) ? 
+        sizeof(struct sockaddr_in) :
+        sizeof(struct sockaddr_in6);
+      getnameinfo(sh_ipvx_sockaddr_cast(serv_addr), len,
+                  ipbuf2, sizeof(ipbuf2), NULL, 0, NI_NUMERICHOST);
+#else
+      char * p = inet_ntoa((serv_addr->sin).sin_addr);
+      sl_strlcpy(ipbuf2, p, sizeof(ipbuf2));
+#endif
+      sh_ipvx_ntoa (ipbuf, sizeof(ipbuf), serv_addr);
+      sl_snprintf(buf, sizeof(buf), _("Address: %s / %s"),
+                  ipbuf, ipbuf2);
+      sh_error_handle (SH_ERR_ALL, FIL__, __LINE__, 0, MSG_E_SUBGEN,
+                       buf, _("retry_accept"));
+    }
 
   *addrlen = (int) my_addrlen;