Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/networking/libiproute/ipaddress.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/networking/libiproute/ipaddress.c (modified) (27 diffs)

branches/2.2.5/mindi-busybox/networking/libiproute/ipaddress.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * ipaddress.c      "ip address".
@@ -10 +11 @@
  */
 
-#include "libbb.h"
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-
+//#include <sys/socket.h>
+//#include <sys/ioctl.h>
 #include <fnmatch.h>
-#include <string.h>
-#include <unistd.h>
-
 #include <net/if.h>
 #include <net/if_arp.h>
 
+#include "ip_common.h"  /* #include "libbb.h" is inside */
 #include "rt_names.h"
 #include "utils.h"
-#include "ip_common.h"
-
-
-static struct
-{
+
+
+typedef struct filter_t {
     int ifindex;
     int family;
@@ -42 +37 @@
     int flushe;
     struct rtnl_handle *rth;
-} filter;
+} filter_t;
+
+#define filter (*(filter_t*)&bb_common_bufsiz1)
+
 
 static void print_link_flags(FILE *fp, unsigned flags, unsigned mdown)
@@ -49 +47 @@
     flags &= ~IFF_RUNNING;
 #define _PF(f) if (flags&IFF_##f) { \
-          flags &= ~IFF_##f ; \
+          flags &= ~IFF_##f; \
           fprintf(fp, #f "%s", flags ? "," : ""); }
     _PF(LOOPBACK);
@@ -86 +84 @@
 
     memset(&ifr, 0, sizeof(ifr));
-    strcpy(ifr.ifr_name, name);
-    if (ioctl(s, SIOCGIFTXQLEN, &ifr) < 0) {
-        perror("SIOCGIFXQLEN");
+    strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
+    if (ioctl_or_warn(s, SIOCGIFTXQLEN, &ifr) < 0) {
         close(s);
         return;
@@ -99 +96 @@
 
 static int print_linkinfo(struct sockaddr_nl ATTRIBUTE_UNUSED *who,
-        struct nlmsghdr *n, void ATTRIBUTE_UNUSED *arg)
+        const struct nlmsghdr *n, void ATTRIBUTE_UNUSED *arg)
 {
     FILE *fp = (FILE*)arg;
@@ -125 +122 @@
         return -1;
     }
-    if (filter.label &&
-        (!filter.family || filter.family == AF_PACKET) &&
-        fnmatch(filter.label, RTA_DATA(tb[IFLA_IFNAME]), 0))
-        return 0;
+    if (filter.label
+     && (!filter.family || filter.family == AF_PACKET)
+     && fnmatch(filter.label, RTA_DATA(tb[IFLA_IFNAME]), 0)
+    ) {
+        return 0;
+    }
 
     if (n->nlmsg_type == RTM_DELLINK)
@@ -166 +165 @@
     if (!filter.family || filter.family == AF_PACKET) {
         SPRINT_BUF(b1);
-        fprintf(fp, "%s", _SL_);
-        fprintf(fp, "    link/%s ", ll_type_n2a(ifi->ifi_type, b1, sizeof(b1)));
+        fprintf(fp, "%c    link/%s ", _SL_, ll_type_n2a(ifi->ifi_type, b1, sizeof(b1)));
 
         if (tb[IFLA_ADDRESS]) {
@@ -186 +184 @@
         }
     }
-    fprintf(fp, "\n");
+    fputc('\n', fp);
     fflush(fp);
     return 0;
@@ -194 +192 @@
 {
     if (rtnl_send(filter.rth, filter.flushb, filter.flushp) < 0) {
-        perror("Failed to send flush request\n");
+        bb_perror_msg("failed to send flush request");
         return -1;
     }
@@ -341 +339 @@
         struct ifa_cacheinfo *ci = RTA_DATA(rta_tb[IFA_CACHEINFO]);
         char buf[128];
-        fprintf(fp, "%s", _SL_);
+        fputc(_SL_, fp);
         if (ci->ifa_valid == 0xFFFFFFFFU)
             sprintf(buf, "valid_lft forever");
@@ -352 +350 @@
         fprintf(fp, "       %s", buf);
     }
-    fprintf(fp, "\n");
+    fputc('\n', fp);
     fflush(fp);
     return 0;
@@ -366 +364 @@
 static int print_selected_addrinfo(int ifindex, struct nlmsg_list *ainfo, FILE *fp)
 {
-    for ( ;ainfo ;  ainfo = ainfo->next) {
+    for (; ainfo; ainfo = ainfo->next) {
         struct nlmsghdr *n = &ainfo->h;
         struct ifaddrmsg *ifa = NLMSG_DATA(n);
@@ -412 +410 @@
 }
 
+/* Return value becomes exitcode. It's okay to not return at all */
 int ipaddr_list_or_flush(int argc, char **argv, int flush)
 {
-    static const char *const option[] = { "to", "scope", "up", "label", "dev", 0 };
+    static const char option[] ALIGN1 = "to\0""scope\0""up\0""label\0""dev\0";
 
     struct nlmsg_list *linfo = NULL;
@@ -431 +430 @@
     if (flush) {
         if (argc <= 0) {
-            bb_error_msg(bb_msg_requires_arg, "flush");
-            return -1;
+            bb_error_msg_and_die(bb_msg_requires_arg, "flush");
         }
         if (filter.family == AF_PACKET) {
-            bb_error_msg("Cannot flush link addresses.");
-            return -1;
+            bb_error_msg_and_die("cannot flush link addresses");
         }
     }
 
     while (argc > 0) {
-        const int option_num = compare_string_array(option, *argv);
+        const int option_num = index_in_strings(option, *argv);
         switch (option_num) {
             case 0: /* to */
@@ -484 +481 @@
     }
 
-    if (rtnl_open(&rth, 0) < 0)
-        exit(1);
-
-    if (rtnl_wilddump_request(&rth, preferred_family, RTM_GETLINK) < 0) {
-        bb_perror_msg_and_die("Cannot send dump request");
-    }
-
-    if (rtnl_dump_filter(&rth, store_nlmsg, &linfo, NULL, NULL) < 0) {
-        bb_error_msg_and_die("Dump terminated");
-    }
+    xrtnl_open(&rth);
+
+    xrtnl_wilddump_request(&rth, preferred_family, RTM_GETLINK);
+    xrtnl_dump_filter(&rth, store_nlmsg, &linfo);
 
     if (filter_dev) {
-        filter.ifindex = ll_name_to_index(filter_dev);
-        if (filter.ifindex <= 0) {
-            bb_error_msg("Device \"%s\" does not exist", filter_dev);
-            return -1;
-        }
+        filter.ifindex = xll_name_to_index(filter_dev);
     }
 
@@ -512 +499 @@
 
         for (;;) {
-            if (rtnl_wilddump_request(&rth, filter.family, RTM_GETADDR) < 0) {
-                perror("Cannot send dump request");
-                exit(1);
-            }
+            xrtnl_wilddump_request(&rth, filter.family, RTM_GETADDR);
             filter.flushed = 0;
-            if (rtnl_dump_filter(&rth, print_addrinfo, stdout, NULL, NULL) < 0) {
-                fprintf(stderr, "Flush terminated\n");
-                exit(1);
-            }
+            xrtnl_dump_filter(&rth, print_addrinfo, stdout);
             if (filter.flushed == 0) {
-                fflush(stdout);
                 return 0;
             }
             if (flush_update() < 0)
-                exit(1);
+                return 1;
         }
     }
 
     if (filter.family != AF_PACKET) {
-        if (rtnl_wilddump_request(&rth, filter.family, RTM_GETADDR) < 0) {
-            bb_perror_msg_and_die("Cannot send dump request");
-        }
-
-        if (rtnl_dump_filter(&rth, store_nlmsg, &ainfo, NULL, NULL) < 0) {
-            bb_error_msg_and_die("Dump terminated");
-        }
+        xrtnl_wilddump_request(&rth, filter.family, RTM_GETADDR);
+        xrtnl_dump_filter(&rth, store_nlmsg, &ainfo);
     }
 
@@ -601 +576 @@
     }
 
-    for (l=linfo; l; l = l->next) {
+    for (l = linfo; l; l = l->next) {
         if (no_link || print_linkinfo(NULL, &l->h, stdout) == 0) {
             struct ifinfomsg *ifi = NLMSG_DATA(&l->h);
@@ -607 +582 @@
                 print_selected_addrinfo(ifi->ifi_index, ainfo, stdout);
         }
-        fflush(stdout);
-    }
-
-    exit(0);
+        fflush(stdout); /* why? */
+    }
+
+    return 0;
 }
 
@@ -616 +591 @@
 {
     if (lcl->family == AF_INET) {
-        if (lcl->bytelen >= 1 && *(__u8*)&lcl->data == 127)
+        if (lcl->bytelen >= 1 && *(uint8_t*)&lcl->data == 127)
             return RT_SCOPE_HOST;
     }
@@ -622 +597 @@
 }
 
+/* Return value becomes exitcode. It's okay to not return at all */
 static int ipaddr_modify(int cmd, int argc, char **argv)
 {
-    static const char *const option[] = {
-        "peer", "remote", "broadcast", "brd",
-        "anycast", "scope", "dev", "label", "local", 0
-    };
-
+    static const char option[] ALIGN1 =
+        "peer\0""remote\0""broadcast\0""brd\0"
+        "anycast\0""scope\0""dev\0""label\0""local\0";
     struct rtnl_handle rth;
     struct {
-        struct nlmsghdr     n;
-        struct ifaddrmsg    ifa;
-        char            buf[256];
+        struct nlmsghdr  n;
+        struct ifaddrmsg ifa;
+        char             buf[256];
     } req;
-    char  *d = NULL;
-    char  *l = NULL;
+    char *d = NULL;
+    char *l = NULL;
     inet_prefix lcl;
     inet_prefix peer;
@@ -643 +617 @@
     int brd_len = 0;
     int any_len = 0;
-    int scoped = 0;
+    bool scoped = 0;
 
     memset(&req, 0, sizeof(req));
@@ -653 +627 @@
 
     while (argc > 0) {
-        const int option_num = compare_string_array(option, *argv);
+        const int option_num = index_in_strings(option, *argv);
         switch (option_num) {
             case 0: /* peer */
@@ -678 +652 @@
                     duparg("broadcast", *argv);
                 }
-                if (strcmp(*argv, "+") == 0) {
+                if (LONE_CHAR(*argv, '+')) {
                     brd_len = -1;
                 }
-                else if (strcmp(*argv, "-") == 0) {
+                else if (LONE_DASH(*argv)) {
                     brd_len = -2;
                 } else {
@@ -748 +722 @@
         return -1;
     }
-    if (l && matches(d, l) != 0) {
+    if (l && strncmp(d, l, strlen(d)) != 0) {
         bb_error_msg_and_die("\"dev\" (%s) must match \"label\" (%s)", d, l);
     }
@@ -763 +737 @@
         int i;
         if (req.ifa.ifa_family != AF_INET) {
-            bb_error_msg("Broadcast can be set only for IPv4 addresses");
-            return -1;
+            bb_error_msg_and_die("broadcast can be set only for IPv4 addresses");
         }
         brd = peer;
@@ -781 +754 @@
         req.ifa.ifa_scope = default_scope(&lcl);
 
-    if (rtnl_open(&rth, 0) < 0)
-        exit(1);
+    xrtnl_open(&rth);
 
     ll_init_map(&rth);
 
-    if ((req.ifa.ifa_index = ll_name_to_index(d)) == 0) {
-        bb_error_msg("Cannot find device \"%s\"", d);
-        return -1;
-    }
+    req.ifa.ifa_index = xll_name_to_index(d);
 
     if (rtnl_talk(&rth, &req.n, 0, 0, NULL, NULL, NULL) < 0)
-        exit(2);
-
-    exit(0);
-}
-
+        return 2;
+
+    return 0;
+}
+
+/* Return value becomes exitcode. It's okay to not return at all */
 int do_ipaddr(int argc, char **argv)
 {
-    static const char *const commands[] = {
-        "add", "delete", "list", "show", "lst", "flush", 0
-    };
-
-    int command_num = 2;
+    static const char commands[] ALIGN1 =
+        "add\0""delete\0""list\0""show\0""lst\0""flush\0";
+
+    int command_num = 2; /* default command is list */
 
     if (*argv) {
-        command_num = compare_string_array(commands, *argv);
-    }
-    switch (command_num) {
-        case 0: /* add */
-            return ipaddr_modify(RTM_NEWADDR, argc-1, argv+1);
-        case 1: /* delete */
-            return ipaddr_modify(RTM_DELADDR, argc-1, argv+1);
-        case 2: /* list */
-        case 3: /* show */
-        case 4: /* lst */
-            return ipaddr_list_or_flush(argc-1, argv+1, 0);
-        case 5: /* flush */
-            return ipaddr_list_or_flush(argc-1, argv+1, 1);
-    }
-    bb_error_msg_and_die("Unknown command %s", *argv);
-}
+        command_num = index_in_substrings(commands, *argv);
+    }
+    if (command_num < 0 || command_num > 5)
+        bb_error_msg_and_die("unknown command %s", *argv);
+    --argc;
+    ++argv;
+    if (command_num == 0) /* add */
+        return ipaddr_modify(RTM_NEWADDR, argc, argv);
+    else if (command_num == 1) /* delete */
+        return ipaddr_modify(RTM_DELADDR, argc, argv);
+    else if (command_num == 5) /* flush */
+        return ipaddr_list_or_flush(argc, argv, 1);
+    else /* 2 == list, 3 == show, 4 == lst */
+        return ipaddr_list_or_flush(argc, argv, 0);
+}