154 lines
5.1 KiB
Diff
154 lines
5.1 KiB
Diff
From 7b3f1f4da2921231a351b22d8822c2cb11a9ee53 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
|
|
<alexey.pawlow@gmail.com>
|
|
Date: Thu, 17 Jun 2021 18:51:30 +0530
|
|
Subject: [PATCH 017/N] Detect winsock2 and setup _socket module on MINGW
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Co-authored-by: Алексей <alexey.pawlow@gmail.com>
|
|
---
|
|
Misc/config_mingw | 3 +++
|
|
Modules/socketmodule.c | 8 ++++++--
|
|
configure.ac | 28 +++++++++++++++++++++++-----
|
|
pyconfig.h.in | 4 ++--
|
|
setup.py | 4 +++-
|
|
5 files changed, 37 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/Misc/config_mingw b/Misc/config_mingw
|
|
index 513065d..9be43fd 100644
|
|
--- a/Misc/config_mingw
|
|
+++ b/Misc/config_mingw
|
|
@@ -10,3 +10,6 @@ ac_cv_func_alarm=ignore
|
|
# files to ignore
|
|
ac_cv_file__dev_ptmx=ignore #NOTE: under MSYS environment device exist
|
|
ac_cv_file__dev_ptc=no
|
|
+
|
|
+# force detection of winsock2 functionality - require wxp or newer
|
|
+ac_cv_func_getpeername=yes
|
|
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
|
|
index f0c9b46..179e182 100644
|
|
--- a/Modules/socketmodule.c
|
|
+++ b/Modules/socketmodule.c
|
|
@@ -274,7 +274,7 @@ shutdown(how) -- shut down traffic in one or both directions\n\
|
|
# endif
|
|
|
|
/* Macros based on the IPPROTO enum, see: https://bugs.python.org/issue29515 */
|
|
-#ifdef MS_WINDOWS
|
|
+#ifdef _MSC_VER
|
|
#define IPPROTO_ICMP IPPROTO_ICMP
|
|
#define IPPROTO_IGMP IPPROTO_IGMP
|
|
#define IPPROTO_GGP IPPROTO_GGP
|
|
@@ -305,7 +305,7 @@ shutdown(how) -- shut down traffic in one or both directions\n\
|
|
#define IPPROTO_PGM IPPROTO_PGM // WinSock2 only
|
|
#define IPPROTO_L2TP IPPROTO_L2TP // WinSock2 only
|
|
#define IPPROTO_SCTP IPPROTO_SCTP // WinSock2 only
|
|
-#endif /* MS_WINDOWS */
|
|
+#endif /* _MSC_VER */
|
|
|
|
/* Provides the IsWindows7SP1OrGreater() function */
|
|
#include <versionhelpers.h>
|
|
@@ -404,6 +404,10 @@ remove_unusable_flags(PyObject *m)
|
|
/* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and
|
|
* EAI_* constants are defined in (the already included) ws2tcpip.h.
|
|
*/
|
|
+#elif defined(__MINGW32__)
|
|
+ /* Do not include addrinfo.h as minimum supported version is
|
|
+ * _WIN32_WINNT >= WindowsXP(0x0501)
|
|
+ */
|
|
#else
|
|
# include "addrinfo.h"
|
|
#endif
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 4c3d976..582a9ed 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -5338,18 +5338,33 @@ if test $ac_cv_header_time_altzone = yes; then
|
|
AC_DEFINE(HAVE_ALTZONE, 1, [Define this if your time.h defines altzone.])
|
|
fi
|
|
|
|
+AC_CHECK_HEADERS([ws2tcpip.h])
|
|
AC_CACHE_CHECK([for addrinfo], [ac_cv_struct_addrinfo],
|
|
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], [[struct addrinfo a]])],
|
|
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
|
+#ifdef HAVE_WS2TCPIP_H
|
|
+# include <ws2tcpip.h>
|
|
+#else
|
|
+# include <netdb.h>
|
|
+#endif]],
|
|
+ [[struct addrinfo a]])],
|
|
[ac_cv_struct_addrinfo=yes],
|
|
[ac_cv_struct_addrinfo=no]))
|
|
if test $ac_cv_struct_addrinfo = yes; then
|
|
- AC_DEFINE(HAVE_ADDRINFO, 1, [struct addrinfo (netdb.h)])
|
|
+ AC_DEFINE(HAVE_ADDRINFO, 1, [struct addrinfo])
|
|
fi
|
|
|
|
AC_CACHE_CHECK([for sockaddr_storage], [ac_cv_struct_sockaddr_storage],
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
|
-# include <sys/types.h>
|
|
-# include <sys/socket.h>]], [[struct sockaddr_storage s]])],
|
|
+#ifdef HAVE_WS2TCPIP_H
|
|
+#include <ws2tcpip.h>
|
|
+#endif
|
|
+#ifdef HAVE_SYS_TYPES_H
|
|
+#include <sys/types.h>
|
|
+#endif
|
|
+#ifdef HAVE_SYS_SOCKET_H
|
|
+#include <sys/socket.h>
|
|
+#endif]],
|
|
+ [[struct sockaddr_storage s]])],
|
|
[ac_cv_struct_sockaddr_storage=yes],
|
|
[ac_cv_struct_sockaddr_storage=no]))
|
|
if test $ac_cv_struct_sockaddr_storage = yes; then
|
|
@@ -6444,7 +6459,10 @@ fi
|
|
|
|
AC_CHECK_TYPE(socklen_t,,
|
|
AC_DEFINE(socklen_t,int,
|
|
- [Define to `int' if <sys/socket.h> does not define.]),[
|
|
+ [Define to `int' if <sys/socket.h> or <ws2tcpip.h> does not define.]),[
|
|
+#ifdef HAVE_WS2TCPIP_H
|
|
+#include <ws2tcpip.h>
|
|
+#endif
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
#include <sys/types.h>
|
|
#endif
|
|
diff --git a/pyconfig.h.in b/pyconfig.h.in
|
|
index f213c88..5222abf 100644
|
|
--- a/pyconfig.h.in
|
|
+++ b/pyconfig.h.in
|
|
@@ -60,7 +60,7 @@
|
|
/* Define to 1 if you have the `acosh' function. */
|
|
#undef HAVE_ACOSH
|
|
|
|
-/* struct addrinfo (netdb.h) */
|
|
+/* struct addrinfo */
|
|
#undef HAVE_ADDRINFO
|
|
|
|
/* Define to 1 if you have the `alarm' function. */
|
|
@@ -1848,7 +1848,7 @@
|
|
/* Define to `unsigned int' if <sys/types.h> does not define. */
|
|
#undef size_t
|
|
|
|
-/* Define to `int' if <sys/socket.h> does not define. */
|
|
+/* Define to `int' if <sys/socket.h> or <ws2tcpip.h> does not define. */
|
|
#undef socklen_t
|
|
|
|
/* Define to `int' if <sys/types.h> doesn't define. */
|
|
diff --git a/setup.py b/setup.py
|
|
index 63c5065..1504342 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -971,7 +971,9 @@ def detect_simple_extensions(self):
|
|
# grp(3)
|
|
self.addext(Extension('grp', ['grpmodule.c']))
|
|
|
|
- self.addext(Extension('_socket', ['socketmodule.c']))
|
|
+ self.addext(Extension(
|
|
+ '_socket', ['socketmodule.c'],
|
|
+ libraries=(['ws2_32', 'iphlpapi'] if MS_WINDOWS else None)))
|
|
self.addext(Extension('spwd', ['spwdmodule.c']))
|
|
|
|
# select(2); not on ancient System V
|