diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-04-11 16:23:57 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-04-11 16:23:57 +0000 |
| commit | 12c96a64a4b7ab75cb0e4a7dfde8960c4391b2a8 (patch) | |
| tree | 821458424798193ed98a8884d5448a895920bff8 | |
| parent | 0d058361e722757af84fefdf1b1b8eac7ba53fc0 (diff) | |
| download | busybox-12c96a64a4b7ab75cb0e4a7dfde8960c4391b2a8.tar.gz | |
- set the scope properly. Thanks to Jean Wolter, who wrote:
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.
| -rw-r--r-- | networking/libiproute/iproute.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c index bb0bfaed1..a19586c91 100644 --- a/networking/libiproute/iproute.c +++ b/networking/libiproute/iproute.c @@ -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; |