Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/route.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/networking/route.c (modified) (10 diffs)

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

@@ -56 +56 @@
 #define RTF_IRTT        0x0100  /* Initial round trip time      */
 #define RTF_REJECT      0x0200  /* Reject route                 */
+#define RTF_NONEXTHOP   0x00200000 /* route with no nexthop */
 #endif
 
@@ -129 +130 @@
 ;
 
-static const int flags_ipvx[] = { /* MUST match tbl_ipvx[] values above. */
+static const uint16_t flags_ipvx[] = { /* MUST match tbl_ipvx[] values above. */
 #ifdef RTF_REJECT
     RTF_REJECT,
@@ -284 +285 @@
             rt->rt_flags |= RTF_IRTT;
             rt->rt_irtt = xatoul(args_m1);
-            rt->rt_irtt *= (sysconf(_SC_CLK_TCK) / 100);    /* FIXME */
+            rt->rt_irtt *= (bb_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)) {
@@ -450 +451 @@
 #endif
 
-static const unsigned flagvals[] = { /* Must agree with flagchars[]. */
+static const
+IF_NOT_FEATURE_IPV6(uint16_t)
+IF_FEATURE_IPV6(unsigned)
+flagvals[] = { /* Must agree with flagchars[]. */
+    RTF_UP,
     RTF_GATEWAY,
     RTF_HOST,
@@ -459 +464 @@
     RTF_DEFAULT,
     RTF_ADDRCONF,
-    RTF_CACHE
+    RTF_CACHE,
+    RTF_REJECT,
+    RTF_NONEXTHOP, /* this one doesn't fit into 16 bits */
 #endif
 };
-
-#define IPV4_MASK (RTF_GATEWAY|RTF_HOST|RTF_REINSTATE|RTF_DYNAMIC|RTF_MODIFIED)
-#define IPV6_MASK (RTF_GATEWAY|RTF_HOST|RTF_DEFAULT|RTF_ADDRCONF|RTF_CACHE)
-
 /* Must agree with flagvals[]. */
 static const char flagchars[] ALIGN1 =
-    "GHRDM"
+    "UGHRDM"
 #if ENABLE_FEATURE_IPV6
-    "DAC"
+    "DAC!n"
 #endif
 ;
+#define IPV4_MASK (RTF_UP|RTF_GATEWAY|RTF_HOST|RTF_REINSTATE|RTF_DYNAMIC|RTF_MODIFIED)
+#define IPV6_MASK (RTF_UP|RTF_GATEWAY|RTF_HOST|RTF_DEFAULT|RTF_ADDRCONF|RTF_CACHE|RTF_REJECT|RTF_NONEXTHOP)
 
 static void set_flags(char *flagstr, int flags)
 {
     int i;
-
-    *flagstr++ = 'U';
 
     for (i = 0; (*flagstr = flagchars[i]) != 0; i++) {
@@ -492 +495 @@
     char devname[64], flags[16], *sdest, *sgw;
     unsigned long d, g, m;
+    int r;
     int flgs, ref, use, metric, mtu, win, ir;
     struct sockaddr_in s_addr;
@@ -502 +506 @@
             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. */
+    /* Skip the first line. */
+    r = fscanf(fp, "%*[^\n]\n");
+    if (r < 0) {
+        /* Empty line, read error, or EOF. Yes, if routing table
+         * is completely empty, /proc/net/route has no header.
+         */
+        goto 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);
         if (r != 11) {
+ ERROR:
             if ((r < 0) && feof(fp)) { /* EOF with no (nonspace) chars read. */
                 break;
             }
- ERROR:
-            bb_error_msg_and_die("fscanf");
+            bb_perror_msg_and_die(bb_msg_read_error);
         }
 
@@ -575 +583 @@
         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);
+                &metric, &refcnt, &use, &iflags, iface);
         if (r != 9) {
             if ((r < 0) && feof(fp)) { /* EOF with no (nonspace) chars read. */
@@ -581 +589 @@
             }
  ERROR:
-            bb_error_msg_and_die("fscanf");
+            bb_perror_msg_and_die(bb_msg_read_error);
         }
 
@@ -607 +615 @@
         }
 
-        if (!(iflags & RTF_UP)) { /* Skip interfaces that are down. */
-            continue;
-        }
-
         set_flags(flags, (iflags & IPV6_MASK));