From bfb26eecfbac45cfcd8a5442a3c35b39dd8bfe41 Mon Sep 17 00:00:00 2001 From: Gleb Smirnoff Date: Sat, 22 Oct 2005 14:50:27 +0000 Subject: [PATCH] In in_addprefix() compare not only route addresses, but their masks, too. This fixes problem when connected prefixes overlap. Obtained from: OpenBSD (rev. 1.40 by claudio); [ I came to this fix myself, and then found out that OpenBSD had already fixed it the same way.] --- sys/netinet/in.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 84052a3913e..4d902eab8eb 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -794,7 +794,7 @@ in_addprefix(target, flags) int flags; { struct in_ifaddr *ia; - struct in_addr prefix, mask, p; + struct in_addr prefix, mask, p, m; int error; if ((flags & RTF_HOST) != 0) @@ -806,15 +806,20 @@ in_addprefix(target, flags) } TAILQ_FOREACH(ia, &in_ifaddrhead, ia_link) { - if (rtinitflags(ia)) - p = ia->ia_dstaddr.sin_addr; - else { + if (rtinitflags(ia)) { p = ia->ia_addr.sin_addr; - p.s_addr &= ia->ia_sockmask.sin_addr.s_addr; - } - if (prefix.s_addr != p.s_addr) - continue; + if (prefix.s_addr != p.s_addr) + continue; + } else { + p = ia->ia_addr.sin_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 we got a matching prefix route inserted by other