sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: Simplify the tcp/udp existence check

Browse Source 
Replace defined(CONFIG_NET_TCP) && !defined(CONFIG_NET_TCP_NO_STACK) with NET_TCP_HAVE_STACK
Replace defined(CONFIG_NET_UDP) && !defined(CONFIG_NET_UDP_NO_STACK) with NET_UDP_HAVE_STACK

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2023-03-07 00:55:34 +08:00 committed by Petro Karashchenko
parent 5de49d2939
commit 74e2b75857
6 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/inet/inet.h
View File

@ -103,9 +103,6 @@ EXTERN const struct ether_addr g_ipv6_ethallrouters; /* All link local routers
* Public Function Prototypes * Public Function Prototypes
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_NET_TCP) && !defined(CONFIG_NET_TCP_NO_STACK)
struct tcp_conn_s; /* Forward reference */
#endif
struct socket; /* Forward reference */ struct socket; /* Forward reference */
/**************************************************************************** /****************************************************************************

20
net/inet/inet_sockif.c
View File

@ -667,7 +667,7 @@ static int inet_get_socketlevel_option(FAR struct socket *psock, int option,
return -EINVAL; return -EINVAL;
} }
#if defined(CONFIG_NET_TCP) && !defined(CONFIG_NET_TCP_NO_STACK) #ifdef NET_TCP_HAVE_STACK
if (psock->s_type == SOCK_STREAM) if (psock->s_type == SOCK_STREAM)
{ {
FAR struct tcp_conn_s *tcp = psock->s_conn; FAR struct tcp_conn_s *tcp = psock->s_conn;
@ -675,7 +675,7 @@ static int inet_get_socketlevel_option(FAR struct socket *psock, int option,
} }
else else
#endif #endif
#if defined(CONFIG_NET_UDP) && !defined(CONFIG_NET_UDP_NO_STACK) #ifdef NET_UDP_HAVE_STACK
if (psock->s_type == SOCK_DGRAM) if (psock->s_type == SOCK_DGRAM)
{ {
FAR struct udp_conn_s *udp = psock->s_conn; FAR struct udp_conn_s *udp = psock->s_conn;
@ -698,7 +698,7 @@ static int inet_get_socketlevel_option(FAR struct socket *psock, int option,
return -EINVAL; return -EINVAL;
} }
#if defined(CONFIG_NET_TCP) && !defined(CONFIG_NET_TCP_NO_STACK) #ifdef NET_TCP_HAVE_STACK
if (psock->s_type == SOCK_STREAM) if (psock->s_type == SOCK_STREAM)
{ {
FAR struct tcp_conn_s *tcp = psock->s_conn; FAR struct tcp_conn_s *tcp = psock->s_conn;
@ -706,7 +706,7 @@ static int inet_get_socketlevel_option(FAR struct socket *psock, int option,
} }
else else
#endif #endif
#if defined(CONFIG_NET_UDP) && !defined(CONFIG_NET_UDP_NO_STACK) #ifdef NET_UDP_HAVE_STACK
if (psock->s_type == SOCK_DGRAM) if (psock->s_type == SOCK_DGRAM)
{ {
FAR struct udp_conn_s *udp = psock->s_conn; FAR struct udp_conn_s *udp = psock->s_conn;
@ -931,7 +931,7 @@ static int inet_set_socketlevel_option(FAR struct socket *psock, int option,
net_lock(); net_lock();
#if defined(CONFIG_NET_TCP) && !defined(CONFIG_NET_TCP_NO_STACK) #ifdef NET_TCP_HAVE_STACK
if (psock->s_type == SOCK_STREAM) if (psock->s_type == SOCK_STREAM)
{ {
FAR struct tcp_conn_s *tcp = psock->s_conn; FAR struct tcp_conn_s *tcp = psock->s_conn;
@ -942,7 +942,7 @@ static int inet_set_socketlevel_option(FAR struct socket *psock, int option,
} }
else else
#endif #endif
#if defined(CONFIG_NET_UDP) && !defined(CONFIG_NET_UDP_NO_STACK) #ifdef NET_UDP_HAVE_STACK
if (psock->s_type == SOCK_DGRAM) if (psock->s_type == SOCK_DGRAM)
{ {
FAR struct udp_conn_s *udp = psock->s_conn; FAR struct udp_conn_s *udp = psock->s_conn;
@ -988,7 +988,7 @@ static int inet_set_socketlevel_option(FAR struct socket *psock, int option,
net_lock(); net_lock();
#if defined(CONFIG_NET_TCP) && !defined(CONFIG_NET_TCP_NO_STACK) #ifdef NET_TCP_HAVE_STACK
if (psock->s_type == SOCK_STREAM) if (psock->s_type == SOCK_STREAM)
{ {
FAR struct tcp_conn_s *tcp = psock->s_conn; FAR struct tcp_conn_s *tcp = psock->s_conn;
@ -999,7 +999,7 @@ static int inet_set_socketlevel_option(FAR struct socket *psock, int option,
} }
else else
#endif #endif
#if defined(CONFIG_NET_UDP) && !defined(CONFIG_NET_UDP_NO_STACK) #ifdef NET_UDP_HAVE_STACK
if (psock->s_type == SOCK_DGRAM) if (psock->s_type == SOCK_DGRAM)
{ {
FAR struct udp_conn_s *udp = psock->s_conn; FAR struct udp_conn_s *udp = psock->s_conn;
@ -1904,7 +1904,7 @@ static int inet_ioctl(FAR struct socket *psock, int cmd, unsigned long arg)
return -EBADF; return -EBADF;
} }
#if defined(CONFIG_NET_TCP) && !defined(CONFIG_NET_TCP_NO_STACK) #ifdef NET_TCP_HAVE_STACK
if (psock->s_type == SOCK_STREAM || if (psock->s_type == SOCK_STREAM ||
(psock->s_type == SOCK_CTRL && (psock->s_type == SOCK_CTRL &&
(psock->s_proto == 0 || psock->s_proto == IPPROTO_TCP))) (psock->s_proto == 0 || psock->s_proto == IPPROTO_TCP)))
@ -2123,7 +2123,7 @@ static ssize_t inet_sendfile(FAR struct socket *psock,
FAR struct file *infile, FAR off_t *offset, FAR struct file *infile, FAR off_t *offset,
size_t count) size_t count)
{ {
#if defined(CONFIG_NET_TCP) && !defined(CONFIG_NET_TCP_NO_STACK) #ifdef NET_TCP_HAVE_STACK
if (psock->s_type == SOCK_STREAM) if (psock->s_type == SOCK_STREAM)
{ {
return tcp_sendfile(psock, infile, offset, count); return tcp_sendfile(psock, infile, offset, count);

4
net/inet/ipv4_setsockopt.c
View File

@ -175,7 +175,7 @@ int ipv4_setsockopt(FAR struct socket *psock, int option,
} }
break; break;
#if defined(CONFIG_NET_UDP) && !defined(CONFIG_NET_UDP_NO_STACK) #ifdef NET_UDP_HAVE_STACK
case IP_MULTICAST_TTL: /* Set/read the time-to-live value of case IP_MULTICAST_TTL: /* Set/read the time-to-live value of
* outgoing multicast packets */ * outgoing multicast packets */
{ {
@ -232,7 +232,7 @@ int ipv4_setsockopt(FAR struct socket *psock, int option,
break; break;
#endif /* CONFIG_NET_IGMP */ #endif /* CONFIG_NET_IGMP */
#if defined(CONFIG_NET_UDP) && !defined(CONFIG_NET_UDP_NO_STACK) #ifdef NET_UDP_HAVE_STACK
case IP_PKTINFO: case IP_PKTINFO:
{ {
FAR struct udp_conn_s *conn; FAR struct udp_conn_s *conn;

2
net/inet/ipv6_setsockopt.c
View File

@ -127,7 +127,7 @@ int ipv6_setsockopt(FAR struct socket *psock, int option,
ret = -ENOSYS; ret = -ENOSYS;
break; break;
#if defined(CONFIG_NET_UDP) && !defined(CONFIG_NET_UDP_NO_STACK) #ifdef NET_UDP_HAVE_STACK
case IPV6_PKTINFO: case IPV6_PKTINFO:
case IPV6_RECVPKTINFO: case IPV6_RECVPKTINFO:
{ {

4
net/procfs/net_tcp.c
View File

@ -41,7 +41,7 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_NET_TCP) && !defined(CONFIG_NET_TCP_NO_STACK) #ifdef NET_TCP_HAVE_STACK
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
# define TCP_LINELEN 180 # define TCP_LINELEN 180
@ -215,4 +215,4 @@ ssize_t netprocfs_read_tcpstats(FAR struct netprocfs_file_s *priv,
return len; return len;
} }
#endif /* CONFIG_NET_TCP && !CONFIG_NET_TCP_NO_STACK */ #endif /* NET_TCP_HAVE_STACK */

2
net/procfs/net_udp.c
View File

@ -41,7 +41,7 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_NET_UDP) && !defined(CONFIG_NET_UDP_NO_STACK) #ifdef NET_UDP_HAVE_STACK
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
# define UDP_LINELEN 180 # define UDP_LINELEN 180