wasip2: Some miscellaenous network-related changes (WebAssembly#678)

These were derived from getting Python's sockets-related test suite
passing with wasi-libc. Some new functions are added here, some error
codes are adjusted, and some aborts were changed since they're possible
to trip.

Author: alexcrichton

Makefile

@@ -170,13 +170,16 @@ LIBC_TOP_HALF_MUSL_SOURCES = \
         errno/strerror.c \
         network/htonl.c \
         network/htons.c \
-        network/ntohl.c \
-        network/ntohs.c \
-        network/inet_ntop.c \
-        network/inet_pton.c \
-        network/inet_aton.c \
         network/in6addr_any.c \
         network/in6addr_loopback.c \
+        network/inet_addr.c \
+        network/inet_aton.c \
+        network/inet_legacy.c \
+        network/inet_ntoa.c \
+        network/inet_ntop.c \
+        network/inet_pton.c \
+        network/ntohl.c \
+        network/ntohs.c \
         fenv/fenv.c \
         fenv/fesetround.c \
         fenv/feupdateenv.c \

expected/wasm32-wasip1-threads/defined-symbols.txt

@@ -792,7 +792,13 @@ imaxdiv
 in6addr_any
 in6addr_loopback
 index
+inet_addr
 inet_aton
+inet_lnaof
+inet_makeaddr
+inet_netof
+inet_network
+inet_ntoa
 inet_ntop
 inet_pton
 initstate

expected/wasm32-wasip1/defined-symbols.txt

@@ -757,7 +757,13 @@ imaxdiv
 in6addr_any
 in6addr_loopback
 index
+inet_addr
 inet_aton
+inet_lnaof
+inet_makeaddr
+inet_netof
+inet_network
+inet_ntoa
 inet_ntop
 inet_pton
 initstate

expected/wasm32-wasip2/defined-symbols.txt

@@ -817,7 +817,13 @@ imaxdiv
 in6addr_any
 in6addr_loopback
 index
+inet_addr
 inet_aton
+inet_lnaof
+inet_makeaddr
+inet_netof
+inet_network
+inet_ntoa
 inet_ntop
 inet_pton
 initstate

libc-bottom-half/sources/getsockpeername.c

@@ -9,7 +9,7 @@ int getsockname(int socket, struct sockaddr *__restrict addr,
 	if (!entry)
 		return -1;
         if (!entry->vtable->getsockname) {
-		errno = EOPNOTSUPP;
+		errno = ENOTSOCK;
 		return -1;
         }
         return entry->vtable->getsockname(entry->data, addr, addrlen);
@@ -22,7 +22,7 @@ int getpeername(int socket, struct sockaddr *__restrict addr,
 	if (!entry)
 		return -1;
         if (!entry->vtable->getpeername) {
-		errno = EOPNOTSUPP;
+		errno = ENOTSOCK;
 		return -1;
         }
         return entry->vtable->getpeername(entry->data, addr, addrlen);

libc-bottom-half/sources/netdb.c

@@ -256,7 +256,8 @@ int getnameinfo(const struct sockaddr *restrict sa, socklen_t salen,
 		socklen_t servlen, int flags)
 {
 	// TODO wasi-sockets
-	abort();
+        errno = EOPNOTSUPP;
+        return EAI_SYSTEM;
 }
 
 struct hostent *gethostbyname(const char *name)

libc-bottom-half/sources/wasip2_tcp.c

@@ -476,7 +476,8 @@ static int tcp_listen(void *data, int backlog) {
   }
 
   if (!tcp_method_tcp_socket_set_listen_backlog_size(socket_borrow, backlog, &error)) {
-    abort(); // Our own state checks should've prevented this from happening.
+    errno = __wasi_sockets_utils__map_error(error);
+    return -1;
   }
 
   if (socket->state.tag == TCP_SOCKET_STATE_LISTENING) {

libc-top-half/musl/include/arpa/inet.h

@@ -13,20 +13,16 @@ uint16_t htons(uint16_t);
 uint32_t ntohl(uint32_t);
 uint16_t ntohs(uint16_t);
 
-#ifdef __wasilibc_unmodified_upstream /* WASI has no inet_addr */
 in_addr_t inet_addr (const char *);
 in_addr_t inet_network (const char *);
 char *inet_ntoa (struct in_addr);
-#endif
 int inet_pton (int, const char *__restrict, void *__restrict);
 const char *inet_ntop (int, const void *__restrict, char *__restrict, socklen_t);
 
 int inet_aton (const char *, struct in_addr *);
-#ifdef __wasilibc_unmodified_upstream /* WASI has no inet_makeaddr */
 struct in_addr inet_makeaddr(in_addr_t, in_addr_t);
 in_addr_t inet_lnaof(struct in_addr);
 in_addr_t inet_netof(struct in_addr);
-#endif
 
 #ifdef __cplusplus
 }