Changeset 472 for trunk/src

Timestamp:

May 29, 2015, 7:08:24 PM (9 years ago)

Author:

katerina

Message:

Fix for ticket #370 (Option --bind-address broken in IPv4-only code).

Location:

trunk/src

Files:

• sh_calls.c (modified) (5 diffs)
• sh_tools.c (modified) (15 diffs)

trunk/src/sh_calls.c

@@ -153 +153 @@
     reject = 1;
 
-#if defined(USE_IPVX)
   if (0 == sh_ipvx_aton(str, &bind_addr)) 
     return -1;
-#else
-  if (0 == inet_aton(str, &(bind_addr.sin.sin_addr))) 
-    return -1;
-#endif
 
   use_bind_addr = 1;
@@ -170 +165 @@
 {
   int error;
+  int err_bind = 0;
   long int val_retry = 0;
   char errbuf[SH_ERRBUF_SIZE];
@@ -177 +173 @@
   errno = 0;
 
-  if (0 != use_bind_addr) 
+  if (use_bind_addr) 
     {
       int slen = SH_SS_LEN(bind_addr);
-
-      val_retry = bind(sockfd, sh_ipvx_sockaddr_cast(&bind_addr), slen);
+      struct sockaddr *b_addr = sh_ipvx_sockaddr_cast(&bind_addr);
+
+      if (bind_addr.ss_family == AF_INET)
+        b_addr->sa_family = AF_INET;
+#if defined(USE_IPVX)
+      else
+        b_addr->sa_family = AF_INET6;
+#endif
+      val_retry = bind(sockfd, b_addr, slen);
     }
 
@@ -190 +193 @@
       } while (val_retry < 0 && (errno == EINTR || errno == EINPROGRESS));
     }
+  else
+    {
+      err_bind = 1;
+    }
 
   error = errno;
@@ -195 +202 @@
     long eport;
     char eaddr[SH_IP_BUF];
-
+    char emesg[SH_BUFSIZE];
+    struct sockaddr *err_addr = serv_addr;
     struct sh_sockaddr ss;
-    sh_ipvx_save(&ss, serv_addr->sa_family, serv_addr);
+
+    if (err_bind)
+      err_addr = sh_ipvx_sockaddr_cast(&bind_addr);
+
+    sh_ipvx_save(&ss, err_addr->sa_family, err_addr);
     sh_ipvx_ntoa(eaddr, sizeof(eaddr), &ss);
     
-    if (serv_addr->sa_family == AF_INET)
+    if (err_addr->sa_family == AF_INET)
       eport = (long) ntohs(((struct sockaddr_in *)serv_addr)->sin_port);
+#if defined(USE_IPVX)
     else
       eport = (long) ntohs(((struct sockaddr_in6 *)serv_addr)->sin6_port);
-
-    sh_error_handle ((-1), file, line, error, MSG_ERR_CONNECT, 
-                     sh_error_message(error, errbuf, sizeof(errbuf)),
+#endif
+
+    sl_strlcpy(emesg, sh_error_message(error, errbuf, sizeof(errbuf)), sizeof(emesg));
+    sl_strlcat(emesg, 
+               (err_addr->sa_family == AF_INET) ? _(", AF_INET") : _(", AF_INET6"),
+               sizeof(emesg));
+
+    sl_strlcat(emesg, 
+               (err_bind) ? _(", bind") : _(", connect"),
+               sizeof(emesg));
+    
+    sh_error_handle ((-1), file, line, error, MSG_ERR_CONNECT,
+                     emesg,
                      (long) sockfd, eport, eaddr);
   }

trunk/src/sh_tools.c

@@ -93 +93 @@
 #undef  FIL__
 #define FIL__  _("sh_tools.c")
+
+static int tools_debug = 0;
 
 #ifdef SH_ENCRYPT
@@ -564 +566 @@
   SL_ENTER(_("connect_port"));
 
+  if (tools_debug)
+    fprintf(stderr, _("-00- <%s> <%d> no IPv6 support\n"), address, port);
+
   if (errsiz > 0) errmsg[0] = '\0';
 
@@ -575 +580 @@
       while (check_cache && check_cache->address)
         {
+          if (tools_debug)
+            fprintf(stderr, _("-01- <%s> <%s>\n"), 
+                    address, check_cache->address);
+
           if ( 0 == sl_strncmp(check_cache->address, 
                                address, sl_strlen(address)) )
@@ -584 +593 @@
               break;
             }
+          if (tools_debug)
+            {
+              char eaddr[SH_IP_BUF];
+              sl_strlcpy(eaddr, 
+                         inet_ntoa(*(struct in_addr *) &(sinr.sin_addr)), 
+                         sizeof(eaddr));
+              fprintf(stderr, _("-02- <AF_INET> <%s> <%d> <%d>\n"), 
+                      eaddr,
+                      port, cached);
+            }
           if (check_cache->next)
             check_cache = check_cache->next;
@@ -595 +614 @@
   if (cached == 0)
     {
+      if (tools_debug)
+        fputs(_("-03- not cached\n"), stderr); 
 #ifdef HAVE_INET_ATON
       if (0 == inet_aton(address, &haddr))
@@ -625 +646 @@
               sinr.sin_addr   = *(struct in_addr *) host_entry->h_addr;
 
+              if (tools_debug)
+                fprintf(stderr, 
+                        _("-04- <%s> <%s> hostent->h_name %s <%s> hostent->h_addr\n"), 
+                        address, 
+                        (host_entry->h_name == NULL) ? _("NULL") : host_entry->h_name,
+                        (host_entry->h_addrtype == AF_INET) ? _("AF_INET") : _("AF_INET6"),
+                        inet_ntoa(*(struct in_addr *) &(sinr.sin_addr)));
 
               /* reverse DNS lookup
@@ -688 +716 @@
           sinr.sin_port   = htons (port);
           sinr.sin_addr   = haddr;
+
+          if (tools_debug)
+            fprintf(stderr, 
+                    _("-04- <%s> is_numeric AF_INET <%s> \n"), 
+                    address, 
+                    inet_ntoa(*(struct in_addr *) &(sinr.sin_addr)));
         }
 
@@ -743 +777 @@
         *errnum = status;
         sl_strlcpy(errmsg, sh_error_message (status, errbuf, sizeof(errbuf)), errsiz);
+        sl_strlcat(errmsg, 
+                   (sinr.sin_family == AF_INET) ? _(", AF_INET ") : _(", AF_INET6 "),
+                   errsiz);
         sl_strlcat(errmsg, _(", address "), errsiz);
         sl_strlcat(errmsg, address, errsiz);
@@ -776 +813 @@
     delete_cache();
 
+  if (tools_debug)
+    fprintf(stderr, _("-00- <%s> <%d>\n"), address, port);
+
   if (check_cache != NULL)
     {
       while (check_cache && check_cache->address)
         {
+          if (tools_debug)
+            fprintf(stderr, _("-01- <%s> <%s>\n"), 
+                    address, check_cache->address);
+
           if ( 0 == sl_strcmp(check_cache->address, address) )
             {
@@ -798 +842 @@
                   break;
                 }
+              if (tools_debug)
+                {
+                  char eaddr[SH_IP_BUF];
+                  sh_ipvx_ntoa(eaddr, sizeof(eaddr), &ss);
+                  fprintf(stderr, _("-02- <%s> <%s> <%d> <%d>\n"), 
+                          (ss.ss_family == AF_INET) ? _("AF_INET") : _("AF_INET6"),
+                          eaddr,
+                          port, cached);
+                }
               break;
             }
@@ -809 +862 @@
   if (cached != 0)
     {
+      if (tools_debug)
+        fputs(_("-03- cached\n"), stderr); 
       fd = socket(ss.ss_family, SOCK_STREAM, 0);
       if (fd < 0) 
@@ -854 +909 @@
       struct addrinfo hints;
 
+      if (tools_debug)
+        fputs(_("-03- not cached\n"), stderr);
+
       memset (&hints, '\0', sizeof (hints));
       hints.ai_flags = AI_ADDRCONFIG;
@@ -882 +940 @@
           const char * canonical;
 
+
 #if defined(AI_CANONNAME)
           if (ai->ai_canonname && strlen(ai->ai_canonname) > 0)
             {
               canonical = ai->ai_canonname;
+              if (tools_debug)
+                fprintf(stderr, _("-04- <%s> <%s> ai->ai_canonname\n"), 
+                        address, canonical);
             }
           else
             {
               canonical = address;
+              if (tools_debug)
+                fprintf(stderr, _("-04- <%s> <%s> defined ai_canonname\n"), 
+                        address, canonical);
             }
 #else
           canonical = address;
+          if (tools_debug)
+            fprintf(stderr, _("-04- <%s> <%s> not defined ai_canonname\n"), 
+                    address, canonical);
 #endif
 
@@ -903 +971 @@
               if (e == 0)
                 {
+                  if (tools_debug)
+                    {
+                      fprintf(stderr, _("-05- <%s> <%s> <%s>\n"), 
+                              (p->ai_family == AF_INET) ? _("AF_INET") : _("AF_INET6"),
+                              sh_ipvx_print_sockaddr (p->ai_addr, p->ai_family),
+                              hostname);
+                    }
+
                   if (sl_strcasecmp(hostname, canonical) == 0)
                     {
+                      if (tools_debug)
+                        fprintf(stderr, _("-06- <%s> <%s> match\n"), 
+                                hostname, canonical);
                       success = 1;
                       break;
                     }
+
                 }
             
@@ -1418 +1498 @@
       SH_IS_ASCII(head[5]) && isalpha(head[5]) &&                          
       SH_IS_ASCII(head[6]) && isalpha(head[6])) {
-    fprintf(stderr, "%c %3o %s %5d  %c  %c  %c  %c\n", sign,
+    fprintf(stderr, _("%c %3o %s %5d  %c  %c  %c  %c\n"), sign,
             head[0], code, msg_size, head[3], head[4], head[5], head[6]); 
   } else {
-    fprintf(stderr, "%c %3o %s %5d %2X %2X %2X %2X\n", sign,
+    fprintf(stderr, _("%c %3o %s %5d %2X %2X %2X %2X\n"), sign,
             head[0], code, msg_size, head[3], head[4], head[5], head[6]); 
   }