From d54a20b393d92abd257743038d7ddee8a783aa16 Mon Sep 17 00:00:00 2001 From: chao an Date: Tue, 29 Nov 2022 14:16:36 +0800 Subject: [PATCH] net/tcp/udp: remove all domain assertion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix build break if enable CONFIG_NET_IPv6 only In file included from tcp/tcp_sendfile.c:38: tcp/tcp_sendfile.c: In function ‘sendfile_eventhandler’: tcp/tcp_sendfile.c:173:27: error: ‘struct tcp_conn_s’ has no member named ‘domain’ 173 | DEBUGASSERT(conn->domain == PF_INET6); | ^~ Signed-off-by: chao an --- net/tcp/tcp_send_buffered.c | 3 --- net/tcp/tcp_send_unbuffered.c | 3 --- net/tcp/tcp_sendfile.c | 4 ---- net/udp/udp_sendto_buffered.c | 1 - net/udp/udp_sendto_unbuffered.c | 1 - 5 files changed, 12 deletions(-) diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c index 9035243d575..2387da4a246 100644 --- a/net/tcp/tcp_send_buffered.c +++ b/net/tcp/tcp_send_buffered.c @@ -281,7 +281,6 @@ static inline void send_ipselect(FAR struct net_driver_s *dev, { /* Select the IPv6 domain */ - DEBUGASSERT(conn->domain == PF_INET6); tcp_ipv6_select(dev); } } @@ -361,7 +360,6 @@ static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev, if (conn->domain == PF_INET) #endif { - DEBUGASSERT(IFF_IS_IPv4(dev->d_flags)); tcp = TCPIPv4BUF; } #endif /* CONFIG_NET_IPv4 */ @@ -371,7 +369,6 @@ static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev, else #endif { - DEBUGASSERT(IFF_IS_IPv6(dev->d_flags)); tcp = TCPIPv6BUF; } #endif /* CONFIG_NET_IPv6 */ diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c index 90af5c25b9d..efbd7f6c5a9 100644 --- a/net/tcp/tcp_send_unbuffered.c +++ b/net/tcp/tcp_send_unbuffered.c @@ -139,7 +139,6 @@ static inline void tcpsend_ipselect(FAR struct net_driver_s *dev, { /* Select the IPv6 domain */ - DEBUGASSERT(conn->domain == PF_INET6); tcp_ipv6_select(dev); } } @@ -220,7 +219,6 @@ static uint16_t tcpsend_eventhandler(FAR struct net_driver_s *dev, if (conn->domain == PF_INET) #endif { - DEBUGASSERT(IFF_IS_IPv4(dev->d_flags)); tcp = TCPIPv4BUF; } #endif /* CONFIG_NET_IPv4 */ @@ -230,7 +228,6 @@ static uint16_t tcpsend_eventhandler(FAR struct net_driver_s *dev, else #endif { - DEBUGASSERT(IFF_IS_IPv6(dev->d_flags)); tcp = TCPIPv6BUF; } #endif /* CONFIG_NET_IPv6 */ diff --git a/net/tcp/tcp_sendfile.c b/net/tcp/tcp_sendfile.c index be48a1fe369..cff780382e3 100644 --- a/net/tcp/tcp_sendfile.c +++ b/net/tcp/tcp_sendfile.c @@ -170,7 +170,6 @@ static uint16_t sendfile_eventhandler(FAR struct net_driver_s *dev, if (IFF_IS_IPv6(dev->d_flags)) #endif { - DEBUGASSERT(conn->domain == PF_INET6); tcp = TCPIPv6BUF; } #endif /* CONFIG_NET_IPv6 */ @@ -180,9 +179,6 @@ static uint16_t sendfile_eventhandler(FAR struct net_driver_s *dev, else #endif { -#if defined(CONFIG_NET_IPv4) && defined(CONFIG_NET_IPv6) - DEBUGASSERT(conn->domain == PF_INET); -#endif tcp = TCPIPv4BUF; } #endif /* CONFIG_NET_IPv4 */ diff --git a/net/udp/udp_sendto_buffered.c b/net/udp/udp_sendto_buffered.c index 0ef2713252c..0f48147b500 100644 --- a/net/udp/udp_sendto_buffered.c +++ b/net/udp/udp_sendto_buffered.c @@ -208,7 +208,6 @@ static inline void sendto_ipselect(FAR struct net_driver_s *dev, { /* Select the IPv6 domain */ - DEBUGASSERT(conn->domain == PF_INET6); udp_ipv6_select(dev); } } diff --git a/net/udp/udp_sendto_unbuffered.c b/net/udp/udp_sendto_unbuffered.c index 4a4da2a6eb1..b4bf0da9695 100644 --- a/net/udp/udp_sendto_unbuffered.c +++ b/net/udp/udp_sendto_unbuffered.c @@ -117,7 +117,6 @@ static inline void sendto_ipselect(FAR struct net_driver_s *dev, { /* Select the IPv6 domain */ - DEBUGASSERT(conn->domain == PF_INET6); udp_ipv6_select(dev); } }