nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 06:18:40 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: fix inet #14634 regression

Browse source 
Define wasn't imported by netconfig.h move definitions
This commit is contained in:
Peter van der Perk 2024-11-05 08:54:24 +01:00 committed by Xiang Xiao
parent 8241a10ebc
commit faee89b966
4 changed files with 20 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/nuttx/net/netconfig.h
View file

@ -68,6 +68,24 @@
* matter. It should, however, be valid in the current configuration. * matter. It should, however, be valid in the current configuration.
*/ */
#undef HAVE_INET_SOCKETS
#undef HAVE_PFINET_SOCKETS
#undef HAVE_PFINET6_SOCKETS
#if defined(CONFIG_NET_IPv4) || defined(CONFIG_NET_IPv6)
# define HAVE_INET_SOCKETS
# if (defined(CONFIG_NET_IPv4) && (defined(NET_UDP_HAVE_STACK) || \
defined(NET_TCP_HAVE_STACK))) || defined(CONFIG_NET_ICMP_SOCKET)
# define HAVE_PFINET_SOCKETS
# endif
# if (defined(CONFIG_NET_IPv6) && (defined(NET_UDP_HAVE_STACK) || \
defined(NET_TCP_HAVE_STACK))) || defined(CONFIG_NET_ICMPv6_SOCKET)
# define HAVE_PFINET6_SOCKETS
# endif
#endif
#if defined(HAVE_PFINET_SOCKETS) #if defined(HAVE_PFINET_SOCKETS)
# define NET_SOCK_FAMILY AF_INET # define NET_SOCK_FAMILY AF_INET
#elif defined(HAVE_PFINET6_SOCKETS) #elif defined(HAVE_PFINET6_SOCKETS)

24
net/inet/inet.h
View file

@ -34,30 +34,6 @@
#include <nuttx/net/net.h> #include <nuttx/net/net.h>
#include <nuttx/net/ip.h> #include <nuttx/net/ip.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* Configuration */
#undef HAVE_INET_SOCKETS
#undef HAVE_PFINET_SOCKETS
#undef HAVE_PFINET6_SOCKETS
#if defined(CONFIG_NET_IPv4) || defined(CONFIG_NET_IPv6)
# define HAVE_INET_SOCKETS
# if (defined(CONFIG_NET_IPv4) && (defined(NET_UDP_HAVE_STACK) || \
defined(NET_TCP_HAVE_STACK))) || defined(CONFIG_NET_ICMP_SOCKET)
# define HAVE_PFINET_SOCKETS
# endif
# if (defined(CONFIG_NET_IPv6) && (defined(NET_UDP_HAVE_STACK) || \
defined(NET_TCP_HAVE_STACK))) || defined(CONFIG_NET_ICMPv6_SOCKET)
# define HAVE_PFINET6_SOCKETS
# endif
#endif
/**************************************************************************** /****************************************************************************
* Public Data * Public Data
****************************************************************************/ ****************************************************************************/

1
net/inet/inet_sockif.c
View file

@ -34,6 +34,7 @@
#include <debug.h> #include <debug.h>
#include <nuttx/net/net.h> #include <nuttx/net/net.h>
#include <nuttx/net/netconfig.h>
#include <nuttx/net/tcp.h> #include <nuttx/net/tcp.h>
#include <nuttx/kmalloc.h> #include <nuttx/kmalloc.h>

1
net/socket/net_sockif.c
View file

@ -31,6 +31,7 @@
#include <debug.h> #include <debug.h>
#include <nuttx/net/net.h> #include <nuttx/net/net.h>
#include <nuttx/net/netconfig.h>
#include "inet/inet.h" #include "inet/inet.h"
#include "local/local.h" #include "local/local.h"