!1329 [sync] PR-1324: IGMP: fix problem that can not join the sixteen igmp group

From: @openeuler-sync-bot 
Reviewed-by: @jiangheng12 
Signed-off-by: @jiangheng12
This commit is contained in:
openeuler-ci-bot 2024-11-01 08:03:32 +00:00 committed by Gitee
commit 0faa7a3a93
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 37 additions and 4 deletions

View File

@ -0,0 +1,29 @@
From 27e8c610ec1313e23088ed04a8cfd294b2e96246 Mon Sep 17 00:00:00 2001
From: yinbin <yinbin8@huawei.com>
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

View File

@ -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 <yinbin8@huawei.com> - 2.2.0-61
- IGMP: fix fix problem that can not join the sixteen igmp group
* Mon Oct 14 2024 yinbin <yinbin8@huawei.com> - 2.2.0-60
- IPV6: Enable IPV6_FRAG_COPYHEADER macro to adapt 64bit
- IPV6: fix array out of bounds in function ip6_ntoa_r