Date: Thu, 20 Nov 2003 13:53:29 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 42839 for review Message-ID: <200311202153.hAKLrTAt005558@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=42839 Change 42839 by jhb@jhb_blue on 2003/11/20 13:52:50 IFC @42835. Affected files ... .. //depot/projects/power/sys/netinet6/raw_ip6.c#5 integrate Differences ... ==== //depot/projects/power/sys/netinet6/raw_ip6.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet6/raw_ip6.c,v 1.34 2003/11/18 00:39:05 rwatson Exp $ + * $FreeBSD: src/sys/netinet6/raw_ip6.c,v 1.35 2003/11/20 21:47:20 andre Exp $ */ /* @@ -424,15 +424,12 @@ * Source address selection. */ if ((in6a = in6_selectsrc(dstsock, in6p->in6p_outputopts, - in6p->in6p_moptions, &in6p->in6p_route, &in6p->in6p_laddr, - &error)) == 0) { + in6p->in6p_moptions, NULL, &in6p->in6p_laddr, &error)) == 0) { if (error == 0) error = EADDRNOTAVAIL; goto bad; } ip6->ip6_src = *in6a; - if (in6p->in6p_route.ro_rt) - oifp = ifnet_byindex(in6p->in6p_route.ro_rt->rt_ifp->if_index); ip6->ip6_flow = (ip6->ip6_flow & ~IPV6_FLOWINFO_MASK) | (in6p->in6p_flowinfo & IPV6_FLOWINFO_MASK); ip6->ip6_vfc = (ip6->ip6_vfc & ~IPV6_VERSION_MASK) | @@ -477,7 +474,7 @@ } #endif /*IPSEC*/ - error = ip6_output(m, in6p->in6p_outputopts, &in6p->in6p_route, 0, + error = ip6_output(m, in6p->in6p_outputopts, NULL, 0, in6p->in6p_moptions, &oifp, in6p); if (so->so_proto->pr_protocol == IPPROTO_ICMPV6) { if (oifp) @@ -691,7 +688,7 @@ #endif /* Source address selection. XXX: need pcblookup? */ in6a = in6_selectsrc(addr, inp->in6p_outputopts, - inp->in6p_moptions, &inp->in6p_route, + inp->in6p_moptions, NULL, &inp->in6p_laddr, &error); if (in6a == NULL) return (error ? error : EADDRNOTAVAIL);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311202153.hAKLrTAt005558>