Date: Sun, 15 Mar 2009 08:05:55 GMT From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 159234 for review Message-ID: <200903150805.n2F85tgV064888@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=159234 Change 159234 by julian@julian_trafmon1 on 2009/03/15 08:05:02 hey presto.. compile! Affected files ... .. //depot/projects/vimage/src/sys/netinet/igmp.c#27 edit .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#20 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#53 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/igmp.c#27 (text+ko) ==== @@ -1132,10 +1132,12 @@ nsrc = ntohs(igmpv3->igmp_numsrc); +#if 0 /* MARKO, what is this? */ SLIST_INIT(&V_router_info_head); +#endif if (!IS_DEFAULT_VNET(curvnet)) - return; + return (retval); /* * Deal with group-specific queries upfront. ==== //depot/projects/vimage/src/sys/netinet/in_mcast.c#20 (text+ko) ==== @@ -209,8 +209,7 @@ return (ifp == NULL); } -static struct ifnet * - ip_multicast_if(struct in_addr *a); +static struct ifnet *ip_multicast_if(const struct in_addr *a); /* * Initialize an in_mfilter structure to a known state at t0, t1 @@ -1834,7 +1833,7 @@ ifp = NULL; if (!in_nullhost(ina)) { - ifp = ip_multicast_if(&mreqs.imr_interface); + ifp = ip_multicast_if(&ina); } else { struct route ro; @@ -2895,10 +2894,11 @@ #endif /* KTR */ RB_GENERATE(ip_msource_tree, ip_msource, ims_link, ip_msource_cmp); +/* * following RFC1724 section 3.3, 0.0.0.0/8 is interpreted as interface index. */ static struct ifnet * -ip_multicast_if(struct in_addr *a) +ip_multicast_if(const struct in_addr *a) { INIT_VNET_NET(curvnet); INIT_VNET_INET(curvnet); ==== //depot/projects/vimage/src/sys/netinet/vinet.h#53 (text+ko) ==== @@ -313,7 +313,7 @@ #define V_reply_src VNET_INET(reply_src) #define V_ripcb VNET_INET(ripcb) #define V_ripcbinfo VNET_INET(ripcbinfo) -#define V_router_info_head VNET_INET(router_info_head) +/* #define V_router_info_head VNET_INET(router_info_head) */ #define V_rsvp_on VNET_INET(rsvp_on) #define V_rtq_minreallyold VNET_INET(rtq_minreallyold) #define V_rtq_reallyold VNET_INET(rtq_reallyold)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903150805.n2F85tgV064888>