svn commit: r185918 - in projects/arpv2_merge_1/sys: contrib/pf/net netgraph/netflow netinet

[Kip Macy]

Author: kmacy
Date: Thu Dec 11 07:39:06 2008
New Revision: 185918
URL: http://svn.freebsd.org/changeset/base/185918

Log:
  remove references to RTF_CLONING from modules

Modified:
  projects/arpv2_merge_1/sys/contrib/pf/net/pf.c
  projects/arpv2_merge_1/sys/netgraph/netflow/netflow.c
  projects/arpv2_merge_1/sys/netinet/if_atm.c
  projects/arpv2_merge_1/sys/netinet/ip_fw2.c

Modified: projects/arpv2_merge_1/sys/contrib/pf/net/pf.c
==============================================================================
--- projects/arpv2_merge_1/sys/contrib/pf/net/pf.c	Thu Dec 11 07:02:30 2008	(r185917)
+++ projects/arpv2_merge_1/sys/contrib/pf/net/pf.c	Thu Dec 11 07:39:06 2008	(r185918)
@@ -3162,7 +3162,7 @@ pf_calc_mss(struct pf_addr *addr, sa_fam
 #ifdef RTF_PRCLONING
 		rtalloc_ign(&ro, (RTF_CLONING | RTF_PRCLONING));
 #else /* !RTF_PRCLONING */
-		in_rtalloc_ign(&ro, RTF_CLONING, 0);
+		in_rtalloc_ign(&ro, 0, 0);
 #endif
 #else /* ! __FreeBSD__ */
 		rtalloc_noclone(&ro, NO_CLONING);
@@ -3183,7 +3183,7 @@ pf_calc_mss(struct pf_addr *addr, sa_fam
 		rtalloc_ign((struct route *)&ro6,
 		    (RTF_CLONING | RTF_PRCLONING));
 #else /* !RTF_PRCLONING */
-		rtalloc_ign((struct route *)&ro6, RTF_CLONING);
+		rtalloc_ign((struct route *)&ro6, 0);
 #endif
 #else /* ! __FreeBSD__ */
 		rtalloc_noclone((struct route *)&ro6, NO_CLONING);
@@ -5986,9 +5986,9 @@ pf_routable(struct pf_addr *addr, sa_fam
 #ifdef __FreeBSD__
 /* XXX MRT not always INET */ /* stick with table 0 though */
 	if (af == AF_INET)
-		in_rtalloc_ign((struct route *)&ro, RTF_CLONING, 0);
+		in_rtalloc_ign((struct route *)&ro, 0, 0);
 	else
-		rtalloc_ign((struct route *)&ro, RTF_CLONING);
+		rtalloc_ign((struct route *)&ro, 0);
 #else /* ! __FreeBSD__ */
 	rtalloc_noclone((struct route *)&ro, NO_CLONING);
 #endif
@@ -6068,9 +6068,9 @@ pf_rtlabel_match(struct pf_addr *addr, s
 	rtalloc_ign((struct route *)&ro, (RTF_CLONING|RTF_PRCLONING));
 # else /* !RTF_PRCLONING */
 	if (af == AF_INET)
-		in_rtalloc_ign((struct route *)&ro, RTF_CLONING, 0);
+		in_rtalloc_ign((struct route *)&ro, 0, 0);
 	else
-		rtalloc_ign((struct route *)&ro, RTF_CLONING);
+		rtalloc_ign((struct route *)&ro, 0);
 # endif
 #else /* ! __FreeBSD__ */
 	rtalloc_noclone((struct route *)&ro, NO_CLONING);

Modified: projects/arpv2_merge_1/sys/netgraph/netflow/netflow.c
==============================================================================
--- projects/arpv2_merge_1/sys/netgraph/netflow/netflow.c	Thu Dec 11 07:02:30 2008	(r185917)
+++ projects/arpv2_merge_1/sys/netgraph/netflow/netflow.c	Thu Dec 11 07:39:06 2008	(r185918)
@@ -270,7 +270,7 @@ hash_insert(priv_p priv, struct flow_has
 	sin.sin_family = AF_INET;
 	sin.sin_addr = fle->f.r.r_dst;
 	/* XXX MRT 0 as a default.. need the m here to get fib */
-	rt = rtalloc1_fib((struct sockaddr *)&sin, 0, RTF_CLONING, 0);
+	rt = rtalloc1_fib((struct sockaddr *)&sin, 0, 0, 0);
 	if (rt != NULL) {
 		fle->f.fle_o_ifx = rt->rt_ifp->if_index;
 
@@ -295,7 +295,7 @@ hash_insert(priv_p priv, struct flow_has
 	sin.sin_family = AF_INET;
 	sin.sin_addr = fle->f.r.r_src;
 	/* XXX MRT 0 as a default  revisit.  need the mbuf for fib*/
-	rt = rtalloc1_fib((struct sockaddr *)&sin, 0, RTF_CLONING, 0);
+	rt = rtalloc1_fib((struct sockaddr *)&sin, 0, 0, 0);
 	if (rt != NULL) {
 		if (rt_mask(rt))
 			fle->f.src_mask = bitcount32(((struct sockaddr_in *)

Modified: projects/arpv2_merge_1/sys/netinet/if_atm.c
==============================================================================
--- projects/arpv2_merge_1/sys/netinet/if_atm.c	Thu Dec 11 07:02:30 2008	(r185917)
+++ projects/arpv2_merge_1/sys/netinet/if_atm.c	Thu Dec 11 07:39:06 2008	(r185918)
@@ -127,10 +127,6 @@ atm_rtrequest(int req, struct rtentry *r
 			break;
 		}
 
-		if ((rt->rt_flags & RTF_CLONING) != 0) {
-			printf("atm_rtrequest: cloning route detected?\n");
-			break;
-		}
 		if (gate->sa_family != AF_LINK ||
 		    gate->sa_len < sizeof(null_sdl)) {
 			log(LOG_DEBUG, "atm_rtrequest: bad gateway value");

Modified: projects/arpv2_merge_1/sys/netinet/ip_fw2.c
==============================================================================
--- projects/arpv2_merge_1/sys/netinet/ip_fw2.c	Thu Dec 11 07:02:30 2008	(r185917)
+++ projects/arpv2_merge_1/sys/netinet/ip_fw2.c	Thu Dec 11 07:39:06 2008	(r185918)
@@ -511,7 +511,7 @@ verify_path(struct in_addr src, struct i
 	dst->sin_family = AF_INET;
 	dst->sin_len = sizeof(*dst);
 	dst->sin_addr = src;
-	in_rtalloc_ign(&ro, RTF_CLONING, fib);
+	in_rtalloc_ign(&ro, 0, fib);
 
 	if (ro.ro_rt == NULL)
 		return 0;
@@ -603,7 +603,7 @@ verify_path6(struct in6_addr *src, struc
 	dst->sin6_len = sizeof(*dst);
 	dst->sin6_addr = *src;
 	/* XXX MRT 0 for ipv6 at this time */
-	rtalloc_ign((struct route *)&ro, RTF_CLONING);
+	rtalloc_ign((struct route *)&ro, 0);
 
 	if (ro.ro_rt == NULL)
 		return 0;