* 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
#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
+stub_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,
+stub_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;
}
}
return 0;
}
-
+#undef getnameinfo
+#define getnameifo stub_getnameinfo
#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().
/*
* This functions must be used to free the memory allocated by getaddrinfo().
*/
-static void freeaddrinfo (struct addrinfo *res)
+#ifdef WIN32
+static void WSAAPI stub_freeaddrinfo (struct addrinfo *res)
+#else
+static void stub_freeaddrinfo (struct addrinfo *res)
+#endif
{
- if (res != NULL)
- {
- if (res->ai_canonname != NULL)
- free (res->ai_canonname);
- if (res->ai_addr != NULL)
- free (res->ai_addr);
- if (res->ai_next != NULL)
- free (res->ai_next);
- free (res);
- }
+ if (res == NULL)
+ return;
+ free (res->ai_canonname);
+ free (res->ai_addr);
+ free (res->ai_next);
+ free (res);
}
/*
* 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
+stub_getaddrinfo (const char *node, const char *service,
+ const struct addrinfo *hints, struct addrinfo **res)
+#else
static int
-getaddrinfo (const char *node, const char *service,
+stub_getaddrinfo (const char *node, const char *service,
const struct addrinfo *hints, struct addrinfo **res)
+#endif
{
struct addrinfo *info;
u_long ip;
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;
}
+#undef getaddrinfo
+#define getaddrifo stub_getaddrinfo
+#undef freeaddrinfo
+#define freeaddrifo stub_freeaddrinfo
#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 *);
-static WINAPI int _ws2_getnameinfo_bind( const struct sockaddr *sa, socklen_t salen,
- char *host, DWORD hostlen, char *serv, DWORD servlen, int flags );
+typedef void (WSAAPI * FREEADDRINFO) ( struct addrinfo FAR * );
-static WINAPI int _ws2_getaddrinfo_bind(const char *node, const char *service,
- const struct addrinfo *hints, struct addrinfo **res);
+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;
-static FARPROC ws2_find_api (const char *name)
+static FARPROC ws2_find_api (LPCTSTR name)
{
FARPROC f = NULL;
- HMODULE m = GetModuleHandle ("WS2_32");
+ HMODULE m = GetModuleHandle (TEXT("WS2_32"));
if (m != NULL)
f = GetProcAddress (m, name);
if (f == NULL)
{
/* Windows 2K IPv6 preview */
- m = LoadLibrary ("WSHIP6");
+ m = LoadLibrary (TEXT("WSHIP6"));
if (m != NULL)
f = GetProcAddress (m, name);
}
return f;
}
-static WINAPI int _ws2_getnameinfo_bind( const struct sockaddr *sa, socklen_t salen,
- char *host, DWORD hostlen, char *serv, DWORD servlen, int flags )
+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 )
{
- GETNAMEINFO entry = (GETNAMEINFO)ws2_find_api ("getnameinfo");
- if (entry != NULL)
+ GETNAMEINFO entry = (GETNAMEINFO)ws2_find_api (TEXT("getnameinfo"));
+ int result;
+
+ if (entry == NULL)
{
- ws2_getnameinfo = entry;
- return entry (sa, salen, host, hostlen, serv, servlen, flags);
+ /* not found, use replacement API instead */
+ entry = stub_getnameinfo;
}
- /* return a possible error if API is not found */
- WSASetLastError (WSAEAFNOSUPPORT);
- return EAI_FAMILY;
+ /* 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 int _ws2_getaddrinfo_bind(const char *node, const char *service,
- const struct addrinfo *hints, struct addrinfo **res)
+static WSAAPI int _ws2_getaddrinfo_bind(const char FAR *node, const char FAR *service,
+ const struct addrinfo FAR *hints, struct addrinfo FAR * FAR *res)
{
- GETADDRINFO entry = (GETADDRINFO)ws2_find_api ("getaddrinfo");
- FREEADDRINFO freentry = (FREEADDRINFO)ws2_find_api ("freeaddrinfo");
+ 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))
+ if ((entry == NULL) || (freentry == NULL))
{
- ws2_freeaddrinfo = freentry;
- ws2_getaddrinfo = entry;
- return entry (node, service, hints, res);
+ /* not found, use replacement API instead */
+ entry = stub_getaddrinfo;
+ freentry = stub_freeaddrinfo;
}
- /* return a possible error if API is not found */
- WSASetLastError (WSAHOST_NOT_FOUND);
- return EAI_NONAME;
+ /* 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
#endif
-
int vlc_getnameinfo( const struct sockaddr *sa, int salen,
char *host, int hostlen, int *portnum, int flags )
{
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;
}
/*
{
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);
-#else
- int ret;
- vlc_value_t lock;
-
- 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);
-
+ hints.ai_flags |= AI_IDN;
int ret = getaddrinfo (psz_node, psz_service, &hints, res);
- vlc_mutex_unlock (lock.p_address);
- return ret;
+ if (ret != EAI_BADFLAGS)
+ return ret;
+
+ /* IDN not available: disable and retry without it */
+ hints.ai_flags &= ~AI_IDN;
#endif
+ return getaddrinfo (psz_node, psz_service, &hints, res);
}
{
freeaddrinfo (infos);
}
+
+/**
+ * inet_pton() replacement
+ */
+int vlc_inet_pton (int af, const char *src, void *dst)
+{
+#ifndef HAVE_INET_PTON
+ /* Windows Vista has inet_pton(), but not XP. */
+ /* We have a pretty good example of abstraction inversion here... */
+ struct addrinfo hints = {
+ .ai_family = af,
+ .ai_socktype = SOCK_DGRAM, /* make sure we have... */
+ .ai_protocol = IPPROTO_UDP, /* ...only one response */
+ .ai_flags = AI_NUMERICHOST,
+ }, *res;
+
+ if (getaddrinfo (src, NULL, &hints, &res))
+ return 0;
+
+ const void *data;
+ size_t len;
+
+ switch (af)
+ {
+ case AF_INET:
+ data = &((const struct sockaddr_in *)res->ai_addr)->sin_addr;
+ len = sizeof (struct in_addr);
+ break;
+#ifdef AF_INET6
+ case AF_INET6:
+ data = &((const struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
+ len = sizeof (struct in6_addr);
+ break;
+#endif
+ default:
+ freeaddrinfo (res);
+ return -1;
+ }
+ memcpy (dst, data, len);
+ freeaddrinfo (res);
+ return 1;
+#else /* HAVE_INET_PTON */
+ return inet_pton( af, src, dst );
+#endif /* HAVE_INET_PTON */
+}
+
+/**
+ * inet_ntop() replacement
+ */
+const char *vlc_inet_ntop (int af, const void *src, char *dst, socklen_t cnt)
+{
+#ifndef HAVE_INET_NTOP
+ int ret = EAI_FAMILY;
+
+ switch (af)
+ {
+#ifdef AF_INET6
+ case AF_INET6:
+ {
+ struct sockaddr_in6 addr;
+ memset (&addr, 0, sizeof(addr));
+ addr.sin6_family = AF_INET6;
+ addr.sin6_addr = *(struct in6_addr *)src;
+ ret = getnameinfo ((struct sockaddr *)&addr, sizeof (addr),
+ dst, cnt, NULL, 0, NI_NUMERICHOST);
+ }
+
+#endif
+ case AF_INET:
+ {
+ struct sockaddr_in addr;
+ memset(&addr, 0, sizeof(addr));
+ addr.sin_family = AF_INET;
+ addr.sin_addr = *(struct in_addr *)src;
+ ret = getnameinfo ((struct sockaddr *)&addr, sizeof (addr),
+ dst, cnt, NULL, 0, NI_NUMERICHOST);
+ }
+ }
+ return (ret == 0) ? dst : NULL;
+#else /* HAVE_INET_NTOP */
+ return inet_ntop( af, src, dst, cnt );
+#endif /* HAVE_INET_NTOP */
+}
+
projects / vlc / blobdiff