diff options
| author | mtm <mtm@FreeBSD.org> | 2007-10-29 00:08:24 +0000 |
|---|---|---|
| committer | mtm <mtm@FreeBSD.org> | 2007-10-29 00:08:24 +0000 |
| commit | 13c20f2c7d06b16936b3c933c7e11925205f0ba5 (patch) | |
| tree | e79ca45908968e5e2f88cc6c5b1c3744273c44e4 /sbin | |
| parent | 5d7e7a3ea72c8aeea39f3ea1d0d09db27de48ca3 (diff) | |
| download | FreeBSD-src-13c20f2c7d06b16936b3c933c7e11925205f0ba5.zip FreeBSD-src-13c20f2c7d06b16936b3c933c7e11925205f0ba5.tar.gz | |
Fix an error in bit shifting logic for network addresses. The route
command would add incorrect routing entries if network numbers weren't
fully "spelled" out according to their class. For example:
# route add 128.0/16 (works)
# route add 128/16 (doesn't work)
# route add 193.0.0/24 (works)
# route add 193/24 (doesn't work)
Also, rework the way a netmask is deduced from network number if
it [netmask] is not specified.
Submitted by: Nuno Antunes <nuno.antunes@gmail.com> (mostly)
MFC after: 1 week
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/route/route.c | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/sbin/route/route.c b/sbin/route/route.c index 2edea13..063366a 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -799,28 +799,32 @@ inet_makenetandmask(net, sin, bits) rtm_addrs |= RTA_NETMASK; if (net == 0) mask = addr = 0; - else if (net < 128) { - addr = net << IN_CLASSA_NSHIFT; - mask = IN_CLASSA_NET; - } else if (net < 65536) { - addr = net << IN_CLASSB_NSHIFT; - mask = IN_CLASSB_NET; - } else if (net < 16777216L) { - addr = net << IN_CLASSC_NSHIFT; - mask = IN_CLASSC_NET; - } else { - addr = net; - if ((addr & IN_CLASSA_HOST) == 0) - mask = IN_CLASSA_NET; - else if ((addr & IN_CLASSB_HOST) == 0) - mask = IN_CLASSB_NET; - else if ((addr & IN_CLASSC_HOST) == 0) - mask = IN_CLASSC_NET; + else { + if (net <= 0xff) + addr = net << IN_CLASSA_NSHIFT; + else if (net <= 0xffff) + addr = net << IN_CLASSB_NSHIFT; + else if (net <= 0xffffff) + addr = net << IN_CLASSC_NSHIFT; else - mask = -1; + addr = net; + + if (bits != 0) + mask = 0xffffffff << (32 - bits); + else { + if (IN_CLASSA(addr)) + mask = IN_CLASSA_NET; + else if (IN_CLASSB(addr)) + mask = IN_CLASSB_NET; + else if (IN_CLASSC(addr)) + mask = IN_CLASSC_NET; + else if (IN_MULTICAST(addr)) + mask = IN_CLASSD_NET; + else + mask = 0xffffffff; + } + addr &= mask; } - if (bits) - mask = 0xffffffff << (32 - bits); sin->sin_addr.s_addr = htonl(addr); sin = &so_mask.sin; sin->sin_addr.s_addr = htonl(mask); |
