- set the scope properly. Thanks to Jean Wolter, who wrote:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Wed, 11 Apr 2007 16:23:57 +0000 (16:23 -0000)
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Wed, 11 Apr 2007 16:23:57 +0000 (16:23 -0000)
busybox ip and the original ip utility behave differently when setting
the following route (verified with ip route show using the original ip
utility):

   ip route add 10.0.0.138 dev eth0

Result for busybox ip:

       # ip route add 10.0.0.138 dev eth0
       # /usr/local/bin/ip route show
       10.0.0.138 dev eth0

Result for ip:

       # /usr/local/bin/ip route add 10.0.0.138 dev eth0
       #  /usr/local/bin/ip route show
       10.0.0.138 dev eth0  scope link

A following "ip route add default via 10.0.0.138" fails for busybox
ip, since the kernel can not find a route to 10.0.0.138 (it replies
with Network is unreachable).

The reasons seems to be that the original ip utility explicitly sets
the scope after parsing all parameters. This is missing in busybox,
the attached patch fixes this. I took this from the original iproute
sources and removed some variables, which are not needed for busybox.

networking/libiproute/iproute.c

index bb0bfaed1fee4ba60a662eb5de7e1a283aa27e22..a19586c912c7a55927bc77714056a2c7b368ef4f 100644 (file)
@@ -434,6 +434,18 @@ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
                }
                addattr_l(&req.n, sizeof(req), RTA_METRICS, RTA_DATA(mxrta), RTA_PAYLOAD(mxrta));
        }
+       if (req.r.rtm_type == RTN_LOCAL || req.r.rtm_type == RTN_NAT)
+               req.r.rtm_scope = RT_SCOPE_HOST;
+       else if (req.r.rtm_type == RTN_BROADCAST ||
+                       req.r.rtm_type == RTN_MULTICAST ||
+                       req.r.rtm_type == RTN_ANYCAST)
+               req.r.rtm_scope = RT_SCOPE_LINK;
+       else if (req.r.rtm_type == RTN_UNICAST || req.r.rtm_type == RTN_UNSPEC) {
+               if (cmd == RTM_DELROUTE)
+                       req.r.rtm_scope = RT_SCOPE_NOWHERE;
+               else if (!gw_ok)
+                       req.r.rtm_scope = RT_SCOPE_LINK;
+       }
 
        if (req.r.rtm_family == AF_UNSPEC) {
                req.r.rtm_family = AF_INET;