Re: cvs commit: src/etc/mtree BSD.include.dist src/include Makefile src/sbin/ipfw ipfw.8 ipfw.c ipfw2.c src/share/man/man4 Makefile oldbridge.4 src/sys/conf files options src/sys/dev/agp Makefile src/sys/dev/crypto/hifn Makefile src/sys/dev/crypto/ubsec Makefile ...

["Simon 'corecode' Schubert" <corecode@xxxxxxxxxxxx>]

YONETANI Tomokazu wrote:
> On Sun, Jun 25, 2006 at 04:02:40AM -0700, Simon Schubert wrote:
> > http://www.dragonflybsd.org/cvsweb/src/sys/netinet/if_ether.c.diff?r1=1.32&r2=1.33&f=u
>
> Simon, are you sure about this change?  after this commit, ARP replies
> for alias addresses are lost for non-bridge case.  This part has already
> gone into R1.6 branch.

can you try attached patch?

cheers
 simon

--
Serve - BSD     +++  RENT this banner advert  +++    ASCII Ribbon   /"\
Work - Mac      +++  space for low €€€ NOW!1  +++      Campaign     \ /
Party Enjoy Relax   |   http://dragonflybsd.org      Against  HTML   \
Dude 2c 2 the max   !   http://golden-apple.biz       Mail + News   / \

Index: sys/netinet/if_ether.c
===================================================================
RCS file: /home/dcvs/src/sys/netinet/if_ether.c,v
retrieving revision 1.33
diff -u -r1.33 if_ether.c
--- sys/netinet/if_ether.c	25 Jun 2006 11:02:40 -0000	1.33
+++ sys/netinet/if_ether.c	20 Jul 2006 14:25:00 -0000
@@ -768,37 +768,56 @@
 	memcpy(&isaddr, ar_spa(ah), sizeof isaddr);
 	memcpy(&itaddr, ar_tpa(ah), sizeof itaddr);
 	/*
-	 * For a bridge, we want to check the address irrespective
-	 * of the receive interface. (This will change slightly
-	 * when we have clusters of interfaces).
+	 * Check both target and sender IP addresses:
+	 *
+	 * If we receive the packet on the interface owning the address,
+	 * then accept the address.
+	 *
+	 * For a bridge, we accept the address if the receive interface and
+	 * the interface owning the address are on the same bridge.
+	 * (This will change slightly when we have clusters of interfaces).
 	 */
 	LIST_FOREACH(ia, INADDR_HASH(itaddr.s_addr), ia_hash) {
+		/* Skip all ia's which don't match */
+		if (itaddr.s_addr != ia->ia_addr.sin_addr.s_addr)
+			continue;
+
+		if (ia->ia_ifp == ifp)
+			goto match;
+
 		if (ifp->if_bridge && ia->ia_ifp && 
-		    ifp->if_bridge == ia->ia_ifp->if_bridge &&
-		    itaddr.s_addr == ia->ia_addr.sin_addr.s_addr) {
+		    ifp->if_bridge == ia->ia_ifp->if_bridge)
 			goto match;
-		}
 	}
 	LIST_FOREACH(ia, INADDR_HASH(isaddr.s_addr), ia_hash) {
+		/* Skip all ia's which don't match */
+		if (isaddr.s_addr != ia->ia_addr.sin_addr.s_addr)
+			continue;
+
+		if (ia->ia_ifp == ifp)
+			goto match;
+
 		if (ifp->if_bridge && ia->ia_ifp &&
-		    ifp->if_bridge == ia->ia_ifp->if_bridge &&
-		    isaddr.s_addr == ia->ia_addr.sin_addr.s_addr) {
+		    ifp->if_bridge == ia->ia_ifp->if_bridge)
 			goto match;
-		}
 	}
 	/*
 	 * No match, use the first inet address on the receive interface
 	 * as a dummy address for the rest of the function.
 	 */
-	TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link)
+	TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
 		if (ifa->ifa_addr && ifa->ifa_addr->sa_family == AF_INET) {
 			ia = ifatoia(ifa);
 			goto match;
 		}
-	if ((ia = TAILQ_FIRST(&in_ifaddrhead)) == NULL) {
-		m_freem(m);
-		return;
 	}
+	/*
+	 * If we got here, we didn't find any suitable interface,
+	 * so drop the packet.
+	 */
+	m_freem(m);
+	return;
+
 match:
 	myaddr = ia->ia_addr.sin_addr;
 	if (!bcmp(ar_sha(ah), IF_LLADDR(ifp), ifp->if_addrlen)) {

Attachment: signature.asc
Description: OpenPGP digital signature