From 729e3e8ed5993050d5bd0fc19cb90858c7fb682a Mon Sep 17 00:00:00 2001 From: yinbin Date: Fri, 1 Nov 2024 09:11:16 +0800 Subject: [PATCH] IGMP: fix problem that can not join the sixteen igmp group --- ...-that-can-not-join-the-sixteen-igmp-.patch | 29 +++++++++++++++++++ lwip.spec | 12 +++++--- 2 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 0173-IGMP-fix-problem-that-can-not-join-the-sixteen-igmp-.patch diff --git a/0173-IGMP-fix-problem-that-can-not-join-the-sixteen-igmp-.patch b/0173-IGMP-fix-problem-that-can-not-join-the-sixteen-igmp-.patch new file mode 100644 index 0000000..a249e7a --- /dev/null +++ b/0173-IGMP-fix-problem-that-can-not-join-the-sixteen-igmp-.patch @@ -0,0 +1,29 @@ +From 27e8c610ec1313e23088ed04a8cfd294b2e96246 Mon Sep 17 00:00:00 2001 +From: yinbin +Date: Thu, 31 Oct 2024 17:31:47 +0800 +Subject: [PATCH] IGMP: fix problem that can not join the sixteen igmp group. + +--- + src/include/lwipopts.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/include/lwipopts.h b/src/include/lwipopts.h +index c46dce9..3db6c58 100644 +--- a/src/include/lwipopts.h ++++ b/src/include/lwipopts.h +@@ -199,8 +199,10 @@ + #define UDP_HLEN 8 + + #define MEMP_NUM_UDP_PCB (GAZELLE_MAX_CLIENTS + GAZELLE_RESERVED_CLIENTS) +-#define MEMP_NUM_IGMP_GROUP 16 +-#define MEMP_NUM_MLD6_GROUP 16 ++/* igmp group num should add igmp_allsystems(224.0.0.1) num, which alse consume mempool */ ++#define MEMP_NUM_IGMP_ALLSYSTEMS 1 ++#define MEMP_NUM_IGMP_GROUP (16 + MEMP_NUM_IGMP_ALLSYSTEMS) ++#define MEMP_NUM_MLD6_GROUP (16 + MEMP_NUM_IGMP_ALLSYSTEMS) + + #define DEFAULT_UDP_RECVMBOX_SIZE 4096 + +-- +2.34.1 + diff --git a/lwip.spec b/lwip.spec index 73065e6..28b8865 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: 60 +Release: 61 License: BSD URL: http://savannah.nongnu.org/projects/lwip/ Source0: http://download.savannah.nongnu.org/releases/lwip/%{name}-%{version}.zip @@ -181,9 +181,10 @@ Patch9165: 0166-cleancode-rename-log-level.patch Patch9166: 0167-lwip-add-pingpong-mode-support.patch Patch9167: 0168-lwip-adapt-interrupt-mode.patch Patch9168: 0169-pingpong-fix-send-dup-ack.patch -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 +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 BuildRequires: gcc-c++ dos2unix dpdk-devel @@ -213,6 +214,9 @@ cd %{_builddir}/%{name}-%{version}/src %{_libdir}/liblwip.a %changelog +* Fri Nov 1 2024 yinbin - 2.2.0-61 +- IGMP: fix fix problem that can not join the sixteen igmp group + * Mon Oct 14 2024 yinbin - 2.2.0-60 - IPV6: Enable IPV6_FRAG_COPYHEADER macro to adapt 64bit - IPV6: fix array out of bounds in function ip6_ntoa_r -- Gitee