diff options
| author | sszlbg <[email protected]> | 2021-07-25 17:00:00 +0800 |
|---|---|---|
| committer | sszlbg <[email protected]> | 2021-07-25 17:00:00 +0800 |
| commit | bf88963a3ec85ce6da013e4cd1c59ec5041d29e1 (patch) | |
| tree | d4cd7d4fa3ff6e7b0c859a7660209787f47d168b /components/net/sal_socket | |
| parent | 88d4faf68735948d6310e2d2271d576c5de254a0 (diff) | |
| parent | 2b201cbb00c512def085332d7fb09194656418b9 (diff) | |
Merge branch 'master' into at_client-rt_realloc_iss
# Conflicts:
# components/net/at/src/at_client.c
Diffstat (limited to 'components/net/sal_socket')
| -rw-r--r-- | components/net/sal_socket/include/socket/netdb.h | 2 | ||||
| -rw-r--r-- | components/net/sal_socket/socket/net_sockets.c | 2 | ||||
| -rw-r--r-- | components/net/sal_socket/src/sal_socket.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/components/net/sal_socket/include/socket/netdb.h b/components/net/sal_socket/include/socket/netdb.h index 4783405022..9d54953681 100644 --- a/components/net/sal_socket/include/socket/netdb.h +++ b/components/net/sal_socket/include/socket/netdb.h @@ -6,7 +6,7 @@ * Change Logs: * Date Author Notes * 2015-02-17 Bernard First version - * 2108-05-24 ChenYong Add socket abstraction layer + * 2018-05-24 ChenYong Add socket abstraction layer */ #ifndef NETDB_H__ diff --git a/components/net/sal_socket/socket/net_sockets.c b/components/net/sal_socket/socket/net_sockets.c index 3637635d50..7d4db34327 100644 --- a/components/net/sal_socket/socket/net_sockets.c +++ b/components/net/sal_socket/socket/net_sockets.c @@ -13,7 +13,7 @@ #include <dfs_file.h> #include <dfs_poll.h> #include <dfs_net.h> - +#include <sys/errno.h> #include <sys/socket.h> int accept(int s, struct sockaddr *addr, socklen_t *addrlen) diff --git a/components/net/sal_socket/src/sal_socket.c b/components/net/sal_socket/src/sal_socket.c index 982ab2d08d..dd3c5d3dc2 100644 --- a/components/net/sal_socket/src/sal_socket.c +++ b/components/net/sal_socket/src/sal_socket.c @@ -619,7 +619,9 @@ int sal_accept(int socket, struct sockaddr *addr, socklen_t *addrlen) LOG_E("New socket registered failed, return error %d.", retval); return -1; } - + + /* new socket create by accept should have the same netdev with server*/ + new_sock->netdev = sock->netdev; /* socket structure user_data used to store the acquired new socket */ new_sock->user_data = (void *) new_socket; |