diff options
| author | Man, Jianting (Meco) <[email protected]> | 2022-02-19 11:07:45 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-02-20 00:07:45 +0800 |
| commit | 6895da53071358cdd4da8f15f32c977dfedfbe89 (patch) | |
| tree | c65401f29a630222c0928487415b1d0346b0488b /components/net/sal_socket/socket | |
| parent | 5a61304a09bb2341565407d8fdc0a14f03c50aa3 (diff) | |
[net] adjust folder structure (#5587)
* [net] adjust folder structure
- 将lwip相关的文件夹,移入lwip文件夹
- Kconfig 分散到at netdev lwip sal文件夹中,使用menuconfig代替menu
Diffstat (limited to 'components/net/sal_socket/socket')
| -rw-r--r-- | components/net/sal_socket/socket/net_netdb.c | 43 | ||||
| -rw-r--r-- | components/net/sal_socket/socket/net_sockets.c | 293 |
2 files changed, 0 insertions, 336 deletions
diff --git a/components/net/sal_socket/socket/net_netdb.c b/components/net/sal_socket/socket/net_netdb.c deleted file mode 100644 index 1eb84e1c32..0000000000 --- a/components/net/sal_socket/socket/net_netdb.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2006-2021, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2015-02-17 Bernard First version - * 2108-05-24 ChenYong Add socket abstraction layer - */ - -#include <stddef.h> -#include <rtthread.h> - -#include <netdb.h> - -struct hostent *gethostbyname(const char *name) -{ - return sal_gethostbyname(name); -} -RTM_EXPORT(gethostbyname); - -int gethostbyname_r(const char *name, struct hostent *ret, char *buf, - size_t buflen, struct hostent **result, int *h_errnop) -{ - return sal_gethostbyname_r(name, ret, buf, buflen, result, h_errnop); -} -RTM_EXPORT(gethostbyname_r); - -void freeaddrinfo(struct addrinfo *ai) -{ - sal_freeaddrinfo(ai); -} -RTM_EXPORT(freeaddrinfo); - -int getaddrinfo(const char *nodename, - const char *servname, - const struct addrinfo *hints, - struct addrinfo **res) -{ - return sal_getaddrinfo(nodename, servname, hints, res); -} -RTM_EXPORT(getaddrinfo); diff --git a/components/net/sal_socket/socket/net_sockets.c b/components/net/sal_socket/socket/net_sockets.c deleted file mode 100644 index 1b6db50e6d..0000000000 --- a/components/net/sal_socket/socket/net_sockets.c +++ /dev/null @@ -1,293 +0,0 @@ -/* - * Copyright (c) 2006-2021, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2015-02-17 Bernard First version - * 2018-05-17 ChenYong Add socket abstraction layer - */ - -#include <dfs.h> -#include <dfs_file.h> -#include <poll.h> -#include <dfs_net.h> -#include <sys/errno.h> -#include <sys/socket.h> - -int accept(int s, struct sockaddr *addr, socklen_t *addrlen) -{ - int new_socket = -1; - int socket = dfs_net_getsocket(s); - - new_socket = sal_accept(socket, addr, addrlen); - if (new_socket != -1) - { - /* this is a new socket, create it in file system fd */ - int fd; - struct dfs_fd *d; - - /* allocate a fd */ - fd = fd_new(); - if (fd < 0) - { - rt_set_errno(-ENOMEM); - sal_closesocket(new_socket); - return -1; - } - - d = fd_get(fd); - if(d) - { - /* this is a socket fd */ - d->type = FT_SOCKET; - d->path = NULL; - - d->fops = dfs_net_get_fops(); - - d->flags = O_RDWR; /* set flags as read and write */ - d->size = 0; - d->pos = 0; - - /* set socket to the data of dfs_fd */ - d->data = (void *) new_socket; - - /* release the ref-count of fd */ - fd_put(d); - - return fd; - } - - rt_set_errno(-ENOMEM); - sal_closesocket(new_socket); - return -1; - } - - return -1; -} -RTM_EXPORT(accept); - -int bind(int s, const struct sockaddr *name, socklen_t namelen) -{ - int socket = dfs_net_getsocket(s); - - return sal_bind(socket, name, namelen); -} -RTM_EXPORT(bind); - -int shutdown(int s, int how) -{ - 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; - } - - if (sal_shutdown(socket, how) == 0) - { - error = 0; - } - else - { - rt_set_errno(-ENOTSOCK); - error = -1; - } - - fd_put(d); - - return error; -} -RTM_EXPORT(shutdown); - -int getpeername(int s, struct sockaddr *name, socklen_t *namelen) -{ - int socket = dfs_net_getsocket(s); - - return sal_getpeername(socket, name, namelen); -} -RTM_EXPORT(getpeername); - -int getsockname(int s, struct sockaddr *name, socklen_t *namelen) -{ - int socket = dfs_net_getsocket(s); - - return sal_getsockname(socket, name, namelen); -} -RTM_EXPORT(getsockname); - -int getsockopt(int s, int level, int optname, void *optval, socklen_t *optlen) -{ - int socket = dfs_net_getsocket(s); - - return sal_getsockopt(socket, level, optname, optval, optlen); -} -RTM_EXPORT(getsockopt); - -int setsockopt(int s, int level, int optname, const void *optval, socklen_t optlen) -{ - int socket = dfs_net_getsocket(s); - - return sal_setsockopt(socket, level, optname, optval, optlen); -} -RTM_EXPORT(setsockopt); - -int connect(int s, const struct sockaddr *name, socklen_t namelen) -{ - int socket = dfs_net_getsocket(s); - - return sal_connect(socket, name, namelen); -} -RTM_EXPORT(connect); - -int listen(int s, int backlog) -{ - int socket = dfs_net_getsocket(s); - - return sal_listen(socket, backlog); -} -RTM_EXPORT(listen); - -int recv(int s, void *mem, size_t len, int flags) -{ - int socket = dfs_net_getsocket(s); - - return sal_recvfrom(socket, mem, len, flags, NULL, NULL); -} -RTM_EXPORT(recv); - -int recvfrom(int s, void *mem, size_t len, int flags, - struct sockaddr *from, socklen_t *fromlen) -{ - int socket = dfs_net_getsocket(s); - - return sal_recvfrom(socket, mem, len, flags, from, fromlen); -} -RTM_EXPORT(recvfrom); - -int send(int s, const void *dataptr, size_t size, int flags) -{ - int socket = dfs_net_getsocket(s); - - return sal_sendto(socket, dataptr, size, flags, NULL, 0); -} -RTM_EXPORT(send); - -int sendto(int s, const void *dataptr, size_t size, int flags, - const struct sockaddr *to, socklen_t tolen) -{ - int socket = dfs_net_getsocket(s); - - return sal_sendto(socket, dataptr, size, flags, to, tolen); -} -RTM_EXPORT(sendto); - -int socket(int domain, int type, int protocol) -{ - /* create a BSD socket */ - int fd; - int socket; - struct dfs_fd *d; - - /* allocate a fd */ - fd = fd_new(); - if (fd < 0) - { - rt_set_errno(-ENOMEM); - - return -1; - } - d = fd_get(fd); - - /* create socket and then put it to the dfs_fd */ - socket = sal_socket(domain, type, protocol); - if (socket >= 0) - { - /* this is a socket fd */ - d->type = FT_SOCKET; - d->path = NULL; - - d->fops = dfs_net_get_fops(); - - d->flags = O_RDWR; /* set flags as read and write */ - d->size = 0; - d->pos = 0; - - /* set socket to the data of dfs_fd */ - d->data = (void *) socket; - } - else - { - /* release fd */ - fd_put(d); - fd_put(d); - - rt_set_errno(-ENOMEM); - - return -1; - } - - /* release the ref-count of fd */ - fd_put(d); - - return fd; -} -RTM_EXPORT(socket); - -int closesocket(int 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 == RT_NULL) - { - rt_set_errno(-EBADF); - return -1; - } - - if (sal_closesocket(socket) == 0) - { - error = 0; - } - else - { - rt_set_errno(-ENOTSOCK); - error = -1; - } - - /* socket has been closed, delete it from file system fd */ - fd_put(d); - fd_put(d); - - return error; -} -RTM_EXPORT(closesocket); - -int ioctlsocket(int s, long cmd, void *arg) -{ - int socket = dfs_net_getsocket(s); - - return sal_ioctlsocket(socket, cmd, arg); -} -RTM_EXPORT(ioctlsocket); |
