1 Star 0 Fork 32

jinag12/gazelle_1

forked from src-openEuler/gazelle 
加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
0171-fix-ioctl-set-failed.patch 1.85 KB
一键复制 编辑 原始数据 按行查看 历史
yinbin6 提交于 2024-04-28 15:33 . sync fix ioctl set failed
From 5924fd2879acbb52b12a61380b939cce30a133a9 Mon Sep 17 00:00:00 2001
From: jiangheng <jiangheng14@huawei.com>
Date: Sun, 28 Apr 2024 10:44:15 +0800
Subject: [PATCH] fix ioctl set failed
---
src/lstack/api/lstack_wrap.c | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/lstack/api/lstack_wrap.c b/src/lstack/api/lstack_wrap.c
index c90aa04..7101d98 100644
--- a/src/lstack/api/lstack_wrap.c
+++ b/src/lstack/api/lstack_wrap.c
@@ -690,13 +690,27 @@ static int32_t do_select(int32_t nfds, fd_set *readfds, fd_set *writefds, fd_set
if (select_posix_path() == PATH_KERNEL || \
select_fd_posix_path(_fd, &sock) == PATH_KERNEL) \
return _fcntl_fn(_fd, _cmd, val); \
- int32_t ret = _fcntl_fn(_fd, _cmd, val); \
- if (ret == -1) \
- return ret; \
- return _lwip_fcntl(_fd, _cmd, val); \
+ int32_t ret1 = _fcntl_fn(_fd, _cmd, val); \
+ if (ret1 == -1) { \
+ LSTACK_LOG(ERR, LSTACK, "fd(%d) kernel path call failed, errno is %d, maybe not error\n", \
+ _fd, errno); \
+ return ret1; \
+ } \
+ int32_t ret2 = _lwip_fcntl(_fd, _cmd, val); \
+ /*
+ * if function not implemented, fcntl get/set context will not be modifyed by user path,
+ * return kernel path result
+ */ \
+ if (ret2 == -1) { \
+ if (errno == ENOSYS) { \
+ return ret1; \
+ } \
+ LSTACK_LOG(ERR, LSTACK, "fd(%d) user path call failed, errno is %d, maybe not error\n", \
+ _fd, errno); \
+ } \
+ return ret2; \
} while (0)
-
/* --------------------------------------------------------
* ------- LD_PRELOAD mode replacement interface --------
* --------------------------------------------------------
--
2.33.0
Loading...
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/jiangheng12/gazelle_1.git
git@gitee.com:jiangheng12/gazelle_1.git
jiangheng12
gazelle_1
gazelle_1
master

搜索帮助

0d507c66 1850385 C8b1a773 1850385