Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/inet_common.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/libbb/inet_common.c (modified) (12 diffs)

branches/3.3/mindi-busybox/libbb/inet_common.c

@@ -33 +33 @@
     }
     /* If we expect this to be a hostname, try hostname database first */
-#ifdef DEBUG
     if (hostfirst) {
+#ifdef DEBUG
         bb_error_msg("gethostbyname(%s)", name);
-    }
-#endif
-    if (hostfirst) {
+#endif
         hp = gethostbyname(name);
-        if (hp != NULL) {
+        if (hp) {
             memcpy(&s_in->sin_addr, hp->h_addr_list[0],
                 sizeof(struct in_addr));
@@ -52 +50 @@
 #endif
     np = getnetbyname(name);
-    if (np != NULL) {
+    if (np) {
         s_in->sin_addr.s_addr = htonl(np->n_net);
         return 1;
@@ -67 +65 @@
 #endif
     hp = gethostbyname(name);
-    if (hp == NULL) {
+    if (!hp) {
         return -1;
     }
@@ -75 +73 @@
 
 
-/* numeric: & 0x8000: default instead of *,
+/* numeric: & 0x8000: "default" instead of "*",
  *          & 0x4000: host instead of net,
  *          & 0x0fff: don't resolve
@@ -84 +82 @@
     struct addr {
         struct addr *next;
-        struct sockaddr_in addr;
-        int host;
+        uint32_t nip;
+        smallint is_host;
         char name[1];
     };
@@ -92 +90 @@
     struct addr *pn;
     char *name;
-    uint32_t ad, host_ad;
-    int host = 0;
+    uint32_t nip;
+    smallint is_host;
 
     if (s_in->sin_family != AF_INET) {
@@ -103 +101 @@
         return NULL;
     }
-    ad = s_in->sin_addr.s_addr;
-#ifdef DEBUG
-    bb_error_msg("rresolve: %08x, mask %08x, num %08x", (unsigned)ad, netmask, numeric);
-#endif
-    if (ad == INADDR_ANY) {
-        if ((numeric & 0x0FFF) == 0) {
-            if (numeric & 0x8000)
-                return xstrdup("default");
-            return xstrdup("*");
-        }
-    }
+    nip = s_in->sin_addr.s_addr;
+#ifdef DEBUG
+    bb_error_msg("rresolve: %08x mask:%08x num:%08x", (unsigned)nip, netmask, numeric);
+#endif
     if (numeric & 0x0FFF)
-        return xstrdup(inet_ntoa(s_in->sin_addr));
-
-    if ((ad & (~netmask)) != 0 || (numeric & 0x4000))
-        host = 1;
+        return xmalloc_sockaddr2dotted_noport((void*)s_in);
+    if (nip == INADDR_ANY) {
+        if (numeric & 0x8000)
+            return xstrdup("default");
+        return xstrdup("*");
+    }
+
+    is_host = ((nip & (~netmask)) != 0 || (numeric & 0x4000));
+
     pn = cache;
     while (pn) {
-        if (pn->addr.sin_addr.s_addr == ad && pn->host == host) {
+        if (pn->nip == nip && pn->is_host == is_host) {
 #ifdef DEBUG
             bb_error_msg("rresolve: found %s %08x in cache",
-                      (host ? "host" : "net"), (unsigned)ad);
+                (is_host ? "host" : "net"), (unsigned)nip);
 #endif
             return xstrdup(pn->name);
@@ -131 +127 @@
     }
 
-    host_ad = ntohl(ad);
     name = NULL;
-    if (host) {
-        struct hostent *ent;
-#ifdef DEBUG
-        bb_error_msg("gethostbyaddr (%08x)", (unsigned)ad);
-#endif
-        ent = gethostbyaddr((char *) &ad, 4, AF_INET);
-        if (ent)
-            name = xstrdup(ent->h_name);
+    if (is_host) {
+#ifdef DEBUG
+        bb_error_msg("sockaddr2host_noport(%08x)", (unsigned)nip);
+#endif
+        name = xmalloc_sockaddr2host_noport((void*)s_in);
     } else if (ENABLE_FEATURE_ETC_NETWORKS) {
         struct netent *np;
 #ifdef DEBUG
-        bb_error_msg("getnetbyaddr (%08x)", (unsigned)host_ad);
-#endif
-        np = getnetbyaddr(host_ad, AF_INET);
+        bb_error_msg("getnetbyaddr(%08x)", (unsigned)ntohl(nip));
+#endif
+        np = getnetbyaddr(ntohl(nip), AF_INET);
         if (np)
             name = xstrdup(np->n_name);
     }
     if (!name)
-        name = xstrdup(inet_ntoa(s_in->sin_addr));
+        name = xmalloc_sockaddr2dotted_noport((void*)s_in);
+
     pn = xmalloc(sizeof(*pn) + strlen(name)); /* no '+ 1', it's already accounted for */
     pn->next = cache;
-    pn->addr = *s_in;
-    pn->host = host;
+    pn->nip = nip;
+    pn->is_host = is_host;
     strcpy(pn->name, name);
     cache = pn;
+
     return name;
 }
@@ -176 +170 @@
     }
     memcpy(sin6, ai->ai_addr, sizeof(*sin6));
-    if (ai)
-        freeaddrinfo(ai);
+    freeaddrinfo(ai);
     return 0;
 }
@@ -190 +183 @@
 char* FAST_FUNC INET6_rresolve(struct sockaddr_in6 *sin6, int numeric)
 {
-    char name[128];
-    int s;
-
     if (sin6->sin6_family != AF_INET6) {
 #ifdef DEBUG
@@ -202 +192 @@
     }
     if (numeric & 0x7FFF) {
-        inet_ntop(AF_INET6, &sin6->sin6_addr, name, sizeof(name));
-        return xstrdup(name);
+        return xmalloc_sockaddr2dotted_noport((void*)sin6);
     }
     if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
@@ -211 +200 @@
     }
 
-    s = getnameinfo((struct sockaddr *) sin6, sizeof(*sin6),
-                name, sizeof(name),
-                /*serv,servlen:*/ NULL, 0,
-                0);
-    if (s != 0) {
-        bb_error_msg("getnameinfo failed");
-        return NULL;
-    }
-    return xstrdup(name);
+    return xmalloc_sockaddr2host_noport((void*)sin6);
 }