Changeset 1770 in MondoRescue for branches/stable/mindi-busybox/networking/libiproute

Timestamp:

Nov 6, 2007, 11:01:53 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Better output for mindi-busybox revision
• Remove dummy file created on NFS - report from Arnaud Tiger <arnaud.tiger_at_hp.com>
• strace useful for debug
• fix new versions for pb (2.0.0 for mindi and 1.7.2 for mindi-busybox)
• fix build process for mindi-busybox + options used in that version (dd for label-partitions-as-necessary)
• fix typo in label-partitions-as-necessary which doesn't seem to work
• Update to busybox 1.7.2
• perl is now required at restore time to support uuid swap partitions (and will be used for many other thigs

in the future for sure)

• next mindi version will be 2.0.0 due to all the changes made in it (udev may break working distros)
• small optimization in mindi on keyboard handling (one single find instead of multiple)
• better interaction for USB device when launching mindi manually
• attempt to automatically guess block disk size for ramdisk
• fix typos in bkphw
• Fix the remaining problem with UUID support for swap partitions
• Updates mondoarchive man page for USB support
• Adds preliminary Hardware support to mindi (Proliant SSSTK)
• Tries to add udev support also for rhel4
• Fix UUID support which was still broken.
• Be conservative in test for the start-nfs script
• Update config file for mindi-busybox for 1.7.2 migration
• Try to run around a busybox bug (1.2.2 pb on inexistant links)
• Add build content for mindi-busybox in pb
• Remove distributions content for mindi-busybox
• Fix a warning on inexistant raidtab
• Solve problem on tmpfs in restore init (Problem of inexistant symlink and busybox)
• Create MONDO_CACHE and use it everywhere + creation at start
• Really never try to eject a USB device
• Fix a issue with &> usage (replaced with 1> and 2>)
• Adds magic file to depllist in order to have file working + ldd which helps for debugging issues
• tty modes correct to avoid sh error messages
• Use ext3 normally and not ext2 instead
• USB device should be corrected after reading (take 1st part)
• Adds a mount_USB_here function derived from mount_CDROM_here
• usb detection place before /dev detection in device name at restore time
• Fix when restoring from USB: media is asked in interactive mode
• Adds USB support for mondorestore
• mount_cdrom => mount_media
• elilo.efi is now searched throughout /boot/efi and not in a fixed place as there is no standard
• untar-and-softlink => untar (+ interface change)
• suppress useless softlinks creation/removal in boot process
• avoids udevd messages on groups
• Increase # of disks to 99 as in mindi at restore time (should be a conf file parameter)
• skip existing big file creation
• seems to work correctly for USB mindi boot
• Adds group and tty link to udev conf
• Always load usb-torage (even 2.6) to initiate USB bus discovery
• Better printing of messages
• Attempt to fix a bug in supporting OpenSusE 10.3 kernel for initramfs (mindi may now use multiple regex for kernel initrd detection)
• Links were not correctly done as non relative for modules in mindi
• exclusion of modules denied now works
• Also create modules in their ordinary place, so that classical modprobe works + copy modules.dep
• Fix bugs for DENY_MODS handling
• Add device /dev/console for udev
• ide-generic should now really be excluded
• Fix a bug in major number for tty
• If udev then adds modprobe/insmod to rootfs
• tty0 is also cretaed with udev
• ide-generic put rather in DENY_MODS
• udevd remove from deplist s handled in mindi directly
• better default for mindi when using --usb
• Handles dynamically linked busybox (in case we want to use it soon ;-)
• Adds fixed devices to create for udev
• ide-generic should not be part of the initrd when using libata v2
• support a dynamically linked udev (case on Ubuntu 7.10 and Mandriva 2008.0 so should be quite generic) This will give incitation to move to dyn. linked binaries in the initrd which will help for other tasks (ia6 4)
• Improvement in udev support (do not use cl options not available in busybox)
• Udev in mindi
  • auto creation of the right links at boot time with udev-links.conf(from Mandriva 2008.0)
  • rework startup of udev as current makes kernel crash (from Mandriva 2008.0)
  • add support for 64 bits udev
• Try to render MyInsmod silent at boot time
• Adds udev support (mandatory for newest distributions to avoid remapping of devices in a different way as on the original system)
• We also need vaft format support for USB boot
• Adds libusual support (Ubuntu 7.10 needs it for USB)
• Improve Ubuntu/Debian keyboard detection and support
• pbinit adapted to new pb (0.8.10). Filtering of docs done in it
• Suppress some mondo warnings and errors on USB again
• Tries to fix lack of files in deb mindi package
• Verify should now work for USB devices
• More log/mesages improvement for USB support
• - Supress g_erase_tmpdir_and_scratchdir
• Improve some log messages for USB support
• Try to improve install in mindi to avoid issues with isolinux.cfg not installed vene if in the pkg :-(
• Improve mindi-busybox build
• In conformity with pb 0.8.9
• Add support for Ubuntu 7.10 in build process
• Add USB Key button to Menu UI (CD streamer removed)
• Attempt to fix error messages on tmp/scratch files at the end by removing those dir at the latest possible.
• Fix a bug linked to the size of the -E param which could be used (Arnaud Tiger/René Ribaud).
• Integrate ~/.pbrc content into mondorescue.pb (required project-builder >= 0.8.7)
• Put mondorescue in conformity with new pb filtering rules
• Add USB support at restore time (no test done yet). New start-usb script PB varibale added where useful
• Unmounting USB device before removal of temporary scratchdir
• Stil refining USB copy back to mondo (one command was not executed)
• No need to have the image subdor in the csratchdir when USB.
• umount the USB partition before attempting to use it
• Remove useless copy from mindi to mondo at end of USB handling

(risky merge, we are raising the limits of 2 diverging branches. The status of stable is not completely sure as such. Will need lots of tests, but it's not yet done :-()
(merge -r1692:1769 $SVN_M/branches/2.2.5)

Location:

branches/stable/mindi-busybox/networking/libiproute

Files:

• Kbuild (copied) (copied from branches/2.2.5/mindi-busybox/networking/libiproute/Kbuild )
• Makefile (deleted)
• Makefile.in (deleted)
• ip_common.h (modified) (2 diffs)
• ip_parse_common_args.c (modified) (4 diffs)
• ipaddress.c (modified) (27 diffs)
• iplink.c (modified) (11 diffs)
• iproute.c (modified) (32 diffs)
• iprule.c (copied) (copied from branches/2.2.5/mindi-busybox/networking/libiproute/iprule.c )
• iptunnel.c (modified) (27 diffs)
• libnetlink.c (modified) (16 diffs)
• libnetlink.h (modified) (2 diffs)
• linux/pkt_sched.h (deleted)
• ll_addr.c (modified) (5 diffs)
• ll_map.c (modified) (8 diffs)
• ll_map.h (modified) (1 diff)
• ll_proto.c (modified) (5 diffs)
• ll_types.c (modified) (3 diffs)
• rt_names.c (modified) (16 diffs)
• rt_names.h (modified) (2 diffs)
• rtm_map.c (modified) (4 diffs)
• rtm_map.h (modified) (1 diff)
• utils.c (modified) (18 diffs)
• utils.h (modified) (7 diffs)

branches/stable/mindi-busybox/networking/libiproute/ip_common.h

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 #ifndef _IP_COMMON_H
 #define _IP_COMMON_H 1
 
-#include "busybox.h"
+#include "libbb.h"
 #include <asm/types.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
-
-
-extern int preferred_family;
-extern char * _SL_;
+#if !defined IFA_RTA
+#include <linux/if_addr.h>
+#endif
+#if !defined IFLA_RTA
+#include <linux/if_link.h>
+#endif
 
 extern void ip_parse_common_args(int *argcp, char ***argvp);
@@ -17 +20 @@
 extern void iplink_usage(void) ATTRIBUTE_NORETURN;
 extern void ipneigh_reset_filter(void);
+
 extern int do_ipaddr(int argc, char **argv);
 extern int do_iproute(int argc, char **argv);

branches/stable/mindi-busybox/networking/libiproute/ip_parse_common_args.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * ip.c     "ip" utility frontend.
@@ -15 +16 @@
  */
 
-#include <string.h>
-
-#include "libbb.h"
+#include "ip_common.h"  /* #include "libbb.h" is inside */
 #include "utils.h"
-#include "ip_common.h"
-
 
 int preferred_family = AF_UNSPEC;
-int oneline = 0;
-char * _SL_ = NULL;
+smallint oneline;
+char _SL_;
 
 void ip_parse_common_args(int *argcp, char ***argvp)
@@ -30 +27 @@
     int argc = *argcp;
     char **argv = *argvp;
+    static const char ip_common_commands[] ALIGN1 =
+        "-family\0""inet\0""inet6\0""link\0"
+        "-4\0""-6\0""-0\0""-oneline\0";
+    enum {
+        ARG_family = 1,
+        ARG_inet,
+        ARG_inet6,
+        ARG_link,
+        ARG_IPv4,
+        ARG_IPv6,
+        ARG_packet,
+        ARG_oneline
+    };
+    smalluint arg;
 
     while (argc > 1) {
@@ -35 +46 @@
 
         if (strcmp(opt,"--") == 0) {
-            argc--; argv++;
+            argc--;
+            argv++;
             break;
         }
-
         if (opt[0] != '-')
             break;
-
         if (opt[1] == '-')
             opt++;
-
-        if (matches(opt, "-family") == 0) {
+        arg = index_in_strings(ip_common_commands, opt) + 1;
+        if (arg == ARG_family) {
             argc--;
             argv++;
-            if (! argv[1])
-                bb_show_usage();
-            if (strcmp(argv[1], "inet") == 0)
+            if (!argv[1])
+                bb_show_usage();
+            arg = index_in_strings(ip_common_commands, argv[1]) + 1;
+            if (arg == ARG_inet)
                 preferred_family = AF_INET;
-            else if (strcmp(argv[1], "inet6") == 0)
+            else if (arg == ARG_inet6)
                 preferred_family = AF_INET6;
-            else if (strcmp(argv[1], "link") == 0)
+            else if (arg == ARG_link)
                 preferred_family = AF_PACKET;
             else
                 invarg(argv[1], "protocol family");
-        } else if (strcmp(opt, "-4") == 0) {
+        } else if (arg == ARG_IPv4) {
             preferred_family = AF_INET;
-        } else if (strcmp(opt, "-6") == 0) {
+        } else if (arg == ARG_IPv6) {
             preferred_family = AF_INET6;
-        } else if (strcmp(opt, "-0") == 0) {
+        } else if (arg == ARG_packet) {
             preferred_family = AF_PACKET;
-        } else if (matches(opt, "-oneline") == 0) {
+        } else if (arg == ARG_oneline) {
             ++oneline;
         } else {
             bb_show_usage();
         }
-        argc--; argv++;
+        argc--;
+        argv++;
     }
-    _SL_ = oneline ? "\\" : "\n" ;
+    _SL_ = oneline ? '\\' : '\n';
     *argcp = argc;
     *argvp = argv;

branches/stable/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);
+}

branches/stable/mindi-busybox/networking/libiproute/iplink.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
- * iplink.c     "ip link".
+ * iplink.c "ip link".
  *
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "libbb.h"
-
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
+//#include <sys/ioctl.h>
+//#include <sys/socket.h>
 #include <net/if.h>
 #include <net/if_packet.h>
 #include <netpacket/packet.h>
-
 #include <net/ethernet.h>
 
+#include "ip_common.h"  /* #include "libbb.h" is inside */
 #include "rt_names.h"
 #include "utils.h"
-#include "ip_common.h"
-
-/* take from linux/sockios.h */
+
+/* taken from linux/sockios.h */
 #define SIOCSIFNAME 0x8923      /* set interface name */
 
-static int do_link;
-
-static int on_off(char *msg)
-{
-    bb_error_msg("Error: argument of \"%s\" must be \"on\" or \"off\"", msg);
-    return -1;
-}
-
+static void on_off(const char *msg) ATTRIBUTE_NORETURN;
+static void on_off(const char *msg)
+{
+    bb_error_msg_and_die("error: argument of \"%s\" must be \"on\" or \"off\"", msg);
+}
+
+/* Exits on error */
 static int get_ctl_fd(void)
 {
-    int s_errno;
     int fd;
 
@@ -45 +36 @@
     if (fd >= 0)
         return fd;
-    s_errno = errno;
     fd = socket(PF_PACKET, SOCK_DGRAM, 0);
     if (fd >= 0)
         return fd;
-    fd = socket(PF_INET6, SOCK_DGRAM, 0);
-    if (fd >= 0)
-        return fd;
-    errno = s_errno;
-    perror("Cannot create control socket");
-    return -1;
-}
-
-static int do_chflags(char *dev, __u32 flags, __u32 mask)
+    return xsocket(PF_INET6, SOCK_DGRAM, 0);
+}
+
+/* Exits on error */
+static void do_chflags(char *dev, uint32_t flags, uint32_t mask)
 {
     struct ifreq ifr;
     int fd;
-    int err;
-
-    strcpy(ifr.ifr_name, dev);
+
+    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
     fd = get_ctl_fd();
-    if (fd < 0)
-        return -1;
-    err = ioctl(fd, SIOCGIFFLAGS, &ifr);
-    if (err) {
-        perror("SIOCGIFFLAGS");
-        close(fd);
-        return -1;
-    }
-    if ((ifr.ifr_flags^flags)&mask) {
+    xioctl(fd, SIOCGIFFLAGS, &ifr);
+    if ((ifr.ifr_flags ^ flags) & mask) {
         ifr.ifr_flags &= ~mask;
-        ifr.ifr_flags |= mask&flags;
-        err = ioctl(fd, SIOCSIFFLAGS, &ifr);
-        if (err)
-            perror("SIOCSIFFLAGS");
+        ifr.ifr_flags |= mask & flags;
+        xioctl(fd, SIOCSIFFLAGS, &ifr);
     }
     close(fd);
-    return err;
-}
-
-static int do_changename(char *dev, char *newdev)
+}
+
+/* Exits on error */
+static void do_changename(char *dev, char *newdev)
 {
     struct ifreq ifr;
     int fd;
-    int err;
-
-    strcpy(ifr.ifr_name, dev);
-    strcpy(ifr.ifr_newname, newdev);
+
+    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
+    strncpy(ifr.ifr_newname, newdev, sizeof(ifr.ifr_newname));
     fd = get_ctl_fd();
-    if (fd < 0)
-        return -1;
-    err = ioctl(fd, SIOCSIFNAME, &ifr);
-    if (err) {
-        perror("SIOCSIFNAME");
-        close(fd);
-        return -1;
-    }
+    xioctl(fd, SIOCSIFNAME, &ifr);
     close(fd);
-    return err;
-}
-
-static int set_qlen(char *dev, int qlen)
+}
+
+/* Exits on error */
+static void set_qlen(char *dev, int qlen)
 {
     struct ifreq ifr;
@@ -111 +79 @@
 
     s = get_ctl_fd();
-    if (s < 0)
-        return -1;
-
     memset(&ifr, 0, sizeof(ifr));
-    strcpy(ifr.ifr_name, dev);
+    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
     ifr.ifr_qlen = qlen;
-    if (ioctl(s, SIOCSIFTXQLEN, &ifr) < 0) {
-        perror("SIOCSIFXQLEN");
-        close(s);
-        return -1;
-    }
-    close(s);
-
-    return 0;
-}
-
-static int set_mtu(char *dev, int mtu)
+    xioctl(s, SIOCSIFTXQLEN, &ifr);
+    close(s);
+}
+
+/* Exits on error */
+static void set_mtu(char *dev, int mtu)
 {
     struct ifreq ifr;
@@ -133 +93 @@
 
     s = get_ctl_fd();
-    if (s < 0)
-        return -1;
-
     memset(&ifr, 0, sizeof(ifr));
-    strcpy(ifr.ifr_name, dev);
+    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
     ifr.ifr_mtu = mtu;
-    if (ioctl(s, SIOCSIFMTU, &ifr) < 0) {
-        perror("SIOCSIFMTU");
-        close(s);
-        return -1;
-    }
-    close(s);
-
-    return 0;
-}
-
+    xioctl(s, SIOCSIFMTU, &ifr);
+    close(s);
+}
+
+/* Exits on error */
 static int get_address(char *dev, int *htype)
 {
@@ -156 +108 @@
     int s;
 
-    s = socket(PF_PACKET, SOCK_DGRAM, 0);
-    if (s < 0) {
-        perror("socket(PF_PACKET)");
-        return -1;
-    }
+    s = xsocket(PF_PACKET, SOCK_DGRAM, 0);
 
     memset(&ifr, 0, sizeof(ifr));
-    strcpy(ifr.ifr_name, dev);
-    if (ioctl(s, SIOCGIFINDEX, &ifr) < 0) {
-        perror("SIOCGIFINDEX");
-        close(s);
-        return -1;
-    }
+    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
+    xioctl(s, SIOCGIFINDEX, &ifr);
 
     memset(&me, 0, sizeof(me));
@@ -174 +118 @@
     me.sll_ifindex = ifr.ifr_ifindex;
     me.sll_protocol = htons(ETH_P_LOOP);
-    if (bind(s, (struct sockaddr*)&me, sizeof(me)) == -1) {
-        perror("bind");
-        close(s);
-        return -1;
-    }
+    xbind(s, (struct sockaddr*)&me, sizeof(me));
 
     alen = sizeof(me);
     if (getsockname(s, (struct sockaddr*)&me, &alen) == -1) {
-        perror("getsockname");
-        close(s);
-        return -1;
+        bb_perror_msg_and_die("getsockname");
     }
     close(s);
@@ -191 +129 @@
 }
 
-static int parse_address(char *dev, int hatype, int halen, char *lla, struct ifreq *ifr)
+/* Exits on error */
+static void parse_address(char *dev, int hatype, int halen, char *lla, struct ifreq *ifr)
 {
     int alen;
 
     memset(ifr, 0, sizeof(*ifr));
-    strcpy(ifr->ifr_name, dev);
+    strncpy(ifr->ifr_name, dev, sizeof(ifr->ifr_name));
     ifr->ifr_hwaddr.sa_family = hatype;
     alen = ll_addr_a2n((unsigned char *)(ifr->ifr_hwaddr.sa_data), 14, lla);
     if (alen < 0)
-        return -1;
+        exit(1);
     if (alen != halen) {
-        bb_error_msg("Wrong address (%s) length: expected %d bytes", lla, halen);
-        return -1;
-    }
-    return 0;
-}
-
-static int set_address(struct ifreq *ifr, int brd)
+        bb_error_msg_and_die("wrong address (%s) length: expected %d bytes", lla, halen);
+    }
+}
+
+/* Exits on error */
+static void set_address(struct ifreq *ifr, int brd)
 {
     int s;
 
     s = get_ctl_fd();
-    if (s < 0)
-        return -1;
-    if (ioctl(s, brd?SIOCSIFHWBROADCAST:SIOCSIFHWADDR, ifr) < 0) {
-        perror(brd?"SIOCSIFHWBROADCAST":"SIOCSIFHWADDR");
-        close(s);
-        return -1;
-    }
-    close(s);
-    return 0;
-}
-
-
+    if (brd)
+        xioctl(s, SIOCSIFHWBROADCAST, ifr);
+    else
+        xioctl(s, SIOCSIFHWADDR, ifr);
+    close(s);
+}
+
+
+/* Return value becomes exitcode. It's okay to not return at all */
 static int do_set(int argc, char **argv)
 {
     char *dev = NULL;
-    __u32 mask = 0;
-    __u32 flags = 0;
+    uint32_t mask = 0;
+    uint32_t flags = 0;
     int qlen = -1;
     int mtu = -1;
@@ -237 +172 @@
     char *newname = NULL;
     int htype, halen;
+    static const char keywords[] ALIGN1 =
+        "up\0""down\0""name\0""mtu\0""multicast\0""arp\0""addr\0""dev\0"
+        "on\0""off\0";
+    enum { ARG_up = 1, ARG_down, ARG_name, ARG_mtu, ARG_multicast, ARG_arp,
+        ARG_addr, ARG_dev, PARM_on, PARM_off };
+    smalluint key;
 
     while (argc > 0) {
-        if (strcmp(*argv, "up") == 0) {
+        key = index_in_strings(keywords, *argv) + 1;
+        if (key == ARG_up) {
             mask |= IFF_UP;
             flags |= IFF_UP;
-        } else if (strcmp(*argv, "down") == 0) {
+        } else if (key == ARG_down) {
             mask |= IFF_UP;
             flags &= ~IFF_UP;
-        } else if (strcmp(*argv, "name") == 0) {
+        } else if (key == ARG_name) {
             NEXT_ARG();
             newname = *argv;
-        } else if (strcmp(*argv, "mtu") == 0) {
+        } else if (key == ARG_mtu) {
             NEXT_ARG();
             if (mtu != -1)
@@ -254 +196 @@
             if (get_integer(&mtu, *argv, 0))
                 invarg(*argv, "mtu");
-        } else if (strcmp(*argv, "multicast") == 0) {
+        } else if (key == ARG_multicast) {
             NEXT_ARG();
             mask |= IFF_MULTICAST;
-            if (strcmp(*argv, "on") == 0) {
+            key = index_in_strings(keywords, *argv) + 1;
+            if (key == PARM_on) {
                 flags |= IFF_MULTICAST;
-            } else if (strcmp(*argv, "off") == 0) {
+            } else if (key == PARM_off) {
                 flags &= ~IFF_MULTICAST;
             } else
-                return on_off("multicast");
-        } else if (strcmp(*argv, "arp") == 0) {
+                on_off("multicast");
+        } else if (key == ARG_arp) {
             NEXT_ARG();
             mask |= IFF_NOARP;
-            if (strcmp(*argv, "on") == 0) {
+            key = index_in_strings(keywords, *argv) + 1;
+            if (key == PARM_on) {
                 flags &= ~IFF_NOARP;
-            } else if (strcmp(*argv, "off") == 0) {
+            } else if (key == PARM_off) {
                 flags |= IFF_NOARP;
             } else
-                return on_off("noarp");
-        } else if (strcmp(*argv, "addr") == 0) {
+                on_off("arp");
+        } else if (key == ARG_addr) {
             NEXT_ARG();
             newaddr = *argv;
         } else {
-            if (strcmp(*argv, "dev") == 0) {
+            if (key == ARG_dev) {
                 NEXT_ARG();
             }
@@ -287 +231 @@
 
     if (!dev) {
-        bb_error_msg(bb_msg_requires_arg, "\"dev\"");
-        exit(-1);
+        bb_error_msg_and_die(bb_msg_requires_arg, "\"dev\"");
     }
 
     if (newaddr || newbrd) {
         halen = get_address(dev, &htype);
-        if (halen < 0)
-            return -1;
         if (newaddr) {
-            if (parse_address(dev, htype, halen, newaddr, &ifr0) < 0)
-                return -1;
+            parse_address(dev, htype, halen, newaddr, &ifr0);
         }
         if (newbrd) {
-            if (parse_address(dev, htype, halen, newbrd, &ifr1) < 0)
-                return -1;
+            parse_address(dev, htype, halen, newbrd, &ifr1);
         }
     }
 
     if (newname && strcmp(dev, newname)) {
-        if (do_changename(dev, newname) < 0)
-            return -1;
+        do_changename(dev, newname);
         dev = newname;
     }
     if (qlen != -1) {
-        if (set_qlen(dev, qlen) < 0)
-            return -1;
+        set_qlen(dev, qlen);
     }
     if (mtu != -1) {
-        if (set_mtu(dev, mtu) < 0)
-            return -1;
+        set_mtu(dev, mtu);
     }
     if (newaddr || newbrd) {
         if (newbrd) {
-            if (set_address(&ifr1, 1) < 0)
-                return -1;
+            set_address(&ifr1, 1);
         }
         if (newaddr) {
-            if (set_address(&ifr0, 0) < 0)
-                return -1;
+            set_address(&ifr0, 0);
         }
     }
     if (mask)
-        return do_chflags(dev, flags, mask);
+        do_chflags(dev, flags, mask);
     return 0;
 }
@@ -336 +270 @@
 {
     preferred_family = AF_PACKET;
-    do_link = 1;
     return ipaddr_list_or_flush(argc, argv, 0);
 }
 
+/* Return value becomes exitcode. It's okay to not return at all */
 int do_iplink(int argc, char **argv)
 {
-    if (argc > 0) {
-        if (matches(*argv, "set") == 0)
-            return do_set(argc-1, argv+1);
-        if (matches(*argv, "show") == 0 ||
-            matches(*argv, "lst") == 0 ||
-            matches(*argv, "list") == 0)
-            return ipaddr_list_link(argc-1, argv+1);
-    } else
+    static const char keywords[] ALIGN1 =
+        "set\0""show\0""lst\0""list\0";
+    smalluint key;
+    if (argc <= 0)
         return ipaddr_list_link(0, NULL);
-
-    bb_error_msg("Command \"%s\" is unknown.", *argv);
-    exit(-1);
-}
+    key = index_in_substrings(keywords, *argv) + 1;
+    if (key == 0)
+        bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+    argc--; argv++;
+    if (key == 1) /* set */
+        return do_set(argc, argv);
+    else /* show, lst, list */
+        return ipaddr_list_link(argc, argv);
+}

branches/stable/mindi-busybox/networking/libiproute/iproute.c

@@ -14 +14 @@
  */
 
-#include "libbb.h"
-
-#include <sys/socket.h>
-
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-
+#include "ip_common.h"  /* #include "libbb.h" is inside */
 #include "rt_names.h"
 #include "utils.h"
-#include "ip_common.h"
 
 #ifndef RTAX_RTTVAR
@@ -31 +23 @@
 
 
-static struct
-{
+typedef struct filter_t {
     int tb;
     int flushed;
@@ -52 +43 @@
     inet_prefix rsrc;
     inet_prefix msrc;
-} filter;
+} filter_t;
+
+#define filter (*(filter_t*)&bb_common_bufsiz1)
 
 static int flush_update(void)
 {
     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;
     }
     filter.flushp = 0;
     return 0;
+}
+
+static unsigned get_hz(void)
+{
+    static unsigned hz_internal;
+    FILE *fp;
+
+    if (hz_internal)
+        return hz_internal;
+
+    fp = fopen("/proc/net/psched", "r");
+    if (fp) {
+        unsigned nom, denom;
+
+        if (fscanf(fp, "%*08x%*08x%08x%08x", &nom, &denom) == 2)
+            if (nom == 1000000)
+                hz_internal = denom;
+        fclose(fp);
+    }
+    if (!hz_internal)
+        hz_internal = sysconf(_SC_CLK_TCK);
+    return hz_internal;
 }
 
@@ -86 +101 @@
         return 0;
     len -= NLMSG_LENGTH(sizeof(*r));
-    if (len < 0) {
-        bb_error_msg("wrong nlmsg len %d", len);
-        return -1;
-    }
+    if (len < 0)
+        bb_error_msg_and_die("wrong nlmsg len %d", len);
 
     if (r->rtm_family == AF_INET6)
@@ -170 +183 @@
         if (NLMSG_ALIGN(filter.flushp) + n->nlmsg_len > filter.flushe) {
             if (flush_update())
-                return -1;
+                bb_error_msg_and_die("flush");
         }
         fn = (struct nlmsghdr*)(filter.flushb + NLMSG_ALIGN(filter.flushp));
@@ -249 +262 @@
     }
     if (tb[RTA_PRIORITY]) {
-        fprintf(fp, " metric %d ", *(__u32*)RTA_DATA(tb[RTA_PRIORITY]));
+        fprintf(fp, " metric %d ", *(uint32_t*)RTA_DATA(tb[RTA_PRIORITY]));
     }
     if (r->rtm_family == AF_INET6) {
@@ -257 +270 @@
         }
         if ((r->rtm_flags & RTM_F_CLONED) || (ci && ci->rta_expires)) {
-            static int hz;
-            if (!hz) {
-                hz = get_hz();
-            }
             if (r->rtm_flags & RTM_F_CLONED) {
-                fprintf(fp, "%s    cache ", _SL_);
+                fprintf(fp, "%c    cache ", _SL_);
             }
             if (ci->rta_expires) {
-                fprintf(fp, " expires %dsec", ci->rta_expires/hz);
+                fprintf(fp, " expires %dsec", ci->rta_expires / get_hz());
             }
             if (ci->rta_error != 0) {
@@ -278 +287 @@
         fprintf(fp, " iif %s", ll_index_to_name(*(int*)RTA_DATA(tb[RTA_IIF])));
     }
-    fprintf(fp, "\n");
+    fputc('\n', fp);
     fflush(fp);
     return 0;
 }
 
+/* Return value becomes exitcode. It's okay to not return at all */
 static int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
 {
+    static const char keywords[] ALIGN1 =
+        "src\0""via\0""mtu\0""lock\0""protocol\0"USE_FEATURE_IP_RULE("table\0")
+        "dev\0""oif\0""to\0";
+    enum {
+        ARG_src,
+        ARG_via,
+        ARG_mtu, PARM_lock,
+        ARG_protocol,
+USE_FEATURE_IP_RULE(ARG_table,)
+        ARG_dev,
+        ARG_oif,
+        ARG_to
+    };
+    enum {
+        gw_ok = 1 << 0,
+        dst_ok = 1 << 1,
+        proto_ok = 1 << 2,
+        type_ok = 1 << 3
+    };
     struct rtnl_handle rth;
     struct {
@@ -291 +320 @@
         char            buf[1024];
     } req;
-    char  mxbuf[256];
+    char mxbuf[256];
     struct rtattr * mxrta = (void*)mxbuf;
     unsigned mxlock = 0;
-    char  *d = NULL;
-    int gw_ok = 0;
-    int dst_ok = 0;
-    int proto_ok = 0;
-    int type_ok = 0;
+    char *d = NULL;
+    smalluint ok = 0;
+    int arg;
 
     memset(&req, 0, sizeof(req));
@@ -319 +346 @@
 
     while (argc > 0) {
-        if (strcmp(*argv, "src") == 0) {
+        arg = index_in_substrings(keywords, *argv);
+        if (arg == ARG_src) {
             inet_prefix addr;
+            NEXT_ARG();
+            get_addr(&addr, *argv, req.r.rtm_family);
+            if (req.r.rtm_family == AF_UNSPEC)
+                req.r.rtm_family = addr.family;
+            addattr_l(&req.n, sizeof(req), RTA_PREFSRC, &addr.data, addr.bytelen);
+        } else if (arg == ARG_via) {
+            inet_prefix addr;
+            ok |= gw_ok;
             NEXT_ARG();
             get_addr(&addr, *argv, req.r.rtm_family);
@@ -326 +362 @@
                 req.r.rtm_family = addr.family;
             }
-            addattr_l(&req.n, sizeof(req), RTA_PREFSRC, &addr.data, addr.bytelen);
-        } else if (strcmp(*argv, "via") == 0) {
-            inet_prefix addr;
-            gw_ok = 1;
-            NEXT_ARG();
-            get_addr(&addr, *argv, req.r.rtm_family);
-            if (req.r.rtm_family == AF_UNSPEC) {
-                req.r.rtm_family = addr.family;
-            }
             addattr_l(&req.n, sizeof(req), RTA_GATEWAY, &addr.data, addr.bytelen);
-        } else if (strcmp(*argv, "mtu") == 0) {
+        } else if (arg == ARG_mtu) {
             unsigned mtu;
             NEXT_ARG();
-            if (strcmp(*argv, "lock") == 0) {
+            if (index_in_strings(keywords, *argv) == PARM_lock) {
                 mxlock |= (1<<RTAX_MTU);
                 NEXT_ARG();
             }
-            if (get_unsigned(&mtu, *argv, 0)) {
+            if (get_unsigned(&mtu, *argv, 0))
                 invarg(*argv, "mtu");
-            }
             rta_addattr32(mxrta, sizeof(mxbuf), RTAX_MTU, mtu);
-        } else if (matches(*argv, "protocol") == 0) {
+        } else if (arg == ARG_protocol) {
             uint32_t prot;
             NEXT_ARG();
@@ -353 +379 @@
                 invarg(*argv, "protocol");
             req.r.rtm_protocol = prot;
-            proto_ok =1;
-        } else if (strcmp(*argv, "dev") == 0 ||
-               strcmp(*argv, "oif") == 0) {
+            ok |= proto_ok;
+#if ENABLE_FEATURE_IP_RULE
+        } else if (arg == ARG_table) {
+            uint32_t tid;
+            NEXT_ARG();
+            if (rtnl_rttable_a2n(&tid, *argv))
+                invarg(*argv, "table");
+            req.r.rtm_table = tid;
+#endif
+        } else if (arg == ARG_dev || arg == ARG_oif) {
             NEXT_ARG();
             d = *argv;
@@ -362 +395 @@
             inet_prefix dst;
 
-            if (strcmp(*argv, "to") == 0) {
-                NEXT_ARG();
-            }
-            if ((**argv < '0' || **argv > '9') &&
-                rtnl_rtntype_a2n(&type, *argv) == 0) {
+            if (arg == ARG_to) {
+                NEXT_ARG();
+            }
+            if ((**argv < '0' || **argv > '9')
+                && rtnl_rtntype_a2n(&type, *argv) == 0) {
                 NEXT_ARG();
                 req.r.rtm_type = type;
-                type_ok = 1;
-            }
-
-            if (dst_ok) {
+                ok |= type_ok;
+            }
+
+            if (ok & dst_ok) {
                 duparg2("to", *argv);
             }
@@ -380 +413 @@
             }
             req.r.rtm_dst_len = dst.bitlen;
-            dst_ok = 1;
+            ok |= dst_ok;
             if (dst.bytelen) {
                 addattr_l(&req.n, sizeof(req), RTA_DST, &dst.data, dst.bytelen);
@@ -388 +421 @@
     }
 
-    if (rtnl_open(&rth, 0) < 0) {
-        exit(1);
-    }
+    xrtnl_open(&rth);
 
     if (d)  {
@@ -398 +429 @@
 
         if (d) {
-            if ((idx = ll_name_to_index(d)) == 0) {
-                bb_error_msg("Cannot find device \"%s\"", d);
-                return -1;
-            }
+            idx = xll_name_to_index(d);
             addattr32(&req.n, sizeof(req), RTA_OIF, idx);
         }
@@ -413 +441 @@
     }
 
+    if (req.r.rtm_type == RTN_LOCAL || req.r.rtm_type == RTN_NAT)
+        req.r.rtm_scope = RT_SCOPE_HOST;
+    else if (req.r.rtm_type == RTN_BROADCAST ||
+            req.r.rtm_type == RTN_MULTICAST ||
+            req.r.rtm_type == RTN_ANYCAST)
+        req.r.rtm_scope = RT_SCOPE_LINK;
+    else if (req.r.rtm_type == RTN_UNICAST || req.r.rtm_type == RTN_UNSPEC) {
+        if (cmd == RTM_DELROUTE)
+            req.r.rtm_scope = RT_SCOPE_NOWHERE;
+        else if (!(ok & gw_ok))
+            req.r.rtm_scope = RT_SCOPE_LINK;
+    }
+
     if (req.r.rtm_family == AF_UNSPEC) {
         req.r.rtm_family = AF_INET;
@@ -418 +459 @@
 
     if (rtnl_talk(&rth, &req.n, 0, 0, NULL, NULL, NULL) < 0) {
-        exit(2);
+        return 2;
     }
 
@@ -444 +485 @@
     req.rtm.rtm_flags |= RTM_F_CLONED;
 
-    return sendto(rth->fd, (void*)&req, sizeof(req), 0, (struct sockaddr*)&nladdr, sizeof(nladdr));
-}
-
-static int iproute_flush_cache(void)
-{
-#define ROUTE_FLUSH_PATH "/proc/sys/net/ipv4/route/flush"
-
-    int len;
-    int flush_fd = open (ROUTE_FLUSH_PATH, O_WRONLY);
-    char *buffer = "-1";
+    return xsendto(rth->fd, (void*)&req, sizeof(req), (struct sockaddr*)&nladdr, sizeof(nladdr));
+}
+
+static void iproute_flush_cache(void)
+{
+    static const char fn[] ALIGN1 = "/proc/sys/net/ipv4/route/flush";
+    int flush_fd = open_or_warn(fn, O_WRONLY);
 
     if (flush_fd < 0) {
-        fprintf (stderr, "Cannot open \"%s\"\n", ROUTE_FLUSH_PATH);
-        return -1;
-    }
-
-    len = strlen (buffer);
-
-    if ((write (flush_fd, (void *)buffer, len)) < len) {
-        fprintf (stderr, "Cannot flush routing cache\n");
-        return -1;
+        return;
+    }
+
+    if (write(flush_fd, "-1", 2) < 2) {
+        bb_perror_msg("cannot flush routing cache");
+        return;
     }
     close(flush_fd);
-    return 0;
 }
 
@@ -477 +511 @@
 }
 
+/* Return value becomes exitcode. It's okay to not return at all */
 static int iproute_list_or_flush(int argc, char **argv, int flush)
 {
@@ -483 +518 @@
     char *id = NULL;
     char *od = NULL;
-
+    static const char keywords[] ALIGN1 =
+        "protocol\0""all\0""dev\0""oif\0""iif\0""via\0""table\0""cache\0" /*all*/
+        "from\0""root\0""match\0""exact\0""to\0"/*root match exact*/;
+    enum {
+        ARG_proto, PARM_all,
+        ARG_dev,
+        ARG_oif,
+        ARG_iif,
+        ARG_via,
+        ARG_table, PARM_cache, /*PARM_all,*/
+        ARG_from, PARM_root, PARM_match, PARM_exact,
+        ARG_to  /*PARM_root, PARM_match, PARM_exact*/
+    };
+    int arg, parm;
     iproute_reset_filter();
     filter.tb = RT_TABLE_MAIN;
 
-    if (flush && argc <= 0) {
-        bb_error_msg(bb_msg_requires_arg, "\"ip route flush\"");
-        return -1;
-    }
+    if (flush && argc <= 0)
+        bb_error_msg_and_die(bb_msg_requires_arg, "\"ip route flush\"");
 
     while (argc > 0) {
-        if (matches(*argv, "protocol") == 0) {
+        arg = index_in_substrings(keywords, *argv);
+        if (arg == ARG_proto) {
             uint32_t prot = 0;
             NEXT_ARG();
             filter.protocolmask = -1;
             if (rtnl_rtprot_a2n(&prot, *argv)) {
-                if (strcmp(*argv, "all") != 0) {
+                if (index_in_strings(keywords, *argv) != PARM_all)
                     invarg(*argv, "protocol");
-                }
                 prot = 0;
                 filter.protocolmask = 0;
             }
             filter.protocol = prot;
-        } else if (strcmp(*argv, "dev") == 0 ||
-               strcmp(*argv, "oif") == 0) {
+        } else if (arg == ARG_dev || arg == ARG_oif) {
             NEXT_ARG();
             od = *argv;
-        } else if (strcmp(*argv, "iif") == 0) {
+        } else if (arg == ARG_iif) {
             NEXT_ARG();
             id = *argv;
-        } else if (matches(*argv, "from") == 0) {
-            NEXT_ARG();
-            if (matches(*argv, "root") == 0) {
+        } else if (arg == ARG_via) {
+            NEXT_ARG();
+            get_prefix(&filter.rvia, *argv, do_ipv6);
+        } else if (arg == ARG_table) {
+            NEXT_ARG();
+            parm = index_in_substrings(keywords, *argv);
+            if (parm == PARM_cache)
+                filter.tb = -1;
+            else if (parm == PARM_all)
+                filter.tb = 0;
+            else
+                invarg(*argv, "table");
+        } else if (arg == ARG_from) {
+            NEXT_ARG();
+            parm = index_in_substrings(keywords, *argv);
+            if (parm == PARM_root) {
                 NEXT_ARG();
                 get_prefix(&filter.rsrc, *argv, do_ipv6);
-            } else if (matches(*argv, "match") == 0) {
+            } else if (parm == PARM_match) {
                 NEXT_ARG();
                 get_prefix(&filter.msrc, *argv, do_ipv6);
             } else {
-                if (matches(*argv, "exact") == 0) {
+                if (parm == PARM_exact)
                     NEXT_ARG();
-                }
                 get_prefix(&filter.msrc, *argv, do_ipv6);
                 filter.rsrc = filter.msrc;
             }
         } else {
-            if (matches(*argv, "to") == 0) {
-                NEXT_ARG();
-            }
-            if (matches(*argv, "root") == 0) {
+            /* parm = arg; // would be more plausible, we reuse arg here */
+            if (arg == ARG_to) {
+                NEXT_ARG();
+                arg = index_in_substrings(keywords, *argv);
+            }
+            if (arg == PARM_root) {
                 NEXT_ARG();
                 get_prefix(&filter.rdst, *argv, do_ipv6);
-            } else if (matches(*argv, "match") == 0) {
+            } else if (arg == PARM_match) {
                 NEXT_ARG();
                 get_prefix(&filter.mdst, *argv, do_ipv6);
-            } else if (matches(*argv, "table") == 0) {
-                NEXT_ARG();
-                if (matches(*argv, "cache") == 0) {
-                    filter.tb = -1;
-                } else if (matches(*argv, "main") != 0) {
-                    invarg(*argv, "table");
-                }
-            } else if (matches(*argv, "cache") == 0) {
-                filter.tb = -1;
             } else {
-                if (matches(*argv, "exact") == 0) {
+                if (arg == PARM_exact)
                     NEXT_ARG();
-                }
                 get_prefix(&filter.mdst, *argv, do_ipv6);
                 filter.rdst = filter.mdst;
             }
         }
-        argc--; argv++;
+        argc--;
+        argv++;
     }
 
@@ -561 +611 @@
     }
 
-    if (rtnl_open(&rth, 0) < 0) {
-        exit(1);
-    }
+    xrtnl_open(&rth);
 
     ll_init_map(&rth);
@@ -571 +619 @@
 
         if (id) {
-            if ((idx = ll_name_to_index(id)) == 0) {
-                bb_error_msg("Cannot find device \"%s\"", id);
-                return -1;
-            }
+            idx = xll_name_to_index(id);
             filter.iif = idx;
             filter.iifmask = -1;
         }
         if (od) {
-            if ((idx = ll_name_to_index(od)) == 0) {
-                bb_error_msg("Cannot find device \"%s\"", od);
-            }
+            idx = xll_name_to_index(od);
             filter.oif = idx;
             filter.oifmask = -1;
@@ -603 +646 @@
 
         for (;;) {
-            if (rtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE) < 0) {
-                perror("Cannot send dump request");
-                return -1;
-            }
+            xrtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE);
             filter.flushed = 0;
-            if (rtnl_dump_filter(&rth, print_route, stdout, NULL, NULL) < 0) {
-                bb_error_msg("Flush terminated\n");
-                return -1;
-            }
-            if (filter.flushed == 0) {
-                fflush(stdout);
+            xrtnl_dump_filter(&rth, print_route, stdout);
+            if (filter.flushed == 0)
                 return 0;
-            }
-            if (flush_update() < 0)
-                exit(1);
+            if (flush_update())
+                return 1;
         }
     }
 
     if (filter.tb != -1) {
-        if (rtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE) < 0) {
-            bb_perror_msg_and_die("Cannot send dump request");
-        }
-    } else {
-        if (rtnl_rtcache_request(&rth, do_ipv6) < 0) {
-            bb_perror_msg_and_die("Cannot send dump request");
-        }
-    }
-
-    if (rtnl_dump_filter(&rth, print_route, stdout, NULL, NULL) < 0) {
-        bb_error_msg_and_die("Dump terminated");
-    }
-
-    exit(0);
-}
-
-
+        xrtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE);
+    } else if (rtnl_rtcache_request(&rth, do_ipv6) < 0) {
+        bb_perror_msg_and_die("cannot send dump request");
+    }
+    xrtnl_dump_filter(&rth, print_route, stdout);
+
+    return 0;
+}
+
+
+/* Return value becomes exitcode. It's okay to not return at all */
 static int iproute_get(int argc, char **argv)
 {
     struct rtnl_handle rth;
     struct {
-        struct nlmsghdr     n;
-        struct rtmsg        r;
-        char            buf[1024];
+        struct nlmsghdr n;
+        struct rtmsg    r;
+        char            buf[1024];
     } req;
-    char  *idev = NULL;
-    char  *odev = NULL;
-    int connected = 0;
-    int from_ok = 0;
-    static const char * const options[] =
-        { "from", "iif", "oif", "dev", "notify", "connected", "to", 0 };
+    char *idev = NULL;
+    char *odev = NULL;
+    bool connected = 0;
+    bool from_ok = 0;
+    static const char options[] ALIGN1 =
+        "from\0""iif\0""oif\0""dev\0""notify\0""connected\0""to\0";
 
     memset(&req, 0, sizeof(req));
@@ -671 +700 @@
 
     while (argc > 0) {
-        switch (compare_string_array(options, *argv)) {
+        switch (index_in_strings(options, *argv)) {
             case 0: /* from */
             {
@@ -724 +753 @@
     }
 
-    if (rtnl_open(&rth, 0) < 0)
-        exit(1);
+    xrtnl_open(&rth);
 
     ll_init_map(&rth);
@@ -733 +761 @@
 
         if (idev) {
-            if ((idx = ll_name_to_index(idev)) == 0) {
-                bb_error_msg("Cannot find device \"%s\"", idev);
-                return -1;
-            }
+            idx = xll_name_to_index(idev);
             addattr32(&req.n, sizeof(req), RTA_IIF, idx);
         }
         if (odev) {
-            if ((idx = ll_name_to_index(odev)) == 0) {
-                bb_error_msg("Cannot find device \"%s\"", odev);
-                return -1;
-            }
+            idx = xll_name_to_index(odev);
             addattr32(&req.n, sizeof(req), RTA_OIF, idx);
         }
@@ -753 +775 @@
 
     if (rtnl_talk(&rth, &req.n, 0, 0, &req.n, NULL, NULL) < 0) {
-        exit(2);
+        return 2;
     }
 
@@ -761 +783 @@
         struct rtattr * tb[RTA_MAX+1];
 
-        if (print_route(NULL, &req.n, (void*)stdout) < 0) {
-            bb_error_msg_and_die("An error :-)");
-        }
+        print_route(NULL, &req.n, (void*)stdout);
 
         if (req.n.nlmsg_type != RTM_NEWROUTE) {
-            bb_error_msg("Not a route?");
-            return -1;
+            bb_error_msg_and_die("not a route?");
         }
         len -= NLMSG_LENGTH(sizeof(*r));
         if (len < 0) {
-            bb_error_msg("Wrong len %d", len);
-            return -1;
+            bb_error_msg_and_die("wrong len %d", len);
         }
 
@@ -782 +800 @@
             r->rtm_src_len = 8*RTA_PAYLOAD(tb[RTA_PREFSRC]);
         } else if (!tb[RTA_SRC]) {
-            bb_error_msg("Failed to connect the route");
-            return -1;
+            bb_error_msg_and_die("failed to connect the route");
         }
         if (!odev && tb[RTA_OIF]) {
@@ -798 +815 @@
 
         if (rtnl_talk(&rth, &req.n, 0, 0, &req.n, NULL, NULL) < 0) {
-            exit(2);
-        }
-    }
-
-    if (print_route(NULL, &req.n, (void*)stdout) < 0) {
-        bb_error_msg_and_die("An error :-)");
-    }
-
-    exit(0);
-}
-
+            return 2;
+        }
+    }
+    print_route(NULL, &req.n, (void*)stdout);
+    return 0;
+}
+
+/* Return value becomes exitcode. It's okay to not return at all */
 int do_iproute(int argc, char **argv)
 {
-    static const char * const ip_route_commands[] =
-        { "add", "append", "change", "chg", "delete", "del", "get",
-        "list", "show", "prepend", "replace", "test", "flush", 0 };
-    int command_num = 7;
-    unsigned int flags = 0;
+    static const char ip_route_commands[] ALIGN1 =
+    /*0-3*/ "add\0""append\0""change\0""chg\0"
+    /*4-7*/ "delete\0""get\0""list\0""show\0"
+    /*8..*/ "prepend\0""replace\0""test\0""flush\0";
+    int command_num = 6;
+    unsigned flags = 0;
     int cmd = RTM_NEWROUTE;
 
+    /* "Standard" 'ip r a' treats 'a' as 'add', not 'append' */
+    /* It probably means that it is using "first match" rule */
     if (*argv) {
-        command_num = compare_string_array(ip_route_commands, *argv);
-    }
-    switch(command_num) {
-        case 0: /* add*/
+        command_num = index_in_substrings(ip_route_commands, *argv);
+    }
+    switch (command_num) {
+        case 0: /* add */
             flags = NLM_F_CREATE|NLM_F_EXCL;
             break;
@@ -833 +850 @@
             break;
         case 4: /* delete */
-        case 5: /* del */
             cmd = RTM_DELROUTE;
             break;
-        case 6: /* get */
+        case 5: /* get */
             return iproute_get(argc-1, argv+1);
-        case 7: /* list */
-        case 8: /* show */
+        case 6: /* list */
+        case 7: /* show */
             return iproute_list_or_flush(argc-1, argv+1, 0);
-        case 9: /* prepend */
+        case 8: /* prepend */
             flags = NLM_F_CREATE;
-        case 10: /* replace */
+        case 9: /* replace */
             flags = NLM_F_CREATE|NLM_F_REPLACE;
-        case 11: /* test */
+        case 10: /* test */
             flags = NLM_F_EXCL;
-        case 12: /* flush */
+        case 11: /* flush */
             return iproute_list_or_flush(argc-1, argv+1, 1);
         default:
-            bb_error_msg_and_die("Unknown command %s", *argv);
+            bb_error_msg_and_die("unknown command %s", *argv);
     }
 

branches/stable/mindi-busybox/networking/libiproute/iptunnel.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * iptunnel.c          "ip tunnel"
@@ -14 +15 @@
  */
 
-#include "libbb.h"
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-
-#include <string.h>
-#include <unistd.h>
-
 #include <netinet/ip.h>
-
 #include <net/if.h>
 #include <net/if_arp.h>
-
 #include <asm/types.h>
 #ifndef __constant_htons
@@ -32 +24 @@
 #include <linux/if_tunnel.h>
 
+#include "ip_common.h"  /* #include "libbb.h" is inside */
 #include "rt_names.h"
 #include "utils.h"
-#include "ip_common.h"
-
-
+
+
+/* Dies on error */
 static int do_ioctl_get_ifindex(char *dev)
 {
@@ -42 +35 @@
     int fd;
 
-    strcpy(ifr.ifr_name, dev);
-    fd = socket(AF_INET, SOCK_DGRAM, 0);
-    if (ioctl(fd, SIOCGIFINDEX, &ifr)) {
-        bb_perror_msg("ioctl");
-        return 0;
-    }
+    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
+    fd = xsocket(AF_INET, SOCK_DGRAM, 0);
+    xioctl(fd, SIOCGIFINDEX, &ifr);
     close(fd);
     return ifr.ifr_ifindex;
@@ -53 +43 @@
 
 static int do_ioctl_get_iftype(char *dev)
-{
-    struct ifreq ifr;
-    int fd;
-
-    strcpy(ifr.ifr_name, dev);
-    fd = socket(AF_INET, SOCK_DGRAM, 0);
-    if (ioctl(fd, SIOCGIFHWADDR, &ifr)) {
-        bb_perror_msg("ioctl");
-        return -1;
-    }
-    close(fd);
-    return ifr.ifr_addr.sa_family;
-}
-
-
-static char *do_ioctl_get_ifname(int idx)
-{
-    static struct ifreq ifr;
-    int fd;
-
-    ifr.ifr_ifindex = idx;
-    fd = socket(AF_INET, SOCK_DGRAM, 0);
-    if (ioctl(fd, SIOCGIFNAME, &ifr)) {
-        bb_perror_msg("ioctl");
-        return NULL;
-    }
-    close(fd);
-    return ifr.ifr_name;
-}
-
-
-
-static int do_get_ioctl(char *basedev, struct ip_tunnel_parm *p)
 {
     struct ifreq ifr;
@@ -91 +48 @@
     int err;
 
-    strcpy(ifr.ifr_name, basedev);
-    ifr.ifr_ifru.ifru_data = (void*)p;
-    fd = socket(AF_INET, SOCK_DGRAM, 0);
-    err = ioctl(fd, SIOCGETTUNNEL, &ifr);
-    if (err) {
-        bb_perror_msg("ioctl");
-    }
+    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
+    fd = xsocket(AF_INET, SOCK_DGRAM, 0);
+    err = ioctl_or_warn(fd, SIOCGIFHWADDR, &ifr);
     close(fd);
-    return err;
-}
-
-static int do_add_ioctl(int cmd, char *basedev, struct ip_tunnel_parm *p)
+    return err ? -1 : ifr.ifr_addr.sa_family;
+}
+
+static char *do_ioctl_get_ifname(int idx)
 {
     struct ifreq ifr;
@@ -108 +61 @@
     int err;
 
-    if (cmd == SIOCCHGTUNNEL && p->name[0]) {
-        strcpy(ifr.ifr_name, p->name);
-    } else {
-        strcpy(ifr.ifr_name, basedev);
-    }
-    ifr.ifr_ifru.ifru_data = (void*)p;
-    fd = socket(AF_INET, SOCK_DGRAM, 0);
-    err = ioctl(fd, cmd, &ifr);
-    if (err) {
-        bb_perror_msg("ioctl");
-    }
+    ifr.ifr_ifindex = idx;
+    fd = xsocket(AF_INET, SOCK_DGRAM, 0);
+    err = ioctl_or_warn(fd, SIOCGIFNAME, &ifr);
     close(fd);
-    return err;
-}
-
-static int do_del_ioctl(char *basedev, struct ip_tunnel_parm *p)
+    return err ? NULL : xstrndup(ifr.ifr_name, sizeof(ifr.ifr_name));
+}
+
+static int do_get_ioctl(const char *basedev, struct ip_tunnel_parm *p)
 {
     struct ifreq ifr;
@@ -129 +74 @@
     int err;
 
-    if (p->name[0]) {
-        strcpy(ifr.ifr_name, p->name);
-    } else {
-        strcpy(ifr.ifr_name, basedev);
-    }
+    strncpy(ifr.ifr_name, basedev, sizeof(ifr.ifr_name));
     ifr.ifr_ifru.ifru_data = (void*)p;
-    fd = socket(AF_INET, SOCK_DGRAM, 0);
-    err = ioctl(fd, SIOCDELTUNNEL, &ifr);
-    if (err) {
-        bb_perror_msg("ioctl");
-    }
+    fd = xsocket(AF_INET, SOCK_DGRAM, 0);
+    err = ioctl_or_warn(fd, SIOCGETTUNNEL, &ifr);
     close(fd);
     return err;
 }
 
-static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
-{
+/* Dies on error, otherwise returns 0 */
+static int do_add_ioctl(int cmd, const char *basedev, struct ip_tunnel_parm *p)
+{
+    struct ifreq ifr;
+    int fd;
+
+    if (cmd == SIOCCHGTUNNEL && p->name[0]) {
+        strncpy(ifr.ifr_name, p->name, sizeof(ifr.ifr_name));
+    } else {
+        strncpy(ifr.ifr_name, basedev, sizeof(ifr.ifr_name));
+    }
+    ifr.ifr_ifru.ifru_data = (void*)p;
+    fd = xsocket(AF_INET, SOCK_DGRAM, 0);
+#if ENABLE_IOCTL_HEX2STR_ERROR
+    /* #define magic will turn ioctl# into string */
+    if (cmd == SIOCCHGTUNNEL)
+        xioctl(fd, SIOCCHGTUNNEL, &ifr);
+    else
+        xioctl(fd, SIOCADDTUNNEL, &ifr);
+#else
+    xioctl(fd, cmd, &ifr);
+#endif
+    close(fd);
+    return 0;
+}
+
+/* Dies on error, otherwise returns 0 */
+static int do_del_ioctl(const char *basedev, struct ip_tunnel_parm *p)
+{
+    struct ifreq ifr;
+    int fd;
+
+    if (p->name[0]) {
+        strncpy(ifr.ifr_name, p->name, sizeof(ifr.ifr_name));
+    } else {
+        strncpy(ifr.ifr_name, basedev, sizeof(ifr.ifr_name));
+    }
+    ifr.ifr_ifru.ifru_data = (void*)p;
+    fd = xsocket(AF_INET, SOCK_DGRAM, 0);
+    xioctl(fd, SIOCDELTUNNEL, &ifr);
+    close(fd);
+    return 0;
+}
+
+/* Dies on error */
+static void parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
+{
+    static const char keywords[] ALIGN1 =
+        "mode\0""ipip\0""ip/ip\0""gre\0""gre/ip\0""sit\0""ipv6/ip\0"
+        "key\0""ikey\0""okey\0""seq\0""iseq\0""oseq\0"
+        "csum\0""icsum\0""ocsum\0""nopmtudisc\0""pmtudisc\0"
+        "remote\0""any\0""local\0""dev\0"
+        "ttl\0""inherit\0""tos\0""dsfield\0"
+        "name\0";
+    enum {
+        ARG_mode, ARG_ipip, ARG_ip_ip, ARG_gre, ARG_gre_ip, ARG_sit, ARG_ip6_ip,
+        ARG_key, ARG_ikey, ARG_okey, ARG_seq, ARG_iseq, ARG_oseq,
+        ARG_csum, ARG_icsum, ARG_ocsum, ARG_nopmtudisc, ARG_pmtudisc,
+        ARG_remote, ARG_any, ARG_local, ARG_dev,
+        ARG_ttl, ARG_inherit, ARG_tos, ARG_dsfield,
+        ARG_name
+    };
     int count = 0;
     char medium[IFNAMSIZ];
+    int key;
+
     memset(p, 0, sizeof(*p));
     memset(&medium, 0, sizeof(medium));
@@ -154 +154 @@
     p->iph.ihl = 5;
 #ifndef IP_DF
-#define IP_DF       0x4000      /* Flag: "Don't Fragment"   */
+#define IP_DF 0x4000  /* Flag: "Don't Fragment" */
 #endif
     p->iph.frag_off = htons(IP_DF);
 
     while (argc > 0) {
-        if (strcmp(*argv, "mode") == 0) {
-            NEXT_ARG();
-            if (strcmp(*argv, "ipip") == 0 ||
-                strcmp(*argv, "ip/ip") == 0) {
+        key = index_in_strings(keywords, *argv);
+        if (key == ARG_mode) {
+            NEXT_ARG();
+            key = index_in_strings(keywords, *argv);
+            if (key == ARG_ipip ||
+                key == ARG_ip_ip) {
                 if (p->iph.protocol && p->iph.protocol != IPPROTO_IPIP) {
-                    bb_error_msg("You managed to ask for more than one tunnel mode.");
-                    exit(-1);
+                    bb_error_msg_and_die("you managed to ask for more than one tunnel mode");
                 }
                 p->iph.protocol = IPPROTO_IPIP;
-            } else if (strcmp(*argv, "gre") == 0 ||
-                   strcmp(*argv, "gre/ip") == 0) {
+            } else if (key == ARG_gre ||
+                   key == ARG_gre_ip) {
                 if (p->iph.protocol && p->iph.protocol != IPPROTO_GRE) {
-                    bb_error_msg("You managed to ask for more than one tunnel mode.");
-                    exit(-1);
+                    bb_error_msg_and_die("you managed to ask for more than one tunnel mode");
                 }
                 p->iph.protocol = IPPROTO_GRE;
-            } else if (strcmp(*argv, "sit") == 0 ||
-                   strcmp(*argv, "ipv6/ip") == 0) {
+            } else if (key == ARG_sit ||
+                   key == ARG_ip6_ip) {
                 if (p->iph.protocol && p->iph.protocol != IPPROTO_IPV6) {
-                    bb_error_msg("You managed to ask for more than one tunnel mode.");
-                    exit(-1);
+                    bb_error_msg_and_die("you managed to ask for more than one tunnel mode");
                 }
                 p->iph.protocol = IPPROTO_IPV6;
             } else {
-                bb_error_msg("Cannot guess tunnel mode.");
-                exit(-1);
-            }
-        } else if (strcmp(*argv, "key") == 0) {
+                bb_error_msg_and_die("cannot guess tunnel mode");
+            }
+        } else if (key == ARG_key) {
             unsigned uval;
             NEXT_ARG();
@@ -195 +193 @@
             else {
                 if (get_unsigned(&uval, *argv, 0)<0) {
-                    bb_error_msg("invalid value of \"key\"");
-                    exit(-1);
+                    bb_error_msg_and_die("invalid value of \"key\"");
                 }
                 p->i_key = p->o_key = htonl(uval);
             }
-        } else if (strcmp(*argv, "ikey") == 0) {
+        } else if (key == ARG_ikey) {
             unsigned uval;
             NEXT_ARG();
@@ -208 +205 @@
             else {
                 if (get_unsigned(&uval, *argv, 0)<0) {
-                    bb_error_msg("invalid value of \"ikey\"");
-                    exit(-1);
+                    bb_error_msg_and_die("invalid value of \"ikey\"");
                 }
                 p->i_key = htonl(uval);
             }
-        } else if (strcmp(*argv, "okey") == 0) {
+        } else if (key == ARG_okey) {
             unsigned uval;
             NEXT_ARG();
@@ -221 +217 @@
             else {
                 if (get_unsigned(&uval, *argv, 0)<0) {
-                    bb_error_msg("invalid value of \"okey\"");
-                    exit(-1);
+                    bb_error_msg_and_die("invalid value of \"okey\"");
                 }
                 p->o_key = htonl(uval);
             }
-        } else if (strcmp(*argv, "seq") == 0) {
+        } else if (key == ARG_seq) {
             p->i_flags |= GRE_SEQ;
             p->o_flags |= GRE_SEQ;
-        } else if (strcmp(*argv, "iseq") == 0) {
+        } else if (key == ARG_iseq) {
             p->i_flags |= GRE_SEQ;
-        } else if (strcmp(*argv, "oseq") == 0) {
+        } else if (key == ARG_oseq) {
             p->o_flags |= GRE_SEQ;
-        } else if (strcmp(*argv, "csum") == 0) {
+        } else if (key == ARG_csum) {
             p->i_flags |= GRE_CSUM;
             p->o_flags |= GRE_CSUM;
-        } else if (strcmp(*argv, "icsum") == 0) {
+        } else if (key == ARG_icsum) {
             p->i_flags |= GRE_CSUM;
-        } else if (strcmp(*argv, "ocsum") == 0) {
+        } else if (key == ARG_ocsum) {
             p->o_flags |= GRE_CSUM;
-        } else if (strcmp(*argv, "nopmtudisc") == 0) {
+        } else if (key == ARG_nopmtudisc) {
             p->iph.frag_off = 0;
-        } else if (strcmp(*argv, "pmtudisc") == 0) {
+        } else if (key == ARG_pmtudisc) {
             p->iph.frag_off = htons(IP_DF);
-        } else if (strcmp(*argv, "remote") == 0) {
-            NEXT_ARG();
-            if (strcmp(*argv, "any"))
+        } else if (key == ARG_remote) {
+            NEXT_ARG();
+            key = index_in_strings(keywords, *argv);
+            if (key == ARG_any)
                 p->iph.daddr = get_addr32(*argv);
-        } else if (strcmp(*argv, "local") == 0) {
-            NEXT_ARG();
-            if (strcmp(*argv, "any"))
+        } else if (key == ARG_local) {
+            NEXT_ARG();
+            key = index_in_strings(keywords, *argv);
+            if (key == ARG_any)
                 p->iph.saddr = get_addr32(*argv);
-        } else if (strcmp(*argv, "dev") == 0) {
+        } else if (key == ARG_dev) {
             NEXT_ARG();
             strncpy(medium, *argv, IFNAMSIZ-1);
-        } else if (strcmp(*argv, "ttl") == 0) {
+        } else if (key == ARG_ttl) {
             unsigned uval;
             NEXT_ARG();
-            if (strcmp(*argv, "inherit") != 0) {
+            key = index_in_strings(keywords, *argv);
+            if (key != ARG_inherit) {
                 if (get_unsigned(&uval, *argv, 0))
                     invarg(*argv, "TTL");
@@ -265 +263 @@
                 p->iph.ttl = uval;
             }
-        } else if (strcmp(*argv, "tos") == 0 ||
-               matches(*argv, "dsfield") == 0) {
-            __u32 uval;
-            NEXT_ARG();
-            if (strcmp(*argv, "inherit") != 0) {
+        } else if (key == ARG_tos ||
+               key == ARG_dsfield) {
+            uint32_t uval;
+            NEXT_ARG();
+            key = index_in_strings(keywords, *argv);
+            if (key != ARG_inherit) {
                 if (rtnl_dsfield_a2n(&uval, *argv))
                     invarg(*argv, "TOS");
@@ -276 +275 @@
                 p->iph.tos = 1;
         } else {
-            if (strcmp(*argv, "name") == 0) {
+            if (key == ARG_name) {
                 NEXT_ARG();
             }
@@ -286 +285 @@
                 memset(&old_p, 0, sizeof(old_p));
                 if (do_get_ioctl(*argv, &old_p))
-                    return -1;
+                    exit(1);
                 *p = old_p;
             }
         }
         count++;
-        argc--; argv++;
-    }
-
+        argc--;
+        argv++;
+    }
 
     if (p->iph.protocol == 0) {
@@ -306 +305 @@
     if (p->iph.protocol == IPPROTO_IPIP || p->iph.protocol == IPPROTO_IPV6) {
         if ((p->i_flags & GRE_KEY) || (p->o_flags & GRE_KEY)) {
-            bb_error_msg("Keys are not allowed with ipip and sit.");
-            return -1;
+            bb_error_msg_and_die("keys are not allowed with ipip and sit");
         }
     }
@@ -313 +311 @@
     if (medium[0]) {
         p->link = do_ioctl_get_ifindex(medium);
-        if (p->link == 0)
-            return -1;
     }
 
@@ -326 +322 @@
     }
     if (IN_MULTICAST(ntohl(p->iph.daddr)) && !p->iph.saddr) {
-        bb_error_msg("Broadcast tunnel requires a source address.");
-        return -1;
-    }
-    return 0;
-}
-
-
+        bb_error_msg_and_die("broadcast tunnel requires a source address");
+    }
+}
+
+
+/* Return value becomes exitcode. It's okay to not return at all */
 static int do_add(int cmd, int argc, char **argv)
 {
     struct ip_tunnel_parm p;
 
-    if (parse_args(argc, argv, cmd, &p) < 0)
-        return -1;
+    parse_args(argc, argv, cmd, &p);
 
     if (p.iph.ttl && p.iph.frag_off == 0) {
-        bb_error_msg("ttl != 0 and noptmudisc are incompatible");
-        return -1;
+        bb_error_msg_and_die("ttl != 0 and noptmudisc are incompatible");
     }
 
@@ -353 +346 @@
         return do_add_ioctl(cmd, "sit0", &p);
     default:
-        bb_error_msg("cannot determine tunnel mode (ipip, gre or sit)");
-        return -1;
-    }
-    return -1;
-}
-
+        bb_error_msg_and_die("cannot determine tunnel mode (ipip, gre or sit)");
+    }
+}
+
+/* Return value becomes exitcode. It's okay to not return at all */
 static int do_del(int argc, char **argv)
 {
     struct ip_tunnel_parm p;
 
-    if (parse_args(argc, argv, SIOCDELTUNNEL, &p) < 0)
-        return -1;
+    parse_args(argc, argv, SIOCDELTUNNEL, &p);
 
     switch (p.iph.protocol) {
@@ -376 +367 @@
         return do_del_ioctl(p.name, &p);
     }
-    return -1;
 }
 
@@ -399 +389 @@
     if (p->link) {
         char *n = do_ioctl_get_ifname(p->link);
-        if (n)
+        if (n) {
             printf(" dev %s ", n);
+            free(n);
+        }
     }
     if (p->iph.ttl)
@@ -409 +401 @@
         SPRINT_BUF(b1);
         printf(" tos");
-        if (p->iph.tos&1)
+        if (p->iph.tos & 1)
             printf(" inherit");
-        if (p->iph.tos&~1)
-            printf("%c%s ", p->iph.tos&1 ? '/' : ' ',
-                   rtnl_dsfield_n2a(p->iph.tos&~1, b1, sizeof(b1)));
-    }
-    if (!(p->iph.frag_off&htons(IP_DF)))
+        if (p->iph.tos & ~1)
+            printf("%c%s ", p->iph.tos & 1 ? '/' : ' ',
+                   rtnl_dsfield_n2a(p->iph.tos & ~1, b1, sizeof(b1)));
+    }
+    if (!(p->iph.frag_off & htons(IP_DF)))
         printf(" nopmtudisc");
 
-    if ((p->i_flags&GRE_KEY) && (p->o_flags&GRE_KEY) && p->o_key == p->i_key)
+    if ((p->i_flags & GRE_KEY) && (p->o_flags & GRE_KEY) && p->o_key == p->i_key)
         printf(" key %s", s3);
-    else if ((p->i_flags|p->o_flags)&GRE_KEY) {
-        if (p->i_flags&GRE_KEY)
+    else if ((p->i_flags | p->o_flags) & GRE_KEY) {
+        if (p->i_flags & GRE_KEY)
             printf(" ikey %s ", s3);
-        if (p->o_flags&GRE_KEY)
+        if (p->o_flags & GRE_KEY)
             printf(" okey %s ", s4);
     }
 
-    if (p->i_flags&GRE_SEQ)
-        printf("%s  Drop packets out of sequence.\n", _SL_);
-    if (p->i_flags&GRE_CSUM)
-        printf("%s  Checksum in received packet is required.", _SL_);
-    if (p->o_flags&GRE_SEQ)
-        printf("%s  Sequence packets on output.", _SL_);
-    if (p->o_flags&GRE_CSUM)
-        printf("%s  Checksum output packets.", _SL_);
-}
-
-static int do_tunnels_list(struct ip_tunnel_parm *p)
+    if (p->i_flags & GRE_SEQ)
+        printf("%c  Drop packets out of sequence.\n", _SL_);
+    if (p->i_flags & GRE_CSUM)
+        printf("%c  Checksum in received packet is required.", _SL_);
+    if (p->o_flags & GRE_SEQ)
+        printf("%c  Sequence packets on output.", _SL_);
+    if (p->o_flags & GRE_CSUM)
+        printf("%c  Checksum output packets.", _SL_);
+}
+
+static void do_tunnels_list(struct ip_tunnel_parm *p)
 {
     char name[IFNAMSIZ];
-    unsigned long  rx_bytes, rx_packets, rx_errs, rx_drops,
-    rx_fifo, rx_frame,
-    tx_bytes, tx_packets, tx_errs, tx_drops,
-    tx_fifo, tx_colls, tx_carrier, rx_multi;
+    unsigned long rx_bytes, rx_packets, rx_errs, rx_drops,
+        rx_fifo, rx_frame,
+        tx_bytes, tx_packets, tx_errs, tx_drops,
+        tx_fifo, tx_colls, tx_carrier, rx_multi;
     int type;
     struct ip_tunnel_parm p1;
-
     char buf[512];
-    FILE *fp = fopen("/proc/net/dev", "r");
+    FILE *fp = fopen_or_warn("/proc/net/dev", "r");
+
     if (fp == NULL) {
-        perror("fopen");
-        return -1;
+        return;
     }
 
@@ -459 +450 @@
     while (fgets(buf, sizeof(buf), fp) != NULL) {
         char *ptr;
-        buf[sizeof(buf) - 1] = 0;
-        if ((ptr = strchr(buf, ':')) == NULL ||
+
+        /*buf[sizeof(buf) - 1] = 0; - fgets is safe anyway */
+        ptr = strchr(buf, ':');
+        if (ptr == NULL ||
             (*ptr++ = 0, sscanf(buf, "%s", name) != 1)) {
-            bb_error_msg("Wrong format of /proc/net/dev. Sorry.");
-            return -1;
+            bb_error_msg("wrong format of /proc/net/dev");
+            return;
         }
         if (sscanf(ptr, "%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu",
@@ -475 +468 @@
         type = do_ioctl_get_iftype(name);
         if (type == -1) {
-            bb_error_msg("Failed to get type of [%s]", name);
+            bb_error_msg("cannot get type of [%s]", name);
             continue;
         }
@@ -490 +483 @@
             continue;
         print_tunnel(&p1);
-        printf("\n");
-    }
-    return 0;
-}
-
+        puts("");
+    }
+}
+
+/* Return value becomes exitcode. It's okay to not return at all */
 static int do_show(int argc, char **argv)
 {
@@ -500 +493 @@
     struct ip_tunnel_parm p;
 
-    if (parse_args(argc, argv, SIOCGETTUNNEL, &p) < 0)
-        return -1;
+    parse_args(argc, argv, SIOCGETTUNNEL, &p);
 
     switch (p.iph.protocol) {
@@ -521 +513 @@
 
     print_tunnel(&p);
-    printf("\n");
+    puts("");
     return 0;
 }
 
+/* Return value becomes exitcode. It's okay to not return at all */
 int do_iptunnel(int argc, char **argv)
 {
-    if (argc > 0) {
-        if (matches(*argv, "add") == 0)
-            return do_add(SIOCADDTUNNEL, argc-1, argv+1);
-        if (matches(*argv, "change") == 0)
-            return do_add(SIOCCHGTUNNEL, argc-1, argv+1);
-        if (matches(*argv, "del") == 0)
-            return do_del(argc-1, argv+1);
-        if (matches(*argv, "show") == 0 ||
-            matches(*argv, "lst") == 0 ||
-            matches(*argv, "list") == 0)
-            return do_show(argc-1, argv+1);
-    } else
-        return do_show(0, NULL);
-
-    bb_error_msg("Command \"%s\" is unknown.", *argv);
-    exit(-1);
-}
+    static const char keywords[] ALIGN1 =
+        "add\0""change\0""delete\0""show\0""list\0""lst\0";
+    enum { ARG_add = 0, ARG_change, ARG_del, ARG_show, ARG_list, ARG_lst };
+    int key;
+
+    if (argc) {
+        key = index_in_substrings(keywords, *argv);
+        if (key < 0)
+            bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+        --argc;
+        ++argv;
+        if (key == ARG_add)
+            return do_add(SIOCADDTUNNEL, argc, argv);
+        if (key == ARG_change)
+            return do_add(SIOCCHGTUNNEL, argc, argv);
+        if (key == ARG_del)
+            return do_del(argc, argv);
+    }
+    return do_show(argc, argv);
+}

branches/stable/mindi-busybox/networking/libiproute/libnetlink.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * libnetlink.c RTnetlink service routines.
@@ -11 +12 @@
  */
 
+#include <sys/socket.h>
+#include <sys/uio.h>
+
 #include "libbb.h"
-#include <sys/socket.h>
-
-#include <errno.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#include <sys/uio.h>
-
 #include "libnetlink.h"
 
@@ -28 +23 @@
 }
 
-int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions)
+int xrtnl_open(struct rtnl_handle *rth/*, unsigned subscriptions*/)
 {
     socklen_t addr_len;
@@ -34 +29 @@
     memset(rth, 0, sizeof(rth));
 
-    rth->fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-    if (rth->fd < 0) {
-        bb_perror_msg("Cannot open netlink socket");
-        return -1;
-    }
+    rth->fd = xsocket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
 
     memset(&rth->local, 0, sizeof(rth->local));
     rth->local.nl_family = AF_NETLINK;
-    rth->local.nl_groups = subscriptions;
-
-    if (bind(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local)) < 0) {
-        bb_perror_msg("Cannot bind netlink socket");
-        return -1;
-    }
+    /*rth->local.nl_groups = subscriptions;*/
+
+    xbind(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local));
     addr_len = sizeof(rth->local);
-    if (getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len) < 0) {
-        bb_perror_msg("Cannot getsockname");
-        return -1;
-    }
-    if (addr_len != sizeof(rth->local)) {
-        bb_error_msg("Wrong address length %d", addr_len);
-        return -1;
-    }
-    if (rth->local.nl_family != AF_NETLINK) {
-        bb_error_msg("Wrong address family %d", rth->local.nl_family);
-        return -1;
-    }
+    if (getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len) < 0)
+        bb_perror_msg_and_die("cannot getsockname");
+    if (addr_len != sizeof(rth->local))
+        bb_error_msg_and_die("wrong address length %d", addr_len);
+    if (rth->local.nl_family != AF_NETLINK)
+        bb_error_msg_and_die("wrong address family %d", rth->local.nl_family);
     rth->seq = time(NULL);
     return 0;
 }
 
-int rtnl_wilddump_request(struct rtnl_handle *rth, int family, int type)
+int xrtnl_wilddump_request(struct rtnl_handle *rth, int family, int type)
 {
     struct {
@@ -83 +65 @@
     req.g.rtgen_family = family;
 
-    return sendto(rth->fd, (void*)&req, sizeof(req), 0, (struct sockaddr*)&nladdr, sizeof(nladdr));
+    return xsendto(rth->fd, (void*)&req, sizeof(req),
+                 (struct sockaddr*)&nladdr, sizeof(nladdr));
 }
 
@@ -93 +76 @@
     nladdr.nl_family = AF_NETLINK;
 
-    return sendto(rth->fd, buf, len, 0, (struct sockaddr*)&nladdr, sizeof(nladdr));
+    return xsendto(rth->fd, buf, len, (struct sockaddr*)&nladdr, sizeof(nladdr));
 }
 
@@ -120 +103 @@
 }
 
-int rtnl_dump_filter(struct rtnl_handle *rth,
-             int (*filter)(struct sockaddr_nl *, struct nlmsghdr *n, void *),
-             void *arg1,
-             int (*junk)(struct sockaddr_nl *,struct nlmsghdr *n, void *),
-             void *arg2)
-{
-    char    buf[8192];
+static int rtnl_dump_filter(struct rtnl_handle *rth,
+        int (*filter)(struct sockaddr_nl *, struct nlmsghdr *n, void *),
+        void *arg1/*,
+        int (*junk)(struct sockaddr_nl *, struct nlmsghdr *n, void *),
+        void *arg2*/)
+{
+    char buf[8192];
     struct sockaddr_nl nladdr;
     struct iovec iov = { buf, sizeof(buf) };
@@ -164 +147 @@
                 h->nlmsg_pid != rth->local.nl_pid ||
                 h->nlmsg_seq != rth->dump) {
-                if (junk) {
+/*              if (junk) {
                     err = junk(&nladdr, h, arg2);
-                    if (err < 0) {
+                    if (err < 0)
                         return err;
-                    }
-                }
+                } */
                 goto skip_it;
             }
@@ -187 +169 @@
             }
             err = filter(&nladdr, h, arg1);
-            if (err < 0) {
+            if (err < 0)
                 return err;
-            }
 
 skip_it:
@@ -195 +176 @@
         }
         if (msg.msg_flags & MSG_TRUNC) {
-            bb_error_msg("Message truncated");
+            bb_error_msg("message truncated");
             continue;
         }
         if (status) {
-            bb_error_msg_and_die("!!!Remnant of size %d", status);
-        }
-    }
+            bb_error_msg_and_die("remnant of size %d!", status);
+        }
+    }
+}
+
+int xrtnl_dump_filter(struct rtnl_handle *rth,
+        int (*filter)(struct sockaddr_nl *, struct nlmsghdr *n, void *),
+        void *arg1)
+{
+    int ret = rtnl_dump_filter(rth, filter, arg1/*, NULL, NULL*/);
+    if (ret < 0)
+        bb_error_msg_and_die("dump terminated");
+    return ret;
 }
 
@@ -234 +225 @@
 
     if (status < 0) {
-        bb_perror_msg("Cannot talk to rtnetlink");
+        bb_perror_msg("cannot talk to rtnetlink");
         return -1;
     }
@@ -265 +256 @@
             if (l<0 || len>status) {
                 if (msg.msg_flags & MSG_TRUNC) {
-                    bb_error_msg("Truncated message");
+                    bb_error_msg("truncated message");
                     return -1;
                 }
-                bb_error_msg_and_die("!!!malformed message: len=%d", len);
+                bb_error_msg_and_die("malformed message: len=%d!", len);
             }
 
@@ -304 +295 @@
             }
 
-            bb_error_msg("Unexpected reply!!!");
+            bb_error_msg("unexpected reply!");
 
             status -= NLMSG_ALIGN(len);
@@ -310 +301 @@
         }
         if (msg.msg_flags & MSG_TRUNC) {
-            bb_error_msg("Message truncated");
+            bb_error_msg("message truncated");
             continue;
         }
         if (status) {
-            bb_error_msg_and_die("!!!Remnant of size %d", status);
-        }
-    }
-}
-
-int addattr32(struct nlmsghdr *n, int maxlen, int type, __u32 data)
+            bb_error_msg_and_die("remnant of size %d!", status);
+        }
+    }
+}
+
+int addattr32(struct nlmsghdr *n, int maxlen, int type, uint32_t data)
 {
     int len = RTA_LENGTH(4);
@@ -348 +339 @@
 }
 
-int rta_addattr32(struct rtattr *rta, int maxlen, int type, __u32 data)
+int rta_addattr32(struct rtattr *rta, int maxlen, int type, uint32_t data)
 {
     int len = RTA_LENGTH(4);
@@ -390 +381 @@
     }
     if (len) {
-        bb_error_msg("!!!Deficit %d, rta_len=%d", len, rta->rta_len);
-    }
-    return 0;
-}
+        bb_error_msg("deficit %d, rta_len=%d!", len, rta->rta_len);
+    }
+    return 0;
+}

branches/stable/mindi-busybox/networking/libiproute/libnetlink.h

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 #ifndef __LIBNETLINK_H__
 #define __LIBNETLINK_H__ 1
 
-#include <asm/types.h>
+#include <linux/types.h>
+/* We need linux/types.h because older kernels use __u32 etc
+ * in linux/[rt]netlink.h. 2.6.19 seems to be ok, though */
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
@@ -11 +14 @@
     struct sockaddr_nl  local;
     struct sockaddr_nl  peer;
-    __u32           seq;
-    __u32           dump;
+    uint32_t        seq;
+    uint32_t        dump;
 };
 
-extern int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions);
+extern int xrtnl_open(struct rtnl_handle *rth);
 extern void rtnl_close(struct rtnl_handle *rth);
-extern int rtnl_wilddump_request(struct rtnl_handle *rth, int fam, int type);
+extern int xrtnl_wilddump_request(struct rtnl_handle *rth, int fam, int type);
 extern int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len);
-extern int rtnl_dump_filter(struct rtnl_handle *rth,
-                int (*filter)(struct sockaddr_nl *, struct nlmsghdr *n, void *),
-                void *arg1,
-                int (*junk)(struct sockaddr_nl *,struct nlmsghdr *n, void *),
-                void *arg2);
+extern int xrtnl_dump_filter(struct rtnl_handle *rth,
+            int (*filter)(struct sockaddr_nl*, struct nlmsghdr *n, void*),
+            void *arg1);
 extern int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
-             unsigned groups, struct nlmsghdr *answer,
-             int (*junk)(struct sockaddr_nl *,struct nlmsghdr *n, void *),
-             void *jarg);
+            unsigned groups, struct nlmsghdr *answer,
+            int (*junk)(struct sockaddr_nl *,struct nlmsghdr *n, void *),
+            void *jarg);
 extern int rtnl_send(struct rtnl_handle *rth, char *buf, int);
 
 
-extern int addattr32(struct nlmsghdr *n, int maxlen, int type, __u32 data);
+extern int addattr32(struct nlmsghdr *n, int maxlen, int type, uint32_t data);
 extern int addattr_l(struct nlmsghdr *n, int maxlen, int type, void *data, int alen);
-extern int rta_addattr32(struct rtattr *rta, int maxlen, int type, __u32 data);
+extern int rta_addattr32(struct rtattr *rta, int maxlen, int type, uint32_t data);
 extern int rta_addattr_l(struct rtattr *rta, int maxlen, int type, void *data, int alen);
 
 extern int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len);
 
-
 #endif /* __LIBNETLINK_H__ */
-

branches/stable/mindi-busybox/networking/libiproute/ll_addr.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * ll_addr.c
@@ -10 +11 @@
  */
 
-#include "libbb.h"
-
-#include <string.h>
 #include <net/if_arp.h>
 
+#include "libbb.h"
 #include "rt_names.h"
 #include "utils.h"
@@ -31 +30 @@
     for (i=0; i<alen; i++) {
         if (i==0) {
-            snprintf(buf+l, blen, "%02x", addr[i]);
+            snprintf(buf+l, blen, ":%02x"+1, addr[i]);
             blen -= 2;
             l += 2;
@@ -48 +47 @@
         inet_prefix pfx;
         if (get_addr_1(&pfx, arg, AF_INET)) {
-            bb_error_msg("\"%s\" is invalid lladdr.", arg);
+            bb_error_msg("\"%s\" is invalid lladdr", arg);
             return -1;
         }
@@ -67 +66 @@
             }
             if (sscanf(arg, "%x", &temp) != 1) {
-                bb_error_msg("\"%s\" is invalid lladdr.", arg);
+                bb_error_msg("\"%s\" is invalid lladdr", arg);
                 return -1;
             }
             if (temp < 0 || temp > 255) {
-                bb_error_msg("\"%s\" is invalid lladdr.", arg);
+                bb_error_msg("\"%s\" is invalid lladdr", arg);
                 return -1;
             }

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

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * ll_map.c
@@ -11 +12 @@
  */
 
+#include <net/if.h> /* struct ifreq and co. */
+
 #include "libbb.h"
-#include <string.h>
-
 #include "libnetlink.h"
 #include "ll_map.h"
 
-struct idxmap
-{
-    struct idxmap * next;
-    int     index;
-    int     type;
-    int     alen;
-    unsigned    flags;
-    unsigned char   addr[8];
-    char        name[16];
+struct idxmap {
+    struct idxmap *next;
+    int            index;
+    int            type;
+    int            alen;
+    unsigned       flags;
+    unsigned char  addr[8];
+    char           name[16];
 };
 
 static struct idxmap *idxmap[16];
+
+static struct idxmap *find_by_index(int idx)
+{
+    struct idxmap *im;
+
+    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)
@@ -43 +53 @@
         return -1;
 
-
     memset(tb, 0, sizeof(tb));
     parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), IFLA_PAYLOAD(n));
@@ -49 +58 @@
         return 0;
 
-    h = ifi->ifi_index&0xF;
+    h = ifi->ifi_index & 0xF;
 
-    for (imp=&idxmap[h]; (im=*imp)!=NULL; imp = &im->next)
+    for (imp = &idxmap[h]; (im = *imp) != NULL; imp = &im->next)
         if (im->index == ifi->ifi_index)
-            break;
+            goto found;
 
-    if (im == NULL) {
-        im = xmalloc(sizeof(*im));
-        im->next = *imp;
-        im->index = ifi->ifi_index;
-        *imp = im;
-    }
-
+    im = xmalloc(sizeof(*im));
+    im->next = *imp;
+    im->index = ifi->ifi_index;
+    *imp = im;
+ found:
     im->type = ifi->ifi_type;
     im->flags = ifi->ifi_flags;
@@ -84 +91 @@
     if (idx == 0)
         return "*";
-    for (im = idxmap[idx&0xF]; im; im = im->next)
-        if (im->index == idx)
-            return im->name;
+    im = find_by_index(idx);
+    if (im)
+        return im->name;
     snprintf(buf, 16, "if%d", idx);
     return buf;
@@ -99 +106 @@
 }
 
+#ifdef UNUSED
 int ll_index_to_type(int idx)
 {
@@ -105 +113 @@
     if (idx == 0)
         return -1;
-    for (im = idxmap[idx&0xF]; im; im = im->next)
-        if (im->index == idx)
-            return im->type;
+    im = find_by_index(idx);
+    if (im)
+        return im->type;
     return -1;
 }
+#endif
 
 unsigned ll_index_to_flags(int idx)
@@ -117 +126 @@
     if (idx == 0)
         return 0;
-
-    for (im = idxmap[idx&0xF]; im; im = im->next)
-        if (im->index == idx)
-            return im->flags;
+    im = find_by_index(idx);
+    if (im)
+        return im->flags;
     return 0;
 }
 
-int ll_name_to_index(char *name)
+int xll_name_to_index(const char *const name)
 {
+    int ret = 0;
+    int sock_fd;
+
+/* caching is not warranted - no users which repeatedly call it */
+#ifdef UNUSED
     static char ncache[16];
     static int icache;
+
     struct idxmap *im;
     int i;
 
     if (name == NULL)
-        return 0;
-    if (icache && strcmp(name, ncache) == 0)
-        return icache;
-    for (i=0; i<16; i++) {
+        goto out;
+    if (icache && strcmp(name, ncache) == 0) {
+        ret = icache;
+        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);
-                return im->index;
+                ret = im->index;
+                goto out;
             }
         }
     }
-    return 0;
+    /* 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) {
+        struct ifreq ifr;
+        int tmp;
+
+        strncpy(ifr.ifr_name, name, IFNAMSIZ);
+        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;
+    }
+/* out:*/
+    if (ret <= 0)
+        bb_error_msg_and_die("cannot find device \"%s\"", name);
+    return ret;
 }
 
 int ll_init_map(struct rtnl_handle *rth)
 {
-    if (rtnl_wilddump_request(rth, AF_UNSPEC, RTM_GETLINK) < 0) {
-        perror("Cannot send dump request");
-        exit(1);
-    }
-
-    if (rtnl_dump_filter(rth, ll_remember_index, &idxmap, NULL, NULL) < 0) {
-        fprintf(stderr, "Dump terminated\n");
-        exit(1);
-    }
+    xrtnl_wilddump_request(rth, AF_UNSPEC, RTM_GETLINK);
+    xrtnl_dump_filter(rth, ll_remember_index, &idxmap);
     return 0;
 }

branches/stable/mindi-busybox/networking/libiproute/ll_map.h

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 #ifndef __LL_MAP_H__
 #define __LL_MAP_H__ 1
 
-extern int ll_remember_index(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg);
-extern int ll_init_map(struct rtnl_handle *rth);
-extern int ll_name_to_index(char *name);
-extern const char *ll_index_to_name(int idx);
-extern const char *ll_idx_n2a(int idx, char *buf);
-extern int ll_index_to_type(int idx);
-extern unsigned ll_index_to_flags(int idx);
+int ll_remember_index(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg);
+int ll_init_map(struct rtnl_handle *rth);
+int xll_name_to_index(const char *const name);
+const char *ll_index_to_name(int idx);
+const char *ll_idx_n2a(int idx, char *buf);
+/* int ll_index_to_type(int idx); */
+unsigned ll_index_to_flags(int idx);
 
 #endif /* __LL_MAP_H__ */

branches/stable/mindi-busybox/networking/libiproute/ll_proto.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * ll_proto.c
@@ -11 +12 @@
 
 #include "libbb.h"
-#include <string.h>
-
 #include "rt_names.h"
 #include "utils.h"
 
-#if __GLIBC__ >=2 && __GLIBC_MINOR >= 1
+#if defined(__GLIBC__) && __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1
 #include <net/ethernet.h>
 #else
@@ -25 +24 @@
 static struct {
     int id;
-    char *name;
+    const char *name;
 } llproto_names[] = {
 __PF(LOOP,loop)
@@ -98 +97 @@
     id = ntohs(id);
 
-    for (i=0; i<sizeof(llproto_names)/sizeof(llproto_names[0]); i++) {
+    for (i=0; i < ARRAY_SIZE(llproto_names); i++) {
          if (llproto_names[i].id == id)
             return llproto_names[i].name;
@@ -109 +108 @@
 {
     int i;
-    for (i=0; i<sizeof(llproto_names)/sizeof(llproto_names[0]); i++) {
+    for (i=0; i < ARRAY_SIZE(llproto_names); i++) {
          if (strcasecmp(llproto_names[i].name, buf) == 0) {
              *id = htons(llproto_names[i].id);

branches/stable/mindi-busybox/networking/libiproute/ll_types.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * ll_types.c
@@ -9 +10 @@
  * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
-#include <stdio.h>
 #include <arpa/inet.h>
-
 #include <linux/if_arp.h>
 
+#include "libbb.h"
 #include "rt_names.h"
 
-const char * ll_type_n2a(int type, char *buf, int len)
+const char* ll_type_n2a(int type, char *buf, int len)
 {
 #define __PF(f,n) { ARPHRD_##f, #n },
-static struct {
+static const struct {
     int type;
-    char *name;
+    const char *name;
 } arphrd_names[] = {
 { 0, "generic" },
@@ -109 +109 @@
 
     int i;
-    for (i=0; i<sizeof(arphrd_names)/sizeof(arphrd_names[0]); i++) {
+    for (i = 0; i < ARRAY_SIZE(arphrd_names); i++) {
          if (arphrd_names[i].type == type)
             return arphrd_names[i].name;

branches/stable/mindi-busybox/networking/libiproute/rt_names.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * rt_names.c       rtnetlink names DB.
@@ -9 +10 @@
  * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <stdint.h>
+
+#include "libbb.h"
 #include "rt_names.h"
 
-static void rtnl_tab_initialize(char *file, char **tab, int size)
+static void rtnl_tab_initialize(const char *file, const char **tab, int size)
 {
     char buf[512];
@@ -33 +31 @@
         if (*p == '#' || *p == '\n' || *p == 0)
             continue;
-        if (sscanf(p, "0x%x %s\n", &id, namebuf) != 2 &&
-            sscanf(p, "0x%x %s #", &id, namebuf) != 2 &&
-            sscanf(p, "%d %s\n", &id, namebuf) != 2 &&
-            sscanf(p, "%d %s #", &id, namebuf) != 2) {
-            fprintf(stderr, "Database %s is corrupted at %s\n",
+        if (sscanf(p, "0x%x %s\n", &id, namebuf) != 2
+         && sscanf(p, "0x%x %s #", &id, namebuf) != 2
+         && sscanf(p, "%d %s\n", &id, namebuf) != 2
+         && sscanf(p, "%d %s #", &id, namebuf) != 2
+        ) {
+            bb_error_msg("database %s is corrupted at %s",
                 file, p);
             return;
         }
 
-        if (id<0 || id>size)
+        if (id < 0 || id > size)
             continue;
 
-        tab[id] = strdup(namebuf);
+        tab[id] = xstrdup(namebuf);
     }
     fclose(fp);
@@ -51 +50 @@
 
 
-static char * rtnl_rtprot_tab[256] = {
-    "none",
-    "redirect",
-    "kernel",
-    "boot",
-    "static",
-    NULL,
-    NULL,
-    NULL,
-    "gated",
-    "ra",
-    "mrt",
-    "zebra",
-    "bird",
-};
-
-
-
-static int rtnl_rtprot_init;
+static const char **rtnl_rtprot_tab; /* [256] */
 
 static void rtnl_rtprot_initialize(void)
 {
-    rtnl_rtprot_init = 1;
+    static const char *const init_tab[] = {
+        "none",
+        "redirect",
+        "kernel",
+        "boot",
+        "static",
+        NULL,
+        NULL,
+        NULL,
+        "gated",
+        "ra",
+        "mrt",
+        "zebra",
+        "bird",
+    };
+    if (rtnl_rtprot_tab) return;
+    rtnl_rtprot_tab = xzalloc(256 * sizeof(rtnl_rtprot_tab[0]));
+    memcpy(rtnl_rtprot_tab, init_tab, sizeof(init_tab));
     rtnl_tab_initialize("/etc/iproute2/rt_protos",
                 rtnl_rtprot_tab, 256);
 }
 
-const char * rtnl_rtprot_n2a(int id, char *buf, int len)
-{
-    if (id<0 || id>=256) {
-        snprintf(buf, len, "%d", id);
-        return buf;
-    }
-    if (!rtnl_rtprot_tab[id]) {
-        if (!rtnl_rtprot_init)
-            rtnl_rtprot_initialize();
-    }
+
+const char* rtnl_rtprot_n2a(int id, char *buf, int len)
+{
+    if (id < 0 || id >= 256) {
+        snprintf(buf, len, "%d", id);
+        return buf;
+    }
+
+    rtnl_rtprot_initialize();
+
     if (rtnl_rtprot_tab[id])
         return rtnl_rtprot_tab[id];
@@ -96 +94 @@
 int rtnl_rtprot_a2n(uint32_t *id, char *arg)
 {
-    static char *cache = NULL;
-    static unsigned long res;
-    char *end;
-    int i;
-
-    if (cache && strcmp(cache, arg) == 0) {
-        *id = res;
-        return 0;
-    }
-
-    if (!rtnl_rtprot_init)
-        rtnl_rtprot_initialize();
-
-    for (i=0; i<256; i++) {
+    static const char *cache = NULL;
+    static unsigned long res;
+    int i;
+
+    if (cache && strcmp(cache, arg) == 0) {
+        *id = res;
+        return 0;
+    }
+
+    rtnl_rtprot_initialize();
+
+    for (i = 0; i < 256; i++) {
         if (rtnl_rtprot_tab[i] &&
             strcmp(rtnl_rtprot_tab[i], arg) == 0) {
@@ -119 +115 @@
     }
 
-    res = strtoul(arg, &end, 0);
-    if (!end || end == arg || *end || res > 255)
+    res = bb_strtoul(arg, NULL, 0);
+    if (errno || res > 255)
         return -1;
     *id = res;
@@ -127 +123 @@
 
 
-
-static char * rtnl_rtscope_tab[256] = {
-    "global",
-};
-
-static int rtnl_rtscope_init;
+static const char **rtnl_rtscope_tab; /* [256] */
 
 static void rtnl_rtscope_initialize(void)
 {
-    rtnl_rtscope_init = 1;
+    if (rtnl_rtscope_tab) return;
+    rtnl_rtscope_tab = xzalloc(256 * sizeof(rtnl_rtscope_tab[0]));
+    rtnl_rtscope_tab[0] = "global";
     rtnl_rtscope_tab[255] = "nowhere";
     rtnl_rtscope_tab[254] = "host";
@@ -145 +138 @@
 }
 
-const char * rtnl_rtscope_n2a(int id, char *buf, int len)
-{
-    if (id<0 || id>=256) {
-        snprintf(buf, len, "%d", id);
-        return buf;
-    }
-    if (!rtnl_rtscope_tab[id]) {
-        if (!rtnl_rtscope_init)
-            rtnl_rtscope_initialize();
-    }
+
+const char* rtnl_rtscope_n2a(int id, char *buf, int len)
+{
+    if (id < 0 || id >= 256) {
+        snprintf(buf, len, "%d", id);
+        return buf;
+    }
+
+    rtnl_rtscope_initialize();
+
     if (rtnl_rtscope_tab[id])
         return rtnl_rtscope_tab[id];
@@ -163 +156 @@
 int rtnl_rtscope_a2n(uint32_t *id, char *arg)
 {
-    static char *cache = NULL;
-    static unsigned long res;
-    char *end;
-    int i;
-
-    if (cache && strcmp(cache, arg) == 0) {
-        *id = res;
-        return 0;
-    }
-
-    if (!rtnl_rtscope_init)
-        rtnl_rtscope_initialize();
-
-    for (i=0; i<256; i++) {
+    static const char *cache = NULL;
+    static unsigned long res;
+    int i;
+
+    if (cache && strcmp(cache, arg) == 0) {
+        *id = res;
+        return 0;
+    }
+
+    rtnl_rtscope_initialize();
+
+    for (i = 0; i < 256; i++) {
         if (rtnl_rtscope_tab[i] &&
             strcmp(rtnl_rtscope_tab[i], arg) == 0) {
@@ -186 +177 @@
     }
 
-    res = strtoul(arg, &end, 0);
-    if (!end || end == arg || *end || res > 255)
+    res = bb_strtoul(arg, NULL, 0);
+    if (errno || res > 255)
         return -1;
     *id = res;
@@ -194 +185 @@
 
 
-
-static char * rtnl_rtrealm_tab[256] = {
-    "unknown",
-};
-
-static int rtnl_rtrealm_init;
+static const char **rtnl_rtrealm_tab; /* [256] */
 
 static void rtnl_rtrealm_initialize(void)
 {
-    rtnl_rtrealm_init = 1;
+    if (rtnl_rtrealm_tab) return;
+    rtnl_rtrealm_tab = xzalloc(256 * sizeof(rtnl_rtrealm_tab[0]));
+    rtnl_rtrealm_tab[0] = "unknown";
     rtnl_tab_initialize("/etc/iproute2/rt_realms",
                 rtnl_rtrealm_tab, 256);
 }
 
+
 int rtnl_rtrealm_a2n(uint32_t *id, char *arg)
 {
-    static char *cache = NULL;
-    static unsigned long res;
-    char *end;
-    int i;
-
-    if (cache && strcmp(cache, arg) == 0) {
-        *id = res;
-        return 0;
-    }
-
-    if (!rtnl_rtrealm_init)
-        rtnl_rtrealm_initialize();
-
-    for (i=0; i<256; i++) {
+    static const char *cache = NULL;
+    static unsigned long res;
+    int i;
+
+    if (cache && strcmp(cache, arg) == 0) {
+        *id = res;
+        return 0;
+    }
+
+    rtnl_rtrealm_initialize();
+
+    for (i = 0; i < 256; i++) {
         if (rtnl_rtrealm_tab[i] &&
             strcmp(rtnl_rtrealm_tab[i], arg) == 0) {
@@ -233 +220 @@
     }
 
-    res = strtoul(arg, &end, 0);
-    if (!end || end == arg || *end || res > 255)
+    res = bb_strtoul(arg, NULL, 0);
+    if (errno || res > 255)
         return -1;
     *id = res;
@@ -240 +227 @@
 }
 
-
-
-static char * rtnl_rtdsfield_tab[256] = {
-    "0",
-};
-
-static int rtnl_rtdsfield_init;
+#if ENABLE_FEATURE_IP_RULE
+const char* rtnl_rtrealm_n2a(int id, char *buf, int len)
+{
+    if (id < 0 || id >= 256) {
+        snprintf(buf, len, "%d", id);
+        return buf;
+    }
+
+    rtnl_rtrealm_initialize();
+
+    if (rtnl_rtrealm_tab[id])
+        return rtnl_rtrealm_tab[id];
+    snprintf(buf, len, "%d", id);
+    return buf;
+}
+#endif
+
+
+static const char **rtnl_rtdsfield_tab; /* [256] */
 
 static void rtnl_rtdsfield_initialize(void)
 {
-    rtnl_rtdsfield_init = 1;
+    if (rtnl_rtdsfield_tab) return;
+    rtnl_rtdsfield_tab = xzalloc(256 * sizeof(rtnl_rtdsfield_tab[0]));
+    rtnl_rtdsfield_tab[0] = "0";
     rtnl_tab_initialize("/etc/iproute2/rt_dsfield",
                 rtnl_rtdsfield_tab, 256);
 }
 
+
 const char * rtnl_dsfield_n2a(int id, char *buf, int len)
 {
-    if (id<0 || id>=256) {
-        snprintf(buf, len, "%d", id);
-        return buf;
-    }
-    if (!rtnl_rtdsfield_tab[id]) {
-        if (!rtnl_rtdsfield_init)
-            rtnl_rtdsfield_initialize();
-    }
+    if (id < 0 || id >= 256) {
+        snprintf(buf, len, "%d", id);
+        return buf;
+    }
+
+    rtnl_rtdsfield_initialize();
+
     if (rtnl_rtdsfield_tab[id])
         return rtnl_rtdsfield_tab[id];
@@ -274 +275 @@
 int rtnl_dsfield_a2n(uint32_t *id, char *arg)
 {
-    static char *cache = NULL;
-    static unsigned long res;
-    char *end;
-    int i;
-
-    if (cache && strcmp(cache, arg) == 0) {
-        *id = res;
-        return 0;
-    }
-
-    if (!rtnl_rtdsfield_init)
-        rtnl_rtdsfield_initialize();
-
-    for (i=0; i<256; i++) {
+    static const char *cache = NULL;
+    static unsigned long res;
+    int i;
+
+    if (cache && strcmp(cache, arg) == 0) {
+        *id = res;
+        return 0;
+    }
+
+    rtnl_rtdsfield_initialize();
+
+    for (i = 0; i < 256; i++) {
         if (rtnl_rtdsfield_tab[i] &&
             strcmp(rtnl_rtdsfield_tab[i], arg) == 0) {
@@ -297 +296 @@
     }
 
-    res = strtoul(arg, &end, 16);
-    if (!end || end == arg || *end || res > 255)
+    res = bb_strtoul(arg, NULL, 16);
+    if (errno || res > 255)
         return -1;
     *id = res;
@@ -304 +303 @@
 }
 
+
+#if ENABLE_FEATURE_IP_RULE
+static const char **rtnl_rttable_tab; /* [256] */
+
+static void rtnl_rttable_initialize(void)
+{
+    if (rtnl_rtdsfield_tab) return;
+    rtnl_rttable_tab = xzalloc(256 * sizeof(rtnl_rttable_tab[0]));
+    rtnl_rttable_tab[0] = "unspec";
+    rtnl_rttable_tab[255] = "local";
+    rtnl_rttable_tab[254] = "main";
+    rtnl_rttable_tab[253] = "default";
+    rtnl_tab_initialize("/etc/iproute2/rt_tables", rtnl_rttable_tab, 256);
+}
+
+
+const char *rtnl_rttable_n2a(int id, char *buf, int len)
+{
+    if (id < 0 || id >= 256) {
+        snprintf(buf, len, "%d", id);
+        return buf;
+    }
+
+    rtnl_rttable_initialize();
+
+    if (rtnl_rttable_tab[id])
+        return rtnl_rttable_tab[id];
+    snprintf(buf, len, "%d", id);
+    return buf;
+}
+
+int rtnl_rttable_a2n(uint32_t * id, char *arg)
+{
+    static char *cache = NULL;
+    static unsigned long res;
+    int i;
+
+    if (cache && strcmp(cache, arg) == 0) {
+        *id = res;
+        return 0;
+    }
+
+    rtnl_rttable_initialize();
+
+    for (i = 0; i < 256; i++) {
+        if (rtnl_rttable_tab[i] && strcmp(rtnl_rttable_tab[i], arg) == 0) {
+            cache = (char*)rtnl_rttable_tab[i];
+            res = i;
+            *id = res;
+            return 0;
+        }
+    }
+
+    i = bb_strtoul(arg, NULL, 0);
+    if (errno || i > 255)
+        return -1;
+    *id = i;
+    return 0;
+}
+
+#endif

branches/stable/mindi-busybox/networking/libiproute/rt_names.h

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 #ifndef RT_NAMES_H_
 #define RT_NAMES_H_ 1
@@ -6 +7 @@
 extern const char* rtnl_rtprot_n2a(int id, char *buf, int len);
 extern const char* rtnl_rtscope_n2a(int id, char *buf, int len);
+extern const char* rtnl_rtrealm_n2a(int id, char *buf, int len);
 extern const char* rtnl_dsfield_n2a(int id, char *buf, int len);
+extern const char* rtnl_rttable_n2a(int id, char *buf, int len);
 extern int rtnl_rtprot_a2n(uint32_t *id, char *arg);
 extern int rtnl_rtscope_a2n(uint32_t *id, char *arg);
 extern int rtnl_rtrealm_a2n(uint32_t *id, char *arg);
 extern int rtnl_dsfield_a2n(uint32_t *id, char *arg);
+extern int rtnl_rttable_a2n(uint32_t *id, char *arg);
 
 
-extern const char * ll_type_n2a(int type, char *buf, int len);
+extern const char* ll_type_n2a(int type, char *buf, int len);
 
-extern const char *ll_addr_n2a(unsigned char *addr, int alen, int type,
+extern const char* ll_addr_n2a(unsigned char *addr, int alen, int type,
                 char *buf, int blen);
 extern int ll_addr_a2n(unsigned char *lladdr, int len, char *arg);
 
-extern const char * ll_proto_n2a(unsigned short id, char *buf, int len);
+extern const char* ll_proto_n2a(unsigned short id, char *buf, int len);
 extern int ll_proto_a2n(unsigned short *id, char *buf);
 
-
 #endif

branches/stable/mindi-busybox/networking/libiproute/rtm_map.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * rtm_map.c
@@ -11 +12 @@
  */
 
-#include <stdlib.h>
-#include <string.h>
-
+#include "libbb.h"
 #include "rt_names.h"
 #include "utils.h"
 
-char *rtnl_rtntype_n2a(int id, char *buf, int len)
+const char *rtnl_rtntype_n2a(int id, char *buf, int len)
 {
     switch (id) {
@@ -53 +52 @@
 int rtnl_rtntype_a2n(int *id, char *arg)
 {
+    static const char keywords[] ALIGN1 =
+        "local\0""nat\0""broadcast\0""brd\0""anycast\0"
+        "multicast\0""prohibit\0""unreachable\0""blackhole\0"
+        "xresolve\0""unicast\0""throw\0";
+    enum {
+        ARG_local = 1, ARG_nat, ARG_broadcast, ARG_brd, ARG_anycast,
+        ARG_multicast, ARG_prohibit, ARG_unreachable, ARG_blackhole,
+        ARG_xresolve, ARG_unicast, ARG_throw
+    };
+    const smalluint key = index_in_substrings(keywords, arg) + 1;
     char *end;
     unsigned long res;
 
-    if (strcmp(arg, "local") == 0)
+    if (key == ARG_local)
         res = RTN_LOCAL;
-    else if (strcmp(arg, "nat") == 0)
+    else if (key == ARG_nat)
         res = RTN_NAT;
-    else if (matches(arg, "broadcast") == 0 ||
-         strcmp(arg, "brd") == 0)
+    else if (key == ARG_broadcast || key == ARG_brd)
         res = RTN_BROADCAST;
-    else if (matches(arg, "anycast") == 0)
+    else if (key == ARG_anycast)
         res = RTN_ANYCAST;
-    else if (matches(arg, "multicast") == 0)
+    else if (key == ARG_multicast)
         res = RTN_MULTICAST;
-    else if (matches(arg, "prohibit") == 0)
+    else if (key == ARG_prohibit)
         res = RTN_PROHIBIT;
-    else if (matches(arg, "unreachable") == 0)
+    else if (key == ARG_unreachable)
         res = RTN_UNREACHABLE;
-    else if (matches(arg, "blackhole") == 0)
+    else if (key == ARG_blackhole)
         res = RTN_BLACKHOLE;
-    else if (matches(arg, "xresolve") == 0)
+    else if (key == ARG_xresolve)
         res = RTN_XRESOLVE;
-    else if (matches(arg, "unicast") == 0)
+    else if (key == ARG_unicast)
         res = RTN_UNICAST;
-    else if (strcmp(arg, "throw") == 0)
+    else if (key == ARG_throw)
         res = RTN_THROW;
     else {
@@ -88 +96 @@
 }
 
-int get_rt_realms(__u32 *realms, char *arg)
+int get_rt_realms(uint32_t *realms, char *arg)
 {
-    __u32 realm = 0;
+    uint32_t realm = 0;
     char *p = strchr(arg, '/');
 

branches/stable/mindi-busybox/networking/libiproute/rtm_map.h

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 #ifndef __RTM_MAP_H__
 #define __RTM_MAP_H__ 1
 
-char *rtnl_rtntype_n2a(int id, char *buf, int len);
+const char *rtnl_rtntype_n2a(int id, char *buf, int len);
 int rtnl_rtntype_a2n(int *id, char *arg);
 
-int get_rt_realms(__u32 *realms, char *arg);
+int get_rt_realms(uint32_t *realms, char *arg);
 
 

branches/stable/mindi-busybox/networking/libiproute/utils.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * utils.c
@@ -12 +13 @@
 
 #include "libbb.h"
-
-#include <string.h>
-#include <unistd.h>
-
 #include "utils.h"
 #include "inet_common.h"
@@ -32 +29 @@
     return 0;
 }
-
+//XXX: FIXME: use some libbb function instead
 int get_unsigned(unsigned *val, char *arg, int base)
 {
@@ -47 +44 @@
 }
 
-int get_u32(__u32 * val, char *arg, int base)
+int get_u32(uint32_t * val, char *arg, int base)
 {
     unsigned long res;
@@ -61 +58 @@
 }
 
-int get_u16(__u16 * val, char *arg, int base)
+int get_u16(uint16_t * val, char *arg, int base)
 {
     unsigned long res;
@@ -75 +72 @@
 }
 
-int get_u8(__u8 * val, char *arg, int base)
+int get_u8(uint8_t * val, char *arg, int base)
 {
     unsigned long res;
@@ -89 +86 @@
 }
 
-int get_s16(__s16 * val, char *arg, int base)
+int get_s16(int16_t * val, char *arg, int base)
 {
     long res;
@@ -103 +100 @@
 }
 
-int get_s8(__s8 * val, char *arg, int base)
+int get_s8(int8_t * val, char *arg, int base)
 {
     long res;
@@ -125 +122 @@
     memset(addr, 0, sizeof(*addr));
 
-    if (strcmp(name, bb_INET_default) == 0 ||
+    if (strcmp(name, bb_str_default) == 0 ||
         strcmp(name, "all") == 0 || strcmp(name, "any") == 0) {
         addr->family = family;
@@ -169 +166 @@
     memset(dst, 0, sizeof(*dst));
 
-    if (strcmp(arg, bb_INET_default) == 0 || strcmp(arg, "any") == 0) {
+    if (strcmp(arg, bb_str_default) == 0 || strcmp(arg, "any") == 0) {
         dst->family = family;
         dst->bytelen = 0;
@@ -178 +175 @@
     slash = strchr(arg, '/');
     if (slash)
-        *slash = 0;
+        *slash = '\0';
     err = get_addr_1(dst, arg, family);
     if (err == 0) {
@@ -197 +194 @@
         }
     }
-  done:
+ done:
     if (slash)
         *slash = '/';
@@ -206 +203 @@
 {
     if (family == AF_PACKET) {
-        bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context.", arg);
+        bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context", arg);
     }
     if (get_addr_1(dst, arg, family)) {
-        bb_error_msg_and_die("an inet address is expected rather than \"%s\".", arg);
+        bb_error_msg_and_die("an inet address is expected rather than \"%s\"", arg);
     }
     return 0;
@@ -217 +214 @@
 {
     if (family == AF_PACKET) {
-        bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context.", arg);
+        bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context", arg);
     }
     if (get_prefix_1(dst, arg, family)) {
-        bb_error_msg_and_die("an inet address is expected rather than \"%s\".", arg);
-    }
-    return 0;
-}
-
-__u32 get_addr32(char *name)
+        bb_error_msg_and_die("an inet address is expected rather than \"%s\"", arg);
+    }
+    return 0;
+}
+
+uint32_t get_addr32(char *name)
 {
     inet_prefix addr;
@@ -237 +234 @@
 void incomplete_command(void)
 {
-    bb_error_msg("Command line is not complete. Try option \"help\"");
-    exit(-1);
-}
-
-void invarg(const char * const arg, const char * const opt)
-{
-    bb_error_msg(bb_msg_invalid_arg, arg, opt);
-    exit(-1);
-}
-
-void duparg(char *key, char *arg)
-{
-    bb_error_msg("duplicate \"%s\": \"%s\" is the second value.", key, arg);
-    exit(-1);
-}
-
-void duparg2(char *key, char *arg)
-{
-    bb_error_msg("either \"%s\" is duplicate, or \"%s\" is a garbage.", key, arg);
-    exit(-1);
-}
-
-int matches(char *cmd, char *pattern)
-{
-    int len = strlen(cmd);
-
-    if (len > strlen(pattern)) {
-        return -1;
-    }
-    return memcmp(pattern, cmd, len);
+    bb_error_msg_and_die("command line is not complete, try option \"help\"");
+}
+
+void invarg(const char *arg, const char *opt)
+{
+    bb_error_msg_and_die(bb_msg_invalid_arg, arg, opt);
+}
+
+void duparg(const char *key, const char *arg)
+{
+    bb_error_msg_and_die("duplicate \"%s\": \"%s\" is the second value", key, arg);
+}
+
+void duparg2(const char *key, const char *arg)
+{
+    bb_error_msg_and_die("either \"%s\" is duplicate, or \"%s\" is garbage", key, arg);
 }
 
 int inet_addr_match(inet_prefix * a, inet_prefix * b, int bits)
 {
-    __u32 *a1 = a->data;
-    __u32 *a2 = b->data;
+    uint32_t *a1 = a->data;
+    uint32_t *a2 = b->data;
     int words = bits >> 0x05;
 
@@ -282 +265 @@
 
     if (bits) {
-        __u32 w1, w2;
-        __u32 mask;
+        uint32_t w1, w2;
+        uint32_t mask;
 
         w1 = a1[words];
@@ -295 +278 @@
 
     return 0;
-}
-
-int __iproute2_hz_internal;
-
-int __get_hz(void)
-{
-    int hz = 0;
-    FILE *fp = fopen("/proc/net/psched", "r");
-
-    if (fp) {
-        unsigned nom, denom;
-
-        if (fscanf(fp, "%*08x%*08x%08x%08x", &nom, &denom) == 2)
-            if (nom == 1000000)
-                hz = denom;
-        fclose(fp);
-    }
-    if (hz)
-        return hz;
-    return sysconf(_SC_CLK_TCK);
 }
 
@@ -347 +310 @@
             }
         }
-        if (len > 0 && (h_ent = gethostbyaddr(addr, len, af)) != NULL) {
-            snprintf(buf, buflen - 1, "%s", h_ent->h_name);
-            return buf;
+        if (len > 0) {
+            h_ent = gethostbyaddr(addr, len, af);
+            if (h_ent != NULL) {
+                safe_strncpy(buf, h_ent->h_name, buflen);
+                return buf;
+            }
         }
     }

branches/stable/mindi-busybox/networking/libiproute/utils.h

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 #ifndef __UTILS_H__
 #define __UTILS_H__ 1
-
-#include "libbb.h"
-#include <asm/types.h>
-#include <resolv.h>
 
 #include "libnetlink.h"
@@ -11 +8 @@
 
 extern int preferred_family;
-extern int show_stats;
-extern int show_details;
-extern int show_raw;
-extern int resolve_hosts;
-extern int oneline;
-extern char * _SL_;
+extern smallint show_stats;    /* UNUSED */
+extern smallint show_details;  /* UNUSED */
+extern smallint show_raw;      /* UNUSED */
+extern smallint resolve_hosts; /* UNUSED */
+extern smallint oneline;
+extern char _SL_;
 
 #ifndef IPPROTO_ESP
@@ -30 +27 @@
 extern void incomplete_command(void) ATTRIBUTE_NORETURN;
 
-#define NEXT_ARG() do { argv++; if (--argc <= 0) incomplete_command(); } while(0)
+#define NEXT_ARG() do { argv++; if (--argc <= 0) incomplete_command(); } while (0)
 
 typedef struct
 {
-    __u8 family;
-    __u8 bytelen;
-    __s16 bitlen;
-    __u32 data[4];
+    uint8_t family;
+    uint8_t bytelen;
+    int16_t bitlen;
+    uint32_t data[4];
 } inet_prefix;
 
@@ -45 +42 @@
 #endif
 
-struct dn_naddr
-{
+struct dn_naddr {
     unsigned short          a_len;
     unsigned char a_addr[DN_MAXADDL];
@@ -58 +54 @@
 };
 
-extern __u32 get_addr32(char *name);
+extern uint32_t get_addr32(char *name);
 extern int get_addr_1(inet_prefix *dst, char *arg, int family);
 extern int get_prefix_1(inet_prefix *dst, char *arg, int family);
@@ -69 +65 @@
 #define get_ushort get_u16
 #define get_short get_s16
-extern int get_u32(__u32 *val, char *arg, int base);
-extern int get_u16(__u16 *val, char *arg, int base);
-extern int get_s16(__s16 *val, char *arg, int base);
-extern int get_u8(__u8 *val, char *arg, int base);
-extern int get_s8(__s8 *val, char *arg, int base);
+extern int get_u32(uint32_t *val, char *arg, int base);
+extern int get_u16(uint16_t *val, char *arg, int base);
+extern int get_s16(int16_t *val, char *arg, int base);
+extern int get_u8(uint8_t *val, char *arg, int base);
+extern int get_s8(int8_t *val, char *arg, int base);
 
 extern const char *format_host(int af, int len, void *addr, char *buf, int buflen);
 extern const char *rt_addr_n2a(int af, int len, void *addr, char *buf, int buflen);
 
-void invarg(const char * const, const char * const) ATTRIBUTE_NORETURN;
-void duparg(char *, char *) ATTRIBUTE_NORETURN;
-void duparg2(char *, char *) ATTRIBUTE_NORETURN;
-int matches(char *arg, char *pattern);
-extern int inet_addr_match(inet_prefix *a, inet_prefix *b, int bits);
+void invarg(const char *, const char *) ATTRIBUTE_NORETURN;
+void duparg(const char *, const char *) ATTRIBUTE_NORETURN;
+void duparg2(const char *, const char *) ATTRIBUTE_NORETURN;
+int inet_addr_match(inet_prefix *a, inet_prefix *b, int bits);
 
 const char *dnet_ntop(int af, const void *addr, char *str, size_t len);
@@ -90 +85 @@
 int ipx_pton(int af, const char *src, void *addr);
 
-extern int __iproute2_hz_internal;
-extern int __get_hz(void);
-
-static __inline__ int get_hz(void)
-{
-    if (__iproute2_hz_internal == 0)
-        __iproute2_hz_internal = __get_hz();
-    return __iproute2_hz_internal;
-}
-
 #endif /* __UTILS_H__ */