Skip to content

Commit 5a40f93

Browse files
authored
Merge pull request #3207 from loogg/mlw
去除sal shut_down后释放socket导致close失败的问题
2 parents 1bf5f67 + c531fdc commit 5a40f93

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

components/net/sal_socket/socket/net_sockets.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,7 @@ int shutdown(int s, int how)
105105
rt_set_errno(-ENOTSOCK);
106106
error = -1;
107107
}
108-
109-
/* socket has been closed, delete it from file system fd */
110-
fd_put(d);
108+
111109
fd_put(d);
112110

113111
return error;

components/net/sal_socket/src/sal_socket.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -701,8 +701,6 @@ int sal_shutdown(int socket, int how)
701701
error = -1;
702702
}
703703

704-
/* delete socket */
705-
socket_delete(socket);
706704

707705
return error;
708706
}

0 commit comments

Comments
 (0)