Remove support for sendmsg/recvmsg, simplify send/recv.

Author: sunfishcode

expected/wasm32-wasi/defined-symbols.txt

@@ -1,5 +1,3 @@
-CMSG_FIRSTHDR
-CMSG_NXTHDR
 FD_CLR
 FD_COPY
 FD_ISSET
@@ -832,7 +830,6 @@ readlinkat
 readv
 realloc
 recv
-recvmsg
 regcomp
 regerror
 regexec
@@ -874,7 +871,6 @@ seed48
 seekdir
 select
 send
-sendmsg
 setbuf
 setbuffer
 setenv

expected/wasm32-wasi/include-all.c

@@ -15,7 +15,6 @@
 #include <__header_unistd.h>
 #include <__macro_FD_SETSIZE.h>
 #include <__macro_PAGESIZE.h>
-#include <__struct_cmsghdr.h>
 #include <__struct_dirent.h>
 #include <__struct_in6_addr.h>
 #include <__struct_in_addr.h>

expected/wasm32-wasi/predefined-macros.txt

@@ -244,11 +244,6 @@
 #define CMPLX(x,y) __CMPLX(x, y, double)
 #define CMPLXF(x,y) __CMPLX(x, y, float)
 #define CMPLXL(x,y) __CMPLX(x, y, long double)
-#define CMSG_DATA(cmsg) ((cmsg)->__cmsg_data)
-#define CMSG_FIRSTHDR CMSG_FIRSTHDR
-#define CMSG_LEN(len) (__builtin_offsetof(struct cmsghdr, __cmsg_data[(len)]))
-#define CMSG_NXTHDR CMSG_NXTHDR
-#define CMSG_SPACE(len) ((CMSG_LEN((len)) + (_Alignof(struct cmsghdr) - 1)) & (_Alignof(struct cmsghdr) - 1))
 #define CMSPAR 010000000000
 #define CODESET 14
 #define COLL_WEIGHTS_MAX 2
@@ -1457,7 +1452,6 @@
 #define MOREDATA 2
 #define MSG_ANY 0x02
 #define MSG_BAND 0x04
-#define MSG_CTRUNC __WASI_SOCK_RECV_FDS_TRUNCATED
 #define MSG_HIPRI 0x01
 #define MSG_PEEK __WASI_SOCK_RECV_PEEK
 #define MSG_TRUNC __WASI_SOCK_RECV_DATA_TRUNCATED
@@ -1941,7 +1935,6 @@
 #define SCHED_OTHER 0
 #define SCHED_RESET_ON_FORK 0x40000000
 #define SCHED_RR 2
-#define SCM_RIGHTS 1
 #define SCNd16 "hd"
 #define SCNd32 "d"
 #define SCNd64 __PRI64 "d"
@@ -3596,8 +3589,7 @@
 #define __WASI_SIGWINCH (UINT8_C(27))
 #define __WASI_SIGXCPU (UINT8_C(23))
 #define __WASI_SIGXFSZ (UINT8_C(24))
-#define __WASI_SOCK_RECV_DATA_TRUNCATED (UINT16_C(0x0002))
-#define __WASI_SOCK_RECV_FDS_TRUNCATED (UINT16_C(0x0001))
+#define __WASI_SOCK_RECV_DATA_TRUNCATED (UINT16_C(0x0001))
 #define __WASI_SOCK_RECV_PEEK (UINT16_C(0x0001))
 #define __WASI_SOCK_RECV_WAITALL (UINT16_C(0x0002))
 #define __WASI_SUBSCRIPTION_CLOCK_ABSTIME (UINT16_C(0x0001))
@@ -3651,7 +3643,6 @@
 #define __wasilibc___header_time_h 
 #define __wasilibc___header_unistd_h 
 #define __wasilibc___macro_FD_SETSIZE_h 
-#define __wasilibc___struct_cmsghdr_h 
 #define __wasilibc___struct_dirent_h 
 #define __wasilibc___struct_in6_addr_h 
 #define __wasilibc___struct_in_addr_h 

libc-bottom-half/cloudlibc/src/libc/sys/socket/CMSG_FIRSTHDR.c

@@ -23,18 +23,37 @@ ssize_t recv(int socket, void *restrict buffer, size_t length, int flags) {
 
   // Prepare input parameters.
   __wasi_iovec_t iov = {.buf = buffer, .buf_len = length};
+#ifdef __wasilibc_unmodified_upstream // send/recv
   __wasi_recv_in_t ri = {
       .ri_data = &iov,
       .ri_data_len = 1,
       .ri_flags = flags,
   };
+#else
+  __wasi_iovec_t *ri_data = &iov;
+  size_t ri_data_len = 1;
+  __wasi_riflags_t ri_flags = flags;
+#endif
 
   // Perform system call.
+#ifdef __wasilibc_unmodified_upstream // send/recv
   __wasi_recv_out_t ro;
   __wasi_errno_t error = __wasi_sock_recv(socket, &ri, &ro);
+#else
+  size_t ro_datalen;
+  __wasi_roflags_t ro_flags;
+  __wasi_errno_t error = __wasi_sock_recv(socket,
+                                          ri_data, ri_data_len, ri_flags,
+                                          &ro_datalen,
+                                          &ro_flags);
+#endif
   if (error != 0) {
     errno = errno_fixup_socket(socket, error);
     return -1;
   }
+#ifdef __wasilibc_unmodified_upstream // send/recv
   return ro.ro_datalen;
+#else
+  return ro_datalen;
+#endif
 }

libc-bottom-half/cloudlibc/src/libc/sys/socket/CMSG_NXTHDR.c

@@ -19,17 +19,32 @@ ssize_t send(int socket, const void *buffer, size_t length, int flags) {
 
   // Prepare input parameters.
   __wasi_ciovec_t iov = {.buf = buffer, .buf_len = length};
+#ifdef __wasilibc_unmodified_upstream // send/recv
   __wasi_send_in_t si = {
       .si_data = &iov,
       .si_data_len = 1,
   };
+#else
+  __wasi_ciovec_t *si_data = &iov;
+  size_t si_data_len = 1;
+  __wasi_siflags_t si_flags = 0;
+#endif
 
   // Perform system call.
+#ifdef __wasilibc_unmodified_upstream // send/recv
   __wasi_send_out_t so;
   __wasi_errno_t error = __wasi_sock_send(socket, &si, &so);
+#else
+  size_t so_datalen;
+  __wasi_errno_t error = __wasi_sock_send(socket, si_data, si_data_len, si_flags, &so_datalen);
+#endif
   if (error != 0) {
     errno = errno_fixup_socket(socket, error);
     return -1;
   }
+#ifdef __wasilibc_unmodified_upstream // send/recv
   return so.so_datalen;
+#else
+  return so_datalen;
+#endif
 }

libc-bottom-half/cloudlibc/src/libc/sys/socket/recv.c

@@ -2,7 +2,6 @@
 #define __wasilibc___header_sys_socket_h
 
 #include <__struct_msghdr.h>
-#include <__struct_cmsghdr.h>
 #include <__struct_sockaddr.h>
 #include <__struct_sockaddr_storage.h>
 
@@ -14,10 +13,7 @@
 
 #define MSG_PEEK __WASI_SOCK_RECV_PEEK
 #define MSG_WAITALL __WASI_SOCK_RECV_WAITALL
-#define MSG_CTRUNC __WASI_SOCK_RECV_FDS_TRUNCATED
 #define MSG_TRUNC __WASI_SOCK_RECV_DATA_TRUNCATED
-#define MSG_PEEK __WASI_SOCK_RECV_PEEK
-#define MSG_WAITALL __WASI_SOCK_RECV_WAITALL
 
 #define SOCK_DGRAM __WASI_FILETYPE_SOCKET_DGRAM
 #define SOCK_STREAM __WASI_FILETYPE_SOCKET_STREAM
@@ -29,15 +25,6 @@
 
 #define SO_TYPE 3
 
-#define SCM_RIGHTS 1
-
-#define CMSG_DATA(cmsg) ((cmsg)->__cmsg_data)
-#define CMSG_NXTHDR CMSG_NXTHDR
-#define CMSG_FIRSTHDR CMSG_FIRSTHDR
-#define CMSG_LEN(len) (__builtin_offsetof(struct cmsghdr, __cmsg_data[(len)]))
-#define CMSG_SPACE(len) ((CMSG_LEN((len)) + (_Alignof(struct cmsghdr) - 1)) & \
-                         (_Alignof(struct cmsghdr) - 1))
-
 #define AF_UNSPEC 0
 #define AF_INET 1
 #define AF_INET6 2
@@ -47,9 +34,6 @@
 extern "C" {
 #endif
 
-struct cmsghdr *CMSG_FIRSTHDR(const struct msghdr *);
-struct cmsghdr *CMSG_NXTHDR(const struct msghdr *, const struct cmsghdr *);
-
 #ifdef __cplusplus
 }
 #endif