upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 08:43:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Belatedly catch up with r151555. in_scrubprefix() also needs this fix. We

Browse source 
should compare not only addresses, but their masks, too, when searching
for matching prefix.
This commit is contained in:
Gleb Smirnoff 2011-12-13 06:56:43 +00:00
parent 34415ac907
commit 55174c34ef
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sys/netinet/in.c
View file

@ -1072,7 +1072,7 @@ static int
in_scrubprefix(struct in_ifaddr *target, u_int flags)
{
struct in_ifaddr *ia;
struct in_addr prefix, mask, p;
struct in_addr prefix, mask, p, m;
int error = 0;
struct sockaddr_in prefix0, mask0;
@ -1118,9 +1118,10 @@ in_scrubprefix(struct in_ifaddr *target, u_int flags)
arp_ifscrub(target->ia_ifp, IA_SIN(target)->sin_addr.s_addr);
}
if (rtinitflags(target))
if (rtinitflags(target)) {
prefix = target->ia_dstaddr.sin_addr;
else {
mask.s_addr = 0;
} else {
prefix = target->ia_addr.sin_addr;
mask = target->ia_sockmask.sin_addr;
prefix.s_addr &= mask.s_addr;
@ -1133,15 +1134,22 @@ in_scrubprefix(struct in_ifaddr *target, u_int flags)
IN_IFADDR_RLOCK();
TAILQ_FOREACH(ia, &V_in_ifaddrhead, ia_link) {
if (rtinitflags(ia))
if (rtinitflags(ia)) {
p = ia->ia_dstaddr.sin_addr;
else {
if (prefix.s_addr != p.s_addr)
continue;
} else {
p = ia->ia_addr.sin_addr;
p.s_addr &= ia->ia_sockmask.sin_addr.s_addr;
m = ia->ia_sockmask.sin_addr;
p.s_addr &= m.s_addr;
if (prefix.s_addr != p.s_addr ||
mask.s_addr != m.s_addr)
continue;
}
if ((prefix.s_addr != p.s_addr) ||
!(ia->ia_ifp->if_flags & IFF_UP))
if ((ia->ia_ifp->if_flags & IFF_UP) == 0)
continue;
/*