Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 12 Jul 2011 12:29:33 +0000 (UTC)
From:      Marko Zec <zec@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r223948 - in stable/8/sys: net netinet netinet6
Message-ID:  <201107121229.p6CCTXsX038849@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: zec
Date: Tue Jul 12 12:29:32 2011
New Revision: 223948
URL: http://svn.freebsd.org/changeset/base/223948

Log:
  MFC r223862:
    Permit ARP to proceed for IPv4 host routes for which the gateway is the
    same as the host address.  This already works fine for INET6 and ND6.
  
    While here, remove two function pointers from struct lltable which are
    only initialized but never used.

Modified:
  stable/8/sys/net/if_llatbl.h
  stable/8/sys/netinet/in.c
  stable/8/sys/netinet6/in6.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/net/if_llatbl.h
==============================================================================
--- stable/8/sys/net/if_llatbl.h	Tue Jul 12 11:47:08 2011	(r223947)
+++ stable/8/sys/net/if_llatbl.h	Tue Jul 12 12:29:32 2011	(r223948)
@@ -146,15 +146,12 @@ struct lltable {
 	int			llt_af;
 	struct ifnet		*llt_ifp;
 
-	struct llentry *	(*llt_new)(const struct sockaddr *, u_int);
 	void			(*llt_free)(struct lltable *, struct llentry *);
 	void			(*llt_prefix_free)(struct lltable *,
 				    const struct sockaddr *prefix,
 				    const struct sockaddr *mask);
 	struct llentry *	(*llt_lookup)(struct lltable *, u_int flags,
 				    const struct sockaddr *l3addr);
-	int			(*llt_rtcheck)(struct ifnet *, u_int flags,
-				    const struct sockaddr *);
 	int			(*llt_dump)(struct lltable *,
 				     struct sysctl_req *);
 };

Modified: stable/8/sys/netinet/in.c
==============================================================================
--- stable/8/sys/netinet/in.c	Tue Jul 12 11:47:08 2011	(r223947)
+++ stable/8/sys/netinet/in.c	Tue Jul 12 12:29:32 2011	(r223948)
@@ -1399,6 +1399,18 @@ in_lltable_rtcheck(struct ifnet *ifp, u_
 
 	/* XXX rtalloc1 should take a const param */
 	rt = rtalloc1(__DECONST(struct sockaddr *, l3addr), 0, 0);
+
+	/*
+	 * If the gateway for an existing host route matches the target L3
+	 * address, allow for ARP to proceed.
+	 */
+	if (rt != NULL && (rt->rt_flags & (RTF_HOST|RTF_GATEWAY)) &&
+	    rt->rt_gateway->sa_family == AF_INET &&
+	    memcmp(rt->rt_gateway->sa_data, l3addr->sa_data, 4) == 0) {
+		RTFREE_LOCKED(rt);
+		return (0);
+	}
+
 	if (rt == NULL || (!(flags & LLE_PUB) &&
 			   ((rt->rt_flags & RTF_GATEWAY) || 
 			    (rt->rt_ifp != ifp)))) {
@@ -1581,10 +1593,8 @@ in_domifattach(struct ifnet *ifp)
 
 	llt = lltable_init(ifp, AF_INET);
 	if (llt != NULL) {
-		llt->llt_new = in_lltable_new;
 		llt->llt_free = in_lltable_free;
 		llt->llt_prefix_free = in_lltable_prefix_free;
-		llt->llt_rtcheck = in_lltable_rtcheck;
 		llt->llt_lookup = in_lltable_lookup;
 		llt->llt_dump = in_lltable_dump;
 	}

Modified: stable/8/sys/netinet6/in6.c
==============================================================================
--- stable/8/sys/netinet6/in6.c	Tue Jul 12 11:47:08 2011	(r223947)
+++ stable/8/sys/netinet6/in6.c	Tue Jul 12 12:29:32 2011	(r223948)
@@ -2581,10 +2581,8 @@ in6_domifattach(struct ifnet *ifp)
 	ext->scope6_id = scope6_ifattach(ifp);
 	ext->lltable = lltable_init(ifp, AF_INET6);
 	if (ext->lltable != NULL) {
-		ext->lltable->llt_new = in6_lltable_new;
 		ext->lltable->llt_free = in6_lltable_free;
 		ext->lltable->llt_prefix_free = in6_lltable_prefix_free;
-		ext->lltable->llt_rtcheck = in6_lltable_rtcheck;
 		ext->lltable->llt_lookup = in6_lltable_lookup;
 		ext->lltable->llt_dump = in6_lltable_dump;
 	}

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107121229.p6CCTXsX038849>