- use RESERVE_CONFIG_BUFFER. For defconfig this gives:

[oweals/busybox.git] / networking / route.c

diff --git a/networking/route.c b/networking/route.c
index 9e7a010342301db1a0ee8e3730a5f1cea350515f..8ae0da1826aef4637a0027a78aaa4d50bad08e37 100644 (file)
--- a/networking/route.c
+++ b/networking/route.c
@@ -15,7 +15,7 @@
  * Foundation;  either  version 2 of the License, or  (at
  * your option) any later version.
  *
- * $Id: route.c,v 1.25 2004/03/15 08:28:49 andersen Exp $
+ * $Id: route.c,v 1.26 2004/03/19 23:27:08 mjn3 Exp $
  *
  * displayroute() code added by Vladimir N. Oleynik <dzo@simtreas.ru>
  * adjustments by Larry Doolittle  <LRDoolittle@lbl.gov>
@@ -86,7 +86,7 @@
 /* We remap '-' to '#' to avoid problems with getopt. */
 static const char tbl_hash_net_host[] =
        "\007\001#net\0"
-/*     "\010\002#host\0" */
+/*     "\010\002#host\0" */
        "\007\002#host"                         /* Since last, we can save a byte. */
 ;
 
@@ -128,7 +128,7 @@ static const char tbl_ipvx[] =
 #endif
        "\006\041mod\0"
        "\006\042dyn\0"
-/*     "\014\043reinstate\0" */
+/*     "\014\043reinstate\0" */
        "\013\043reinstate"                     /* Since last, we can save a byte. */
 ;
 
@@ -166,7 +166,7 @@ static int kw_lookup(const char *kwtbl, char ***pargs)
 static void INET_setroute(int action, char **args)
 {
        struct rtentry rt;
-       const char *netmask;
+       const char *netmask = NULL;
        int skfd, isnet, xflag;
 
        assert((action == RTACTION_ADD) || (action == RTACTION_DEL));
@@ -184,14 +184,33 @@ static void INET_setroute(int action, char **args)
 
        {
                const char *target = *args++;
+               char *prefix;
 
+               /* recognize x.x.x.x/mask format. */
+               prefix = strchr(target, '/');
+               if(prefix) {
+                       int prefix_len;
+
+                       prefix_len = bb_xgetularg10_bnd(prefix+1, 0, 32);
+                       mask_in_addr(rt) = htonl( ~ (0xffffffffUL >> prefix_len));
+                       *prefix = '\0';
+#if HAVE_NEW_ADDRT
+                       rt.rt_genmask.sa_family = AF_INET;
+#endif
+               } else {
+                       /* Default netmask. */
+                       netmask = bb_INET_default;
+               }
                /* 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) {
                        bb_error_msg_and_die("resolving %s", target);
                }
-
+               if(prefix) {
+                       /* do not destroy prefix for process args */
+                       *prefix = '/';
+               }
        }
 
        if (xflag) {            /* Reinit isnet if -net or -host was specified. */
@@ -201,8 +220,6 @@ static void INET_setroute(int action, char **args)
        /* Fill in the other fields. */
        rt.rt_flags = ((isnet) ? RTF_UP : (RTF_UP | RTF_HOST));
 
-       netmask = bb_INET_default;
-
        while (*args) {
                int k = kw_lookup(tbl_ipvx, &args);
                const char *args_m1 = args[-1];
@@ -282,7 +299,8 @@ static void INET_setroute(int action, char **args)
                /* 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))) {
-                       rt.rt_dev = (char *) args_m1;
+                       /* Don't use args_m1 here since args may have changed! */
+                       rt.rt_dev = args[-1];
                        continue;
                }
 
@@ -328,8 +346,7 @@ static void INET_setroute(int action, char **args)
                bb_perror_msg_and_die("SIOC[ADD|DEL]RT");
        }
 
-       /* Don't bother closing, as we're exiting after we return anyway. */
-       /* close(skfd); */
+       if (ENABLE_FEATURE_CLEAN_UP) close(skfd);
 }
 
 #ifdef CONFIG_FEATURE_IPV6
@@ -347,7 +364,7 @@ static void INET6_setroute(int action, char **args)
                /* We know args isn't NULL from the check in route_main. */
                const char *target = *args++;
 
-               if (strcmp(target, "default") == 0) {
+               if (strcmp(target, bb_INET_default) == 0) {
                        prefix_len = 0;
                        memset(&sa6, 0, sizeof(sa6));
                } else {
@@ -407,7 +424,8 @@ static void INET6_setroute(int action, char **args)
                /* Device is special in that it can be the last arg specified
                 * and doesn't requre the dev/device keyword in that case. */
                if (!devname && ((k == KW_IPVx_DEVICE) || (!k && !*++args))) {
-                       devname = args_m1;
+                       /* Don't use args_m1 here since args may have changed! */
+                       devname = args[-1];
                        continue;
                }
 
@@ -438,8 +456,7 @@ static void INET6_setroute(int action, char **args)
                bb_perror_msg_and_die("SIOC[ADD|DEL]RT");
        }
 
-       /* Don't bother closing, as we're exiting after we return anyway. */
-       /* close(skfd); */
+       if (ENABLE_FEATURE_CLEAN_UP) close(skfd);
 }
 #endif
 
@@ -459,7 +476,7 @@ static const unsigned int flagvals[] = { /* Must agree with flagchars[]. */
 #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)
 
-static const char flagchars[] =                /* Must agree with flagvals[]. */
+static const char flagchars[] =                /* Must agree with flagvals[]. */
        "GHRDM"
 #ifdef CONFIG_FEATURE_IPV6
        "DAC"
@@ -483,6 +500,7 @@ void set_flags(char *flagstr, int flags)
        }
 }
 
+/* also used in netstat */
 void displayroutes(int noresolve, int netstatfmt)
 {
        char devname[64], flags[16], sdest[16], sgw[16];
@@ -644,10 +662,10 @@ static void INET6_displayroutes(int noresolve)
 #define ROUTE_OPT_INET6                0x08 /* Not an actual option. See below. */
 
 /* 1st byte is offset to next entry offset.  2nd byte is return value. */
-static const char tbl_verb[] =         /* 2nd byte matches RTACTION_* code */
+static const char tbl_verb[] = /* 2nd byte matches RTACTION_* code */
        "\006\001add\0"
        "\006\002del\0"
-/*     "\011\002delete\0" */
+/*     "\011\002delete\0" */
        "\010\002delete"                        /* Since last, we can save a byte. */
 ;