Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/networking/libiproute/ll_map.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/networking/libiproute/ll_map.c (modified) (12 diffs)

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

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ll_map.c
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
-#include <net/if.h> /* struct ifreq and co. */
+#include <net/if.h>  /* struct ifreq and co. */
 
 #include "libbb.h"
@@ -28 +25 @@
 };
 
-static struct idxmap *idxmap[16];
+static struct idxmap **idxmap; /* treat as *idxmap[16] */
 
 static struct idxmap *find_by_index(int idx)
@@ -34 +31 @@
     struct idxmap *im;
 
-    for (im = idxmap[idx & 0xF]; im; im = im->next)
-        if (im->index == idx)
-            return im;
+    if (idxmap)
+        for (im = idxmap[idx & 0xF]; im; im = im->next)
+            if (im->index == idx)
+                return im;
     return NULL;
 }
 
-int ll_remember_index(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
+int FAST_FUNC ll_remember_index(const struct sockaddr_nl *who UNUSED_PARAM,
+        struct nlmsghdr *n,
+        void *arg UNUSED_PARAM)
 {
     int h;
@@ -58 +58 @@
         return 0;
 
+    if (!idxmap)
+        idxmap = xzalloc(sizeof(idxmap[0]) * 16);
+
     h = ifi->ifi_index & 0xF;
-
     for (imp = &idxmap[h]; (im = *imp) != NULL; imp = &im->next)
         if (im->index == ifi->ifi_index)
@@ -74 +76 @@
         int alen;
         im->alen = alen = RTA_PAYLOAD(tb[IFLA_ADDRESS]);
-        if (alen > sizeof(im->addr))
+        if (alen > (int)sizeof(im->addr))
             alen = sizeof(im->addr);
         memcpy(im->addr, RTA_DATA(tb[IFLA_ADDRESS]), alen);
@@ -85 +87 @@
 }
 
-const char *ll_idx_n2a(int idx, char *buf)
+const char FAST_FUNC *ll_idx_n2a(int idx, char *buf)
 {
     struct idxmap *im;
@@ -99 +101 @@
 
 
-const char *ll_index_to_name(int idx)
+const char FAST_FUNC *ll_index_to_name(int idx)
 {
     static char nbuf[16];
@@ -120 +122 @@
 #endif
 
-unsigned ll_index_to_flags(int idx)
+unsigned FAST_FUNC ll_index_to_flags(int idx)
 {
     struct idxmap *im;
@@ -132 +134 @@
 }
 
-int xll_name_to_index(const char *const name)
+int FAST_FUNC xll_name_to_index(const char *name)
 {
     int ret = 0;
@@ -151 +153 @@
         goto out;
     }
-    for (i = 0; i < 16; i++) {
-        for (im = idxmap[i]; im; im = im->next) {
-            if (strcmp(im->name, name) == 0) {
-                icache = im->index;
-                strcpy(ncache, name);
-                ret = im->index;
-                goto out;
+    if (idxmap) {
+        for (i = 0; i < 16; i++) {
+            for (im = idxmap[i]; im; im = im->next) {
+                if (strcmp(im->name, name) == 0) {
+                    icache = im->index;
+                    strcpy(ncache, name);
+                    ret = im->index;
+                    goto out;
+                }
             }
         }
@@ -171 +175 @@
 
     sock_fd = socket(AF_INET, SOCK_DGRAM, 0);
-    if (sock_fd) {
+    if (sock_fd >= 0) {
         struct ifreq ifr;
         int tmp;
 
-        strncpy(ifr.ifr_name, name, IFNAMSIZ);
+        strncpy_IFNAMSIZ(ifr.ifr_name, name);
         ifr.ifr_ifindex = -1;
         tmp = ioctl(sock_fd, SIOCGIFINDEX, &ifr);
@@ -187 +191 @@
 /* out:*/
     if (ret <= 0)
-        bb_error_msg_and_die("cannot find device \"%s\"", name);
+        bb_error_msg_and_die("can't find device '%s'", name);
     return ret;
 }
 
-int ll_init_map(struct rtnl_handle *rth)
+int FAST_FUNC ll_init_map(struct rtnl_handle *rth)
 {
     xrtnl_wilddump_request(rth, AF_UNSPEC, RTM_GETLINK);
-    xrtnl_dump_filter(rth, ll_remember_index, &idxmap);
+    xrtnl_dump_filter(rth, ll_remember_index, NULL);
     return 0;
 }