Support building with emscripten. (sctplab#549)

dasteihn · Nov 18, 2020 · c5c0584 · c5c0584
1 parent 3906e03
commit c5c0584
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/usrsctplib/netinet/sctp_os_userspace.h b/usrsctplib/netinet/sctp_os_userspace.h
@@ -283,7 +283,7 @@ typedef char* caddr_t;
 
 #else /* !defined(Userspace_os_Windows) */
 #include <sys/socket.h>
-#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__native_client__) || defined(__Fuchsia__)
+#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__native_client__) || defined(__Fuchsia__) || defined(__EMSCRIPTEN_PTHREADS__)
 #include <pthread.h>
 #endif
 typedef pthread_mutex_t userland_mutex_t;
@@ -509,7 +509,7 @@ struct sx {int dummy;};
 #if !defined(_WIN32)
 #include <netinet/ip6.h>
 #endif
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(_WIN32)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(_WIN32) || defined(__EMSCRIPTEN__)
 #include "user_ip6_var.h"
 #else
 #include <netinet6/ip6_var.h>
@@ -1132,7 +1132,7 @@ sctp_get_mbuf_for_msg(unsigned int space_needed, int want_header, int how, int a
 
 #define SCTP_IS_LISTENING(inp) ((inp->sctp_flags & SCTP_PCB_FLAGS_ACCEPTING) != 0)
 
-#if defined(__APPLE__) || defined(__DragonFly__) || defined(__linux__) || defined(__native_client__) || defined(__NetBSD__) || defined(_WIN32) || defined(__Fuchsia__)
+#if defined(__APPLE__) || defined(__DragonFly__) || defined(__linux__) || defined(__native_client__) || defined(__NetBSD__) || defined(_WIN32) || defined(__Fuchsia__) || defined(__EMSCRIPTEN__)
 int
 timingsafe_bcmp(const void *, const void *, size_t);
 #endif

diff --git a/usrsctplib/netinet/sctp_userspace.c b/usrsctplib/netinet/sctp_userspace.c
@@ -126,7 +126,7 @@ sctp_userspace_get_mtu_from_ifn(uint32_t if_index, int af)
 }
 #endif
 
-#if defined(__APPLE__) || defined(__DragonFly__) || defined(__linux__) || defined(__native_client__) || defined(__NetBSD__) || defined(_WIN32) || defined(__Fuchsia__)
+#if defined(__APPLE__) || defined(__DragonFly__) || defined(__linux__) || defined(__native_client__) || defined(__NetBSD__) || defined(_WIN32) || defined(__Fuchsia__) || defined(__EMSCRIPTEN__)
 int
 timingsafe_bcmp(const void *b1, const void *b2, size_t n)
 {

diff --git a/usrsctplib/netinet/sctp_usrreq.c b/usrsctplib/netinet/sctp_usrreq.c
@@ -7863,7 +7863,7 @@ sctp_connect(struct socket *so, struct mbuf *nam, struct proc *p)
 #if defined(__Userspace__)
 	/* TODO __Userspace__ falls into this code for IPv6 stuff at the moment... */
 #endif
-#if !defined(_WIN32) && !defined(__linux__)
+#if !defined(_WIN32) && !defined(__linux__) && !defined(__EMSCRIPTEN__)
 	switch (addr->sa_family) {
 #ifdef INET6
 	case AF_INET6:

diff --git a/usrsctplib/user_environment.c b/usrsctplib/user_environment.c
@@ -139,8 +139,7 @@ finish_random(void)
 {
 	return;
 }
-#elif defined(__ANDROID__)
-#if (__ANDROID_API__ < 28)
+#elif (defined(__ANDROID__) && (__ANDROID_API__ < 28)) || defined(__EMSCRIPTEN__)
 #include <fcntl.h>
 
 static int fd = -1;
@@ -174,7 +173,7 @@ finish_random(void)
 	close(fd);
 	return;
 }
-#else
+#elif defined(__ANDROID__) && (__ANDROID_API__ >= 28)
 #include <sys/random.h>
 
 void
@@ -204,7 +203,6 @@ finish_random(void)
 {
 	return;
 }
-#endif
 #elif defined(__linux__)
 #include <unistd.h>
 #include <sys/syscall.h>

diff --git a/usrsctplib/user_ip6_var.h b/usrsctplib/user_ip6_var.h
@@ -87,13 +87,11 @@ struct ip6_hdr {
 #if defined(_WIN32)
 #define s6_addr16 u.Word
 #endif
-#if !defined(_WIN32)
-#if !defined(__linux__)
+#if !defined(_WIN32) && !defined(__linux__) && !defined(__EMSCRIPTEN__)
 #define s6_addr8  __u6_addr.__u6_addr8
 #define s6_addr16 __u6_addr.__u6_addr16
 #define s6_addr32 __u6_addr.__u6_addr32
 #endif
-#endif
 
 #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
 struct route_in6 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -126,7 +126,7 @@ sctp_userspace_get_mtu_from_ifn(uint32_t if_index, int af) @@
     }
     #endif
-    #if defined(__APPLE__) || defined(__DragonFly__) || defined(__linux__) || defined(__native_client__) || defined(__NetBSD__) || defined(_WIN32) || defined(__Fuchsia__)
+    #if defined(__APPLE__) || defined(__DragonFly__) || defined(__linux__) || defined(__native_client__) || defined(__NetBSD__) || defined(_WIN32) || defined(__Fuchsia__) || defined(__EMSCRIPTEN__)
     int
     timingsafe_bcmp(const void *b1, const void *b2, size_t n)
     {
@@ Expand Down @@