[Python-checkins] bpo-44077: Expose IP_RECVTOS in the socket module (GH-25992)

[miss-islington]

https://github.com/python/cpython/commit/28fe0159f59a761bf52c1999c8f7cb12d0d12562
commit: 28fe0159f59a761bf52c1999c8f7cb12d0d12562
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-06-20T13:36:21-07:00
summary:

bpo-44077: Expose IP_RECVTOS in the socket module (GH-25992)


Co-authored-by: Pablo Galindo <pablogsal at gmail.com>
(cherry picked from commit a317778fd58b1c6b250feffbdb4ecf15e293ef48)

Co-authored-by: Georg Sauthoff <mail at georg.so>

files:
A Misc/NEWS.d/next/Library/2021-05-13-19-44-38.bpo-44077.04b2a4.rst
M Doc/library/socket.rst
M Doc/whatsnew/3.10.rst
M Modules/socketmodule.c

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 8a1fc96e0362e2..914fdd7296dbb4 100755
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -379,6 +379,9 @@ Constants
       On Windows, ``TCP_KEEPIDLE``, ``TCP_KEEPINTVL`` appear if run-time Windows
       supports.
 
+   .. versionchanged:: 3.10
+      ``IP_RECVTOS`` was added.
+
 .. data:: AF_CAN
           PF_CAN
           SOL_CAN_*
diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
index 605cb6430e447a..249f0e98e06ac0 100644
--- a/Doc/whatsnew/3.10.rst
+++ b/Doc/whatsnew/3.10.rst
@@ -1219,6 +1219,9 @@ The exception :exc:`socket.timeout` is now an alias of :exc:`TimeoutError`.
 Add option to create MPTCP sockets with ``IPPROTO_MPTCP``
 (Contributed by Rui Cunha in :issue:`43571`.)
 
+Add ``IP_RECVTOS`` option to receive the type of service (ToS) or DSCP/ECN fields
+(Contributed by Georg Sauthoff in :issue:`44077`.)
+
 ssl
 ---
 
diff --git a/Misc/NEWS.d/next/Library/2021-05-13-19-44-38.bpo-44077.04b2a4.rst b/Misc/NEWS.d/next/Library/2021-05-13-19-44-38.bpo-44077.04b2a4.rst
new file mode 100644
index 00000000000000..7bb4379f571b68
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-05-13-19-44-38.bpo-44077.04b2a4.rst
@@ -0,0 +1,3 @@
+It's now possible to receive the type of service (ToS), a.k.a. differentiated
+services (DS), a.k.a. differenciated services code point (DSCP) and excplicit
+congestion notification (ECN) IP header fields with ``socket.IP_RECVTOS``.
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 79559c04d5104d..142cc7c8a7484e 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -8024,6 +8024,9 @@ PyInit__socket(void)
 #ifdef  IP_RECVRETOPTS
     PyModule_AddIntMacro(m, IP_RECVRETOPTS);
 #endif
+#ifdef  IP_RECVTOS
+    PyModule_AddIntMacro(m, IP_RECVTOS);
+#endif
 #ifdef  IP_RECVDSTADDR
     PyModule_AddIntMacro(m, IP_RECVDSTADDR);
 #endif