From: Rui Cunha <rpmonteiro24@hotmail.com>
Date: Sat, 20 Mar 2021 22:04:56 +0000 (+0000)
Subject: bpo-43571: Add IPPROTO_MPTCP macro (GH-24946)
X-Git-Tag: v3.10.0a7~122
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b05b48dd7ab68bf0046356f2abd6d7fe3b5b3d77;p=thirdparty%2FPython%2Fcpython.git

bpo-43571: Add IPPROTO_MPTCP macro (GH-24946)

Add IPPROTO_MPTCP constant when defined in the system headers.
---

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 2255b827aa8e..31d804ce294a 100755
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -610,6 +610,9 @@ The following functions all create :ref:`socket objects <socket-objects>`.
    .. versionchanged:: 3.9
        The CAN_J1939 protocol was added.
 
+   .. versionchanged:: 3.10
+       The IPPROTO_MPTCP protocol was added.
+
 .. function:: socketpair([family[, type[, proto]]])
 
    Build a pair of connected socket objects using the given address family, socket
diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
index 51b3331be89e..b5e425293962 100644
--- a/Doc/whatsnew/3.10.rst
+++ b/Doc/whatsnew/3.10.rst
@@ -800,6 +800,9 @@ socket
 The exception :exc:`socket.timeout` is now an alias of :exc:`TimeoutError`.
 (Contributed by Christian Heimes in :issue:`42413`.)
 
+Added option to create MPTCP sockets with ``IPPROTO_MPTCP``
+(Contributed by Rui Cunha in :issue:`43571`.)
+
 sys
 ---
 
diff --git a/Misc/NEWS.d/next/Library/2021-03-20-17-40-35.bpo-43571.acAL0W.rst b/Misc/NEWS.d/next/Library/2021-03-20-17-40-35.bpo-43571.acAL0W.rst
new file mode 100644
index 000000000000..56714dc86bd5
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-03-20-17-40-35.bpo-43571.acAL0W.rst
@@ -0,0 +1 @@
+It's now possible to create MPTCP sockets with IPPROTO_MPTCP
\ No newline at end of file
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 0f56d94229fb..23aab59d9749 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -7927,6 +7927,9 @@ PyInit__socket(void)
 #ifdef  IPPROTO_BIP
     PyModule_AddIntMacro(m, IPPROTO_BIP);
 #endif
+#ifdef  IPPROTO_MPTCP
+    PyModule_AddIntMacro(m, IPPROTO_MPTCP);
+#endif
 /**/
 #ifdef  IPPROTO_RAW
     PyModule_AddIntMacro(m, IPPROTO_RAW);