From 0d9b7d60db49c82205d745a1583346d865627883 Mon Sep 17 00:00:00 2001 From: chenyong <1521761801@qq.com> Date: Tue, 5 Mar 2019 19:25:05 +0800 Subject: [net][sal_socket] improve closesocke/shutdown error handling Signed-off-by: chenyong <1521761801@qq.com> --- components/net/sal_socket/socket/net_sockets.c | 62 ++++++++++++++++++-------- 1 file changed, 43 insertions(+), 19 deletions(-) (limited to 'components/net/sal_socket/socket') diff --git a/components/net/sal_socket/socket/net_sockets.c b/components/net/sal_socket/socket/net_sockets.c index 232b87ba1e..12024c8173 100644 --- a/components/net/sal_socket/socket/net_sockets.c +++ b/components/net/sal_socket/socket/net_sockets.c @@ -78,29 +78,39 @@ RTM_EXPORT(bind); int shutdown(int s, int how) { - int socket; + int error = 0; + int socket = -1; struct dfs_fd *d; + socket = dfs_net_getsocket(s); + if (socket < 0) + { + rt_set_errno(-ENOTSOCK); + return -1; + } + d = fd_get(s); if (d == NULL) { rt_set_errno(-EBADF); - return -1; } - - socket = dfs_net_getsocket(s); + if (sal_shutdown(socket, how) == 0) { - /* socket has been closed, delete it from file system fd */ - fd_put(d); - fd_put(d); - - return 0; + error = 0; + } + else + { + rt_set_errno(-ENOTSOCK); + error = -1; } - return -1; + /* socket has been closed, delete it from file system fd */ + fd_put(d); + fd_put(d); + return error; } RTM_EXPORT(shutdown); @@ -228,7 +238,7 @@ int socket(int domain, int type, int protocol) rt_set_errno(-ENOMEM); - return -1; + return -1; } /* release the ref-count of fd */ @@ -240,25 +250,39 @@ RTM_EXPORT(socket); int closesocket(int s) { - int socket = dfs_net_getsocket(s); + int error = 0; + int socket = -1; struct dfs_fd *d; + socket = dfs_net_getsocket(s); + if (socket < 0) + { + rt_set_errno(-ENOTSOCK); + return -1; + } + d = fd_get(s); - if(!d) + if (d == RT_NULL) { + rt_set_errno(-EBADF); return -1; } if (sal_closesocket(socket) == 0) { - /* socket has been closed, delete it from file system fd */ - fd_put(d); - fd_put(d); - - return 0; + error = 0; + } + else + { + rt_set_errno(-ENOTSOCK); + error = -1; } - return -1; + /* socket has been closed, delete it from file system fd */ + fd_put(d); + fd_put(d); + + return error; } RTM_EXPORT(closesocket); -- cgit v1.3.1 From c531fdc7aeb0f7440f7e518e68666faa9900ace6 Mon Sep 17 00:00:00 2001 From: malongwei <2544047213@qq.com> Date: Sat, 16 Nov 2019 12:33:09 +0800 Subject: 去除sal shut_down后释放socket导致close失败的问题 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/net/sal_socket/socket/net_sockets.c | 4 +--- components/net/sal_socket/src/sal_socket.c | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'components/net/sal_socket/socket') diff --git a/components/net/sal_socket/socket/net_sockets.c b/components/net/sal_socket/socket/net_sockets.c index 12024c8173..a53b2f1f9c 100644 --- a/components/net/sal_socket/socket/net_sockets.c +++ b/components/net/sal_socket/socket/net_sockets.c @@ -105,9 +105,7 @@ int shutdown(int s, int how) rt_set_errno(-ENOTSOCK); error = -1; } - - /* socket has been closed, delete it from file system fd */ - fd_put(d); + fd_put(d); return error; diff --git a/components/net/sal_socket/src/sal_socket.c b/components/net/sal_socket/src/sal_socket.c index 4a9056838d..2d8e703845 100644 --- a/components/net/sal_socket/src/sal_socket.c +++ b/components/net/sal_socket/src/sal_socket.c @@ -701,8 +701,6 @@ int sal_shutdown(int socket, int how) error = -1; } - /* delete socket */ - socket_delete(socket); return error; } -- cgit v1.3.1