Skip to content

gh-114917: add support for AI_NUMERICSERV in getaddrinfo emulation #114918

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
vstinner merged 6 commits into from
Mar 18, 2025
Merged

gh-114917: add support for AI_NUMERICSERV in getaddrinfo emulation #114918

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e185f72
add support for AI_NUMERICSERV in getaddrinfo emulation
maxbachmann Feb 2, 2024
eaa2540
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 2, 2024
c97626c
Merge branch 'main' into patch-15
maxbachmann Sep 3, 2024
d97125e
Merge branch 'main' into patch-15
maxbachmann Mar 11, 2025
1041701
add test for socket.AI_NUMERICSERV
maxbachmann Mar 11, 2025
06c2ddc
set res to NULL
maxbachmann Mar 12, 2025
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
5 changes: 4 additions & 1 deletion Lib/test/test_socket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1662,8 +1662,11 @@ def testGetaddrinfo(self):
# Issue #6697.
self.assertRaises(UnicodeEncodeError, socket.getaddrinfo, 'localhost', '\uD800')

# Issue 17269: test workaround for OS X platform bug segfault
if hasattr(socket, 'AI_NUMERICSERV'):
self.assertRaises(socket.gaierror, socket.getaddrinfo, "localhost", "http",
flags=socket.AI_NUMERICSERV)

# Issue 17269: test workaround for OS X platform bug segfault
try:
# The arguments here are undefined and the call may succeed
# or fail. All we care here is that it doesn't segfault.
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2024-02-02-15-26-48.gh-issue-114917.sf0GuO.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add support for AI_NUMERICSERV in getaddrinfo emulation
4 changes: 3 additions & 1 deletion Modules/addrinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
#undef AI_PASSIVE
#undef AI_CANONNAME
#undef AI_NUMERICHOST
#undef AI_NUMERICSERV
#undef AI_MASK
#undef AI_ALL
#undef AI_V4MAPPED_CFG
Expand All @@ -88,8 +89,9 @@
#define AI_PASSIVE 0x00000001 /* get address to use bind() */
#define AI_CANONNAME 0x00000002 /* fill ai_canonname */
#define AI_NUMERICHOST 0x00000004 /* prevent name resolution */
#define AI_NUMERICSERV 0x00000008 /* prevent service resolution */
/* valid flags for addrinfo */
#define AI_MASK (AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST)
#define AI_MASK (AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_NUMERICSERV)

#define AI_ALL 0x00000100 /* IPv6 and IPv4-mapped (with AI_V4MAPPED) */
#define AI_V4MAPPED_CFG 0x00000200 /* accept IPv4-mapped if kernel supports */
Expand Down
3 changes: 3 additions & 0 deletions Modules/getaddrinfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,9 @@ getaddrinfo(const char*hostname, const char*servname,
struct servent *sp;
const char *proto;

if (ai->ai_flags & AI_NUMERICSERV)
Comment thread
maxbachmann marked this conversation as resolved.
Outdated
return EAI_NONAME;

proto = NULL;
switch (pai->ai_socktype) {
case GAI_ANY:
Expand Down