From a5f7635f31b237ad8ce09610ee76a75f4072e7d4 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Sat, 22 May 2021 02:50:35 +0800 Subject: remove libc_errno.h & libc_limits.h --- components/net/sal_socket/socket/net_sockets.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/net/sal_socket') 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 #include #include - +#include #include int accept(int s, struct sockaddr *addr, socklen_t *addrlen) -- cgit v1.3.1 From a245403f4df10841222b6269337218d56db21561 Mon Sep 17 00:00:00 2001 From: NightIsDark <935528249@qq.com> Date: Thu, 27 May 2021 09:56:51 +0800 Subject: 多网卡应用下，accept创建的socket应该和server使用一样的网卡（默认网卡不一定正确） MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/net/sal_socket/src/sal_socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'components/net/sal_socket') diff --git a/components/net/sal_socket/src/sal_socket.c b/components/net/sal_socket/src/sal_socket.c index 982ab2d08d..19f1af5358 100644 --- a/components/net/sal_socket/src/sal_socket.c +++ b/components/net/sal_socket/src/sal_socket.c @@ -619,7 +619,8 @@ 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; -- cgit v1.3.1 From 122f90922e9b34a66ca8a753a9cbbd46a8524f73 Mon Sep 17 00:00:00 2001 From: NightIsDark <935528249@qq.com> Date: Thu, 27 May 2021 17:28:06 +0800 Subject: Revert "多网卡应用下，accept创建的socket应该和server使用一样的网卡（默认网卡不一定正确）" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 05124def81684a2bf73b89513e2ffaf88a03f806. --- components/net/sal_socket/src/sal_socket.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'components/net/sal_socket') diff --git a/components/net/sal_socket/src/sal_socket.c b/components/net/sal_socket/src/sal_socket.c index 19f1af5358..982ab2d08d 100644 --- a/components/net/sal_socket/src/sal_socket.c +++ b/components/net/sal_socket/src/sal_socket.c @@ -619,8 +619,7 @@ 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; -- cgit v1.3.1 From ce7d1c6ca6a08dcefa2b55c5c7db661f1761d775 Mon Sep 17 00:00:00 2001 From: NightIsDark <935528249@qq.com> Date: Thu, 27 May 2021 17:33:59 +0800 Subject: 修订PR邮箱错误无法签署CLA的问题 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/net/sal_socket/src/sal_socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'components/net/sal_socket') diff --git a/components/net/sal_socket/src/sal_socket.c b/components/net/sal_socket/src/sal_socket.c index 982ab2d08d..19f1af5358 100644 --- a/components/net/sal_socket/src/sal_socket.c +++ b/components/net/sal_socket/src/sal_socket.c @@ -619,7 +619,8 @@ 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; -- cgit v1.3.1 From 550ad698e0266794c77b9710284bf29107bf7234 Mon Sep 17 00:00:00 2001 From: NightIsDark <935528249@qq.com> Date: Mon, 31 May 2021 10:17:56 +0800 Subject: 格式错误修订 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/net/sal_socket/src/sal_socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'components/net/sal_socket') diff --git a/components/net/sal_socket/src/sal_socket.c b/components/net/sal_socket/src/sal_socket.c index 19f1af5358..295772bb37 100644 --- a/components/net/sal_socket/src/sal_socket.c +++ b/components/net/sal_socket/src/sal_socket.c @@ -619,8 +619,8 @@ 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; + /* 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; -- cgit v1.3.1 From 247d1a50d7d4a33727b7be943b79900944cb89cb Mon Sep 17 00:00:00 2001 From: NightIsDark <935528249@qq.com> Date: Wed, 30 Jun 2021 23:01:09 +0800 Subject: git rebase commit --- components/net/sal_socket/src/sal_socket.c | 1 + 1 file changed, 1 insertion(+) (limited to 'components/net/sal_socket') diff --git a/components/net/sal_socket/src/sal_socket.c b/components/net/sal_socket/src/sal_socket.c index 295772bb37..dd3c5d3dc2 100644 --- a/components/net/sal_socket/src/sal_socket.c +++ b/components/net/sal_socket/src/sal_socket.c @@ -619,6 +619,7 @@ 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 */ -- cgit v1.3.1 From 004e8bbf0f1fb19624534d59ee7dcdc1294cb4b3 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Fri, 23 Jul 2021 03:52:35 +0800 Subject: [SAL] 修复一处笔误 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/net/sal_socket/include/socket/netdb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/net/sal_socket') 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__ -- cgit v1.3.1