From 19aadd1a8c685ecf9e60279a89560f7e86860bc5 Mon Sep 17 00:00:00 2001 From: jiangheng Date: Wed, 28 Dec 2022 21:31:12 +0800 Subject: [PATCH] move pcb_if to ip_pcb to let listen pcb can use it --- 0048-listen-pcb-also-use-pcb_if.patch | 37 +++++++++++++++++++++++++++ lwip.spec | 7 ++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 0048-listen-pcb-also-use-pcb_if.patch diff --git a/0048-listen-pcb-also-use-pcb_if.patch b/0048-listen-pcb-also-use-pcb_if.patch new file mode 100644 index 0000000..81ff5ba --- /dev/null +++ b/0048-listen-pcb-also-use-pcb_if.patch @@ -0,0 +1,37 @@ +From 11d8e9f6d54a606163a452f1c8beaa5bc90e949c Mon Sep 17 00:00:00 2001 +From: jiangheng +Date: Wed, 28 Dec 2022 21:25:36 +0800 +Subject: [PATCH] listen pcb also use pcb_if + +--- + src/include/lwip/ip.h | 1 + + src/include/lwip/tcp.h | 1 - + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/include/lwip/ip.h b/src/include/lwip/ip.h +index d560f6b..4cf5f5e 100644 +--- a/src/include/lwip/ip.h ++++ b/src/include/lwip/ip.h +@@ -79,6 +79,7 @@ extern "C" { + ip_addr_t remote_ip; \ + /* Bound netif index */ \ + u8_t netif_idx; \ ++ struct netif *pcb_if; \ + /* Socket options */ \ + u8_t so_options; \ + /* Type Of Service */ \ +diff --git a/src/include/lwip/tcp.h b/src/include/lwip/tcp.h +index 97cb882..0b65b01 100644 +--- a/src/include/lwip/tcp.h ++++ b/src/include/lwip/tcp.h +@@ -409,7 +409,6 @@ struct tcp_pcb { + u8_t snd_scale; + u8_t rcv_scale; + #endif +- struct netif* pcb_if; + }; + + #if TCP_PCB_HASH +-- +2.23.0 + diff --git a/lwip.spec b/lwip.spec index 3aec73d..482abf0 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.1.3 -Release: 37 +Release: 38 License: BSD URL: http://savannah.nongnu.org/projects/lwip/ Source0: http://download.savannah.nongnu.org/releases/lwip/%{name}-%{version}.zip @@ -59,6 +59,7 @@ Patch9043: 0044-skip-unnecessary-tcp_route.patch Patch9044: 0045-add-variable-in-struct-sock.patch Patch9045: 0046-add-dataack-when-recv-too-many-acks-with-data.patch Patch9046: 0047-reduce-struct-pbuf-size.patch +Patch9047: 0048-listen-pcb-also-use-pcb_if.patch BuildRequires: gcc-c++ dos2unix dpdk-devel @@ -122,6 +123,7 @@ find %{_builddir}/%{name}-%{version} -type f -exec dos2unix -q {} \; %patch9044 -p1 %patch9045 -p1 %patch9046 -p1 +%patch9047 -p1 %build cd %{_builddir}/%{name}-%{version}/src @@ -137,6 +139,9 @@ cd %{_builddir}/%{name}-%{version}/src %{_libdir}/liblwip.a %changelog +* Wed Dec 21 2022 jiangheng - 2.1.3-38 +- move pcb_if to ip_pcb to let listen pcb can use it + * Wed Dec 21 2022 wuchangsheng - 2.1.3-37 - reduce struct pbuf size -- Gitee