summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormalongwei <[email protected]>2019-11-16 12:33:09 +0800
committermalongwei <[email protected]>2019-11-16 12:33:09 +0800
commitc531fdc7aeb0f7440f7e518e68666faa9900ace6 (patch)
tree7e1860ef609a501e36f8e281e8e58e6ac2e41ad9
parent69e8c0324e77d7c30634d2a74264fd4fc171ec24 (diff)
去除sal shut_down后释放socket导致close失败的问题
-rw-r--r--components/net/sal_socket/socket/net_sockets.c4
-rw-r--r--components/net/sal_socket/src/sal_socket.c2
2 files changed, 1 insertions, 5 deletions
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;
}