60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
From 7dbceaeab7f85df6a58b77858c507fa9087d5ba7 Mon Sep 17 00:00:00 2001
|
|
From: jiangheng <jiangheng14@huawei.com>
|
|
Date: Mon, 22 Jan 2024 20:38:57 +0800
|
|
Subject: [PATCH] fix receive fin packet process error
|
|
|
|
---
|
|
src/core/tcp_in.c | 9 ---------
|
|
src/include/lwipsock.h | 1 +
|
|
2 files changed, 1 insertion(+), 9 deletions(-)
|
|
|
|
diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c
|
|
index 9d5a695..84d22ca 100644
|
|
--- a/src/core/tcp_in.c
|
|
+++ b/src/core/tcp_in.c
|
|
@@ -1142,9 +1142,6 @@ tcp_process(struct tcp_pcb *pcb)
|
|
if (recv_flags & TF_GOT_FIN) {
|
|
tcp_ack_now(pcb);
|
|
pcb->state = CLOSE_WAIT;
|
|
-#if GAZELLE_ENABLE
|
|
- API_EVENT(((struct netconn *)pcb->callback_arg), NETCONN_EVT_ERROR, 0);
|
|
-#endif
|
|
}
|
|
} else {
|
|
/* incorrect ACK number, send RST */
|
|
@@ -1163,9 +1160,6 @@ tcp_process(struct tcp_pcb *pcb)
|
|
if (recv_flags & TF_GOT_FIN) { /* passive close */
|
|
tcp_ack_now(pcb);
|
|
pcb->state = CLOSE_WAIT;
|
|
-#if GAZELLE_ENABLE
|
|
- API_EVENT(((struct netconn *)pcb->callback_arg), NETCONN_EVT_ERROR, 0);
|
|
-#endif
|
|
}
|
|
break;
|
|
case FIN_WAIT_1:
|
|
@@ -1820,9 +1814,6 @@ tcp_receive(struct tcp_pcb *pcb)
|
|
recv_flags |= TF_GOT_FIN;
|
|
if (pcb->state == ESTABLISHED) { /* force passive close or we can move to active close */
|
|
pcb->state = CLOSE_WAIT;
|
|
-#if GAZELLE_ENABLE
|
|
- API_EVENT(((struct netconn *)pcb->callback_arg), NETCONN_EVT_ERROR, 0);
|
|
-#endif
|
|
}
|
|
}
|
|
|
|
diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h
|
|
index ccc8c43..f4cb1de 100644
|
|
--- a/src/include/lwipsock.h
|
|
+++ b/src/include/lwipsock.h
|
|
@@ -120,7 +120,6 @@ struct lwip_sock {
|
|
char pad2 __rte_cache_aligned;
|
|
/* stack thread all use */
|
|
struct list_node recv_list;
|
|
- struct pbuf *send_lastdata;
|
|
struct pbuf *send_pre_del;
|
|
sem_t snd_ring_sem;
|
|
|
|
--
|
|
2.33.0
|
|
|