Changeset 472 for trunk/src/sh_calls.c

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).

File:

• trunk/src/sh_calls.c (modified) (5 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);
   }