diff options
author | brian <brian@FreeBSD.org> | 2002-04-10 01:42:32 +0000 |
---|---|---|
committer | brian <brian@FreeBSD.org> | 2002-04-10 01:42:32 +0000 |
commit | 2eb3cb5ccab133455558a344fae48af5a2bac852 (patch) | |
tree | 1ae2dc8cd06704b7ea0fd8b82deea994972aca78 /sys | |
parent | 78e19df6f611d5facf38b583e4680cc30cd9346c (diff) | |
download | FreeBSD-src-2eb3cb5ccab133455558a344fae48af5a2bac852.zip FreeBSD-src-2eb3cb5ccab133455558a344fae48af5a2bac852.tar.gz |
Don't add host routes for interface addresses of 0.0.0.0/8 -> 0.255.255.255.
This change allows bootp to work with more than one interface, at the
expense of some rather ``wrong'' looking code. I plan to MFC this in
place of luigi's recent #ifdef BOOTP stuff that was committed to this
file in -stable, as that's slightly more wrong that this is.
Offered for review on: -arch, -net
MFC after: 2 weeks
Diffstat (limited to 'sys')
-rw-r--r-- | sys/netinet/in.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 6631f07..f4b9bff 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -661,7 +661,7 @@ in_ifinit(ifp, ia, sin, scrub) { register u_long i = ntohl(sin->sin_addr.s_addr); struct sockaddr_in oldaddr; - int s = splimp(), flags = RTF_UP, error; + int s = splimp(), flags = RTF_UP, error = 0; oldaddr = ia->ia_addr; ia->ia_addr = *sin; @@ -723,12 +723,24 @@ in_ifinit(ifp, ia, sin, scrub) return (0); flags |= RTF_HOST; } - if ((error = rtinit(&(ia->ia_ifa), (int)RTM_ADD, flags)) == 0) - ia->ia_flags |= IFA_ROUTE; - if (error != 0 && ia->ia_dstaddr.sin_family == AF_INET) { - ia->ia_addr = oldaddr; - return (error); + /*- + * Don't add host routes for interface addresses of + * 0.0.0.0 --> 0.255.255.255 netmask 255.0.0.0. This makes it + * possible to assign several such address pairs with consistent + * results (no host route) and is required by BOOTP. + * + * XXX: This is ugly ! There should be a way for the caller to + * say that they don't want a host route. + */ + if (ia->ia_addr.sin_addr.s_addr != INADDR_ANY || + ia->ia_netmask != IN_CLASSA_NET || + ia->ia_dstaddr.sin_addr.s_addr != htonl(IN_CLASSA_HOST)) { + if ((error = rtinit(&ia->ia_ifa, (int)RTM_ADD, flags)) != 0) { + ia->ia_addr = oldaddr; + return (error); + } + ia->ia_flags |= IFA_ROUTE; } /* XXX check if the subnet route points to the same interface */ |