diff --git a/0174-bugfix-Codedump-occurs-when-the-GAZELLE_TCP_REUSE_IP.patch b/0174-bugfix-Codedump-occurs-when-the-GAZELLE_TCP_REUSE_IP.patch new file mode 100644 index 0000000000000000000000000000000000000000..c896e641b7b37ac6559bcb0dfae7775c829bd527 --- /dev/null +++ b/0174-bugfix-Codedump-occurs-when-the-GAZELLE_TCP_REUSE_IP.patch @@ -0,0 +1,41 @@ +From 63ad56cdd63673506db317161b89b20b254fca8a Mon Sep 17 00:00:00 2001 +From: hankangkang +Date: Fri, 1 Nov 2024 15:22:52 +0800 +Subject: [PATCH] bugfix: Codedump occurs, when the GAZELLE_TCP_REUSE_IPPORT is + turned on and only monitors the v6 address. + +--- + src/core/tcp_in.c | 3 +++ + src/include/lwipopts.h | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c +index fa2a88b..2910c84 100644 +--- a/src/core/tcp_in.c ++++ b/src/core/tcp_in.c +@@ -405,6 +405,9 @@ tcp_input(struct pbuf *p, struct netif *inp) + if (IP_IS_ANY_TYPE_VAL(lpcb->local_ip)) { + /* found an ANY TYPE (IPv4/IPv6) match */ + #if SO_REUSE ++#if GAZELLE_TCP_REUSE_IPPORT ++ min_cnts_lpcb = min_cnts_lpcb_get(lpcb); ++#endif + lpcb_any = lpcb; + lpcb_prev = prev; + #else /* SO_REUSE */ +diff --git a/src/include/lwipopts.h b/src/include/lwipopts.h +index 4f89884..572d550 100644 +--- a/src/include/lwipopts.h ++++ b/src/include/lwipopts.h +@@ -259,7 +259,7 @@ + + #define LWIP_SO_SNDTIMEO 1 + +-#define LWIP_SO_LINGER 0 ++#define LWIP_SO_LINGER 1 + + #define LWIP_SO_RCVBUF 1 + +-- +2.33.0 + diff --git a/lwip.spec b/lwip.spec index 28b8865897e0710004d22d305845f9362b089dec..c86556ed57cfdbe1cc47b2dc1229cc00c9d9db24 100644 --- a/lwip.spec +++ b/lwip.spec @@ -4,7 +4,7 @@ Summary: lwip is a small independent implementation of the TCP/IP protocol suite Name: lwip Version: 2.2.0 -Release: 61 +Release: 62 License: BSD URL: http://savannah.nongnu.org/projects/lwip/ Source0: http://download.savannah.nongnu.org/releases/lwip/%{name}-%{version}.zip @@ -185,6 +185,7 @@ Patch9169: 0170-IPV6-Enable-IPV6_FRAG_COPYHEADER-macro-to-adapt-64bi.patch Patch9170: 0171-IPV6-fix-array-out-of-bounds-in-function-ip6_ntoa_r.patch Patch9171: 0172-IPV6-add-group-check-while-mld6-schedule-a-report.patch Patch9172: 0173-IGMP-fix-problem-that-can-not-join-the-sixteen-igmp-.patch +Patch9173: 0174-bugfix-Codedump-occurs-when-the-GAZELLE_TCP_REUSE_IP.patch BuildRequires: gcc-c++ dos2unix dpdk-devel @@ -214,6 +215,10 @@ cd %{_builddir}/%{name}-%{version}/src %{_libdir}/liblwip.a %changelog +* Fri Nov 1 2024 hankangkang - 2.2.0-62 +- When the GAZELLE_TCP_REUSE_IPPORT is on, min_cnts_lpcb is NULL +- Turn on the LWIP_SO-LINGER switch + * Fri Nov 1 2024 yinbin - 2.2.0-61 - IGMP: fix fix problem that can not join the sixteen igmp group