From a377d167742caede63c398aeb71157ac00206807 Mon Sep 17 00:00:00 2001 From: yinbin Date: Wed, 22 Nov 2023 16:01:47 +0800 Subject: [PATCH] sync ipv6 (cherry picked from commit 4662eaed3baa88a8b608912845a689e45b65e39a) --- 0052-ipv6.patch | 25 +++++++++++++++++++++++++ gazelle.spec | 6 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0052-ipv6.patch diff --git a/0052-ipv6.patch b/0052-ipv6.patch new file mode 100644 index 0000000..c587389 --- /dev/null +++ b/0052-ipv6.patch @@ -0,0 +1,25 @@ +From 894c59a8e2351f0c0b34e3582054a696a913f114 Mon Sep 17 00:00:00 2001 +From: zhengjiebing +Date: Sat, 18 Nov 2023 00:44:43 +0800 +Subject: [PATCH] ipv6 + +--- + src/lstack/api/lstack_wrap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lstack/api/lstack_wrap.c b/src/lstack/api/lstack_wrap.c +index 1e67b76..b6ac1bd 100644 +--- a/src/lstack/api/lstack_wrap.c ++++ b/src/lstack/api/lstack_wrap.c +@@ -370,7 +370,7 @@ static inline int32_t do_socket(int32_t domain, int32_t type, int32_t protocol) + return posix_api->socket_fn(domain, type, protocol); + } + +- if ((domain != AF_INET && domain != AF_UNSPEC) || ++ if ((domain != AF_INET && domain != AF_UNSPEC && domain != AF_INET6) || + ((domain == AF_INET6) && !get_global_cfg_params()->ipv6_enable) || + ((type & SOCK_DGRAM) && !get_global_cfg_params()->udp_enable)) { + return posix_api->socket_fn(domain, type, protocol); +-- +2.27.0 + diff --git a/gazelle.spec b/gazelle.spec index 4c11927..a42651a 100644 --- a/gazelle.spec +++ b/gazelle.spec @@ -2,7 +2,7 @@ Name: gazelle Version: 1.0.2 -Release: 15 +Release: 16 Summary: gazelle is a high performance user-mode stack License: MulanPSL-2.0 URL: https://gitee.com/openeuler/gazelle @@ -67,6 +67,7 @@ Patch9048: 0048-add-tx-package-timeout.patch Patch9049: 0049-modif-mem.patch Patch9050: 0050-enable-ipv6.patch Patch9051: 0051-wrap-dont-hijack-select-temporarily.patch +Patch9052: 0052-ipv6.patch %description %{name} is a high performance user-mode stack. @@ -108,6 +109,9 @@ install -Dpm 0640 %{_builddir}/%{name}-%{version}/src/ltran/ltran.conf %{b %config(noreplace) %{conf_path}/ltran.conf %changelog +* Wed Nov 22 2023 yinbin6 - 1.0.2-16 +- ipv6 + * Sat Nov 18 2023 yinbin6 - 1.0.2-15 - wrap: dont hijack select temporarily