Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/networking/route.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/networking/route.c (modified) (24 diffs)

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

@@ -26 +26 @@
  */
 
+//usage:#define route_trivial_usage
+//usage:       "[{add|del|delete}]"
+//usage:#define route_full_usage "\n\n"
+//usage:       "Edit kernel routing tables\n"
+//usage:     "\n    -n  Don't resolve names"
+//usage:     "\n    -e  Display other/more information"
+//usage:     "\n    -A inet" IF_FEATURE_IPV6("{6}") "   Select address family"
+
 #include <net/route.h>
 #include <net/if.h>
@@ -154 +162 @@
 static NOINLINE void INET_setroute(int action, char **args)
 {
-    struct rtentry rt;
+    /* char buffer instead of bona-fide struct avoids aliasing warning */
+    char rt_buf[sizeof(struct rtentry)];
+    struct rtentry *const rt = (void *)rt_buf;
+
     const char *netmask = NULL;
     int skfd, isnet, xflag;
@@ -167 +178 @@
 
     /* Clean out the RTREQ structure. */
-    memset(&rt, 0, sizeof(rt));
+    memset(rt, 0, sizeof(*rt));
 
     {
@@ -179 +190 @@
 
             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
-            rt.rt_genmask.sa_family = AF_INET;
+            rt->rt_genmask.sa_family = AF_INET;
 #endif
         } else {
@@ -189 +200 @@
         }
         /* Prefer hostname lookup is -host flag (xflag==1) was given. */
-        isnet = INET_resolve(target, (struct sockaddr_in *) &rt.rt_dst,
+        isnet = INET_resolve(target, (struct sockaddr_in *) &rt->rt_dst,
                              (xflag & HOST_FLAG));
         if (isnet < 0) {
@@ -205 +216 @@
 
     /* Fill in the other fields. */
-    rt.rt_flags = ((isnet) ? RTF_UP : (RTF_UP | RTF_HOST));
+    rt->rt_flags = ((isnet) ? RTF_UP : (RTF_UP | RTF_HOST));
 
     while (*args) {
@@ -212 +223 @@
 
         if (k & KW_IPVx_FLAG_ONLY) {
-            rt.rt_flags |= flags_ipvx[k & 3];
+            rt->rt_flags |= flags_ipvx[k & 3];
             continue;
         }
@@ -218 +229 @@
 #if HAVE_NEW_ADDRT
         if (k == KW_IPVx_METRIC) {
-            rt.rt_metric = xatoul(args_m1) + 1;
+            rt->rt_metric = xatoul(args_m1) + 1;
             continue;
         }
@@ -226 +237 @@
             struct sockaddr mask;
 
-            if (mask_in_addr(rt)) {
+            if (mask_in_addr(*rt)) {
                 bb_show_usage();
             }
@@ -235 +246 @@
                 bb_error_msg_and_die("resolving %s", netmask);
             }
-            rt.rt_genmask = full_mask(mask);
+            rt->rt_genmask = full_mask(mask);
             continue;
         }
 
         if (k == KW_IPVx_GATEWAY) {
-            if (rt.rt_flags & RTF_GATEWAY) {
+            if (rt->rt_flags & RTF_GATEWAY) {
                 bb_show_usage();
             }
 
             isnet = INET_resolve(args_m1,
-                                 (struct sockaddr_in *) &rt.rt_gateway, 1);
-            rt.rt_flags |= RTF_GATEWAY;
+                        (struct sockaddr_in *) &rt->rt_gateway, 1);
+            rt->rt_flags |= RTF_GATEWAY;
 
             if (isnet) {
@@ -258 +269 @@
 
         if (k == KW_IPVx_MSS) { /* Check valid MSS bounds. */
-            rt.rt_flags |= RTF_MSS;
-            rt.rt_mss = xatoul_range(args_m1, 64, 32768);
+            rt->rt_flags |= RTF_MSS;
+            rt->rt_mss = xatoul_range(args_m1, 64, 32768);
             continue;
         }
 
         if (k == KW_IPVx_WINDOW) {  /* Check valid window bounds. */
-            rt.rt_flags |= RTF_WINDOW;
-            rt.rt_window = xatoul_range(args_m1, 128, INT_MAX);
+            rt->rt_flags |= RTF_WINDOW;
+            rt->rt_window = xatoul_range(args_m1, 128, INT_MAX);
             continue;
         }
@@ -271 +282 @@
 #ifdef RTF_IRTT
         if (k == KW_IPVx_IRTT) {
-            rt.rt_flags |= RTF_IRTT;
-            rt.rt_irtt = xatoul(args_m1);
-            rt.rt_irtt *= (sysconf(_SC_CLK_TCK) / 100); /* FIXME */
+            rt->rt_flags |= RTF_IRTT;
+            rt->rt_irtt = xatoul(args_m1);
+            rt->rt_irtt *= (sysconf(_SC_CLK_TCK) / 100);    /* FIXME */
 #if 0                   /* FIXME: do we need to check anything of this? */
-            if (rt.rt_irtt < 1 || rt.rt_irtt > (120 * HZ)) {
+            if (rt->rt_irtt < 1 || rt->rt_irtt > (120 * HZ)) {
                 bb_error_msg_and_die("bad irtt");
             }
@@ -285 +296 @@
         /* Device is special in that it can be the last arg specified
          * and doesn't requre the dev/device keyword in that case. */
-        if (!rt.rt_dev && ((k == KW_IPVx_DEVICE) || (!k && !*++args))) {
+        if (!rt->rt_dev && ((k == KW_IPVx_DEVICE) || (!k && !*++args))) {
             /* Don't use args_m1 here since args may have changed! */
-            rt.rt_dev = args[-1];
+            rt->rt_dev = args[-1];
             continue;
         }
@@ -296 +307 @@
 
 #ifdef RTF_REJECT
-    if ((rt.rt_flags & RTF_REJECT) && !rt.rt_dev) {
-        rt.rt_dev = (char*)"lo";
+    if ((rt->rt_flags & RTF_REJECT) && !rt->rt_dev) {
+        rt->rt_dev = (char*)"lo";
     }
 #endif
 
     /* sanity checks.. */
-    if (mask_in_addr(rt)) {
-        uint32_t mask = mask_in_addr(rt);
+    if (mask_in_addr(*rt)) {
+        uint32_t mask = mask_in_addr(*rt);
 
         mask = ~ntohl(mask);
-        if ((rt.rt_flags & RTF_HOST) && mask != 0xffffffff) {
+        if ((rt->rt_flags & RTF_HOST) && mask != 0xffffffff) {
             bb_error_msg_and_die("netmask %.8x and host route conflict",
                                  (unsigned int) mask);
@@ -313 +324 @@
             bb_error_msg_and_die("bogus netmask %s", netmask);
         }
-        mask = ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr;
-        if (mask & ~(uint32_t)mask_in_addr(rt)) {
+        mask = ((struct sockaddr_in *) &rt->rt_dst)->sin_addr.s_addr;
+        if (mask & ~(uint32_t)mask_in_addr(*rt)) {
             bb_error_msg_and_die("netmask and route address conflict");
         }
@@ -320 +331 @@
 
     /* Fill out netmask if still unset */
-    if ((action == RTACTION_ADD) && (rt.rt_flags & RTF_HOST)) {
-        mask_in_addr(rt) = 0xffffffff;
+    if ((action == RTACTION_ADD) && (rt->rt_flags & RTF_HOST)) {
+        mask_in_addr(*rt) = 0xffffffff;
     }
 
@@ -328 +339 @@
 
     if (action == RTACTION_ADD)
-        xioctl(skfd, SIOCADDRT, &rt);
+        xioctl(skfd, SIOCADDRT, rt);
     else
-        xioctl(skfd, SIOCDELRT, &rt);
+        xioctl(skfd, SIOCDELRT, rt);
 
     if (ENABLE_FEATURE_CLEAN_UP) close(skfd);
@@ -399 +410 @@
             }
             memcpy(&rt.rtmsg_gateway, sa6.sin6_addr.s6_addr,
-                   sizeof(struct in6_addr));
+                    sizeof(struct in6_addr));
             rt.rtmsg_flags |= RTF_GATEWAY;
             continue;
@@ -425 +436 @@
         memset(&ifr, 0, sizeof(ifr));
         strncpy_IFNAMSIZ(ifr.ifr_name, devname);
-        xioctl(skfd, SIOGIFINDEX, &ifr);
+        xioctl(skfd, SIOCGIFINDEX, &ifr);
         rt.rtmsg_ifindex = ifr.ifr_ifindex;
     }
@@ -488 +499 @@
 
     printf("Kernel IP routing table\n"
-           "Destination     Gateway         Genmask         Flags %s Iface\n",
+        "Destination     Gateway         Genmask         Flags %s Iface\n",
             netstatfmt ? "  MSS Window  irtt" : "Metric Ref    Use");
 
     if (fscanf(fp, "%*[^\n]\n") < 0) { /* Skip the first line. */
-        goto ERROR;        /* Empty or missing line, or read error. */
+        goto ERROR;                /* Empty or missing line, or read error. */
     }
     while (1) {
         int r;
         r = fscanf(fp, "%63s%lx%lx%X%d%d%d%lx%d%d%d\n",
-                   devname, &d, &g, &flgs, &ref, &use, &metric, &m,
-                   &mtu, &win, &ir);
+                devname, &d, &g, &flgs, &ref, &use, &metric, &m,
+                &mtu, &win, &ir);
         if (r != 11) {
             if ((r < 0) && feof(fp)) { /* EOF with no (nonspace) chars read. */
@@ -535 +546 @@
         }
     }
+    fclose(fp);
 }
 
@@ -556 +568 @@
 
     printf("Kernel IPv6 routing table\n%-44s%-40s"
-              "Flags Metric Ref    Use Iface\n",
-              "Destination", "Next Hop");
+            "Flags Metric Ref    Use Iface\n",
+            "Destination", "Next Hop");
 
     while (1) {
@@ -602 +614 @@
 
         r = 0;
-        do {
+        while (1) {
             inet_pton(AF_INET6, addr6x + r,
                       (struct sockaddr *) &snaddr6.sin6_addr);
             snaddr6.sin6_family = AF_INET6;
             naddr6 = INET6_rresolve((struct sockaddr_in6 *) &snaddr6,
-                           0x0fff /* Apparently, upstream never resolves. */
-                           );
+                        0x0fff /* Apparently, upstream never resolves. */
+                        );
 
             if (!r) {           /* 1st pass */
@@ -621 +633 @@
                 break;
             }
-        } while (1);
-    }
+        }
+    }
+    fclose(fp);
 }