d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't add host routes for interface addresses of 0.0.0.0/8 -> 0.255.255.255.

Browse Source 
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
This commit is contained in:
brian 2002-04-10 01:42:32 +00:00
parent 6b69929c14
commit 84770128bf
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/netinet/in.c
View File

@ -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 */