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

Timestamp:

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

Author:

Bruno Cornec

Message:

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

File:

• branches/2.2.9/mindi-busybox/networking/route.c (modified) (17 diffs)

branches/2.2.9/mindi-busybox/networking/route.c

@@ -11 +11 @@
  *              (derived from FvK's 'route.c     1.70    01/04/94')
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  *
@@ -26 +26 @@
  */
 
-#include <getopt.h>
 #include <net/route.h>
 #include <net/if.h>
@@ -153 +152 @@
 /* Add or delete a route, depending on action. */
 
-static void INET_setroute(int action, char **args)
+static NOINLINE void INET_setroute(int action, char **args)
 {
     struct rtentry rt;
@@ -180 +179 @@
 
             prefix_len = xatoul_range(prefix+1, 0, 32);
-            mask_in_addr(rt) = htonl( ~ (0xffffffffUL >> prefix_len));
+            mask_in_addr(rt) = htonl( ~(0xffffffffUL >> prefix_len));
             *prefix = '\0';
 #if HAVE_NEW_ADDRT
@@ -187 +186 @@
         } else {
             /* Default netmask. */
-            netmask = bb_str_default;
+            netmask = "default";
         }
         /* Prefer hostname lookup is -host flag (xflag==1) was given. */
@@ -304 +303 @@
     /* sanity checks.. */
     if (mask_in_addr(rt)) {
-        unsigned long mask = mask_in_addr(rt);
+        uint32_t mask = mask_in_addr(rt);
 
         mask = ~ntohl(mask);
@@ -315 +314 @@
         }
         mask = ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr;
-        if (mask & ~mask_in_addr(rt)) {
+        if (mask & ~(uint32_t)mask_in_addr(rt)) {
             bb_error_msg_and_die("netmask and route address conflict");
         }
@@ -338 +337 @@
 #if ENABLE_FEATURE_IPV6
 
-static void INET6_setroute(int action, char **args)
+static NOINLINE void INET6_setroute(int action, char **args)
 {
     struct sockaddr_in6 sa6;
@@ -348 +347 @@
         const char *target = *args++;
 
-        if (strcmp(target, bb_str_default) == 0) {
+        if (strcmp(target, "default") == 0) {
             prefix_len = 0;
             memset(&sa6, 0, sizeof(sa6));
         } else {
             char *cp;
-            if ((cp = strchr(target, '/'))) { /* Yes... const to non is ok. */
-                *cp = 0;
-                prefix_len = xatoul_range(cp+1, 0, 128);
+            cp = strchr(target, '/'); /* Yes... const to non is ok. */
+            if (cp) {
+                *cp = '\0';
+                prefix_len = xatoul_range(cp + 1, 0, 128);
             } else {
                 prefix_len = 128;
@@ -424 +424 @@
         struct ifreq ifr;
         memset(&ifr, 0, sizeof(ifr));
-        strncpy(ifr.ifr_name, devname, sizeof(ifr.ifr_name));
+        strncpy_IFNAMSIZ(ifr.ifr_name, devname);
         xioctl(skfd, SIOGIFINDEX, &ifr);
         rt.rtmsg_ifindex = ifr.ifr_ifindex;
@@ -477 +477 @@
 
 /* also used in netstat */
-void bb_displayroutes(int noresolve, int netstatfmt)
+void FAST_FUNC bb_displayroutes(int noresolve, int netstatfmt)
 {
     char devname[64], flags[16], *sdest, *sgw;
@@ -485 +485 @@
     struct in_addr mask;
 
-    FILE *fp = xfopen("/proc/net/route", "r");
+    FILE *fp = xfopen_for_read("/proc/net/route");
 
     printf("Kernel IP routing table\n"
@@ -539 +539 @@
 #if ENABLE_FEATURE_IPV6
 
-static void INET6_displayroutes(int noresolve)
+static void INET6_displayroutes(void)
 {
     char addr6[128], *naddr6;
@@ -553 +553 @@
     struct sockaddr_in6 snaddr6;
 
-    FILE *fp = xfopen("/proc/net/ipv6_route", "r");
+    FILE *fp = xfopen_for_read("/proc/net/ipv6_route");
 
     printf("Kernel IPv6 routing table\n%-44s%-40s"
@@ -562 +562 @@
         int r;
         r = fscanf(fp, "%32s%x%*s%x%32s%x%x%x%x%s\n",
-                   addr6x+14, &prefix_len, &slen, addr6x+40+7,
-                   &metric, &use, &refcnt, &iflags, iface);
+                addr6x+14, &prefix_len, &slen, addr6x+40+7,
+                &metric, &use, &refcnt, &iflags, iface);
         if (r != 9) {
             if ((r < 0) && feof(fp)) { /* EOF with no (nonspace) chars read. */
@@ -641 +641 @@
 ;
 
-int route_main(int argc, char **argv);
-int route_main(int argc, char **argv)
+int route_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int route_main(int argc UNUSED_PARAM, char **argv)
 {
     unsigned opt;
@@ -675 +675 @@
 #if ENABLE_FEATURE_IPV6
         if (opt & ROUTE_OPT_INET6)
-            INET6_displayroutes(noresolve);
+            INET6_displayroutes();
         else
 #endif