lib: posix: net: Add support for namespaced network symbols

Use namespaced network symbols in order to avoid circular dependency
between Posix and network subsystems.

Signed-off-by: Jukka Rissanen <[email protected]>

Author: jukkar

include/zephyr/posix/arpa/inet.h

@@ -24,6 +24,13 @@ char *inet_ntoa(struct in_addr in);
 char *inet_ntop(sa_family_t family, const void *src, char *dst, size_t size);
 int inet_pton(sa_family_t family, const char *src, void *dst);
 
+#define ntohs(x)  net_ntohs(x)
+#define ntohl(x)  net_ntohl(x)
+#define ntohll(x) net_ntohll(x)
+#define htons(x)  net_htons(x)
+#define htonl(x)  net_htonl(x)
+#define htonll(x) net_htonll(x)
+
 #ifdef __cplusplus
 }
 #endif

include/zephyr/posix/net/if.h

@@ -12,6 +12,10 @@
 #define IF_NAMESIZE 1
 #endif
 
+#if !defined(IFNAMSIZ)
+#define IFNAMSIZ IF_NAMESIZE
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif

include/zephyr/posix/netdb.h

@@ -63,10 +63,10 @@ void endhostent(void);
 void endnetent(void);
 void endprotoent(void);
 void endservent(void);
-void freeaddrinfo(struct zsock_addrinfo *ai);
+void freeaddrinfo(struct addrinfo *ai);
 const char *gai_strerror(int errcode);
-int getaddrinfo(const char *host, const char *service, const struct zsock_addrinfo *hints,
-		struct zsock_addrinfo **res);
+int getaddrinfo(const char *host, const char *service, const struct addrinfo *hints,
+		struct addrinfo **res);
 struct hostent *gethostent(void);
 int getnameinfo(const struct sockaddr *addr, socklen_t addrlen, char *host, socklen_t hostlen,
 		char *serv, socklen_t servlen, int flags);

include/zephyr/posix/netinet/in.h

@@ -17,6 +17,12 @@ extern "C" {
 typedef uint16_t in_port_t;
 typedef uint32_t in_addr_t;
 
+#define in_addr  net_in_addr
+#define in6_addr net_in6_addr
+
+#define INET_ADDRSTRLEN  NET_INET_ADDRSTRLEN
+#define INET6_ADDRSTRLEN NET_INET6_ADDRSTRLEN
+
 #ifdef __cplusplus
 }
 #endif

include/zephyr/posix/sys/socket.h

@@ -7,16 +7,11 @@
 #define ZEPHYR_INCLUDE_POSIX_SYS_SOCKET_H_
 
 #include <sys/types.h>
-#include <zephyr/net/socket.h>
-
-#define SHUT_RD   ZSOCK_SHUT_RD
-#define SHUT_WR   ZSOCK_SHUT_WR
-#define SHUT_RDWR ZSOCK_SHUT_RDWR
 
-#define MSG_PEEK     ZSOCK_MSG_PEEK
-#define MSG_TRUNC    ZSOCK_MSG_TRUNC
-#define MSG_DONTWAIT ZSOCK_MSG_DONTWAIT
-#define MSG_WAITALL  ZSOCK_MSG_WAITALL
+#undef ZEPHYR_INCLUDE_NET_COMPAT_MODE_SYMBOLS
+#define ZEPHYR_INCLUDE_NET_COMPAT_MODE_SYMBOLS
+#include <zephyr/net/socket.h>
+#undef ZEPHYR_INCLUDE_NET_COMPAT_MODE_SYMBOLS
 
 #ifdef __cplusplus
 extern "C" {
@@ -31,6 +26,15 @@ struct linger {
 typedef uint32_t socklen_t;
 struct msghdr;
 struct sockaddr;
+
+#define MSG_PEEK     ZSOCK_MSG_PEEK
+#define MSG_TRUNC    ZSOCK_MSG_TRUNC
+#define MSG_DONTWAIT ZSOCK_MSG_DONTWAIT
+#define MSG_WAITALL  ZSOCK_MSG_WAITALL
+
+#define SHUT_RD   ZSOCK_SHUT_RD
+#define SHUT_WR   ZSOCK_SHUT_WR
+#define SHUT_RDWR ZSOCK_SHUT_RDWR
 #endif
 
 int accept(int sock, struct sockaddr *addr, socklen_t *addrlen);