Skip to content

gh-98030: socket: add missing TCP socket options #98031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 8, 2022
Merged

gh-98030: socket: add missing TCP socket options #98031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adcd727
gh-98030: socket: add missing TCP socket options
matttbe Oct 7, 2022
e88ecc3
News: blurp the parent commit
matttbe Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion Doc/library/socket.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,14 @@ Constants
.. versionchanged:: 3.12
Added ``SO_RTABLE`` and ``SO_USER_COOKIE``. On OpenBSD
and FreeBSD respectively those constants can be used in the same way that
``SO_MARK`` is used on Linux.
``SO_MARK`` is used on Linux. Also added missing TCP socket options from
Linux: ``TCP_MD5SIG``, ``TCP_THIN_LINEAR_TIMEOUTS``, ``TCP_THIN_DUPACK``,
``TCP_REPAIR``, ``TCP_REPAIR_QUEUE``, ``TCP_QUEUE_SEQ``,
``TCP_REPAIR_OPTIONS``, ``TCP_TIMESTAMP``, ``TCP_CC_INFO``,
``TCP_SAVE_SYN``, ``TCP_SAVED_SYN``, ``TCP_REPAIR_WINDOW``,
``TCP_FASTOPEN_CONNECT``, ``TCP_ULP``, ``TCP_MD5SIG_EXT``,
``TCP_FASTOPEN_KEY``, ``TCP_FASTOPEN_NO_COOKIE``,
``TCP_ZEROCOPY_RECEIVE``, ``TCP_INQ``, ``TCP_TX_DELAY``.

.. data:: AF_CAN
PF_CAN
Expand Down
7 changes: 7 additions & 0 deletions Misc/NEWS.d/next/Library/2022-10-07-18-16-00.gh-issue-98030.2oQCZy.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Add missing TCP socket options from Linux: ``TCP_MD5SIG``,
``TCP_THIN_LINEAR_TIMEOUTS``, ``TCP_THIN_DUPACK``, ``TCP_REPAIR``,
``TCP_REPAIR_QUEUE``, ``TCP_QUEUE_SEQ``, ``TCP_REPAIR_OPTIONS``,
``TCP_TIMESTAMP``, ``TCP_CC_INFO``, ``TCP_SAVE_SYN``, ``TCP_SAVED_SYN``,
``TCP_REPAIR_WINDOW``, ``TCP_FASTOPEN_CONNECT``, ``TCP_ULP``,
``TCP_MD5SIG_EXT``, ``TCP_FASTOPEN_KEY``, ``TCP_FASTOPEN_NO_COOKIE``,
``TCP_ZEROCOPY_RECEIVE``, ``TCP_INQ``, ``TCP_TX_DELAY``.
66 changes: 63 additions & 3 deletions Modules/socketmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8484,18 +8484,78 @@ PyInit__socket(void)
#ifdef TCP_QUICKACK
PyModule_AddIntMacro(m, TCP_QUICKACK);
#endif
#ifdef TCP_FASTOPEN
PyModule_AddIntMacro(m, TCP_FASTOPEN);
#endif
#ifdef TCP_CONGESTION
PyModule_AddIntMacro(m, TCP_CONGESTION);
#endif
#ifdef TCP_MD5SIG
PyModule_AddIntMacro(m, TCP_MD5SIG);
#endif
#ifdef TCP_THIN_LINEAR_TIMEOUTS
PyModule_AddIntMacro(m, TCP_THIN_LINEAR_TIMEOUTS);
#endif
#ifdef TCP_THIN_DUPACK
PyModule_AddIntMacro(m, TCP_THIN_DUPACK);
#endif
#ifdef TCP_USER_TIMEOUT
PyModule_AddIntMacro(m, TCP_USER_TIMEOUT);
#endif
#ifdef TCP_REPAIR
PyModule_AddIntMacro(m, TCP_REPAIR);
#endif
#ifdef TCP_REPAIR_QUEUE
PyModule_AddIntMacro(m, TCP_REPAIR_QUEUE);
#endif
#ifdef TCP_QUEUE_SEQ
PyModule_AddIntMacro(m, TCP_QUEUE_SEQ);
#endif
#ifdef TCP_REPAIR_OPTIONS
PyModule_AddIntMacro(m, TCP_REPAIR_OPTIONS);
#endif
#ifdef TCP_FASTOPEN
PyModule_AddIntMacro(m, TCP_FASTOPEN);
#endif
#ifdef TCP_TIMESTAMP
PyModule_AddIntMacro(m, TCP_TIMESTAMP);
#endif
#ifdef TCP_NOTSENT_LOWAT
PyModule_AddIntMacro(m, TCP_NOTSENT_LOWAT);
#endif
#ifdef TCP_CC_INFO
PyModule_AddIntMacro(m, TCP_CC_INFO);
#endif
#ifdef TCP_SAVE_SYN
PyModule_AddIntMacro(m, TCP_SAVE_SYN);
#endif
#ifdef TCP_SAVED_SYN
PyModule_AddIntMacro(m, TCP_SAVED_SYN);
#endif
#ifdef TCP_REPAIR_WINDOW
PyModule_AddIntMacro(m, TCP_REPAIR_WINDOW);
#endif
#ifdef TCP_FASTOPEN_CONNECT
PyModule_AddIntMacro(m, TCP_FASTOPEN_CONNECT);
#endif
#ifdef TCP_ULP
PyModule_AddIntMacro(m, TCP_ULP);
#endif
#ifdef TCP_MD5SIG_EXT
PyModule_AddIntMacro(m, TCP_MD5SIG_EXT);
#endif
#ifdef TCP_FASTOPEN_KEY
PyModule_AddIntMacro(m, TCP_FASTOPEN_KEY);
#endif
#ifdef TCP_FASTOPEN_NO_COOKIE
PyModule_AddIntMacro(m, TCP_FASTOPEN_NO_COOKIE);
#endif
#ifdef TCP_ZEROCOPY_RECEIVE
PyModule_AddIntMacro(m, TCP_ZEROCOPY_RECEIVE);
#endif
#ifdef TCP_INQ
PyModule_AddIntMacro(m, TCP_INQ);
#endif
#ifdef TCP_TX_DELAY
PyModule_AddIntMacro(m, TCP_TX_DELAY);
#endif

/* IPX options */
#ifdef IPX_TYPE
Expand Down