michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: tcp: Remove the 'goto next_state' in tcp_in()

Browse source 
Each incoming TCP packet has been completely handled in current
state. No need to do further process by 'goto next_state'.

Signed-off-by: Shrek Wang <inet_eman@outlook.com>
This commit is contained in:
Shrek Wang 2025-05-06 20:29:13 +08:00 • committed by Benjamin Cabé
commit e59fb26db8
1 changed files with 8 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

33
subsys/net/ip/tcp.c
View file

@ -2921,7 +2921,6 @@ static enum net_verdict tcp_in(struct tcp *conn, struct net_pkt *pkt)
} }
} }
next_state:
len = pkt ? tcp_data_len(pkt) : 0; len = pkt ? tcp_data_len(pkt) : 0;
switch (conn->state) { switch (conn->state) {
@ -3091,8 +3090,6 @@ next_state:
case TCP_ESTABLISHED: case TCP_ESTABLISHED:
/* full-close */ /* full-close */
if (th && FL(&fl, &, FIN, th_seq(th) == conn->ack)) { if (th && FL(&fl, &, FIN, th_seq(th) == conn->ack)) {
bool acked = false;
if (len) { if (len) {
verdict = tcp_data_get(conn, pkt, &len); verdict = tcp_data_get(conn, pkt, &len);
if (verdict == NET_OK) { if (verdict == NET_OK) {
@ -3106,25 +3103,16 @@ next_state:
conn_ack(conn, + len + 1); conn_ack(conn, + len + 1);
keep_alive_timer_stop(conn); keep_alive_timer_stop(conn);
if (FL(&fl, &, ACK)) { if (FL(&fl, &, ACK) && (net_tcp_seq_cmp(th_ack(th), conn->seq) > 0)) {
acked = true; uint32_t len_acked = th_ack(th) - conn->seq;
if (net_tcp_seq_cmp(th_ack(th), conn->seq) > 0) { conn_seq(conn, len_acked);
uint32_t len_acked = th_ack(th) - conn->seq;
conn_seq(conn, + len_acked);
}
} }
if (acked) { tcp_out(conn, FIN | ACK);
tcp_out(conn, FIN | ACK); conn_seq(conn, 1);
conn_seq(conn, + 1); tcp_setup_last_ack_timer(conn);
tcp_setup_last_ack_timer(conn); next = TCP_LAST_ACK;
next = TCP_LAST_ACK;
} else {
tcp_out(conn, ACK);
next = TCP_CLOSE_WAIT;
}
break; break;
} }
@ -3316,10 +3304,7 @@ next_state:
break; break;
case TCP_CLOSE_WAIT: case TCP_CLOSE_WAIT:
tcp_out(conn, FIN | ACK); /* Half-close is not supported, so do nothing here */
conn_seq(conn, + 1);
next = TCP_LAST_ACK;
tcp_setup_last_ack_timer(conn);
break; break;
case TCP_LAST_ACK: case TCP_LAST_ACK:
if (th && FL(&fl, ==, ACK, th_ack(th) == conn->seq)) { if (th && FL(&fl, ==, ACK, th_ack(th) == conn->seq)) {
@ -3586,8 +3571,6 @@ out:
k_sem_give(&conn->connect_sem); k_sem_give(&conn->connect_sem);
} }
goto next_state;
} }
if (conn->context) { if (conn->context) {