Commit 3f4c43b0aa

@@ -0,0 +1,1 @@
+typedef unsigned long __jmp_buf[8];

@@ -1,5 +1,8 @@
 #ifndef	_SYS_SOCKET_H
 #define	_SYS_SOCKET_H
+
+#include <__wasi_snapshot.h>
+
 #ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
 #else
 #include <__header_sys_socket.h>
@@ -395,30 +398,33 @@ struct sockaddr_storage {
 #include <__struct_sockaddr_storage.h>
 #endif
 
-#ifdef __wasilibc_unmodified_upstream /* WASI has no socket/socketpair */
+#if (defined __wasilibc_unmodified_upstream) || (defined __wasilibc_use_wasip2)
 int socket (int, int, int);
+#endif
+
+#ifdef __wasilibc_unmodified_upstream /* WASI has no socketpair */
 int socketpair (int, int, int, int [2]);
 #endif
 
 int shutdown (int, int);
 
-#ifdef __wasilibc_unmodified_upstream /* WASI has no bind/connect/listen/accept */
-int bind (int, const struct sockaddr *, socklen_t);
+#if (defined __wasilibc_unmodified_upstream) || (defined __wasilibc_use_wasip2)
 int connect (int, const struct sockaddr *, socklen_t);
+int bind (int, const struct sockaddr *, socklen_t);
 int listen (int, int);
 #endif
 
 int accept (int, struct sockaddr *__restrict, socklen_t *__restrict);
 int accept4(int, struct sockaddr *__restrict, socklen_t *__restrict, int);
 
-#ifdef __wasilibc_unmodified_upstream /* WASI has no getsockname/getpeername */
+#if (defined __wasilibc_unmodified_upstream) || (defined __wasilibc_use_wasip2)
 int getsockname (int, struct sockaddr *__restrict, socklen_t *__restrict);
 int getpeername (int, struct sockaddr *__restrict, socklen_t *__restrict);
 #endif
 
 ssize_t send (int, const void *, size_t, int);
 ssize_t recv (int, void *, size_t, int);
-#ifdef __wasilibc_unmodified_upstream /* WASI has no sendto/recvfrom */
+#if (defined __wasilibc_unmodified_upstream) || (defined __wasilibc_use_wasip2)
 ssize_t sendto (int, const void *, size_t, int, const struct sockaddr *, socklen_t);
 ssize_t recvfrom (int, void *__restrict, size_t, int, struct sockaddr *__restrict, socklen_t *__restrict);
 #endif
@@ -428,7 +434,7 @@ ssize_t recvmsg (int, struct msghdr *, int);
 #endif
 
 int getsockopt (int, int, int, void *__restrict, socklen_t *__restrict);
-#ifdef __wasilibc_unmodified_upstream /* WASI has no setsockopt */
+#if (defined __wasilibc_unmodified_upstream) || (defined __wasilibc_use_wasip2)
 int setsockopt (int, int, int, const void *, socklen_t);
 #endif
 

@@ -78,11 +78,9 @@ int stat(const char *__restrict, struct stat *__restrict);
 int fstat(int, struct stat *);
 int lstat(const char *__restrict, struct stat *__restrict);
 int fstatat(int, const char *__restrict, struct stat *__restrict, int);
-#ifdef __wasilibc_unmodified_upstream /* WASI has no chmod */
 int chmod(const char *, mode_t);
 int fchmod(int, mode_t);
 int fchmodat(int, const char *, mode_t, int);
-#endif
 #ifdef __wasilibc_unmodified_upstream /* WASI has no umask */
 mode_t umask(mode_t);
 #endif

@@ -0,0 +1,56 @@
+#ifndef	_SYS_STATVFS_H
+#define	_SYS_STATVFS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#define __NEED_fsblkcnt_t
+#define __NEED_fsfilcnt_t
+#include <bits/alltypes.h>
+
+struct statvfs {
+	unsigned long f_bsize, f_frsize;
+	fsblkcnt_t f_blocks, f_bfree, f_bavail;
+	fsfilcnt_t f_files, f_ffree, f_favail;
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+	unsigned long f_fsid;
+	unsigned :8*(2*sizeof(int)-sizeof(long));
+#else
+	unsigned :8*(2*sizeof(int)-sizeof(long));
+	unsigned long f_fsid;
+#endif
+	unsigned long f_flag, f_namemax;
+	int __reserved[6];
+};
+
+int statvfs (const char *__restrict, struct statvfs *__restrict);
+int fstatvfs (int, struct statvfs *);
+
+#define ST_RDONLY 1
+#define ST_NOSUID 2
+#define ST_NODEV  4
+#define ST_NOEXEC 8
+#define ST_SYNCHRONOUS 16
+#define ST_MANDLOCK    64
+#define ST_WRITE       128
+#define ST_APPEND      256
+#define ST_IMMUTABLE   512
+#define ST_NOATIME     1024
+#define ST_NODIRATIME  2048
+#define ST_RELATIME    4096
+
+#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
+#define statvfs64 statvfs
+#define fstatvfs64 fstatvfs
+#define fsblkcnt64_t fsblkcnt_t
+#define fsfilcnt64_t fsfilcnt_t
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

@@ -11,6 +11,12 @@ extern "C" {
 struct stat;
 struct timespec;
 
+/// Populate libc's preopen tables. This is normally done automatically
+/// just before it's needed, however if you call `__wasi_fd_renumber` or
+/// `__wasi_fd_close` directly, and you need the preopens to be accurate
+/// afterward, you should call this before doing so.
+void __wasilibc_populate_preopens(void);
+
 /// Register the given pre-opened file descriptor under the given path.
 ///
 /// This function does not take ownership of `prefix` (it makes its own copy).

@@ -5,16 +5,11 @@
 extern "C" {
 #endif
 
-#ifdef __cplusplus
-extern thread_local int errno;
-#else
 extern _Thread_local int errno;
-#endif
 
 #define errno errno
 
 #ifdef __cplusplus
 }
 #endif
-
 #endif

@@ -11,12 +11,16 @@
 #define DT_REG __WASI_FILETYPE_REGULAR_FILE
 #define DT_UNKNOWN __WASI_FILETYPE_UNKNOWN
 
+// DT_SOCK is not supported in WASI Preview 1 (but will be in Preview 2).  We
+// define it regardless so that libc++'s `<filesystem>` implementation builds.
+// The exact value is mostly arbitrary, but chosen so it doesn't conflict with
+// any of the existing `__WASI_FILETYPE_*` flags.  We do not expect any new
+// flags to be added to WASI Preview 1, so that should be sufficient.
+#define DT_SOCK 20
+
 #define IFTODT(x) (__wasilibc_iftodt(x))
 #define DTTOIF(x) (__wasilibc_dttoif(x))
 
-int __wasilibc_iftodt(int x);
-int __wasilibc_dttoif(int x);
-
 #include <__struct_dirent.h>
 #include <__typedef_DIR.h>
 
@@ -24,6 +28,9 @@ int __wasilibc_dttoif(int x);
 extern "C" {
 #endif
 
+int __wasilibc_iftodt(int x);
+int __wasilibc_dttoif(int x);
+
 int closedir(DIR *);
 DIR *opendir(const char *);
 DIR *fdopendir(int);

@@ -1,6 +1,7 @@
 #ifndef __wasilibc___header_sys_socket_h
 #define __wasilibc___header_sys_socket_h
 
+#include <__wasi_snapshot.h>
 #include <__struct_msghdr.h>
 #include <__struct_sockaddr.h>
 #include <__struct_sockaddr_storage.h>
@@ -11,9 +12,42 @@
 #define SHUT_WR __WASI_SDFLAGS_WR
 #define SHUT_RDWR (SHUT_RD | SHUT_WR)
 
+#ifdef __wasilibc_use_wasip2
+#define MSG_DONTWAIT  0x0040
+#define MSG_NOSIGNAL  0x4000
+#define MSG_PEEK      0x0002
+#define MSG_WAITALL   0x0100
+#define MSG_TRUNC     0x0020
+
+#define SOL_IP     0
+#define SOL_TCP    6
+#define SOL_UDP    17
+#define SOL_IPV6   41
+
+#define SOMAXCONN 128
+
+#define SO_REUSEADDR 2
+#define SO_ERROR 4
+#define SO_SNDBUF 7
+#define SO_RCVBUF 8
+#define SO_KEEPALIVE 9
+#define SO_ACCEPTCONN 30
+#define SO_PROTOCOL 38
+#define SO_DOMAIN 39
+ 
+#if __LONG_MAX == 0x7fffffff
+#define SO_RCVTIMEO     66
+#define SO_SNDTIMEO     67
+#else
+#define SO_RCVTIMEO     20
+#define SO_SNDTIMEO     21
+#endif
+
+#else // __wasilibc_use_wasip2
 #define MSG_PEEK __WASI_RIFLAGS_RECV_PEEK
 #define MSG_WAITALL __WASI_RIFLAGS_RECV_WAITALL
-#define MSG_TRUNC __WASI_RIFLAGS_RECV_DATA_TRUNCATED
+#define MSG_TRUNC __WASI_ROFLAGS_RECV_DATA_TRUNCATED
+#endif // __wasilibc_use_wasip2
 
 #define SOCK_DGRAM __WASI_FILETYPE_SOCKET_DGRAM
 #define SOCK_STREAM __WASI_FILETYPE_SOCKET_STREAM
@@ -25,9 +59,13 @@
 
 #define SO_TYPE 3
 
-#define AF_UNSPEC 0
-#define AF_INET 1
-#define AF_INET6 2
+#define PF_UNSPEC 0
+#define PF_INET 1
+#define PF_INET6 2
+
+#define AF_UNSPEC PF_UNSPEC
+#define AF_INET PF_INET
+#define AF_INET6 PF_INET6
 #define AF_UNIX 3
 
 #ifdef __cplusplus

@@ -9,7 +9,7 @@
 #define S_IFLNK (0xa000)
 #define S_IFREG (0x8000)
 #define S_IFSOCK (0xc000)
-#define S_IFIFO (0xc000)
+#define S_IFIFO (0x1000)
 
 #define S_ISBLK(m) (((m)&S_IFMT) == S_IFBLK)
 #define S_ISCHR(m) (((m)&S_IFMT) == S_IFCHR)

@@ -1,9 +1,6 @@
 #ifndef __wasilibc___struct_sockaddr_h
 #define __wasilibc___struct_sockaddr_h
 
-#define __need_STDDEF_H_misc
-#include <stddef.h>
-
 #include <__typedef_sa_family_t.h>
 
 struct sockaddr {

@@ -1,15 +1,12 @@
 #ifndef __wasilibc___struct_sockaddr_in_h
 #define __wasilibc___struct_sockaddr_in_h
 
-#define __need_STDDEF_H_misc
-#include <stddef.h>
-
 #include <__typedef_sa_family_t.h>
 #include <__typedef_in_port_t.h>
 #include <__struct_in_addr.h>
 
 struct sockaddr_in {
-    _Alignas(max_align_t) sa_family_t sin_family;
+    __attribute__((aligned(__BIGGEST_ALIGNMENT__))) sa_family_t sin_family;
     in_port_t sin_port;
     struct in_addr sin_addr;
 };

@@ -1,15 +1,12 @@
 #ifndef __wasilibc___struct_sockaddr_in6_h
 #define __wasilibc___struct_sockaddr_in6_h
 
-#define __need_STDDEF_H_misc
-#include <stddef.h>
-
 #include <__typedef_sa_family_t.h>
 #include <__typedef_in_port_t.h>
 #include <__struct_in6_addr.h>
 
 struct sockaddr_in6 {
-    _Alignas(max_align_t) sa_family_t sin6_family;
+    __attribute__((aligned(__BIGGEST_ALIGNMENT__))) sa_family_t sin6_family;
     in_port_t sin6_port;
     unsigned sin6_flowinfo;
     struct in6_addr sin6_addr;

@@ -1,13 +1,10 @@
 #ifndef __wasilibc___struct_sockaddr_storage_h
 #define __wasilibc___struct_sockaddr_storage_h
 
-#define __need_STDDEF_H_misc
-#include <stddef.h>
-
 #include <__typedef_sa_family_t.h>
 
 struct sockaddr_storage {
-    _Alignas(max_align_t) sa_family_t ss_family;
+    __attribute__((aligned(__BIGGEST_ALIGNMENT__))) sa_family_t ss_family;
     char __ss_data[32];
 };
 

@@ -1,13 +1,10 @@
 #ifndef __wasilibc___struct_sockaddr_un_h
 #define __wasilibc___struct_sockaddr_un_h
 
-#define __need_STDDEF_H_misc
-#include <stddef.h>
-
 #include <__typedef_sa_family_t.h>
 
 struct sockaddr_un {
-    _Alignas(max_align_t) sa_family_t sun_family;
+    __attribute__((aligned(__BIGGEST_ALIGNMENT__))) sa_family_t sun_family;
 };
 
 #endif

@@ -0,0 +1,55 @@
+#ifndef	_SETJMP_H
+#define	_SETJMP_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#ifndef __wasilibc_unmodified_upstream
+/* WASI has no setjmp */
+#if !defined(__wasm_exception_handling__)
+#error Setjmp/longjmp support requires Exception handling support, which is [not yet standardized](https://github.com/WebAssembly/proposals?tab=readme-ov-file#phase-3---implementation-phase-cg--wg). To enable it, compile with `-mllvm -wasm-enable-sjlj` and use an engine that implements the Exception handling proposal.
+#endif
+#endif
+#include <bits/setjmp.h>
+
+typedef struct __jmp_buf_tag {
+	__jmp_buf __jb;
+	unsigned long __fl;
+	unsigned long __ss[128/sizeof(long)];
+} jmp_buf[1];
+
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
+#define __setjmp_attr __attribute__((__returns_twice__))
+#else
+#define __setjmp_attr
+#endif
+
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
+typedef jmp_buf sigjmp_buf;
+int sigsetjmp (sigjmp_buf, int) __setjmp_attr;
+_Noreturn void siglongjmp (sigjmp_buf, int);
+#endif
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
+int _setjmp (jmp_buf) __setjmp_attr;
+_Noreturn void _longjmp (jmp_buf, int);
+#endif
+
+int setjmp (jmp_buf) __setjmp_attr;
+_Noreturn void longjmp (jmp_buf, int);
+
+#define setjmp setjmp
+
+#undef __setjmp_attr
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

@@ -128,9 +128,7 @@ int rand_r (unsigned *);
 
 #if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
  || defined(_BSD_SOURCE)
-#ifdef __wasilibc_unmodified_upstream /* WASI has no absolute paths */
 char *realpath (const char *__restrict, char *__restrict);
-#endif
 long int random (void);
 void srandom (unsigned int);
 char *initstate (unsigned int, char *, size_t);

@@ -336,7 +336,9 @@ pid_t gettid(void);
 #endif
 #define _POSIX_VDISABLE         0
 
+#if defined(__wasilibc_unmodified_upstream) || defined(_REENTRANT)
 #define _POSIX_THREADS          _POSIX_VERSION
+#endif
 #define _POSIX_THREAD_PROCESS_SHARED _POSIX_VERSION
 #define _POSIX_THREAD_SAFE_FUNCTIONS _POSIX_VERSION
 #define _POSIX_THREAD_ATTR_STACKADDR _POSIX_VERSION

@@ -56,7 +56,7 @@
 
 // Defind by the linker to have the address of the start of the heap.
 extern unsigned char __heap_base;
-extern unsigned char __heap_end __attribute__((__weak__));
+extern unsigned char __heap_end;
 
 // Behavior of right shifting a signed integer is compiler implementation defined.
 static_assert((((int32_t)0x80000000U) >> 31) == -1, "This malloc implementation requires that right-shifting a signed integer produces a sign-extending (arithmetic) shift!");
@@ -66,7 +66,7 @@ static_assert((((int32_t)0x80000000U) >> 31) == -1, "This malloc implementation
 #define MALLOC_ALIGNMENT alignof(max_align_t)
 static_assert(alignof(max_align_t) == 16, "max_align_t must be correct");
 
-#define EMMALLOC_EXPORT __attribute__((__weak__))
+#define EMMALLOC_EXPORT __attribute__((weak))
 
 #define MIN(x, y) ((x) < (y) ? (x) : (y))
 #define MAX(x, y) ((x) > (y) ? (x) : (y))
@@ -546,12 +546,13 @@ static bool claim_more_memory(size_t numBytes)
     // If this is the first time we're called, see if we can use
     // the initial heap memory set up by wasm-ld.
     if (!listOfAllRegions) {
+      unsigned char *heap_base = &__heap_base;
       unsigned char *heap_end = &__heap_end;
-      if (heap_end == NULL)
-        heap_end = sbrk(0);
-
-      if (numBytes <= (size_t)(heap_end - &__heap_base)) {
-        startPtr = &__heap_base;
+      if (heap_end < heap_base) {
+	__builtin_trap();
+      }
+      if (numBytes <= (size_t)(heap_end - heap_base)) {
+        startPtr = heap_base;
         endPtr = heap_end;
 	break;
       }

@@ -7,7 +7,7 @@
 #include <poll.h>
 #include <stdbool.h>
 
-int poll(struct pollfd *fds, size_t nfds, int timeout) {
+static int poll_wasip1(struct pollfd *fds, size_t nfds, int timeout) {
   // Construct events for poll().
   size_t maxevents = 2 * nfds + 1;
   __wasi_subscription_t subscriptions[maxevents];
@@ -127,3 +127,48 @@ int poll(struct pollfd *fds, size_t nfds, int timeout) {
   }
   return retval;
 }
+
+#ifdef __wasilibc_use_wasip2
+#include <wasi/descriptor_table.h>
+
+int poll_wasip2(struct pollfd *fds, size_t nfds, int timeout);
+
+int poll(struct pollfd* fds, nfds_t nfds, int timeout)
+{
+    bool found_socket = false;
+    bool found_non_socket = false;
+    for (size_t i = 0; i < nfds; ++i) {
+        descriptor_table_entry_t* entry;
+        if (descriptor_table_get_ref(fds[i].fd, &entry)) {
+            found_socket = true;
+        } else {
+            found_non_socket = true;
+        }
+    }
+
+    if (found_socket) {
+        if (found_non_socket) {
+            // We currently don't support polling a mix of non-sockets and
+            // sockets here (though you can do it by using the host APIs
+            // directly), and we probably won't until we've migrated entirely to
+            // WASI 0.2.
+            errno = ENOTSUP;
+            return -1;
+        }
+
+        return poll_wasip2(fds, nfds, timeout);
+    } else if (found_non_socket) {
+        return poll_wasip1(fds, nfds, timeout);
+    } else if (timeout >= 0) {
+        return poll_wasip2(fds, nfds, timeout);
+    } else {
+        errno = ENOTSUP;
+        return -1;
+    }
+}
+#else // not __wasilibc_use_wasip2
+int poll(struct pollfd* fds, nfds_t nfds, int timeout)
+{
+    return poll_wasip1(fds, nfds, timeout);
+}
+#endif // not __wasilibc_use_wasip2

@@ -4,11 +4,66 @@
 
 #include <sys/ioctl.h>
 
-#include <wasi/api.h>
 #include <errno.h>
 #include <stdarg.h>
 
+#include <wasi/api.h>
+#ifdef __wasilibc_use_wasip2
+#include <wasi/descriptor_table.h>
+#endif
+
 int ioctl(int fildes, int request, ...) {
+#ifdef __wasilibc_use_wasip2
+	descriptor_table_entry_t *entry;
+	if (descriptor_table_get_ref(fildes, &entry)) {
+		switch (entry->tag) {
+		case DESCRIPTOR_TABLE_ENTRY_TCP_SOCKET: {
+			tcp_socket_t *socket = &entry->tcp_socket;
+			switch (request) {
+			case FIONBIO: {
+				va_list ap;
+				va_start(ap, request);
+				socket->blocking = *va_arg(ap, const int *) ==
+						   0;
+				va_end(ap);
+
+				return 0;
+			}
+
+			default:
+				// TODO wasi-sockets: anything else we should support?
+				errno = EINVAL;
+				return -1;
+			}
+		}
+
+		case DESCRIPTOR_TABLE_ENTRY_UDP_SOCKET: {
+			udp_socket_t *socket = &entry->udp_socket;
+			switch (request) {
+			case FIONBIO: {
+				va_list ap;
+				va_start(ap, request);
+				socket->blocking = *va_arg(ap, const int *) ==
+						   0;
+				va_end(ap);
+
+				return 0;
+			}
+
+			default:
+				// TODO wasi-sockets: anything else we should support?
+				errno = EINVAL;
+				return -1;
+			}
+		}
+
+		default:
+			errno = ENOPROTOOPT;
+			return -1;
+		}
+	}
+#endif // __wasilibc_use_wasip2
+
   switch (request) {
     case FIONREAD: {
       // Poll the file descriptor to determine how many bytes can be read.

@@ -8,6 +8,7 @@
 
 #include <wasi/api.h>
 #include <errno.h>
+#include <poll.h>
 
 int pselect(int nfds, fd_set *restrict readfds, fd_set *restrict writefds,
             fd_set *restrict errorfds, const struct timespec *restrict timeout,
@@ -33,93 +34,66 @@ int pselect(int nfds, fd_set *restrict readfds, fd_set *restrict writefds,
   if (writefds == NULL)
     writefds = &empty;
 
-  // Determine the maximum number of events.
-  size_t maxevents = readfds->__nfds + writefds->__nfds + 1;
-  __wasi_subscription_t subscriptions[maxevents];
-  size_t nsubscriptions = 0;
-
-  // Convert the readfds set.
+  struct pollfd poll_fds[readfds->__nfds + writefds->__nfds];
+  size_t poll_nfds = 0;
+  
   for (size_t i = 0; i < readfds->__nfds; ++i) {
     int fd = readfds->__fds[i];
     if (fd < nfds) {
-      __wasi_subscription_t *subscription = &subscriptions[nsubscriptions++];
-      *subscription = (__wasi_subscription_t){
-          .userdata = fd,
-          .u.tag = __WASI_EVENTTYPE_FD_READ,
-          .u.u.fd_read.file_descriptor = fd,
-      };
+        poll_fds[poll_nfds++] = (struct pollfd){
+            .fd = fd,
+            .events = POLLRDNORM,
+            .revents = 0
+        };
     }
   }
-
-  // Convert the writefds set.
+  
   for (size_t i = 0; i < writefds->__nfds; ++i) {
     int fd = writefds->__fds[i];
     if (fd < nfds) {
-      __wasi_subscription_t *subscription = &subscriptions[nsubscriptions++];
-      *subscription = (__wasi_subscription_t){
-          .userdata = fd,
-          .u.tag = __WASI_EVENTTYPE_FD_WRITE,
-          .u.u.fd_write.file_descriptor = fd,
+      poll_fds[poll_nfds++] = (struct pollfd){
+          .fd = fd,
+          .events = POLLWRNORM,
+          .revents = 0
       };
     }
   }
 
-  // Create extra event for the timeout.
-  if (timeout != NULL) {
-    __wasi_subscription_t *subscription = &subscriptions[nsubscriptions++];
-    *subscription = (__wasi_subscription_t){
-        .u.tag = __WASI_EVENTTYPE_CLOCK,
-        .u.u.clock.id = __WASI_CLOCKID_REALTIME,
-    };
-    if (!timespec_to_timestamp_clamp(timeout, &subscription->u.u.clock.timeout)) {
+  int poll_timeout;
+  if (timeout) {
+    uint64_t timeout_u64;
+    if (!timespec_to_timestamp_clamp(timeout, &timeout_u64) ) {
       errno = EINVAL;
       return -1;
     }
-  }
 
-  // Execute poll().
-  size_t nevents;
-  __wasi_event_t events[nsubscriptions];
-  __wasi_errno_t error =
-      __wasi_poll_oneoff(subscriptions, events, nsubscriptions, &nevents);
-  if (error != 0) {
-    // WASI's poll requires at least one subscription, or else it returns
-    // `EINVAL`. Since a `pselect` with nothing to wait for is valid in POSIX,
-    // return `ENOTSUP` to indicate that we don't support that case.
-    //
-    // Wasm has no signal handling, so if none of the user-provided `pollfd`
-    // elements, nor the timeout, led us to producing even one subscription
-    // to wait for, there would be no way for the poll to wake up. WASI
-    // returns `EINVAL` in this case, but for users of `poll`, `ENOTSUP` is
-    // more likely to be understood.
-    if (nsubscriptions == 0)
-      errno = ENOTSUP;
-    else
-      errno = error;
-    return -1;
-  }
+    // Convert nanoseconds to milliseconds:
+    timeout_u64 /= 1000000;
 
-  // Test for EBADF.
-  for (size_t i = 0; i < nevents; ++i) {
-    const __wasi_event_t *event = &events[i];
-    if ((event->type == __WASI_EVENTTYPE_FD_READ ||
-         event->type == __WASI_EVENTTYPE_FD_WRITE) &&
-        event->error == __WASI_ERRNO_BADF) {
-      errno = EBADF;
-      return -1;
+    if (timeout_u64 > INT_MAX) {
+      timeout_u64 = INT_MAX;
     }
+
+    poll_timeout = (int) timeout_u64;
+  } else {
+    poll_timeout = -1;
+  };
+  
+  if (poll(poll_fds, poll_nfds, poll_timeout) < 0) {
+    return -1;
   }
 
-  // Clear and set entries in the result sets.
   FD_ZERO(readfds);
   FD_ZERO(writefds);
-  for (size_t i = 0; i < nevents; ++i) {
-    const __wasi_event_t *event = &events[i];
-    if (event->type == __WASI_EVENTTYPE_FD_READ) {
-      readfds->__fds[readfds->__nfds++] = event->userdata;
-    } else if (event->type == __WASI_EVENTTYPE_FD_WRITE) {
-      writefds->__fds[writefds->__nfds++] = event->userdata;
+  for (size_t i = 0; i < poll_nfds; ++i) {
+    struct pollfd* pollfd = poll_fds + i;
+    if ((pollfd->revents & POLLRDNORM) != 0) {
+      readfds->__fds[readfds->__nfds++] = pollfd->fd;
+    }
+    if ((pollfd->revents & POLLWRNORM) != 0) {
+      writefds->__fds[writefds->__nfds++] = pollfd->fd;
     }
   }
+  
   return readfds->__nfds + writefds->__nfds;
 }

@@ -1,16 +0,0 @@
-// Copyright (c) 2015-2016 Nuxi, https://nuxi.nl/
-//
-// SPDX-License-Identifier: BSD-2-Clause
-
-#include <wasi/api.h>
-#include <errno.h>
-#include <unistd.h>
-
-int close(int fildes) {
-  __wasi_errno_t error = __wasi_fd_close(fildes);
-  if (error != 0) {
-    errno = error;
-    return -1;
-  }
-  return 0;
-}

@@ -20,18 +20,18 @@ void _start(void) {
     static volatile _Atomic int started = 0;
     int expected = 0;
     if (!atomic_compare_exchange_strong(&started, &expected, 1)) {
-	__builtin_trap();
+        __builtin_trap();
     }
 #else
     static volatile int started = 0;
     if (started != 0) {
-	__builtin_trap();
+        __builtin_trap();
     }
     started = 1;
 #endif
 
 #ifdef _REENTRANT
-	__wasi_init_tp();
+    __wasi_init_tp();
 #endif
 
     // The linker synthesizes this to call constructors.

@@ -0,0 +1,127 @@
+#ifndef DESCRIPTOR_TABLE_H
+#define DESCRIPTOR_TABLE_H
+
+#include <wasi/wasip2.h>
+
+typedef struct {
+	int dummy;
+} tcp_socket_state_unbound_t;
+typedef struct {
+	int dummy;
+} tcp_socket_state_bound_t;
+typedef struct {
+	int dummy;
+} tcp_socket_state_connecting_t;
+typedef struct {
+	int dummy;
+} tcp_socket_state_listening_t;
+
+typedef struct {
+	streams_own_input_stream_t input;
+	poll_own_pollable_t input_pollable;
+	streams_own_output_stream_t output;
+	poll_own_pollable_t output_pollable;
+} tcp_socket_state_connected_t;
+
+typedef struct {
+	network_error_code_t error_code;
+} tcp_socket_state_connect_failed_t;
+
+// This is a tagged union. When adding/removing/renaming cases, be sure to keep the tag and union definitions in sync.
+typedef struct {
+	enum {
+		TCP_SOCKET_STATE_UNBOUND,
+		TCP_SOCKET_STATE_BOUND,
+		TCP_SOCKET_STATE_CONNECTING,
+		TCP_SOCKET_STATE_CONNECTED,
+		TCP_SOCKET_STATE_CONNECT_FAILED,
+		TCP_SOCKET_STATE_LISTENING,
+	} tag;
+	union {
+		tcp_socket_state_unbound_t unbound;
+		tcp_socket_state_bound_t bound;
+		tcp_socket_state_connecting_t connecting;
+		tcp_socket_state_connected_t connected;
+		tcp_socket_state_connect_failed_t connect_failed;
+		tcp_socket_state_listening_t listening;
+	};
+} tcp_socket_state_t;
+
+typedef struct {
+	tcp_own_tcp_socket_t socket;
+	poll_own_pollable_t socket_pollable;
+	bool blocking;
+	bool fake_nodelay;
+	bool fake_reuseaddr;
+	network_ip_address_family_t family;
+	tcp_socket_state_t state;
+} tcp_socket_t;
+
+typedef struct {
+	udp_own_incoming_datagram_stream_t incoming;
+	poll_own_pollable_t incoming_pollable;
+	udp_own_outgoing_datagram_stream_t outgoing;
+	poll_own_pollable_t outgoing_pollable;
+} udp_socket_streams_t;
+
+typedef struct {
+	int dummy;
+} udp_socket_state_unbound_t;
+typedef struct {
+	int dummy;
+} udp_socket_state_bound_nostreams_t;
+
+typedef struct {
+	udp_socket_streams_t streams; // Streams have no remote_address
+} udp_socket_state_bound_streaming_t;
+
+typedef struct {
+	udp_socket_streams_t streams; // Streams have a remote_address
+} udp_socket_state_connected_t;
+
+// This is a tagged union. When adding/removing/renaming cases, be sure to keep the tag and union definitions in sync.
+// The "bound" state is split up into two distinct tags:
+// - "bound_nostreams": Bound, but no datagram streams set up (yet). That will be done the first time send or recv is called.
+// - "bound_streaming": Bound with active streams.
+typedef struct {
+	enum {
+		UDP_SOCKET_STATE_UNBOUND,
+		UDP_SOCKET_STATE_BOUND_NOSTREAMS,
+		UDP_SOCKET_STATE_BOUND_STREAMING,
+		UDP_SOCKET_STATE_CONNECTED,
+	} tag;
+	union {
+		udp_socket_state_unbound_t unbound;
+		udp_socket_state_bound_nostreams_t bound_nostreams;
+		udp_socket_state_bound_streaming_t bound_streaming;
+		udp_socket_state_connected_t connected;
+	};
+} udp_socket_state_t;
+
+typedef struct {
+	udp_own_udp_socket_t socket;
+	poll_own_pollable_t socket_pollable;
+	bool blocking;
+	network_ip_address_family_t family;
+	udp_socket_state_t state;
+} udp_socket_t;
+
+// This is a tagged union. When adding/removing/renaming cases, be sure to keep the tag and union definitions in sync.
+typedef struct {
+	enum {
+		DESCRIPTOR_TABLE_ENTRY_TCP_SOCKET,
+		DESCRIPTOR_TABLE_ENTRY_UDP_SOCKET,
+	} tag;
+	union {
+		tcp_socket_t tcp_socket;
+		udp_socket_t udp_socket;
+	};
+} descriptor_table_entry_t;
+
+bool descriptor_table_insert(descriptor_table_entry_t entry, int *fd);
+
+bool descriptor_table_get_ref(int fd, descriptor_table_entry_t **entry);
+
+bool descriptor_table_remove(int fd, descriptor_table_entry_t *entry);
+
+#endif

@@ -0,0 +1,53 @@
+#ifndef __wasi_sockets_utils_h
+#define __wasi_sockets_utils_h
+
+#include <netinet/in.h>
+
+#include <wasi/descriptor_table.h>
+
+typedef struct {
+	enum {
+		OUTPUT_SOCKADDR_NULL,
+		OUTPUT_SOCKADDR_V4,
+		OUTPUT_SOCKADDR_V6,
+	} tag;
+	union {
+		struct {
+			int dummy;
+		} null;
+		struct {
+			struct sockaddr_in *addr;
+			socklen_t *addrlen;
+		} v4;
+		struct {
+			struct sockaddr_in6 *addr;
+			socklen_t *addrlen;
+		} v6;
+	};
+} output_sockaddr_t;
+
+network_borrow_network_t __wasi_sockets_utils__borrow_network();
+int __wasi_sockets_utils__map_error(network_error_code_t wasi_error);
+bool __wasi_sockets_utils__parse_address(
+	network_ip_address_family_t expected_family,
+	const struct sockaddr *address, socklen_t len,
+	network_ip_socket_address_t *result, int *error);
+bool __wasi_sockets_utils__output_addr_validate(
+	network_ip_address_family_t expected_family, struct sockaddr *addr,
+	socklen_t *addrlen, output_sockaddr_t *result);
+void __wasi_sockets_utils__output_addr_write(
+	const network_ip_socket_address_t input, output_sockaddr_t *output);
+int __wasi_sockets_utils__posix_family(network_ip_address_family_t wasi_family);
+network_ip_socket_address_t
+__wasi_sockets_utils__any_addr(network_ip_address_family_t family);
+int __wasi_sockets_utils__tcp_bind(tcp_socket_t *socket,
+				   network_ip_socket_address_t *address);
+int __wasi_sockets_utils__udp_bind(udp_socket_t *socket,
+				   network_ip_socket_address_t *address);
+bool __wasi_sockets_utils__stream(udp_socket_t *socket,
+				  network_ip_socket_address_t *remote_address,
+				  udp_socket_streams_t *result,
+				  network_error_code_t *error);
+void __wasi_sockets_utils__drop_streams(udp_socket_streams_t streams);
+
+#endif

@@ -30,13 +30,13 @@ static void core_handler(int sig) {
 
 _Noreturn
 static void terminate_handler(int sig) {
-    fprintf(stderr, "Program recieved termination signal: %s\n", strsignal(sig));
+    fprintf(stderr, "Program received termination signal: %s\n", strsignal(sig));
     abort();
 }
 
 _Noreturn
 static void stop_handler(int sig) {
-    fprintf(stderr, "Program recieved stop signal: %s\n", strsignal(sig));
+    fprintf(stderr, "Program received stop signal: %s\n", strsignal(sig));
     abort();
 }
 

@@ -5,6 +5,11 @@
 int __wasilibc_main(int argc, char *argv[]) asm("main");
 
 // The user's `main` function, expecting arguments.
+//
+// Note that we make this a weak symbol so that it will have a
+// `WASM_SYM_BINDING_WEAK` flag in libc.so, which tells the dynamic linker that
+// it need not be defined (e.g. in reactor-style apps with no main function).
+// See also the TODO comment on `__main_void` below.
 __attribute__((__weak__, nodebug))
 int __main_argc_argv(int argc, char *argv[]) {
     return __wasilibc_main(argc, argv);
@@ -13,6 +18,11 @@ int __main_argc_argv(int argc, char *argv[]) {
 // If the user's `main` function expects arguments, the compiler will rename
 // it to `__main_argc_argv`, and this version will get linked in, which
 // initializes the argument data and calls `__main_argc_argv`.
+//
+// TODO: Ideally this function would be defined in a crt*.o file and linked in
+// as necessary by the Clang driver.  However, moving it to crt1-command.c
+// breaks `--no-gc-sections`, so we'll probably need to create a new file
+// (e.g. crt0.o or crtend.o) and teach Clang to use it when needed.
 __attribute__((__weak__, nodebug))
 int __main_void(void) {
     __wasi_errno_t err;

@@ -11,3 +11,97 @@ int __wasilibc_fd_renumber(int fd, int newfd) {
     }
     return 0;
 }
+
+#ifdef __wasilibc_use_wasip2
+#include <wasi/descriptor_table.h>
+
+void drop_tcp_socket(tcp_socket_t socket) {
+    switch (socket.state.tag) {
+    case TCP_SOCKET_STATE_UNBOUND:
+    case TCP_SOCKET_STATE_BOUND:
+    case TCP_SOCKET_STATE_CONNECTING:
+    case TCP_SOCKET_STATE_LISTENING:
+    case TCP_SOCKET_STATE_CONNECT_FAILED:
+        // No additional resources to drop.
+        break;
+    case TCP_SOCKET_STATE_CONNECTED: {
+        tcp_socket_state_connected_t connection = socket.state.connected;
+
+        poll_pollable_drop_own(connection.input_pollable);
+        poll_pollable_drop_own(connection.output_pollable);
+        streams_input_stream_drop_own(connection.input);
+        streams_output_stream_drop_own(connection.output);
+        break;
+    }
+    default: /* unreachable */ abort();
+    }
+
+    poll_pollable_drop_own(socket.socket_pollable);
+    tcp_tcp_socket_drop_own(socket.socket);
+}
+
+void drop_udp_socket_streams(udp_socket_streams_t streams) {
+    poll_pollable_drop_own(streams.incoming_pollable);
+    poll_pollable_drop_own(streams.outgoing_pollable);
+    udp_incoming_datagram_stream_drop_own(streams.incoming);
+    udp_outgoing_datagram_stream_drop_own(streams.outgoing);
+}
+
+void drop_udp_socket(udp_socket_t socket) {
+    switch (socket.state.tag) {
+    case UDP_SOCKET_STATE_UNBOUND:
+    case UDP_SOCKET_STATE_BOUND_NOSTREAMS:
+        // No additional resources to drop.
+        break;
+    case UDP_SOCKET_STATE_BOUND_STREAMING:
+        drop_udp_socket_streams(socket.state.bound_streaming.streams);
+        break;
+    case UDP_SOCKET_STATE_CONNECTED: {
+        drop_udp_socket_streams(socket.state.connected.streams);
+        break;
+    }
+    default: /* unreachable */ abort();
+    }
+
+    poll_pollable_drop_own(socket.socket_pollable);
+    udp_udp_socket_drop_own(socket.socket);
+}
+#endif // __wasilibc_use_wasip2
+
+int close(int fd) {
+    // Scan the preopen fds before making any changes.
+    __wasilibc_populate_preopens();
+
+#ifdef __wasilibc_use_wasip2
+    descriptor_table_entry_t entry;
+    if (descriptor_table_remove(fd, &entry)) {
+
+        switch (entry.tag)
+        {
+        case DESCRIPTOR_TABLE_ENTRY_TCP_SOCKET:
+            drop_tcp_socket(entry.tcp_socket);
+            break;
+        case DESCRIPTOR_TABLE_ENTRY_UDP_SOCKET:
+            drop_udp_socket(entry.udp_socket);
+            break;
+        default: /* unreachable */ abort();
+        }
+        
+        return 0;
+    }
+#endif // __wasilibc_use_wasip2
+    
+    __wasi_errno_t error = __wasi_fd_close(fd);
+    if (error != 0) {
+        errno = error;
+        return -1;
+    }
+
+    return 0;
+}
+
+weak void __wasilibc_populate_preopens(void) {
+    // This version does nothing. It may be overridden by a version which does
+    // something if `__wasilibc_find_abspath` or `__wasilibc_find_relpath` are
+    // used.
+}

@@ -6,6 +6,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/stat.h>
+#include <sys/statvfs.h>
 #include <unistd.h>
 #include <utime.h>
 #include <wasi/libc.h>
@@ -310,6 +311,46 @@ int rename(const char *old, const char *new) {
     return -1;
 }
 
+int chmod(const char *path, mode_t mode) {
+    // TODO: We plan to support this eventually in WASI, but not yet.
+    // Meanwhile, we provide a stub so that libc++'s `<filesystem>`
+    // implementation will build unmodified.
+    errno = ENOSYS;
+    return -1;
+}
+
+int fchmod(int fd, mode_t mode) {
+    // TODO: We plan to support this eventually in WASI, but not yet.
+    // Meanwhile, we provide a stub so that libc++'s `<filesystem>`
+    // implementation will build unmodified.
+    errno = ENOSYS;
+    return -1;
+}
+
+int fchmodat(int fd, const char *path, mode_t mode, int flag) {
+    // TODO: We plan to support this eventually in WASI, but not yet.
+    // Meanwhile, we provide a stub so that libc++'s `<filesystem>`
+    // implementation will build unmodified.
+    errno = ENOSYS;
+    return -1;
+}
+
+int statvfs(const char *__restrict path, struct statvfs *__restrict buf) {
+    // TODO: We plan to support this eventually in WASI, but not yet.
+    // Meanwhile, we provide a stub so that libc++'s `<filesystem>`
+    // implementation will build unmodified.
+    errno = ENOSYS;
+    return -1;
+}
+
+int fstatvfs(int fd, struct statvfs *buf) {
+    // TODO: We plan to support this eventually in WASI, but not yet.
+    // Meanwhile, we provide a stub so that libc++'s `<filesystem>`
+    // implementation will build unmodified.
+    errno = ENOSYS;
+    return -1;
+}
+
 // Like `access`, but with `faccessat`'s flags argument.
 int
 __wasilibc_access(const char *path, int mode, int flags)

@@ -218,51 +218,3 @@ int __wasilibc_find_abspath(const char *path,
     *relative_path = computed;
     return fd;
 }
-
-/// This is referenced by weak reference from crt1.c and lives in the same
-/// source file as `__wasilibc_find_relpath` so that it's linked in when it's
-/// needed.
-// Concerning the 51 -- see the comment by the constructor priority in
-// libc-bottom-half/sources/environ.c.
-__attribute__((constructor(51)))
-static void __wasilibc_populate_preopens(void) {
-    // Skip stdin, stdout, and stderr, and count up until we reach an invalid
-    // file descriptor.
-    for (__wasi_fd_t fd = 3; fd != 0; ++fd) {
-        __wasi_prestat_t prestat;
-        __wasi_errno_t ret = __wasi_fd_prestat_get(fd, &prestat);
-        if (ret == __WASI_ERRNO_BADF)
-            break;
-        if (ret != __WASI_ERRNO_SUCCESS)
-            goto oserr;
-        switch (prestat.tag) {
-        case __WASI_PREOPENTYPE_DIR: {
-            char *prefix = malloc(prestat.u.dir.pr_name_len + 1);
-            if (prefix == NULL)
-                goto software;
-
-            // TODO: Remove the cast on `path` once the witx is updated with
-            // char8 support.
-            ret = __wasi_fd_prestat_dir_name(fd, (uint8_t *)prefix,
-                                             prestat.u.dir.pr_name_len);
-            if (ret != __WASI_ERRNO_SUCCESS)
-                goto oserr;
-            prefix[prestat.u.dir.pr_name_len] = '\0';
-
-            if (internal_register_preopened_fd(fd, prefix) != 0)
-                goto software;
-            free(prefix);
-
-            break;
-        }
-        default:
-            break;
-        }
-    }
-
-    return;
-oserr:
-    _Exit(EX_OSERR);
-software:
-    _Exit(EX_SOFTWARE);
-}

@@ -0,0 +1,1 @@
+typedef unsigned long __jmp_buf[8];

@@ -1,55 +0,0 @@
-#ifndef _NET_ETHERNET_H
-#define _NET_ETHERNET_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <sys/types.h>
-#include <netinet/if_ether.h>
-
-struct ether_addr {
-	uint8_t ether_addr_octet[ETH_ALEN];
-};
-
-struct ether_header {
-	uint8_t  ether_dhost[ETH_ALEN];
-	uint8_t  ether_shost[ETH_ALEN];
-	uint16_t ether_type;
-};
-
-#define	ETHERTYPE_PUP		0x0200
-#define ETHERTYPE_SPRITE	0x0500
-#define	ETHERTYPE_IP		0x0800
-#define	ETHERTYPE_ARP		0x0806
-#define	ETHERTYPE_REVARP	0x8035
-#define ETHERTYPE_AT		0x809B
-#define ETHERTYPE_AARP		0x80F3
-#define	ETHERTYPE_VLAN		0x8100
-#define ETHERTYPE_IPX		0x8137
-#define	ETHERTYPE_IPV6		0x86dd
-#define ETHERTYPE_LOOPBACK	0x9000
-
-
-#define	ETHER_ADDR_LEN	ETH_ALEN
-#define	ETHER_TYPE_LEN	2
-#define	ETHER_CRC_LEN	4
-#define	ETHER_HDR_LEN	ETH_HLEN
-#define	ETHER_MIN_LEN	(ETH_ZLEN + ETHER_CRC_LEN)
-#define	ETHER_MAX_LEN	(ETH_FRAME_LEN + ETHER_CRC_LEN)
-
-#define	ETHER_IS_VALID_LEN(foo)	\
-	((foo) >= ETHER_MIN_LEN && (foo) <= ETHER_MAX_LEN)
-
-#define	ETHERTYPE_TRAIL		0x1000
-#define	ETHERTYPE_NTRAILER	16
-
-#define	ETHERMTU	ETH_DATA_LEN
-#define	ETHERMIN	(ETHER_MIN_LEN - ETHER_HDR_LEN - ETHER_CRC_LEN)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

@@ -1,141 +0,0 @@
-#ifndef _NET_IF_H
-#define _NET_IF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#define IF_NAMESIZE 16
-
-struct if_nameindex {
-	unsigned int if_index;
-	char *if_name;
-};
-
-unsigned int if_nametoindex (const char *);
-char *if_indextoname (unsigned int, char *);
-struct if_nameindex *if_nameindex (void);
-void if_freenameindex (struct if_nameindex *);
-
-
-
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-
-#include <sys/socket.h>
-
-#define IFF_UP	0x1
-#define IFF_BROADCAST 0x2
-#define IFF_DEBUG 0x4
-#define IFF_LOOPBACK 0x8
-#define IFF_POINTOPOINT 0x10
-#define IFF_NOTRAILERS 0x20
-#define IFF_RUNNING 0x40
-#define IFF_NOARP 0x80
-#define IFF_PROMISC 0x100
-#define IFF_ALLMULTI 0x200
-#define IFF_MASTER 0x400
-#define IFF_SLAVE 0x800
-#define IFF_MULTICAST 0x1000
-#define IFF_PORTSEL 0x2000
-#define IFF_AUTOMEDIA 0x4000
-#define IFF_DYNAMIC 0x8000
-#define IFF_LOWER_UP 0x10000
-#define IFF_DORMANT 0x20000
-#define IFF_ECHO 0x40000
-#define IFF_VOLATILE (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST| \
-        IFF_ECHO|IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT)
-
-struct ifaddr {
-	struct sockaddr ifa_addr;
-	union {
-		struct sockaddr	ifu_broadaddr;
-		struct sockaddr	ifu_dstaddr;
-	} ifa_ifu;
-	struct iface *ifa_ifp;
-	struct ifaddr *ifa_next;
-};
-
-#define ifa_broadaddr	ifa_ifu.ifu_broadaddr
-#define ifa_dstaddr	ifa_ifu.ifu_dstaddr
-
-struct ifmap {
-	unsigned long int mem_start;
-	unsigned long int mem_end;
-	unsigned short int base_addr;
-	unsigned char irq;
-	unsigned char dma;
-	unsigned char port;
-};
-
-#define IFHWADDRLEN	6
-#define IFNAMSIZ	IF_NAMESIZE
-
-struct ifreq {
-	union {
-		char ifrn_name[IFNAMSIZ];
-	} ifr_ifrn;
-	union {
-		struct sockaddr ifru_addr;
-		struct sockaddr ifru_dstaddr;
-		struct sockaddr ifru_broadaddr;
-		struct sockaddr ifru_netmask;
-		struct sockaddr ifru_hwaddr;
-		short int ifru_flags;
-		int ifru_ivalue;
-		int ifru_mtu;
-		struct ifmap ifru_map;
-		char ifru_slave[IFNAMSIZ];
-		char ifru_newname[IFNAMSIZ];
-		char *ifru_data;
-	} ifr_ifru;
-};
-
-#define ifr_name	ifr_ifrn.ifrn_name
-#define ifr_hwaddr	ifr_ifru.ifru_hwaddr
-#define ifr_addr	ifr_ifru.ifru_addr
-#define ifr_dstaddr	ifr_ifru.ifru_dstaddr
-#define ifr_broadaddr	ifr_ifru.ifru_broadaddr
-#define ifr_netmask	ifr_ifru.ifru_netmask
-#define ifr_flags	ifr_ifru.ifru_flags
-#define ifr_metric	ifr_ifru.ifru_ivalue
-#define ifr_mtu		ifr_ifru.ifru_mtu
-#define ifr_map		ifr_ifru.ifru_map
-#define ifr_slave	ifr_ifru.ifru_slave
-#define ifr_data	ifr_ifru.ifru_data
-#define ifr_ifindex	ifr_ifru.ifru_ivalue
-#define ifr_bandwidth	ifr_ifru.ifru_ivalue
-#define ifr_qlen	ifr_ifru.ifru_ivalue
-#define ifr_newname	ifr_ifru.ifru_newname
-#define _IOT_ifreq	_IOT(_IOTS(char),IFNAMSIZ,_IOTS(char),16,0,0)
-#define _IOT_ifreq_short _IOT(_IOTS(char),IFNAMSIZ,_IOTS(short),1,0,0)
-#define _IOT_ifreq_int	_IOT(_IOTS(char),IFNAMSIZ,_IOTS(int),1,0,0)
-
-struct ifconf {
-	int ifc_len;		
-	union {
-		char *ifcu_buf;
-		struct ifreq *ifcu_req;
-	} ifc_ifcu;
-};
-
-#define ifc_buf		ifc_ifcu.ifcu_buf
-#define ifc_req		ifc_ifcu.ifcu_req
-#define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0)
-
-#define __UAPI_DEF_IF_IFCONF                                    0
-#define __UAPI_DEF_IF_IFMAP                                     0
-#define __UAPI_DEF_IF_IFNAMSIZ                                  0
-#define __UAPI_DEF_IF_IFREQ                                     0
-#define __UAPI_DEF_IF_NET_DEVICE_FLAGS                          0
-#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO    0
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

@@ -1,142 +0,0 @@
-/* Nonstandard header */
-#ifndef _NET_IF_ARP_H
-#define _NET_IF_ARP_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <inttypes.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#define MAX_ADDR_LEN	7
-
-#define	ARPOP_REQUEST	1
-#define	ARPOP_REPLY	2
-#define	ARPOP_RREQUEST	3
-#define	ARPOP_RREPLY	4
-#define	ARPOP_InREQUEST	8
-#define	ARPOP_InREPLY	9
-#define	ARPOP_NAK	10
-
-struct arphdr {
-	uint16_t ar_hrd;
-	uint16_t ar_pro;
-	uint8_t ar_hln;
-	uint8_t ar_pln;
-	uint16_t ar_op;
-};
-
-
-#define ARPHRD_NETROM	0
-#define ARPHRD_ETHER 	1
-#define	ARPHRD_EETHER	2
-#define	ARPHRD_AX25	3
-#define	ARPHRD_PRONET	4
-#define	ARPHRD_CHAOS	5
-#define	ARPHRD_IEEE802	6
-#define	ARPHRD_ARCNET	7
-#define	ARPHRD_APPLETLK	8
-#define	ARPHRD_DLCI	15
-#define	ARPHRD_ATM	19
-#define	ARPHRD_METRICOM	23
-#define ARPHRD_IEEE1394	24
-#define ARPHRD_EUI64		27
-#define ARPHRD_INFINIBAND	32
-#define ARPHRD_SLIP	256
-#define ARPHRD_CSLIP	257
-#define ARPHRD_SLIP6	258
-#define ARPHRD_CSLIP6	259
-#define ARPHRD_RSRVD	260
-#define ARPHRD_ADAPT	264
-#define ARPHRD_ROSE	270
-#define ARPHRD_X25	271
-#define ARPHRD_HWX25	272
-#define ARPHRD_CAN	280
-#define ARPHRD_PPP	512
-#define ARPHRD_CISCO	513
-#define ARPHRD_HDLC	ARPHRD_CISCO
-#define ARPHRD_LAPB	516
-#define ARPHRD_DDCMP	517
-#define	ARPHRD_RAWHDLC	518
-#define ARPHRD_RAWIP	519
-
-#define ARPHRD_TUNNEL	768
-#define ARPHRD_TUNNEL6	769
-#define ARPHRD_FRAD	770
-#define ARPHRD_SKIP	771
-#define ARPHRD_LOOPBACK	772
-#define ARPHRD_LOCALTLK 773
-#define ARPHRD_FDDI	774
-#define ARPHRD_BIF	775
-#define ARPHRD_SIT	776
-#define ARPHRD_IPDDP	777
-#define ARPHRD_IPGRE	778
-#define ARPHRD_PIMREG	779
-#define ARPHRD_HIPPI	780
-#define ARPHRD_ASH	781
-#define ARPHRD_ECONET	782
-#define ARPHRD_IRDA	783
-#define ARPHRD_FCPP	784
-#define ARPHRD_FCAL	785
-#define ARPHRD_FCPL	786
-#define ARPHRD_FCFABRIC 787
-#define ARPHRD_IEEE802_TR 800
-#define ARPHRD_IEEE80211 801
-#define ARPHRD_IEEE80211_PRISM 802
-#define ARPHRD_IEEE80211_RADIOTAP 803
-#define ARPHRD_IEEE802154 804
-#define ARPHRD_IEEE802154_MONITOR 805
-#define ARPHRD_PHONET 820
-#define ARPHRD_PHONET_PIPE 821
-#define ARPHRD_CAIF 822
-#define ARPHRD_IP6GRE 823
-#define ARPHRD_NETLINK 824
-#define ARPHRD_6LOWPAN 825
-#define ARPHRD_VSOCKMON 826
-
-#define ARPHRD_VOID	  0xFFFF
-#define ARPHRD_NONE	  0xFFFE
-
-struct arpreq {
-	struct sockaddr arp_pa;
-	struct sockaddr arp_ha;
-	int arp_flags;
-	struct sockaddr arp_netmask;
-	char arp_dev[16];
-};
-
-struct arpreq_old {
-	struct sockaddr arp_pa;
-	struct sockaddr arp_ha;
-	int arp_flags;
-	struct sockaddr arp_netmask;
-};
-
-#define ATF_COM		0x02
-#define	ATF_PERM	0x04
-#define	ATF_PUBL	0x08
-#define	ATF_USETRAILERS	0x10
-#define ATF_NETMASK     0x20
-#define ATF_DONTPUB	0x40
-#define ATF_MAGIC	0x80
-
-#define ARPD_UPDATE	0x01
-#define ARPD_LOOKUP	0x02
-#define ARPD_FLUSH	0x03
-
-struct arpd_request {
-	unsigned short req;
-	uint32_t ip;
-	unsigned long dev;
-	unsigned long stamp;
-	unsigned long updated;
-	unsigned char ha[MAX_ADDR_LEN];
-};
-
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif

@@ -1,124 +0,0 @@
-#ifndef _NET_ROUTE_H
-#define _NET_ROUTE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-
-
-struct rtentry {
-	unsigned long int rt_pad1;
-	struct sockaddr rt_dst;
-	struct sockaddr rt_gateway;
-	struct sockaddr rt_genmask;
-	unsigned short int rt_flags;
-	short int rt_pad2;
-	unsigned long int rt_pad3;
-	unsigned char rt_tos;
-	unsigned char rt_class;
-	short int rt_pad4[sizeof(long)/2-1];
-	short int rt_metric;
-	char *rt_dev;
-	unsigned long int rt_mtu;
-	unsigned long int rt_window;
-	unsigned short int rt_irtt;
-};
-
-#define rt_mss	rt_mtu
-
-
-struct in6_rtmsg {
-	struct in6_addr rtmsg_dst;
-	struct in6_addr rtmsg_src;
-	struct in6_addr rtmsg_gateway;
-	uint32_t rtmsg_type;
-	uint16_t rtmsg_dst_len;
-	uint16_t rtmsg_src_len;
-	uint32_t rtmsg_metric;
-	unsigned long int rtmsg_info;
-	uint32_t rtmsg_flags;
-	int rtmsg_ifindex;
-};
-
-
-#define	RTF_UP		0x0001
-#define	RTF_GATEWAY	0x0002
-
-#define	RTF_HOST	0x0004
-#define RTF_REINSTATE	0x0008
-#define	RTF_DYNAMIC	0x0010
-#define	RTF_MODIFIED	0x0020
-#define RTF_MTU		0x0040
-#define RTF_MSS		RTF_MTU
-#define RTF_WINDOW	0x0080
-#define RTF_IRTT	0x0100
-#define RTF_REJECT	0x0200
-#define	RTF_STATIC	0x0400
-#define	RTF_XRESOLVE	0x0800
-#define RTF_NOFORWARD   0x1000
-#define RTF_THROW	0x2000
-#define RTF_NOPMTUDISC  0x4000
-
-#define RTF_DEFAULT	0x00010000
-#define RTF_ALLONLINK	0x00020000
-#define RTF_ADDRCONF	0x00040000
-
-#define RTF_LINKRT	0x00100000
-#define RTF_NONEXTHOP	0x00200000
-
-#define RTF_CACHE	0x01000000
-#define RTF_FLOW	0x02000000
-#define RTF_POLICY	0x04000000
-
-#define RTCF_VALVE	0x00200000
-#define RTCF_MASQ	0x00400000
-#define RTCF_NAT	0x00800000
-#define RTCF_DOREDIRECT 0x01000000
-#define RTCF_LOG	0x02000000
-#define RTCF_DIRECTSRC	0x04000000
-
-#define RTF_LOCAL	0x80000000
-#define RTF_INTERFACE	0x40000000
-#define RTF_MULTICAST	0x20000000
-#define RTF_BROADCAST	0x10000000
-#define RTF_NAT		0x08000000
-
-#define RTF_ADDRCLASSMASK	0xF8000000
-#define RT_ADDRCLASS(flags)	((uint32_t) flags >> 23)
-
-#define RT_TOS(tos)		((tos) & IPTOS_TOS_MASK)
-
-#define RT_LOCALADDR(flags)	((flags & RTF_ADDRCLASSMASK) \
-				 == (RTF_LOCAL|RTF_INTERFACE))
-
-#define RT_CLASS_UNSPEC		0
-#define RT_CLASS_DEFAULT	253
-
-#define RT_CLASS_MAIN		254
-#define RT_CLASS_LOCAL		255
-#define RT_CLASS_MAX		255
-
-
-#define RTMSG_ACK		NLMSG_ACK
-#define RTMSG_OVERRUN		NLMSG_OVERRUN
-
-#define RTMSG_NEWDEVICE		0x11
-#define RTMSG_DELDEVICE		0x12
-#define RTMSG_NEWROUTE		0x21
-#define RTMSG_DELROUTE		0x22
-#define RTMSG_NEWRULE		0x31
-#define RTMSG_DELRULE		0x32
-#define RTMSG_CONTROL		0x40
-
-#define RTMSG_AR_FAILED		0x51
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

@@ -1,22 +0,0 @@
-#ifndef _NETINET_ETHER_H
-#define _NETINET_ETHER_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <netinet/if_ether.h>
-
-char *ether_ntoa (const struct ether_addr *);
-struct ether_addr *ether_aton (const char *);
-char *ether_ntoa_r (const struct ether_addr *, char *);
-struct ether_addr *ether_aton_r (const char *, struct ether_addr *);
-int ether_line(const char *, struct ether_addr *, char *);
-int ether_ntohost(char *, const struct ether_addr *);
-int ether_hostton(const char *, struct ether_addr *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

@@ -1,149 +0,0 @@
-#ifndef _NETINET_IF_ETHER_H
-#define _NETINET_IF_ETHER_H
-
-#include <stdint.h>
-#include <sys/types.h>
-
-#define ETH_ALEN	6
-#define ETH_TLEN	2
-#define ETH_HLEN	14
-#define ETH_ZLEN	60
-#define ETH_DATA_LEN	1500
-#define ETH_FRAME_LEN	1514
-#define ETH_FCS_LEN	4
-#define ETH_MIN_MTU	68
-#define ETH_MAX_MTU	0xFFFFU
-
-#define ETH_P_LOOP	0x0060
-#define ETH_P_PUP	0x0200
-#define ETH_P_PUPAT	0x0201
-#define ETH_P_TSN	0x22F0
-#define ETH_P_ERSPAN2	0x22EB
-#define ETH_P_IP	0x0800
-#define ETH_P_X25	0x0805
-#define ETH_P_ARP	0x0806
-#define	ETH_P_BPQ	0x08FF
-#define ETH_P_IEEEPUP	0x0a00
-#define ETH_P_IEEEPUPAT	0x0a01
-#define ETH_P_BATMAN	0x4305
-#define ETH_P_DEC       0x6000
-#define ETH_P_DNA_DL    0x6001
-#define ETH_P_DNA_RC    0x6002
-#define ETH_P_DNA_RT    0x6003
-#define ETH_P_LAT       0x6004
-#define ETH_P_DIAG      0x6005
-#define ETH_P_CUST      0x6006
-#define ETH_P_SCA       0x6007
-#define ETH_P_TEB	0x6558
-#define ETH_P_RARP      0x8035
-#define ETH_P_ATALK	0x809B
-#define ETH_P_AARP	0x80F3
-#define ETH_P_8021Q	0x8100
-#define ETH_P_IPX	0x8137
-#define ETH_P_IPV6	0x86DD
-#define ETH_P_PAUSE	0x8808
-#define ETH_P_SLOW	0x8809
-#define ETH_P_WCCP	0x883E
-#define ETH_P_MPLS_UC	0x8847
-#define ETH_P_MPLS_MC	0x8848
-#define ETH_P_ATMMPOA	0x884c
-#define ETH_P_PPP_DISC	0x8863
-#define ETH_P_PPP_SES	0x8864
-#define ETH_P_LINK_CTL	0x886c
-#define ETH_P_ATMFATE	0x8884
-#define ETH_P_PAE	0x888E
-#define ETH_P_AOE	0x88A2
-#define ETH_P_8021AD	0x88A8
-#define ETH_P_802_EX1	0x88B5
-#define ETH_P_ERSPAN	0x88BE
-#define ETH_P_PREAUTH	0x88C7
-#define ETH_P_TIPC	0x88CA
-#define ETH_P_LLDP	0x88CC
-#define ETH_P_MRP	0x88E3
-#define ETH_P_MACSEC	0x88E5
-#define ETH_P_8021AH	0x88E7
-#define ETH_P_MVRP	0x88F5
-#define ETH_P_1588	0x88F7
-#define ETH_P_NCSI	0x88F8
-#define ETH_P_PRP	0x88FB
-#define ETH_P_CFM	0x8902
-#define ETH_P_FCOE	0x8906
-#define ETH_P_TDLS	0x890D
-#define ETH_P_FIP	0x8914
-#define ETH_P_IBOE	0x8915
-#define ETH_P_80221	0x8917
-#define ETH_P_HSR	0x892F
-#define ETH_P_NSH	0x894F
-#define ETH_P_LOOPBACK	0x9000
-#define ETH_P_QINQ1	0x9100
-#define ETH_P_QINQ2	0x9200
-#define ETH_P_QINQ3	0x9300
-#define ETH_P_EDSA	0xDADA
-#define ETH_P_DSA_8021Q	0xDADB
-#define ETH_P_IFE	0xED3E
-#define ETH_P_AF_IUCV	0xFBFB
-
-#define ETH_P_802_3_MIN	0x0600
-
-#define ETH_P_802_3	0x0001
-#define ETH_P_AX25	0x0002
-#define ETH_P_ALL	0x0003
-#define ETH_P_802_2	0x0004
-#define ETH_P_SNAP	0x0005
-#define ETH_P_DDCMP     0x0006
-#define ETH_P_WAN_PPP   0x0007
-#define ETH_P_PPP_MP    0x0008
-#define ETH_P_LOCALTALK 0x0009
-#define ETH_P_CAN	0x000C
-#define ETH_P_CANFD	0x000D
-#define ETH_P_PPPTALK	0x0010
-#define ETH_P_TR_802_2	0x0011
-#define ETH_P_MOBITEX	0x0015
-#define ETH_P_CONTROL	0x0016
-#define ETH_P_IRDA	0x0017
-#define ETH_P_ECONET	0x0018
-#define ETH_P_HDLC	0x0019
-#define ETH_P_ARCNET	0x001A
-#define ETH_P_DSA	0x001B
-#define ETH_P_TRAILER	0x001C
-#define ETH_P_PHONET	0x00F5
-#define ETH_P_IEEE802154 0x00F6
-#define ETH_P_CAIF	0x00F7
-#define ETH_P_XDSA	0x00F8
-#define ETH_P_MAP	0x00F9
-
-struct ethhdr {
-	uint8_t h_dest[ETH_ALEN];
-	uint8_t h_source[ETH_ALEN];
-	uint16_t h_proto;
-};
-
-#include <net/ethernet.h>
-#include <net/if_arp.h>
-
-struct	ether_arp {
-	struct	arphdr ea_hdr;
-	uint8_t arp_sha[ETH_ALEN];
-	uint8_t arp_spa[4];
-	uint8_t arp_tha[ETH_ALEN];
-	uint8_t arp_tpa[4];
-};
-#define	arp_hrd	ea_hdr.ar_hrd
-#define	arp_pro	ea_hdr.ar_pro
-#define	arp_hln	ea_hdr.ar_hln
-#define	arp_pln	ea_hdr.ar_pln
-#define	arp_op	ea_hdr.ar_op
-
-#define ETHER_MAP_IP_MULTICAST(ipaddr, enaddr) \
-do { \
-	(enaddr)[0] = 0x01; \
-	(enaddr)[1] = 0x00; \
-	(enaddr)[2] = 0x5e; \
-	(enaddr)[3] = ((uint8_t *)ipaddr)[1] & 0x7f; \
-	(enaddr)[4] = ((uint8_t *)ipaddr)[2]; \
-	(enaddr)[5] = ((uint8_t *)ipaddr)[3]; \
-} while(0)
-
-#define __UAPI_DEF_ETHHDR       0
-
-#endif