Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/libiproute/ll_map.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/networking/libiproute/ll_map.c (modified) (4 diffs)

branches/3.3/mindi-busybox/networking/libiproute/ll_map.c

@@ -87 +87 @@
 }
 
-const char FAST_FUNC *ll_idx_n2a(int idx, char *buf)
+static
+const char FAST_FUNC *ll_idx_n2a(int idx/*, char *buf*/)
 {
     struct idxmap *im;
@@ -96 +97 @@
     if (im)
         return im->name;
-    snprintf(buf, 16, "if%d", idx);
-    return buf;
+    //snprintf(buf, 16, "if%d", idx);
+    //return buf;
+    return auto_string(xasprintf("if%d", idx));
 }
-
 
 const char FAST_FUNC *ll_index_to_name(int idx)
 {
-    static char nbuf[16];
-
-    return ll_idx_n2a(idx, nbuf);
+    //static char nbuf[16];
+    return ll_idx_n2a(idx/*, nbuf*/);
 }
 
@@ -137 +137 @@
 {
     int ret = 0;
-    int sock_fd;
 
 /* caching is not warranted - no users which repeatedly call it */
@@ -165 +164 @@
         }
     }
-    /* We have not found the interface in our cache, but the kernel
-     * may still know about it. One reason is that we may be using
-     * module on-demand loading, which means that the kernel will
-     * load the module and make the interface exist only when
-     * we explicitely request it (check for dev_load() in net/core/dev.c).
-     * I can think of other similar scenario, but they are less common...
-     * Jean II */
 #endif
-
-    sock_fd = socket(AF_INET, SOCK_DGRAM, 0);
-    if (sock_fd >= 0) {
-        struct ifreq ifr;
-        int tmp;
-
-        strncpy_IFNAMSIZ(ifr.ifr_name, name);
-        ifr.ifr_ifindex = -1;
-        tmp = ioctl(sock_fd, SIOCGIFINDEX, &ifr);
-        close(sock_fd);
-        if (tmp >= 0)
-            /* In theory, we should redump the interface list
-             * to update our cache, this is left as an exercise
-             * to the reader... Jean II */
-            ret = ifr.ifr_ifindex;
-    }
+    ret = if_nametoindex(name);
 /* out:*/
     if (ret <= 0)