From d9afe3fd9ccf64a0686683f5453937c08611aa28 Mon Sep 17 00:00:00 2001 From: Mojca Miklavec Date: Wed, 21 Mar 2018 18:02:46 +0100 Subject: [PATCH] Only use EAI_OVERFLOW, AI_NUMERICSERV if defined Some systems like Mac OS X 10.5 (and lower) do not have EAI_OVERFLOW and AI_NUMERICSERV defined. These variables are used to avoid a potentially slow name resolution for the hostname (which will always be an ip address) and for service name (which will always be an actual port number). The code might be slower, but it should still work. Closes: #242 --- src/udp.c | 5 ++++- src/usocket.c | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/udp.c b/src/udp.c index 99a766f..e59fa1b 100644 --- a/src/udp.c +++ b/src/udp.c @@ -188,7 +188,10 @@ static int meth_sendto(lua_State *L) { memset(&aihint, 0, sizeof(aihint)); aihint.ai_family = udp->family; aihint.ai_socktype = SOCK_DGRAM; - aihint.ai_flags = AI_NUMERICHOST | AI_NUMERICSERV; + aihint.ai_flags = AI_NUMERICHOST; +#ifdef AI_NUMERICSERV + aihint.ai_flags |= AI_NUMERICSERV; +#endif err = getaddrinfo(ip, port, &aihint, &ai); if (err) { lua_pushnil(L); diff --git a/src/usocket.c b/src/usocket.c index 08a961d..aee876d 100644 --- a/src/usocket.c +++ b/src/usocket.c @@ -440,7 +440,9 @@ LUASOCKET_PRIVATE const char *socket_gaistrerror(int err) { case EAI_FAMILY: return PIE_FAMILY; case EAI_MEMORY: return PIE_MEMORY; case EAI_NONAME: return PIE_NONAME; +#ifdef EAI_OVERFLOW case EAI_OVERFLOW: return PIE_OVERFLOW; +#endif #ifdef EAI_PROTOCOL case EAI_PROTOCOL: return PIE_PROTOCOL; #endif