adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

net: sockets: Remove deperecated CONFIG_NET_SOCKETS_POSIX_NAMES

Browse source 
The deprecated CONFIG_NET_SOCKETS_POSIX_NAMES option is removed.
If one wishes to use POSIX API socket calls, then CONFIG_POSIX_API
option needs to be enabled.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
This commit is contained in:
Jukka Rissanen 2024-12-02 10:50:22 +02:00 committed by Benjamin Cabé
parent a3d5036198
commit abad505bde
4 changed files with 0 additions and 301 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/zephyr.doxyfile.in
View file

@ -2489,7 +2489,6 @@ PREDEFINED = __DOXYGEN__ \
CONFIG_NET_L2_IEEE802154_MGMT \ CONFIG_NET_L2_IEEE802154_MGMT \
CONFIG_NET_L2_IEEE802154_SECURITY \ CONFIG_NET_L2_IEEE802154_SECURITY \
CONFIG_NET_MGMT_EVENT \ CONFIG_NET_MGMT_EVENT \
CONFIG_NET_SOCKETS_POSIX_NAMES \
CONFIG_NET_TCP \ CONFIG_NET_TCP \
CONFIG_NET_UDP \ CONFIG_NET_UDP \
CONFIG_SCHED_CPU_MASK \ CONFIG_SCHED_CPU_MASK \

238
include/zephyr/net/socket.h
View file

@ -804,242 +804,6 @@ int zsock_getnameinfo(const struct sockaddr *addr, socklen_t addrlen,
char *host, socklen_t hostlen, char *host, socklen_t hostlen,
char *serv, socklen_t servlen, int flags); char *serv, socklen_t servlen, int flags);
#if defined(CONFIG_NET_SOCKETS_POSIX_NAMES)
/**
* @name Socket APIs available if CONFIG_NET_SOCKETS_POSIX_NAMES is enabled
* @{
*/
/** POSIX wrapper for @ref zsock_pollfd */
#define pollfd zsock_pollfd
/** POSIX wrapper for @ref zsock_socket */
static inline int socket(int family, int type, int proto)
{
return zsock_socket(family, type, proto);
}
/** POSIX wrapper for @ref zsock_socketpair */
static inline int socketpair(int family, int type, int proto, int sv[2])
{
return zsock_socketpair(family, type, proto, sv);
}
/** POSIX wrapper for @ref zsock_close */
static inline int close(int sock)
{
return zsock_close(sock);
}
/** POSIX wrapper for @ref zsock_shutdown */
static inline int shutdown(int sock, int how)
{
return zsock_shutdown(sock, how);
}
/** POSIX wrapper for @ref zsock_bind */
static inline int bind(int sock, const struct sockaddr *addr, socklen_t addrlen)
{
return zsock_bind(sock, addr, addrlen);
}
/** POSIX wrapper for @ref zsock_connect */
static inline int connect(int sock, const struct sockaddr *addr,
socklen_t addrlen)
{
return zsock_connect(sock, addr, addrlen);
}
/** POSIX wrapper for @ref zsock_listen */
static inline int listen(int sock, int backlog)
{
return zsock_listen(sock, backlog);
}
/** POSIX wrapper for @ref zsock_accept */
static inline int accept(int sock, struct sockaddr *addr, socklen_t *addrlen)
{
return zsock_accept(sock, addr, addrlen);
}
/** POSIX wrapper for @ref zsock_send */
static inline ssize_t send(int sock, const void *buf, size_t len, int flags)
{
return zsock_send(sock, buf, len, flags);
}
/** POSIX wrapper for @ref zsock_recv */
static inline ssize_t recv(int sock, void *buf, size_t max_len, int flags)
{
return zsock_recv(sock, buf, max_len, flags);
}
/** POSIX wrapper for @ref zsock_sendto */
static inline ssize_t sendto(int sock, const void *buf, size_t len, int flags,
const struct sockaddr *dest_addr,
socklen_t addrlen)
{
return zsock_sendto(sock, buf, len, flags, dest_addr, addrlen);
}
/** POSIX wrapper for @ref zsock_sendmsg */
static inline ssize_t sendmsg(int sock, const struct msghdr *message,
int flags)
{
return zsock_sendmsg(sock, message, flags);
}
/** POSIX wrapper for @ref zsock_recvfrom */
static inline ssize_t recvfrom(int sock, void *buf, size_t max_len, int flags,
struct sockaddr *src_addr, socklen_t *addrlen)
{
return zsock_recvfrom(sock, buf, max_len, flags, src_addr, addrlen);
}
/** POSIX wrapper for @ref zsock_recvmsg */
static inline ssize_t recvmsg(int sock, struct msghdr *msg, int flags)
{
return zsock_recvmsg(sock, msg, flags);
}
/** POSIX wrapper for @ref zsock_poll */
static inline int poll(struct zsock_pollfd *fds, int nfds, int timeout)
{
return zsock_poll(fds, nfds, timeout);
}
/** POSIX wrapper for @ref zsock_getsockopt */
static inline int getsockopt(int sock, int level, int optname,
void *optval, socklen_t *optlen)
{
return zsock_getsockopt(sock, level, optname, optval, optlen);
}
/** POSIX wrapper for @ref zsock_setsockopt */
static inline int setsockopt(int sock, int level, int optname,
const void *optval, socklen_t optlen)
{
return zsock_setsockopt(sock, level, optname, optval, optlen);
}
/** POSIX wrapper for @ref zsock_getpeername */
static inline int getpeername(int sock, struct sockaddr *addr,
socklen_t *addrlen)
{
return zsock_getpeername(sock, addr, addrlen);
}
/** POSIX wrapper for @ref zsock_getsockname */
static inline int getsockname(int sock, struct sockaddr *addr,
socklen_t *addrlen)
{
return zsock_getsockname(sock, addr, addrlen);
}
/** POSIX wrapper for @ref zsock_getaddrinfo */
static inline int getaddrinfo(const char *host, const char *service,
const struct zsock_addrinfo *hints,
struct zsock_addrinfo **res)
{
return zsock_getaddrinfo(host, service, hints, res);
}
/** POSIX wrapper for @ref zsock_freeaddrinfo */
static inline void freeaddrinfo(struct zsock_addrinfo *ai)
{
zsock_freeaddrinfo(ai);
}
/** POSIX wrapper for @ref zsock_gai_strerror */
static inline const char *gai_strerror(int errcode)
{
return zsock_gai_strerror(errcode);
}
/** POSIX wrapper for @ref zsock_getnameinfo */
static inline int getnameinfo(const struct sockaddr *addr, socklen_t addrlen,
char *host, socklen_t hostlen,
char *serv, socklen_t servlen, int flags)
{
return zsock_getnameinfo(addr, addrlen, host, hostlen,
serv, servlen, flags);
}
/** POSIX wrapper for @ref zsock_addrinfo */
#define addrinfo zsock_addrinfo
/** POSIX wrapper for @ref zsock_gethostname */
static inline int gethostname(char *buf, size_t len)
{
return zsock_gethostname(buf, len);
}
/** POSIX wrapper for @ref zsock_inet_pton */
static inline int inet_pton(sa_family_t family, const char *src, void *dst)
{
return zsock_inet_pton(family, src, dst);
}
/** POSIX wrapper for @ref zsock_inet_ntop */
static inline char *inet_ntop(sa_family_t family, const void *src, char *dst,
size_t size)
{
return zsock_inet_ntop(family, src, dst, size);
}
/** POSIX wrapper for @ref ZSOCK_POLLIN */
#define POLLIN ZSOCK_POLLIN
/** POSIX wrapper for @ref ZSOCK_POLLOUT */
#define POLLOUT ZSOCK_POLLOUT
/** POSIX wrapper for @ref ZSOCK_POLLERR */
#define POLLERR ZSOCK_POLLERR
/** POSIX wrapper for @ref ZSOCK_POLLHUP */
#define POLLHUP ZSOCK_POLLHUP
/** POSIX wrapper for @ref ZSOCK_POLLNVAL */
#define POLLNVAL ZSOCK_POLLNVAL
/** POSIX wrapper for @ref ZSOCK_MSG_PEEK */
#define MSG_PEEK ZSOCK_MSG_PEEK
/** POSIX wrapper for @ref ZSOCK_MSG_CTRUNC */
#define MSG_CTRUNC ZSOCK_MSG_CTRUNC
/** POSIX wrapper for @ref ZSOCK_MSG_TRUNC */
#define MSG_TRUNC ZSOCK_MSG_TRUNC
/** POSIX wrapper for @ref ZSOCK_MSG_DONTWAIT */
#define MSG_DONTWAIT ZSOCK_MSG_DONTWAIT
/** POSIX wrapper for @ref ZSOCK_MSG_WAITALL */
#define MSG_WAITALL ZSOCK_MSG_WAITALL
/** POSIX wrapper for @ref ZSOCK_SHUT_RD */
#define SHUT_RD ZSOCK_SHUT_RD
/** POSIX wrapper for @ref ZSOCK_SHUT_WR */
#define SHUT_WR ZSOCK_SHUT_WR
/** POSIX wrapper for @ref ZSOCK_SHUT_RDWR */
#define SHUT_RDWR ZSOCK_SHUT_RDWR
/** POSIX wrapper for @ref DNS_EAI_BADFLAGS */
#define EAI_BADFLAGS DNS_EAI_BADFLAGS
/** POSIX wrapper for @ref DNS_EAI_NONAME */
#define EAI_NONAME DNS_EAI_NONAME
/** POSIX wrapper for @ref DNS_EAI_AGAIN */
#define EAI_AGAIN DNS_EAI_AGAIN
/** POSIX wrapper for @ref DNS_EAI_FAIL */
#define EAI_FAIL DNS_EAI_FAIL
/** POSIX wrapper for @ref DNS_EAI_NODATA */
#define EAI_NODATA DNS_EAI_NODATA
/** POSIX wrapper for @ref DNS_EAI_MEMORY */
#define EAI_MEMORY DNS_EAI_MEMORY
/** POSIX wrapper for @ref DNS_EAI_SYSTEM */
#define EAI_SYSTEM DNS_EAI_SYSTEM
/** POSIX wrapper for @ref DNS_EAI_SERVICE */
#define EAI_SERVICE DNS_EAI_SERVICE
/** POSIX wrapper for @ref DNS_EAI_SOCKTYPE */
#define EAI_SOCKTYPE DNS_EAI_SOCKTYPE
/** POSIX wrapper for @ref DNS_EAI_FAMILY */
#define EAI_FAMILY DNS_EAI_FAMILY
/** @} */
#endif /* defined(CONFIG_NET_SOCKETS_POSIX_NAMES) */
/** /**
* @name Network interface name description * @name Network interface name description
* @{ * @{
@ -1430,8 +1194,6 @@ struct net_socket_register {
* *
* Additionally, if non-zephyr-prefixed headers are used here, * Additionally, if non-zephyr-prefixed headers are used here,
* native_sim pulls in those from the host rather than Zephyr's. * native_sim pulls in those from the host rather than Zephyr's.
*
* This should be removed when CONFIG_NET_SOCKETS_POSIX_NAMES is removed.
*/ */
#if defined(CONFIG_POSIX_API) #if defined(CONFIG_POSIX_API)
#if !defined(ZEPHYR_INCLUDE_POSIX_ARPA_INET_H_) #if !defined(ZEPHYR_INCLUDE_POSIX_ARPA_INET_H_)

38
include/zephyr/net/socket_select.h
View file

@ -120,44 +120,6 @@ static inline void ZSOCK_FD_SET(int fd, zsock_fd_set *set)
ZVFS_FD_SET(fd, set); ZVFS_FD_SET(fd, set);
} }
/** @cond INTERNAL_HIDDEN */
#ifdef CONFIG_NET_SOCKETS_POSIX_NAMES
#define fd_set zsock_fd_set
#define FD_SETSIZE ZSOCK_FD_SETSIZE
static inline int select(int nfds, zsock_fd_set *readfds,
zsock_fd_set *writefds, zsock_fd_set *exceptfds,
struct timeval *timeout)
{
return zsock_select(nfds, readfds, writefds, exceptfds, timeout);
}
static inline void FD_ZERO(zsock_fd_set *set)
{
ZSOCK_FD_ZERO(set);
}
static inline int FD_ISSET(int fd, zsock_fd_set *set)
{
return ZSOCK_FD_ISSET(fd, set);
}
static inline void FD_CLR(int fd, zsock_fd_set *set)
{
ZSOCK_FD_CLR(fd, set);
}
static inline void FD_SET(int fd, zsock_fd_set *set)
{
ZSOCK_FD_SET(fd, set);
}
#endif /* CONFIG_NET_SOCKETS_POSIX_NAMES */
/** @endcond */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

24
subsys/net/lib/sockets/Kconfig
View file

@ -23,30 +23,6 @@ config NET_SOCKETS_PRIORITY_DEFAULT
allows to for instance prioritize offloaded socket processing during allows to for instance prioritize offloaded socket processing during
socket creation over the native one, or vice versa. socket creation over the native one, or vice versa.
config NET_SOCKETS_POSIX_NAMES
bool "[DEPRECATED] POSIX names for Sockets API (without full POSIX API)"
depends on !POSIX_API
select DEPRECATED
help
This option is marked as deprecated in favor of using normal
POSIX socket API includes found under the include/zephyr/posix
directory. If you want to use BSD socket API calls, you need
to select POSIX_API and use the socket headers in POSIX subsystem.
With this option, Socket API functions are available under the
standard POSIX names like socket(), recv(), and close(), etc.,
even if full POSIX API (CONFIG_POSIX_API) is not enabled. (Note
that close() may require a special attention, as in POSIX it
closes any file descriptor, while with this option enabled, it
will apply only to sockets.)
Various networking libraries require either
CONFIG_NET_SOCKETS_POSIX_NAMES or CONFIG_POSIX_API to be set.
If both are disabled, Zephyr's socket functions will be
available (only) with ``zsock_`` prefix, (e.g. `zsock_socket`).
This is useful only in peculiar cases, e.g. when integrating
with 3rd-party socket libraries.
config NET_SOCKETS_POLL_MAX config NET_SOCKETS_POLL_MAX
int "Max number of supported poll() entries [DEPRECATED]" int "Max number of supported poll() entries [DEPRECATED]"
default 0 default 0