d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the bug that IPv4 ttl is not initialized when AF_INET6 socket is used

Browse Source 
for IPv4 communication.(IPv4 mapped IPv6 addr.)
Also removed IPv6 hoplimit initialization because it is alway done at
tcp_output.

Confirmed by: Bernd Walter <ticso@cicely5.cicely.de>
This commit is contained in:
shin 2000-01-25 01:05:18 +00:00
parent 1a88679ae1
commit 3dd6ac3283
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/netinet/tcp_subr.c
View File

@ -517,14 +517,11 @@ tcp_newtcpcb(inp)
tp->snd_cwnd = TCP_MAXWIN << TCP_MAX_WINSHIFT;
tp->snd_ssthresh = TCP_MAXWIN << TCP_MAX_WINSHIFT;
tp->t_rcvtime = ticks;
#ifdef INET6
if (isipv6 != 0)
inp->in6p_ip6_hlim = in6_selecthlim(inp,
inp->in6p_route.ro_rt ?
inp->in6p_route.ro_rt->rt_ifp :
NULL);
else
#endif
/*
* IPv4 TTL initialization is necessary for an IPv6 socket as well,
* because the socket may be bound to an IPv6 wildcard address,
* which may match an IPv4-mapped IPv6 address.
*/
inp->inp_ip_ttl = ip_defttl;
inp->inp_ppcb = (caddr_t)tp;
return (tp); /* XXX */

13
sys/netinet/tcp_timewait.c
View File

@ -517,14 +517,11 @@ tcp_newtcpcb(inp)
tp->snd_cwnd = TCP_MAXWIN << TCP_MAX_WINSHIFT;
tp->snd_ssthresh = TCP_MAXWIN << TCP_MAX_WINSHIFT;
tp->t_rcvtime = ticks;
#ifdef INET6
if (isipv6 != 0)
inp->in6p_ip6_hlim = in6_selecthlim(inp,
inp->in6p_route.ro_rt ?
inp->in6p_route.ro_rt->rt_ifp :
NULL);
else
#endif
/*
* IPv4 TTL initialization is necessary for an IPv6 socket as well,
* because the socket may be bound to an IPv6 wildcard address,
* which may match an IPv4-mapped IPv6 address.
*/
inp->inp_ip_ttl = ip_defttl;
inp->inp_ppcb = (caddr_t)tp;
return (tp); /* XXX */