packages/lwip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not update cwnd when send dataack

Browse Source 
(cherry picked from commit d0e5d8cd5ed2c5d67821624ebcc1c2e5214d615f)
This commit is contained in:
kircher 2022-12-21 17:52:28 +08:00 committed by openeuler-sync-bot
parent afa594b990
commit 13bbeae356
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
0046-add-dataack-when-recv-too-many-acks-with-data.patch
View File

@ -1,16 +1,16 @@
From bf16309bdb9c2571e91d50cec7b379d93559d573 Mon Sep 17 00:00:00 2001 From 1aa27395a4c4b73b6db472c4ae75ed91637a11bf Mon Sep 17 00:00:00 2001
From: kircher <majun65@huawei.com> From: kircher <majun65@huawei.com>
Date: Tue, 20 Dec 2022 18:52:59 +0800 Date: Wed, 21 Dec 2022 17:50:50 +0800
Subject: [PATCH] add dataack when recv too many acks with data Subject: [PATCH] add dataack when recv too many acks with data
--- ---
src/core/tcp_in.c | 19 +++++++++++++++++++ src/core/tcp_in.c | 22 ++++++++++++++++++++++
src/include/lwip/tcp.h | 1 + src/include/lwip/tcp.h | 1 +
src/include/lwipopts.h | 2 ++ src/include/lwipopts.h | 2 ++
3 files changed, 22 insertions(+) 3 files changed, 25 insertions(+)
diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c
index 78954bd..dcd564b 100644 index 78954bd..35ec6d9 100644
--- a/src/core/tcp_in.c --- a/src/core/tcp_in.c
+++ b/src/core/tcp_in.c +++ b/src/core/tcp_in.c
@@ -1260,6 +1260,7 @@ tcp_receive(struct tcp_pcb *pcb) @@ -1260,6 +1260,7 @@ tcp_receive(struct tcp_pcb *pcb)
@ -21,7 +21,7 @@ index 78954bd..dcd564b 100644
LWIP_ASSERT("tcp_receive: invalid pcb", pcb != NULL); LWIP_ASSERT("tcp_receive: invalid pcb", pcb != NULL);
LWIP_ASSERT("tcp_receive: wrong state", pcb->state >= ESTABLISHED); LWIP_ASSERT("tcp_receive: wrong state", pcb->state >= ESTABLISHED);
@@ -1337,11 +1338,28 @@ tcp_receive(struct tcp_pcb *pcb) @@ -1337,11 +1338,31 @@ tcp_receive(struct tcp_pcb *pcb)
} }
} }
} }
@ -33,7 +33,10 @@ index 78954bd..dcd564b 100644
+ found_dataack = 1; + found_dataack = 1;
+ ++pcb->dataacks; + ++pcb->dataacks;
+ if (pcb->dataacks > MAX_DATA_ACK_NUM) { + if (pcb->dataacks > MAX_DATA_ACK_NUM) {
+ tcp_rexmit_fast(pcb); + if (tcp_rexmit(pcb) == ERR_OK) {
+ pcb->rtime = 0;
+ pcb->dataacks = 0;
+ }
+ } + }
+ } + }
+ } + }
@ -50,7 +53,7 @@ index 78954bd..dcd564b 100644
} else if (TCP_SEQ_BETWEEN(ackno, pcb->lastack + 1, pcb->snd_nxt)) { } else if (TCP_SEQ_BETWEEN(ackno, pcb->lastack + 1, pcb->snd_nxt)) {
/* We come here when the ACK acknowledges new data. */ /* We come here when the ACK acknowledges new data. */
tcpwnd_size_t acked; tcpwnd_size_t acked;
@@ -1367,6 +1385,7 @@ tcp_receive(struct tcp_pcb *pcb) @@ -1367,6 +1388,7 @@ tcp_receive(struct tcp_pcb *pcb)
/* Reset the fast retransmit variables. */ /* Reset the fast retransmit variables. */
pcb->dupacks = 0; pcb->dupacks = 0;
pcb->lastack = ackno; pcb->lastack = ackno;

5
lwip.spec
View File

@ -4,7 +4,7 @@
Summary: lwip is a small independent implementation of the TCP/IP protocol suite Summary: lwip is a small independent implementation of the TCP/IP protocol suite
Name: lwip Name: lwip
Version: 2.1.3 Version: 2.1.3
Release: 35 Release: 36
License: BSD License: BSD
URL: http://savannah.nongnu.org/projects/lwip/ URL: http://savannah.nongnu.org/projects/lwip/
Source0: http://download.savannah.nongnu.org/releases/lwip/%{name}-%{version}.zip Source0: http://download.savannah.nongnu.org/releases/lwip/%{name}-%{version}.zip
@ -135,6 +135,9 @@ cd %{_builddir}/%{name}-%{version}/src
%{_libdir}/liblwip.a %{_libdir}/liblwip.a
%changelog %changelog
* Wed Dec 21 2022 kircher<majun65@huawei.com> - 2.1.3-36
- do not update cwnd when send dataack
* Tue Dec 20 2022 kircher<majun65@huawei.com> - 2.1.3-35 * Tue Dec 20 2022 kircher<majun65@huawei.com> - 2.1.3-35
- fix the dataack is always lower than 256 - fix the dataack is always lower than 256