espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-06 09:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[tcp] send RST and clear send buffer on abort (#11269)

Browse Source 
This commit corrects the timing of Transmission Control Block (TCB)
re-initialization to ensure proper RST packet sending during TCP
connection aborts and to prevent potential issues due to incomplete
TCB cleanup.
This commit is contained in:
Yaoxing Shan
2025-04-22 15:07:45 -07:00
committed by GitHub
parent 283edc0bd5
commit 424de28a2f
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
third_party/tcplp/bsdtcp/tcp_subr.c
Vendored
+14 -1
View File
@@ -49,6 +49,8 @@
#include "tcp_const.h"
static void reinitialize_tcb(struct tcpcb* tp);
/*
* samkumar: This is rewritten to have the host network stack to generate the
* ISN with appropriate randomness.
@@ -145,6 +147,15 @@ void initialize_tcb(struct tcpcb* tp) {
tcp_sack_init(tp);
}
/* Re-initialize the TCB. */
static void reinitialize_tcb(struct tcpcb* tp)
{
uint32_t ntraversed;
lbuf_pop(&tp->sendbuf, lbuf_used_space(&tp->sendbuf), &ntraversed);
cbuf_pop(&tp->recvbuf, cbuf_used_space(&tp->recvbuf));
tp->accepted_from = NULL;
initialize_tcb(tp);
}
/*
* samkumar: Most of this function was no longer needed. It did things like
@@ -165,6 +176,8 @@ tcp_discardcb(struct tcpcb *tp)
CC_ALGO(tp)->cb_destroy(tp->ccv);
tcp_free_sackholes(tp);
reinitialize_tcb(tp);
}
@@ -352,7 +365,7 @@ struct tcpcb *
tcp_drop(struct tcpcb *tp, int errnum)
{
if (TCPS_HAVERCVDSYN(tp->t_state)) {
tcp_state_change(tp, TCPS_CLOSED);
tcp_state_change(tp, TCP6S_CLOSED);
(void) tcplp_output(tp);
}
if (errnum == ETIMEDOUT && tp->t_softerror)
third_party/tcplp/bsdtcp/tcp_usrreq.c
Vendored
+1 -1
View File
@@ -522,7 +522,7 @@ tcp_usr_abort(struct tcpcb* tp)
if (tp->t_state != TCP6S_TIME_WAIT &&
tp->t_state != TCP6S_CLOSED) {
tcp_drop(tp, ECONNABORTED);
} else if (tp->t_state == TCPS_TIME_WAIT) { // samkumar: I added this clause
} else if (tp->t_state == TCP6S_TIME_WAIT) { // samkumar: I added this clause
tp = tcp_close_tcb(tp);
tcplp_sys_connection_lost(tp, CONN_LOST_NORMAL);
}