Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/libbb/xconnect.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/libbb/xconnect.c (modified) (7 diffs)

branches/3.2/mindi-busybox/libbb/xconnect.c

@@ -135 +135 @@
 }
 
-void FAST_FUNC set_nport(len_and_sockaddr *lsa, unsigned port)
-{
-#if ENABLE_FEATURE_IPV6
-    if (lsa->u.sa.sa_family == AF_INET6) {
-        lsa->u.sin6.sin6_port = port;
+void FAST_FUNC set_nport(struct sockaddr *sa, unsigned port)
+{
+#if ENABLE_FEATURE_IPV6
+    if (sa->sa_family == AF_INET6) {
+        struct sockaddr_in6 *sin6 = (void*) sa;
+        sin6->sin6_port = port;
         return;
     }
 #endif
-    if (lsa->u.sa.sa_family == AF_INET) {
-        lsa->u.sin.sin_port = port;
+    if (sa->sa_family == AF_INET) {
+        struct sockaddr_in *sin = (void*) sa;
+        sin->sin_port = port;
         return;
     }
@@ -256 +258 @@
     memset(&hint, 0 , sizeof(hint));
     hint.ai_family = af;
-    /* Needed. Or else we will get each address thrice (or more)
+    /* Need SOCK_STREAM, or else we get each address thrice (or more)
      * for each possible socket type (tcp,udp,raw...): */
     hint.ai_socktype = SOCK_STREAM;
@@ -284 +286 @@
 
  set_port:
-    set_nport(r, htons(port));
+    set_nport(&r->u.sa, htons(port));
  ret:
-    freeaddrinfo(result);
+    if (result)
+        freeaddrinfo(result);
     return r;
 }
@@ -320 +323 @@
 }
 
-#undef xsocket_type
-int FAST_FUNC xsocket_type(len_and_sockaddr **lsap, IF_FEATURE_IPV6(int family,) int sock_type)
-{
-    IF_NOT_FEATURE_IPV6(enum { family = AF_INET };)
+int FAST_FUNC xsocket_type(len_and_sockaddr **lsap, int family, int sock_type)
+{
     len_and_sockaddr *lsa;
     int fd;
     int len;
 
-#if ENABLE_FEATURE_IPV6
     if (family == AF_UNSPEC) {
+#if ENABLE_FEATURE_IPV6
         fd = socket(AF_INET6, sock_type, 0);
         if (fd >= 0) {
@@ -335 +336 @@
             goto done;
         }
+#endif
         family = AF_INET;
     }
-#endif
+
     fd = xsocket(family, sock_type, 0);
+
     len = sizeof(struct sockaddr_in);
+    if (family == AF_UNIX)
+        len = sizeof(struct sockaddr_un);
 #if ENABLE_FEATURE_IPV6
     if (family == AF_INET6) {
@@ -355 +360 @@
 int FAST_FUNC xsocket_stream(len_and_sockaddr **lsap)
 {
-    return xsocket_type(lsap, IF_FEATURE_IPV6(AF_UNSPEC,) SOCK_STREAM);
+    return xsocket_type(lsap, AF_UNSPEC, SOCK_STREAM);
 }
 
@@ -368 +373 @@
         fd = xsocket(lsa->u.sa.sa_family, sock_type, 0);
     } else {
-        fd = xsocket_type(&lsa, IF_FEATURE_IPV6(AF_UNSPEC,) sock_type);
-        set_nport(lsa, htons(port));
+        fd = xsocket_type(&lsa, AF_UNSPEC, sock_type);
+        set_nport(&lsa->u.sa, htons(port));
     }
     setsockopt_reuseaddr(fd);