From 769e1d92d7bcdf2a2ec40b8e72bed75f7a771809 Mon Sep 17 00:00:00 2001 From: jiangheng12 Date: Wed, 22 Feb 2023 20:29:56 +0800 Subject: [PATCH] lwip_fnctl only suport F_SETFL,F_GETFL, other opt return 0 for compitable (cherry picked from commit 0ce5c99f1e262bcd6cbbff19185ccc36410d1daa) --- ...p_fnctl-only-support-F_SETFL-F_GETFL.patch | 30 +++++++++++++++++++ lwip.spec | 7 ++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0052-lwip_fnctl-only-support-F_SETFL-F_GETFL.patch diff --git a/0052-lwip_fnctl-only-support-F_SETFL-F_GETFL.patch b/0052-lwip_fnctl-only-support-F_SETFL-F_GETFL.patch new file mode 100644 index 0000000..02af140 --- /dev/null +++ b/0052-lwip_fnctl-only-support-F_SETFL-F_GETFL.patch @@ -0,0 +1,30 @@ +From 40bd7d38bd7a15d22459c4b35cfc7480205a57d9 Mon Sep 17 00:00:00 2001 +From: jiangheng12 +Date: Wed, 22 Feb 2023 20:20:35 +0800 +Subject: [PATCH] lwip_cnctl only support F_SETFL,F_GETFL, other opt return 0 + for compitable + +--- + src/api/sockets.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/api/sockets.c b/src/api/sockets.c +index 9b3f514..2cb6f22 100644 +--- a/src/api/sockets.c ++++ b/src/api/sockets.c +@@ -4107,7 +4107,12 @@ lwip_fcntl(int s, int cmd, int val) + break; + default: + LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_fcntl(%d, UNIMPL: %d, %d)\n", s, cmd, val)); ++#if USE_LIBOS ++ sock_set_errno(sock, 0); /* not yet implemented, but we return 0 for compatilbe with app */ ++ ret = 0; ++#else + sock_set_errno(sock, ENOSYS); /* not yet implemented */ ++#endif + break; + } + done_socket(sock); +-- +2.23.0 + diff --git a/lwip.spec b/lwip.spec index c9ebdfb..19499eb 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: 42 +Release: 43 License: BSD URL: http://savannah.nongnu.org/projects/lwip/ Source0: http://download.savannah.nongnu.org/releases/lwip/%{name}-%{version}.zip @@ -63,6 +63,7 @@ Patch9047: 0048-listen-pcb-also-use-pcb_if.patch Patch9048: 0049-expand-recv-mbox-size.patch Patch9049: 0050-lwip-reuse-ip-port.patch Patch9050: 0051-lwip-add-need_tso_send.patch +Patch9051: 0052-lwip_fnctl-only-support-F_SETFL-F_GETFL.patch BuildRequires: gcc-c++ dos2unix dpdk-devel @@ -130,6 +131,7 @@ find %{_builddir}/%{name}-%{version} -type f -exec dos2unix -q {} \; %patch9048 -p1 %patch9049 -p1 %patch9050 -p1 +%patch9051 -p1 %build cd %{_builddir}/%{name}-%{version}/src @@ -145,6 +147,9 @@ cd %{_builddir}/%{name}-%{version}/src %{_libdir}/liblwip.a %changelog +* Tue Wed 22 2023 jiangheng - 2.1.3-43 +- lwip_fnctl only suport F_SETFL,F_GETFL, other opt return 0 for compitable + * Tue Feb 21 2023 majun - 2.1.3-42 - add lwip need_tso_send -- Gitee