summaryrefslogtreecommitdiff
path: root/components/net/sal_socket
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2019-03-17 09:33:47 +0800
committerGitHub <[email protected]>2019-03-17 09:33:47 +0800
commitd778c9df25cbbd8e202a0133453e4c8b8e179eff (patch)
tree6dd97c1487eacf0a6d858b7541866f865b9203de /components/net/sal_socket
parent2d69172ad39a52e574a22b4374ee89848d832fe8 (diff)
parent94e3f77f25249b52c6f72921a2d2564f68bcd6ff (diff)
Merge pull request #2455 from armink/lts-v3.1.x
Lts v3.1.x
Diffstat (limited to 'components/net/sal_socket')
-rw-r--r--components/net/sal_socket/socket/net_sockets.c62
-rw-r--r--components/net/sal_socket/src/sal_socket.c4
2 files changed, 44 insertions, 22 deletions
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);
diff --git a/components/net/sal_socket/src/sal_socket.c b/components/net/sal_socket/src/sal_socket.c
index dba8e66254..771a56f061 100644
--- a/components/net/sal_socket/src/sal_socket.c
+++ b/components/net/sal_socket/src/sal_socket.c
@@ -19,10 +19,8 @@
#endif
#include <sal.h>
-#define DBG_ENABLE
-#define DBG_SECTION_NAME "SAL_SOC"
+#define DBG_SECTION_NAME "SAL_SKT"
#define DBG_LEVEL DBG_INFO
-#define DBG_COLOR
#include <rtdbg.h>
#define SOCKET_TABLE_STEP_LEN 4