Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

net/tcp/tcp_send.c: Fix RST packet with wrong ack number.

Browse Source
This commit is contained in:
biantao
2019-08-26 10:16:43 -06:00
committed by Gregory Nutt
parent 9fc5db7b39
commit f1c46b4498
1 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/tcp/tcp_send.c
+43 -11
View File
@@ -1,7 +1,7 @@
/****************************************************************************
* net/tcp/tcp_send.c
*
* Copyright (C) 2007-2010, 2012, 2015, 2018 Gregory Nutt. All rights
* Copyright (C) 2007-2010, 2012, 2015, 2018-2019 Gregory Nutt. All rights
* reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
@@ -428,8 +428,20 @@ void tcp_send(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
void tcp_reset(FAR struct net_driver_s *dev)
{
FAR struct tcp_hdr_s *tcp = tcp_header(dev);
uint32_t ackno;
uint16_t tmp16;
uint16_t acklen = 0;
uint8_t seqbyte;
uint8_t domain;
#if defined(CONFIG_NET_IPv4) && defined(CONFIG_NET_IPv6)
bool ipv6 = IFF_IS_IPv6(dev->d_flags);
domain = ipv6 ? PF_INET6 : PF_INET;
#elif defined(CONFIG_NET_IPv4)
domain = PF_INET;
#else /* defined(CONFIG_NET_IPv6) */
domain = PF_INET6;
#endif
#ifdef CONFIG_NET_STATISTICS
g_netstats.tcp.rst++;
@@ -437,6 +449,33 @@ void tcp_reset(FAR struct net_driver_s *dev)
/* TCP setup */
if ((tcp->flags & TCP_SYN) != 0 || (tcp->flags & TCP_FIN) != 0)
{
acklen++;
}
#ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NET_IPv4
if (ipv6)
#endif
{
FAR struct ipv6_hdr_s *ip = IPv6BUF;
acklen += (ip->len[0] << 8 | ip->len[1]);
}
#endif /* CONFIG_NET_IPv6 */
#ifdef CONFIG_NET_IPv4
#ifdef CONFIG_NET_IPv6
else
#endif
{
FAR struct ipv4_hdr_s *ip = IPv4BUF;
acklen += (ip->len[0] << 8) + ip->len[1] - (ip->vhl & 0x0f) * 4;
}
#endif /* CONFIG_NET_IPv4 */
acklen -= (tcp->tcpoffset >> 4) << 2;
tcp->flags = TCP_RST | TCP_ACK;
tcp->tcpoffset = 5 << 4;
@@ -463,16 +502,9 @@ void tcp_reset(FAR struct net_driver_s *dev)
* to propagate the carry to the other bytes as well.
*/
if (++(tcp->ackno[3]) == 0)
{
if (++(tcp->ackno[2]) == 0)
{
if (++(tcp->ackno[1]) == 0)
{
++(tcp->ackno[0]);
}
}
}
ackno = tcp_addsequence(tcp->ackno, acklen);
tcp_setsequence(tcp->ackno, ackno);
/* Swap port numbers. */