Skip to content

tcp_input: remove tcp_callback(ABORT) when accept conn recv TCP_RESET #15380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Dec 31, 2024
Merged

tcp_input: remove tcp_callback(ABORT) when accept conn recv TCP_RESET #15380

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 2 additions & 36 deletions net/tcp/tcp_input.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,8 +901,6 @@ static void tcp_input(FAR struct net_driver_s *dev, uint8_t domain,

if ((tcp->flags & TCP_RST) != 0)
{
FAR struct tcp_conn_s *listener = NULL;

/* An RST received during the 3-way connection handshake requires
* little more clean-up.
*/
Expand All @@ -912,33 +910,6 @@ static void tcp_input(FAR struct net_driver_s *dev, uint8_t domain,
conn->tcpstateflags = TCP_CLOSED;
nwarn("WARNING: RESET in TCP_SYN_RCVD\n");

/* Notify the listener for the connection of the reset event */

#ifdef CONFIG_NET_IPv6
# ifdef CONFIG_NET_IPv4
if (domain == PF_INET6)
# endif
{
net_ipv6addr_copy(&uaddr.ipv6.laddr, IPv6BUF->destipaddr);
}
#endif

#ifdef CONFIG_NET_IPv4
# ifdef CONFIG_NET_IPv6
if (domain == PF_INET)
# endif
{
net_ipv4addr_copy(uaddr.ipv4.laddr,
net_ip4addr_conv32(IPv4BUF->destipaddr));
}
#endif

#if defined(CONFIG_NET_IPv4) && defined(CONFIG_NET_IPv6)
listener = tcp_findlistener(&uaddr, conn->lport, domain);
#else
listener = tcp_findlistener(&uaddr, conn->lport);
#endif

/* We must free this TCP connection structure; this connection
* will never be established. There should only be one reference
* on this connection when we allocated for the connection.
Expand All @@ -955,15 +926,10 @@ static void tcp_input(FAR struct net_driver_s *dev, uint8_t domain,

/* Notify this connection of the reset event */

listener = conn;
tcp_callback(dev, conn, TCP_ABORT);
}

/* Perform the TCP_ABORT callback and drop the packet */

if (listener != NULL)
{
tcp_callback(dev, listener, TCP_ABORT);
}
/* Drop the packet */

goto drop;
}
Expand Down
Loading