Remove code for protocols we don't properly support. (Most of this could

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

diff --git a/networking/route.c b/networking/route.c
index 49d219ae096d4eb2155fe49fb897ad853dd01920..e7e8f1c020ad6776823be7d4b6f2e9b1b9e14f22 100644 (file)
--- a/networking/route.c
+++ b/networking/route.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* route
  *
  * Similar to the standard Unix route, but with only the necessary
@@ -9,11 +10,7 @@
  *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
  *              (derived from FvK's 'route.c     1.70    01/04/94')
  *
- * This program is free software; you can redistribute it
- * and/or  modify it under  the terms of  the GNU General
- * Public  License as  published  by  the  Free  Software
- * Foundation;  either  version 2 of the License, or  (at
- * your option) any later version.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
  * $Id: route.c,v 1.26 2004/03/19 23:27:08 mjn3 Exp $
  *
@@ -166,7 +163,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 +181,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,
                                                         (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 +217,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];
@@ -321,9 +335,7 @@ static void INET_setroute(int action, char **args)
        }
 
        /* Create a socket to the INET kernel. */
-       if ((skfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-               bb_perror_msg_and_die("socket");
-       }
+       skfd = bb_xsocket(AF_INET, SOCK_DGRAM, 0);
 
        if (ioctl(skfd, ((action==RTACTION_ADD) ? SIOCADDRT : SIOCDELRT), &rt)<0) {
                bb_perror_msg_and_die("SIOC[ADD|DEL]RT");
@@ -417,9 +429,7 @@ static void INET6_setroute(int action, char **args)
        }
 
        /* Create a socket to the INET6 kernel. */
-       if ((skfd = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
-               bb_perror_msg_and_die("socket");
-       }
+       skfd = bb_xsocket(AF_INET6, SOCK_DGRAM, 0);
 
        rt.rtmsg_ifindex = 0;