diff options
| author | ume <ume@FreeBSD.org> | 2002-07-25 17:40:45 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2002-07-25 17:40:45 +0000 |
| commit | e96d7f22052f9700c14e497313ce169decfeba90 (patch) | |
| tree | 7145dd896cf6ecc88290710ad88db0a06897a3bc /sys/netinet6 | |
| parent | bdf708d20aad82d19c4148d07378c73d30842f12 (diff) | |
| download | FreeBSD-src-e96d7f22052f9700c14e497313ce169decfeba90.zip FreeBSD-src-e96d7f22052f9700c14e497313ce169decfeba90.tar.gz | |
cleanup usage of ip6_mapped_addr_on and ip6_v6only. now,
ip6_mapped_addr_on is unified into ip6_v6only.
MFC after: 1 week
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/ip6_var.h | 1 | ||||
| -rw-r--r-- | sys/netinet6/udp6_usrreq.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index f226cc6..fdf709b 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -260,7 +260,6 @@ extern int ip6_gif_hlim; /* Hop limit for gif encap packet */ extern int ip6_use_deprecated; /* allow deprecated addr as source */ extern int ip6_rr_prune; /* router renumbering prefix * walk list every 5 sec. */ -#define ip6_mapped_addr_on (!ip6_v6only) extern int ip6_v6only; extern struct socket *ip6_mrouter; /* multicast routing daemon */ diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 8617d0d..c9fcbcb 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -538,7 +538,7 @@ udp6_attach(struct socket *so, int proto, struct thread *td) return error; inp = (struct inpcb *)so->so_pcb; inp->inp_vflag |= INP_IPV6; - if (ip6_mapped_addr_on) + if (!ip6_v6only) inp->inp_vflag |= INP_IPV4; inp->in6p_hops = -1; /* use kernel default */ inp->in6p_cksum = -1; /* just to be sure */ @@ -627,7 +627,7 @@ udp6_connect(struct socket *so, struct sockaddr *nam, struct thread *td) error = in6_pcbconnect(inp, nam, td); splx(s); if (error == 0) { - if (ip6_mapped_addr_on) { /* should be non mapped addr */ + if (!ip6_v6only) { /* should be non mapped addr */ inp->inp_vflag &= ~INP_IPV4; inp->inp_vflag |= INP_IPV6; } @@ -703,7 +703,7 @@ udp6_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, } } - if (ip6_mapped_addr_on) { + if (!ip6_v6only) { int hasv4addr; struct sockaddr_in6 *sin6 = 0; |
