diff options
| author | ume <ume@FreeBSD.org> | 2010-08-17 17:30:56 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2010-08-17 17:30:56 +0000 |
| commit | 30f327ba13db9022eb365fc23bdd7477a360a821 (patch) | |
| tree | c8961b7d014ab74bf450f7c5816e42882ee69f71 /sys/netinet6/raw_ip6.c | |
| parent | 6ed7860b674397db1944f1573e52975cea9a54ea (diff) | |
| download | FreeBSD-src-30f327ba13db9022eb365fc23bdd7477a360a821.zip FreeBSD-src-30f327ba13db9022eb365fc23bdd7477a360a821.tar.gz | |
Make `ping6 -I' work with net.inet6.ip6.use_defaultzone=1.
MFC after: 2 weeks
Diffstat (limited to 'sys/netinet6/raw_ip6.c')
| -rw-r--r-- | sys/netinet6/raw_ip6.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 0e18fb4..9365360 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -401,6 +401,7 @@ rip6_output(m, va_alist) struct ifnet *oifp = NULL; int type = 0, code = 0; /* for ICMPv6 output statistics only */ int scope_ambiguous = 0; + int use_defzone = 0; struct in6_addr in6a; va_list ap; @@ -430,9 +431,11 @@ rip6_output(m, va_alist) * XXX: we may still need to determine the zone later. */ if (!(so->so_state & SS_ISCONNECTED)) { - if (dstsock->sin6_scope_id == 0 && !V_ip6_use_defzone) + if (!optp->ip6po_pktinfo || !optp->ip6po_pktinfo->ipi6_ifindex) + use_defzone = V_ip6_use_defzone; + if (dstsock->sin6_scope_id == 0 && !use_defzone) scope_ambiguous = 1; - if ((error = sa6_embedscope(dstsock, V_ip6_use_defzone)) != 0) + if ((error = sa6_embedscope(dstsock, use_defzone)) != 0) goto bad; } |
