summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles-François Natali <neologix@free.fr>2011-12-17 13:59:56 (GMT)
committerCharles-François Natali <neologix@free.fr>2011-12-17 13:59:56 (GMT)
commit564a42c8decbfe5a18a5ff0b6c496a41740c5a0f (patch)
tree37bcf51dff483054f84e70d757fe749befef1ef6
parentf2fe7f0881b89c3aeba2f7fda0cb73611857cf30 (diff)
downloadcpython-564a42c8decbfe5a18a5ff0b6c496a41740c5a0f.zip
cpython-564a42c8decbfe5a18a5ff0b6c496a41740c5a0f.tar.gz
cpython-564a42c8decbfe5a18a5ff0b6c496a41740c5a0f.tar.bz2
Issue #12809: Expose IP_TRANSPARENT in the socket module. Patch by Michael
Farrell.
-rw-r--r--Misc/ACKS1
-rw-r--r--Modules/socketmodule.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index ce64e20..43d746d 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -304,6 +304,7 @@ Martijn Faassen
Clovis Fabricio
Andreas Faerber
Bill Fancher
+Michael Farrell
Troy J. Farrell
Mark Favas
Boris Feld
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 132d6c7..37ae6d8 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -6192,6 +6192,9 @@ PyInit__socket(void)
#ifdef IP_MAX_MEMBERSHIPS
PyModule_AddIntConstant(m, "IP_MAX_MEMBERSHIPS", IP_MAX_MEMBERSHIPS);
#endif
+#ifdef IP_TRANSPARENT
+ PyModule_AddIntConstant(m, "IP_TRANSPARENT", IP_TRANSPARENT);
+#endif
/* IPv6 [gs]etsockopt options, defined in RFC2553 */
#ifdef IPV6_JOIN_GROUP