diff --git a/0140-fix-rtc-accept4-create-ring.patch b/0140-fix-rtc-accept4-create-ring.patch new file mode 100644 index 0000000000000000000000000000000000000000..11876486ea9b6cf7222b6242c03abef21709614f --- /dev/null +++ b/0140-fix-rtc-accept4-create-ring.patch @@ -0,0 +1,15 @@ +diff --git a/src/api/sockets.c b/src/api/sockets.c +index 5a72b62..6fdf593 100644 +--- a/src/api/sockets.c ++++ b/src/api/sockets.c +@@ -834,7 +834,9 @@ lwip_accept4(int s, struct sockaddr *addr, socklen_t *addrlen, int flags) + } + #if GAZELLE_ENABLE + LWIP_ASSERT("invalid socket index", (newsock >= LWIP_SOCKET_OFFSET) && (newsock < sockets_num + LWIP_SOCKET_OFFSET)); +- do_lwip_init_sock(newsock); ++ if (!netif_is_rtc_mode(netif_default)) { ++ do_lwip_init_sock(newsock); ++ } + #else + LWIP_ASSERT("invalid socket index", (newsock >= LWIP_SOCKET_OFFSET) && (newsock < NUM_SOCKETS + LWIP_SOCKET_OFFSET)); + #endif /* GAZELLE_ENABLE */ diff --git a/lwip.spec b/lwip.spec index 64d1b3bd75649d1e50f11f3e046195202840ba27..3bdb705d55807fb96d8e0aab5d6f5cab12478afa 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: 32 +Release: 33 License: BSD URL: http://savannah.nongnu.org/projects/lwip/ Source0: http://download.savannah.nongnu.org/releases/lwip/%{name}-%{version}.zip @@ -151,6 +151,7 @@ Patch9135: 0136-fix-vlan-filter-bug.patch Patch9136: 0137-reduce-pbuf-pool-size.patch Patch9137: 0138-lwip_sock-add-sock_time_stamp.patch Patch9138: 0139-distinguish-tcp-udp-get_from_sendring.patch +Patch9139: 0140-fix-rtc-accept4-create-ring.patch BuildRequires: gcc-c++ dos2unix dpdk-devel @@ -180,6 +181,9 @@ cd %{_builddir}/%{name}-%{version}/src %{_libdir}/liblwip.a %changelog +* Fri Jun 21 2024 zhengjiebing - 2.2.0-33 +- fix rtc mode accept4 create ring for newsock + * Mon Jun 17 2024 jiangheng - 2.2.0-32 - distinguish tcp/udp from sendring