diff options
| author | ume <ume@FreeBSD.org> | 2002-07-25 18:10:04 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2002-07-25 18:10:04 +0000 |
| commit | 3428bc649e49662b8d682412bc1b948204561db8 (patch) | |
| tree | f0a83789724928fd1b6e6ccc61116071e83e7a38 /sys/netinet/tcp_usrreq.c | |
| parent | 01cbae63566b001fc97e0370d7938e00f3b0668d (diff) | |
| download | FreeBSD-src-3428bc649e49662b8d682412bc1b948204561db8.zip FreeBSD-src-3428bc649e49662b8d682412bc1b948204561db8.tar.gz | |
make setsockopt(IPV6_V6ONLY, 0) actuall work for tcp6.
MFC after: 1 week
Diffstat (limited to 'sys/netinet/tcp_usrreq.c')
| -rw-r--r-- | sys/netinet/tcp_usrreq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 286fd7f..9dc5663 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -280,7 +280,7 @@ tcp6_usr_bind(struct socket *so, struct sockaddr *nam, struct thread *td) } inp->inp_vflag &= ~INP_IPV4; inp->inp_vflag |= INP_IPV6; - if (!ip6_v6only && (inp->inp_flags & IN6P_IPV6_V6ONLY) == 0) { + if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0) { if (IN6_IS_ADDR_UNSPECIFIED(&sin6p->sin6_addr)) inp->inp_vflag |= INP_IPV4; else if (IN6_IS_ADDR_V4MAPPED(&sin6p->sin6_addr)) { @@ -333,7 +333,7 @@ tcp6_usr_listen(struct socket *so, struct thread *td) COMMON_START(); if (inp->inp_lport == 0) { inp->inp_vflag &= ~INP_IPV4; - if (!ip6_v6only && (inp->inp_flags & IN6P_IPV6_V6ONLY) == 0) + if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0) inp->inp_vflag |= INP_IPV4; error = in6_pcbbind(inp, (struct sockaddr *)0, td); } @@ -407,7 +407,7 @@ tcp6_usr_connect(struct socket *so, struct sockaddr *nam, struct thread *td) if (IN6_IS_ADDR_V4MAPPED(&sin6p->sin6_addr)) { struct sockaddr_in sin; - if (ip6_v6only || (inp->inp_flags & IN6P_IPV6_V6ONLY)) + if ((inp->inp_flags & IN6P_IPV6_V6ONLY) != 0) return(EINVAL); in6_sin6_2_sin(&sin, sin6p); |
