[Python-checkins] bpo-40280: Disable AF_UNIX, AF_PACKET, SO_REUSE* on Emscripten (#31829)

tiran webhook-mailer at python.org
Fri Mar 11 17:25:24 EST 2022


https://github.com/python/cpython/commit/ecfff63e06e77e22035a7f7caa26986f033f3aea
commit: ecfff63e06e77e22035a7f7caa26986f033f3aea
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-03-11T23:25:14+01:00
summary:

bpo-40280: Disable AF_UNIX, AF_PACKET, SO_REUSE* on Emscripten (#31829)

Emscripten's socket emulation is limited. AF_UNIX, AF_PACKET, setsockopt(), and most SO_* constants are not supported.

files:
M Lib/socketserver.py
M Modules/socketmodule.c
M Modules/socketmodule.h
M Tools/wasm/config.site-wasm32-emscripten

diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index 5e070bc3912af..30a5cfa59fe05 100644
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -465,9 +465,9 @@ def server_bind(self):
         May be overridden.
 
         """
-        if self.allow_reuse_address:
+        if self.allow_reuse_address and hasattr(socket, "SO_REUSEADDR"):
             self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        if self.allow_reuse_port:
+        if self.allow_reuse_port and hasattr(socket, "SO_REUSEPORT"):
             self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
         self.socket.bind(self.server_address)
         self.server_address = self.socket.getsockname()
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 3fca9f68512e8..fbdd1a164db25 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -7933,7 +7933,7 @@ PyInit__socket(void)
 #ifdef  IPPROTO_VRRP
     PyModule_AddIntMacro(m, IPPROTO_VRRP);
 #endif
-#if defined(IPPROTO_SCTP) && !defined(__EMSCRIPTEN__)
+#ifdef  IPPROTO_SCTP
     PyModule_AddIntMacro(m, IPPROTO_SCTP);
 #endif
 #ifdef  IPPROTO_BIP
diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
index db26c046c3637..1b35b11cdee6a 100644
--- a/Modules/socketmodule.h
+++ b/Modules/socketmodule.h
@@ -192,6 +192,21 @@ typedef int socklen_t;
 
 #endif /* HAVE_SOCKADDR_ALG */
 
+#ifdef __EMSCRIPTEN__
+// wasm32-emscripten sockets only support subset of IPv4 and IPv6.
+// SCTP protocol crashes runtime.
+#ifdef IPPROTO_SCTP
+#  undef IPPROTO_SCTP
+#endif
+// setsockopt() fails with ENOPROTOOPT, getsockopt only supports SO_ERROR.
+// undef SO_REUSEADDR and SO_REUSEPORT so they cannot be used.
+#ifdef SO_REUSEADDR
+#  undef SO_REUSEADDR
+#endif
+#ifdef SO_REUSEPORT
+#  undef SO_REUSEPORT
+#endif
+#endif // __EMSCRIPTEN__
 
 #ifndef Py__SOCKET_H
 #define Py__SOCKET_H
diff --git a/Tools/wasm/config.site-wasm32-emscripten b/Tools/wasm/config.site-wasm32-emscripten
index 5eaa7933776a8..2a601987ccedf 100644
--- a/Tools/wasm/config.site-wasm32-emscripten
+++ b/Tools/wasm/config.site-wasm32-emscripten
@@ -74,8 +74,10 @@ ac_cv_func_posix_fallocate=no
 ac_cv_func_utimensat=no
 ac_cv_header_sys_ioctl_h=no
 
-# sockets are supported, but only in non-blocking mode
-# ac_cv_header_sys_socket_h=no
+# sockets are supported, but only AF_INET / AF_INET6 in non-blocking mode.
+# Disable AF_UNIX and AF_PACKET support, see socketmodule.h.
+ac_cv_header_sys_un_h=no
+ac_cv_header_netpacket_packet_h=no
 
 # aborts with bad ioctl
 ac_cv_func_openpty=no



More information about the Python-checkins mailing list