diff options
| author | suz <suz@FreeBSD.org> | 2005-10-21 15:45:13 +0000 |
|---|---|---|
| committer | suz <suz@FreeBSD.org> | 2005-10-21 15:45:13 +0000 |
| commit | f77be35fb4f260b5352c3b4ba8ea484598268d2e (patch) | |
| tree | 914fea8539dfcbf0c84ac60312ed809343ca2a62 /sys/netinet6 | |
| parent | c5ecef48ae9ec7b50a627b90b9ac889010f35d9a (diff) | |
| download | FreeBSD-src-f77be35fb4f260b5352c3b4ba8ea484598268d2e.zip FreeBSD-src-f77be35fb4f260b5352c3b4ba8ea484598268d2e.tar.gz | |
sync with KAME (renamed a macro IPV6_DADOUTPUT to IPV6_UNSPECSRC)
Obtained from: KAME
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/ip6_output.c | 2 | ||||
| -rw-r--r-- | sys/netinet6/ip6_var.h | 2 | ||||
| -rw-r--r-- | sys/netinet6/nd6_nbr.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 5bdef30..193f877 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -525,7 +525,7 @@ skip_ipsec2:; /* Source address validation */ if (IN6_IS_ADDR_UNSPECIFIED(&ip6->ip6_src) && - (flags & IPV6_DADOUTPUT) == 0) { + (flags & IPV6_UNSPECSRC) == 0) { error = EOPNOTSUPP; ip6stat.ip6s_badscope++; goto bad; diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index f88f125..a0dfec3 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -276,7 +276,7 @@ struct ip6aux { #ifdef _KERNEL /* flags passed to ip6_output as last parameter */ -#define IPV6_DADOUTPUT 0x01 /* DAD */ +#define IPV6_UNSPECSRC 0x01 /* allow :: as the source address */ #define IPV6_FORWARDING 0x02 /* most of IPv6 header exists */ #define IPV6_MINMTU 0x04 /* use minimum MTU (IPV6_USE_MIN_MTU) */ diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index dc1de4e..f596c64 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -514,7 +514,7 @@ nd6_ns_output(ifp, daddr6, taddr6, ln, dad) nd_ns->nd_ns_cksum = in6_cksum(m, IPPROTO_ICMPV6, sizeof(*ip6), icmp6len); - ip6_output(m, NULL, &ro, dad ? IPV6_DADOUTPUT : 0, &im6o, NULL, NULL); + ip6_output(m, NULL, &ro, dad ? IPV6_UNSPECSRC : 0, &im6o, NULL, NULL); icmp6_ifstat_inc(ifp, ifs6_out_msg); icmp6_ifstat_inc(ifp, ifs6_out_neighborsolicit); icmp6stat.icp6s_outhist[ND_NEIGHBOR_SOLICIT]++; |
