* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <stddef.h> /* size_t */
#include <string.h> /* strlen(), memcpy(), memset(), strchr() */
# define AF_UNSPEC 0
#endif
-#define _NI_MASK (NI_NUMERICHOST|NI_NUMERICSERV|NI_NOFQDN|NI_NAMEREQD|\
- NI_DGRAM)
-#define _AI_MASK (AI_PASSIVE|AI_CANONNAME|AI_NUMERICHOST)
-
#ifndef HAVE_GAI_STRERROR
-static struct
+static const struct
{
- int code;
- const char *msg;
-} const __gai_errlist[] =
+ int code;
+ const char msg[41];
+} gai_errlist[] =
{
{ 0, "Error 0" },
{ EAI_BADFLAGS, "Invalid flag used" },
{ EAI_MEMORY, "Memory allocation failure" },
{ EAI_OVERFLOW, "Buffer overflow" },
{ EAI_SYSTEM, "System error" },
- { 0, NULL }
+ { 0, "" },
};
-static const char *__gai_unknownerr = "Unrecognized error number";
+static const char gai_unknownerr[] = "Unrecognized error number";
/****************************************************************************
* Converts an EAI_* error code into human readable english text.
****************************************************************************/
const char *vlc_gai_strerror (int errnum)
{
- for (unsigned i = 0; __gai_errlist[i].msg != NULL; i++)
- if (errnum == __gai_errlist[i].code)
- return __gai_errlist[i].msg;
+ for (unsigned i = 0; *gai_errlist[i].msg; i++)
+ if (errnum == gai_errlist[i].code)
+ return gai_errlist[i].msg;
- return __gai_unknownerr;
+ return gai_unknownerr;
}
#else /* ifndef HAVE_GAI_STRERROR */
const char *vlc_gai_strerror (int errnum)
}
#endif
-#ifndef WIN32
-#if !(defined (HAVE_GETNAMEINFO) && defined (HAVE_GETADDRINFO))
-/*
- * Converts the current herrno error value into an EAI_* error code.
- * That error code is normally returned by getnameinfo() or getaddrinfo().
- */
-static int
-gai_error_from_herrno (void)
-{
- switch (h_errno)
- {
- case HOST_NOT_FOUND:
- return EAI_NONAME;
-
- case NO_ADDRESS:
-# if (NO_ADDRESS != NO_DATA)
- case NO_DATA:
-# endif
- return EAI_NODATA;
-
- case NO_RECOVERY:
- return EAI_FAIL;
-
- case TRY_AGAIN:
- return EAI_AGAIN;
- }
- return EAI_SYSTEM;
-}
-#endif /* if !(HAVE_GETNAMEINFO && HAVE_GETADDRINFO) */
-
#ifndef HAVE_GETNAMEINFO
+#define _NI_MASK (NI_NUMERICHOST|NI_NUMERICSERV|NI_NOFQDN|NI_NAMEREQD|\
+ NI_DGRAM)
/*
* getnameinfo() non-thread-safe IPv4-only implementation,
- * Address-family-independant address to hostname translation
+ * Address-family-independent address to hostname translation
* (reverse DNS lookup in case of IPv4).
*
* This is meant for use on old IP-enabled systems that are not IPv6-aware,
* GNU C library 2.0.x is known to lack this function, even though it defines
* getaddrinfo().
*/
+#ifdef WIN32
+static int WSAAPI
+getnameinfo (const struct sockaddr *sa, socklen_t salen,
+ char *host, DWORD hostlen, char *serv, DWORD servlen, int flags)
+#else
static int
getnameinfo (const struct sockaddr *sa, socklen_t salen,
char *host, int hostlen, char *serv, int servlen, int flags)
+#endif
{
if (((size_t)salen < sizeof (struct sockaddr_in))
|| (sa->sa_family != AF_INET))
if (snprintf (host, hostlen, "%u.%u.%u.%u", ipv4 >> 24,
(ipv4 >> 16) & 0xff, (ipv4 >> 8) & 0xff,
- ipv4 & 0xff) >= hostlen)
+ ipv4 & 0xff) >= (int)hostlen)
return EAI_OVERFLOW;
}
if (serv != NULL)
{
if (snprintf (serv, servlen, "%u",
- (unsigned int)ntohs (addr->sin_port)) >= servlen)
+ (unsigned int)ntohs (addr->sin_port)) >= (int)servlen)
return EAI_OVERFLOW;
}
}
#endif /* if !HAVE_GETNAMEINFO */
#ifndef HAVE_GETADDRINFO
+#define _AI_MASK (AI_PASSIVE|AI_CANONNAME|AI_NUMERICHOST)
+/*
+ * Converts the current herrno error value into an EAI_* error code.
+ * That error code is normally returned by getnameinfo() or getaddrinfo().
+ */
+static int
+gai_error_from_herrno (void)
+{
+ switch (h_errno)
+ {
+ case HOST_NOT_FOUND:
+ return EAI_NONAME;
+
+ case NO_ADDRESS:
+# if (NO_ADDRESS != NO_DATA)
+ case NO_DATA:
+# endif
+ return EAI_NODATA;
+
+ case NO_RECOVERY:
+ return EAI_FAIL;
+
+ case TRY_AGAIN:
+ return EAI_AGAIN;
+ }
+ return EAI_SYSTEM;
+}
+
/*
* This functions must be used to free the memory allocated by getaddrinfo().
*/
+#ifdef WIN32
+static void WSAAPI freeaddrinfo (struct addrinfo *res)
+#else
static void freeaddrinfo (struct addrinfo *res)
+#endif
{
if (res != NULL)
{
/*
* getaddrinfo() non-thread-safe IPv4-only implementation
- * Address-family-independant hostname to address resolution.
+ * Address-family-independent hostname to address resolution.
*
* This is meant for IPv6-unaware systems that do probably not provide
* getaddrinfo(), but still have old function gethostbyname().
*
* Only UDP and TCP over IPv4 are supported here.
*/
+#ifdef WIN32
+static int WSAAPI
+getaddrinfo (const char *node, const char *service,
+ const struct addrinfo *hints, struct addrinfo **res)
+#else
static int
getaddrinfo (const char *node, const char *service,
const struct addrinfo *hints, struct addrinfo **res)
+#endif
{
struct addrinfo *info;
u_long ip;
entry = gethostbyname (node);
if (entry == NULL)
- return EAI_NONAME;
+ return gai_error_from_herrno ();
if ((entry->h_length != 4) || (entry->h_addrtype != AF_INET))
return EAI_FAMILY;
port = 0;
else
{
- long d;
+ unsigned long d;
char *end;
d = strtoul (service, &end, 0);
- if (end[0] /* service is not a number */
- || (d > 65535))
- {
- struct servent *entry;
- const char *protoname;
-
- switch (protocol)
- {
- case IPPROTO_TCP:
- protoname = "tcp";
- break;
-
- case IPPROTO_UDP:
- protoname = "udp";
- break;
-
- default:
- protoname = NULL;
- }
-
- entry = getservbyname (service, protoname);
- if (entry == NULL)
- return EAI_SERVICE;
+ if (end[0] || (d > 65535u))
+ return EAI_SERVICE;
- port = entry->s_port;
- }
- else
- port = htons ((u_short)d);
+ port = htons ((u_short)d);
}
/* building results... */
return 0;
}
#endif /* if !HAVE_GETADDRINFO */
-#endif
#if defined( WIN32 ) && !defined( UNDER_CE )
/*
* Here is the kind of kludge you need to keep binary compatibility among
* varying OS versions...
*/
-typedef int (CALLBACK * GETNAMEINFO) ( const struct sockaddr*, socklen_t,
- char*, DWORD, char*, DWORD, int );
-typedef int (CALLBACK * GETADDRINFO) (const char *, const char *,
- const struct addrinfo *,
- struct addrinfo **);
-
-typedef void (CALLBACK * FREEADDRINFO) ( struct addrinfo * );
+typedef int (WSAAPI * GETNAMEINFO) ( const struct sockaddr FAR *, socklen_t,
+ char FAR *, DWORD, char FAR *, DWORD, int );
+typedef int (WSAAPI * GETADDRINFO) (const char FAR *, const char FAR *,
+ const struct addrinfo FAR *,
+ struct addrinfo FAR * FAR *);
+typedef void (WSAAPI * FREEADDRINFO) ( struct addrinfo FAR * );
-static WINAPI int _ws2_getnameinfo_bind( const struct sockaddr *sa, socklen_t salen,
- char *host, DWORD hostlen, char *serv, DWORD servlen, int flags );
-
-static WINAPI int _ws2_getaddrinfo_bind(const char *node, const char *service,
- const struct addrinfo *hints, struct addrinfo **res);
-
-static WINAPI void _ws2_freeaddrinfo_bind( struct addrinfo *infos );
+static int WSAAPI _ws2_getnameinfo_bind ( const struct sockaddr FAR *, socklen_t,
+ char FAR *, DWORD, char FAR *, DWORD, int );
+static int WSAAPI _ws2_getaddrinfo_bind (const char FAR *, const char FAR *,
+ const struct addrinfo FAR *,
+ struct addrinfo FAR * FAR *);
static GETNAMEINFO ws2_getnameinfo = _ws2_getnameinfo_bind;
static GETADDRINFO ws2_getaddrinfo = _ws2_getaddrinfo_bind;
-static FREEADDRINFO ws2_freeaddrinfo = _ws2_freeaddrinfo_bind;
+static FREEADDRINFO ws2_freeaddrinfo;
-static int _ws2_find_ipv6_api(void)
+static FARPROC ws2_find_api (LPCTSTR name)
{
- /* For Windows XP and above, IPv6 stack is in WS2_32.DLL */
- HINSTANCE module = LoadLibrary( "ws2_32.dll" );
- if( module != NULL )
- {
- ws2_getnameinfo = (GETNAMEINFO)GetProcAddress( module, "getnameinfo" );
- ws2_getaddrinfo = (GETADDRINFO)GetProcAddress( module, "getaddrinfo" );
- ws2_freeaddrinfo = (FREEADDRINFO)GetProcAddress( module, "freeaddrinfo" );
- if( ws2_getnameinfo && ws2_getaddrinfo && ws2_freeaddrinfo )
- {
- /* got them */
- return 1;
- }
- FreeLibrary( module );
+ FARPROC f = NULL;
- /* For Windows 2000 and below, try IPv6 stack in in WSHIP6.DLL */
- module = LoadLibrary( "wship6.dll" );
- if( module != NULL )
- {
- ws2_getnameinfo = (GETNAMEINFO)GetProcAddress( module, "getnameinfo" );
- ws2_getaddrinfo = (GETADDRINFO)GetProcAddress( module, "getaddrinfo" );
- ws2_freeaddrinfo = (FREEADDRINFO)GetProcAddress( module, "freeaddrinfo" );
- if( ws2_getnameinfo && ws2_getaddrinfo && ws2_freeaddrinfo )
- {
- /* got them */
- return 1;
- }
- FreeLibrary( module );
- }
- }
- /* no API */
- return 0;
-}
+ HMODULE m = GetModuleHandle (TEXT("WS2_32"));
+ if (m != NULL)
+ f = GetProcAddress (m, name);
-static WINAPI int _ws2_getnameinfo_bind( const struct sockaddr *sa, socklen_t salen,
- char *host, DWORD hostlen, char *serv, DWORD servlen, int flags )
-{
- if( _ws2_find_ipv6_api() )
+ if (f == NULL)
{
- return ws2_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags);
+ /* Windows 2K IPv6 preview */
+ m = LoadLibrary (TEXT("WSHIP6"));
+ if (m != NULL)
+ f = GetProcAddress (m, name);
}
- /* return a possible error if API is not found */
- WSASetLastError(WSAHOST_NOT_FOUND);
- return WSAHOST_NOT_FOUND;
+
+ return f;
}
-static WINAPI int _ws2_getaddrinfo_bind(const char *node, const char *service,
- const struct addrinfo *hints, struct addrinfo **res)
+static WSAAPI int _ws2_getnameinfo_bind( const struct sockaddr FAR * sa, socklen_t salen,
+ char FAR *host, DWORD hostlen, char FAR *serv, DWORD servlen, int flags )
{
- if( _ws2_find_ipv6_api() )
+ GETNAMEINFO entry = (GETNAMEINFO)ws2_find_api (TEXT("getnameinfo"));
+ int result;
+
+ if (entry == NULL)
{
- return ws2_getaddrinfo(node, service, hints, res);
+ /* not found, use replacement API instead */
+ entry = getnameinfo;
+
}
- /* return a possible error if API is not found */
- WSASetLastError(WSAHOST_NOT_FOUND);
- return WSAHOST_NOT_FOUND;
+ /* call API before replacing function pointer to avoid crash */
+ result = entry (sa, salen, host, hostlen, serv, servlen, flags);
+ ws2_getnameinfo = entry;
+ return result;
}
+#undef getnameinfo
+#define getnameinfo ws2_getnameinfo
-static WINAPI void _ws2_freeaddrinfo_bind( struct addrinfo *infos )
+static WSAAPI int _ws2_getaddrinfo_bind(const char FAR *node, const char FAR *service,
+ const struct addrinfo FAR *hints, struct addrinfo FAR * FAR *res)
{
- if( _ws2_find_ipv6_api() )
+ GETADDRINFO entry;
+ FREEADDRINFO freentry;
+ int result;
+
+ entry = (GETADDRINFO)ws2_find_api (TEXT("getaddrinfo"));
+ freentry = (FREEADDRINFO)ws2_find_api (TEXT("freeaddrinfo"));
+
+ if ((entry == NULL) || (freentry == NULL))
{
- ws2_freeaddrinfo(infos);
+ /* not found, use replacement API instead */
+ entry = getaddrinfo;
+ freentry = freeaddrinfo;
}
+ /* call API before replacing function pointer to avoid crash */
+ result = entry (node, service, hints, res);
+ ws2_freeaddrinfo = freentry;
+ ws2_getaddrinfo = entry;
+ return result;
}
-
+#undef getaddrinfo
+#undef freeaddrinfo
+#define getaddrinfo ws2_getaddrinfo
+#define freeaddrinfo ws2_freeaddrinfo
+#define HAVE_GETADDRINFO
#endif
i_servlen = 0;
}
-#if defined (HAVE_GETNAMEINFO)
i_val = getnameinfo(sa, salen, host, hostlen, psz_serv, i_servlen, flags);
-#elif defined (WIN32)
- i_val = ws2_getnameinfo (sa, salen, host, hostlen, psz_serv, i_servlen, flags);
-#else
- i_val = __getnameinfo (sa, salen, host, hostlen, psz_serv, i_servlen, flags);
-#endif
if( portnum != NULL )
*portnum = atoi( psz_serv );
}
-/* TODO: support for setting sin6_scope_id */
int vlc_getaddrinfo( vlc_object_t *p_this, const char *node,
int i_port, const struct addrinfo *p_hints,
struct addrinfo **res )
snprintf( psz_service, 6, "%d", i_port );
/* Check if we have to force ipv4 or ipv6 */
- if( p_hints == NULL )
- memset( &hints, 0, sizeof( hints ) );
- else
- memcpy( &hints, p_hints, sizeof( hints ) );
-
- if( hints.ai_family == AF_UNSPEC )
+ memset (&hints, 0, sizeof (hints));
+ if (p_hints != NULL)
{
- vlc_value_t val;
+ const int safe_flags =
+ AI_PASSIVE |
+ AI_CANONNAME |
+ AI_NUMERICHOST |
+ AI_NUMERICSERV |
+#ifdef AI_ALL
+ AI_ALL |
+#endif
+#ifdef AI_ADDRCONFIG
+ AI_ADDRCONFIG |
+#endif
+#ifdef AI_V4MAPPED
+ AI_V4MAPPED |
+#endif
+ 0;
+
+ hints.ai_family = p_hints->ai_family;
+ hints.ai_socktype = p_hints->ai_socktype;
+ hints.ai_protocol = p_hints->ai_protocol;
+ /* Unfortunately, some flags chang the layout of struct addrinfo, so
+ * they cannot be copied blindly from p_hints to &hints. Therefore, we
+ * only copy flags that we know for sure are "safe".
+ */
+ hints.ai_flags = p_hints->ai_flags & safe_flags;
+ }
- var_Create( p_this, "ipv4", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Get( p_this, "ipv4", &val );
- if( val.b_bool )
- hints.ai_family = AF_INET;
+ /* We only ever use port *numbers* */
+ hints.ai_flags |= AI_NUMERICSERV;
+ if( hints.ai_family == AF_UNSPEC )
+ {
#ifdef AF_INET6
- var_Create( p_this, "ipv6", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Get( p_this, "ipv6", &val );
- if( val.b_bool )
+ if (var_CreateGetBool (p_this, "ipv6"))
hints.ai_family = AF_INET6;
+ else
#endif
+ if (var_CreateGetBool (p_this, "ipv4"))
+ hints.ai_family = AF_INET;
}
/*
#ifdef WIN32
/*
* Winsock tries to resolve numerical IPv4 addresses as AAAA
- * and IPv6 addresses as A... There comes the work around.
+ * and IPv6 addresses as A... There comes the bug-to-bug fix.
*/
if ((hints.ai_flags & AI_NUMERICHOST) == 0)
{
hints.ai_flags |= AI_NUMERICHOST;
- if (ws2_getaddrinfo (psz_node, psz_service, &hints, res) == 0)
+ if (getaddrinfo (psz_node, psz_service, &hints, res) == 0)
return 0;
hints.ai_flags &= ~AI_NUMERICHOST;
}
#endif
-#if defined (HAVE_GETADDRINFO)
-# ifdef AI_IDN
+#ifdef AI_IDN
/* Run-time I18n Domain Names support */
- static vlc_bool_t b_idn = VLC_TRUE; /* beware of thread-safety */
-
- if (b_idn)
- {
- hints.ai_flags |= AI_IDN;
- int ret = getaddrinfo (psz_node, psz_service, &hints, res);
-
- if (ret != EAI_BADFLAGS)
- return ret;
-
- /* IDN not available: disable and retry without it */
- hints.ai_flags &= ~AI_IDN;
- b_idn = VLC_FALSE;
- msg_Info (p_this, "International Domain Names not supported");
- }
-# endif
- return getaddrinfo (psz_node, psz_service, &hints, res);
-#elif defined (WIN32)
- return ws2_getaddrinfo (psz_node, psz_service, &hints, res);
-#else
- int ret;
- vlc_value_t lock;
+ hints.ai_flags |= AI_IDN;
+ int ret = getaddrinfo (psz_node, psz_service, &hints, res);
+ if (ret != EAI_BADFLAGS)
+ return ret;
- var_Create (p_this->p_libvlc, "getaddrinfo_mutex", VLC_VAR_MUTEX);
- var_Get (p_this->p_libvlc, "getaddrinfo_mutex", &lock);
- vlc_mutex_lock (lock.p_address);
-
- int ret = __getaddrinfo (psz_node, psz_service, &hints, res);
- vlc_mutex_unlock (lock.p_address);
- return ret;
+ /* IDN not available: disable and retry without it */
+ hints.ai_flags &= ~AI_IDN;
#endif
+ return getaddrinfo (psz_node, psz_service, &hints, res);
}
void vlc_freeaddrinfo( struct addrinfo *infos )
{
-#if defined (HAVE_GETADDRINFO)
freeaddrinfo (infos);
-#elif defined (WIN32)
- ws2_freeaddrinfo (infos);
-#else
- __freeaddrinfo( infos );
-#endif
}