X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Fgetaddrinfo.c;h=ff4f0fe77e8d39e043dc51d590e2b4ef91e82948;hb=bb7ae441f98c35ed5248c6cb2946a371d4a82c96;hp=6599463112d53ea4dbb6542eb536554fb35c303a;hpb=cb02fb5c58f2110749384e23fee818a31e980880;p=vlc diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c index 6599463112..ff4f0fe77e 100644 --- a/src/network/getaddrinfo.c +++ b/src/network/getaddrinfo.c @@ -22,533 +22,26 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include /* size_t */ #include /* strlen(), memcpy(), memset(), strchr() */ #include /* malloc(), free(), strtoul() */ #include +#include -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_ARPA_INET_H -# include -#endif -#ifdef HAVE_NETINET_IN_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include -#endif - +#include #include -#ifndef NO_ADDRESS -# define NO_ADDRESS NO_DATA -#endif -#ifndef INADDR_NONE -# define INADDR_NONE 0xFFFFFFFF -#endif #ifndef AF_UNSPEC # 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 -{ - int code; - const char *msg; -} const __gai_errlist[] = -{ - { 0, "Error 0" }, - { EAI_BADFLAGS, "Invalid flag used" }, - { EAI_NONAME, "Host or service not found" }, - { EAI_AGAIN, "Temporary name service failure" }, - { EAI_FAIL, "Non-recoverable name service failure" }, - { EAI_NODATA, "No data for host name" }, - { EAI_FAMILY, "Unsupported address family" }, - { EAI_SOCKTYPE, "Unsupported socket type" }, - { EAI_SERVICE, "Incompatible service for socket type" }, - { EAI_ADDRFAMILY, "Unavailable address family for host name" }, - { EAI_MEMORY, "Memory allocation failure" }, - { EAI_OVERFLOW, "Buffer overflow" }, - { EAI_SYSTEM, "System error" }, - { 0, NULL } -}; - -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 ) -{ - int i; - - for (i = 0; __gai_errlist[i].msg != NULL; i++) - if (errnum == __gai_errlist[i].code) - return __gai_errlist[i].msg; - - return __gai_unknownerr; -} -#else /* ifndef HAVE_GAI_STRERROR */ -const char *vlc_gai_strerror( int errnum ) -{ - return gai_strerror( errnum ); -} -#endif - -#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 -/* - * getnameinfo() non-thread-safe IPv4-only implementation, - * Address-family-independant 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, - * and probably do not have getnameinfo(), but have the old gethostbyaddr() - * function. - * - * GNU C library 2.0.x is known to lack this function, even though it defines - * getaddrinfo(). - */ -static int -__getnameinfo( const struct sockaddr *sa, socklen_t salen, - char *host, int hostlen, char *serv, int servlen, int flags ) -{ - if (((unsigned)salen < sizeof (struct sockaddr_in)) - || (sa->sa_family != AF_INET)) - return EAI_FAMILY; - else if (flags & (~_NI_MASK)) - return EAI_BADFLAGS; - else - { - const struct sockaddr_in *addr; - - addr = (const struct sockaddr_in *)sa; - - if (host != NULL) - { - /* host name resolution */ - if (!(flags & NI_NUMERICHOST)) - { - if (flags & NI_NAMEREQD) - return EAI_NONAME; - } - - /* inet_ntoa() is not thread-safe, do not use it */ - uint32_t ipv4 = ntohl (addr->sin_addr.s_addr); - - if (snprintf (host, hostlen, "%u.%u.%u.%u", ipv4 >> 24, - (ipv4 >> 16) & 0xff, (ipv4 >> 8) & 0xff, - ipv4 & 0xff) >= hostlen) - return EAI_OVERFLOW; - } - - if (serv != NULL) - { - if (snprintf (serv, servlen, "%u", - (unsigned int)ntohs (addr->sin_port)) >= servlen) - return EAI_OVERFLOW; - } - } - return 0; -} - -#endif /* if !HAVE_GETNAMEINFO */ - -#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 * ); - - -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 GETNAMEINFO ws2_getnameinfo = _ws2_getnameinfo_bind; -static GETADDRINFO ws2_getaddrinfo = _ws2_getaddrinfo_bind; -static FREEADDRINFO ws2_freeaddrinfo = _ws2_freeaddrinfo_bind; - -static int _ws2_find_ipv6_api(void) -{ - /* 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 ); - - /* 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; -} - -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() ) - { - return ws2_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags); - } - /* return a possible error if API is not found */ - WSASetLastError(WSAHOST_NOT_FOUND); - return WSAHOST_NOT_FOUND; -} - -static WINAPI int _ws2_getaddrinfo_bind(const char *node, const char *service, - const struct addrinfo *hints, struct addrinfo **res) -{ - if( _ws2_find_ipv6_api() ) - { - return ws2_getaddrinfo(node, service, hints, res); - } - /* return a possible error if API is not found */ - WSASetLastError(WSAHOST_NOT_FOUND); - return WSAHOST_NOT_FOUND; -} - -static WINAPI void _ws2_freeaddrinfo_bind( struct addrinfo *infos ) -{ - if( _ws2_find_ipv6_api() ) - { - ws2_freeaddrinfo(infos); - } -} - -#endif - -#ifndef HAVE_GETADDRINFO -/* - * This functions must be used to free the memory allocated by getaddrinfo(). - */ -static void -__freeaddrinfo (struct addrinfo *res) -{ - 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); - } -} - - -/* - * Internal function that builds an addrinfo struct. - */ -static struct addrinfo * -makeaddrinfo (int af, int type, int proto, - const struct sockaddr *addr, size_t addrlen, - const char *canonname) -{ - struct addrinfo *res; - - res = (struct addrinfo *)malloc (sizeof (struct addrinfo)); - if (res != NULL) - { - res->ai_flags = 0; - res->ai_family = af; - res->ai_socktype = type; - res->ai_protocol = proto; - res->ai_addrlen = addrlen; - res->ai_addr = malloc (addrlen); - res->ai_canonname = NULL; - res->ai_next = NULL; - - if (res->ai_addr != NULL) - { - memcpy (res->ai_addr, addr, addrlen); - - if (canonname != NULL) - { - res->ai_canonname = strdup (canonname); - if (res->ai_canonname != NULL) - return res; /* success ! */ - } - else - return res; - } - } - /* failsafe */ - vlc_freeaddrinfo (res); - return NULL; -} - - -static struct addrinfo * -makeipv4info (int type, int proto, u_long ip, u_short port, const char *name) -{ - struct sockaddr_in addr; - - memset (&addr, 0, sizeof (addr)); - addr.sin_family = AF_INET; -# ifdef HAVE_SA_LEN - addr.sin_len = sizeof (addr); -# endif - addr.sin_port = port; - addr.sin_addr.s_addr = ip; - - return makeaddrinfo (AF_INET, type, proto, - (struct sockaddr*)&addr, sizeof (addr), name); -} - - -/* - * getaddrinfo() non-thread-safe IPv4-only implementation - * Address-family-independant 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. - */ -static int -__getaddrinfo (const char *node, const char *service, - const struct addrinfo *hints, struct addrinfo **res) -{ - struct addrinfo *info; - u_long ip; - u_short port; - int protocol = 0, flags = 0; - const char *name = NULL; - -#ifdef WIN32 - /* - * Maybe you knew already that Winsock does not handle TCP/RST packets - * properly, so that when a TCP connection fails, it will wait until it - * times out even if the remote host did return a TCP/RST. However, it - * still sees the TCP/RST as the error code is 10061 instead of 10060. - * Basically, we have the stupid brainfucked behavior with DNS queries... - * When the recursive DNS server returns an error, Winsock waits about - * 2 seconds before it returns to the callers, even though it should know - * that is pointless. I'd like to know how come this hasn't been fixed - * for the past decade, or maybe not. - * - * Anyway, this is causing a severe delay when the SAP listener tries - * to resolve more than ten IPv6 numeric addresses. Modern systems will - * eventually realize that it is an IPv6 address, and won't try to resolve - * it as a IPv4 address via the Domain Name Service. Old systems - * (including Windows XP without the IPv6 stack) will not. It is normally - * not an issue as the DNS server usually returns an error very quickly. - * But it IS a severe issue on Windows, given the bug explained above. - * So here comes one more bug-to-bug Windows compatibility fix. - */ - if ((node != NULL) && (strchr (node, ':') != NULL)) - return EAI_NONAME; -#endif - - if (hints != NULL) - { - flags = hints->ai_flags; - - if (flags & ~_AI_MASK) - return EAI_BADFLAGS; - /* only accept AF_INET and AF_UNSPEC */ - if (hints->ai_family && (hints->ai_family != AF_INET)) - return EAI_FAMILY; - - /* protocol sanity check */ - switch (hints->ai_socktype) - { - case SOCK_STREAM: - protocol = IPPROTO_TCP; - break; - - case SOCK_DGRAM: - protocol = IPPROTO_UDP; - break; - -#ifndef SOCK_RAW - case SOCK_RAW: -#endif - case 0: - break; - - default: - return EAI_SOCKTYPE; - } - if (hints->ai_protocol && protocol - && (protocol != hints->ai_protocol)) - return EAI_SERVICE; - } - - *res = NULL; - - /* default values */ - if (node == NULL) - { - if (flags & AI_PASSIVE) - ip = htonl (INADDR_ANY); - else - ip = htonl (INADDR_LOOPBACK); - } - else - if ((ip = inet_addr (node)) == INADDR_NONE) - { - struct hostent *entry = NULL; - - /* hostname resolution */ - if (!(flags & AI_NUMERICHOST)) - entry = gethostbyname (node); - - if (entry == NULL) - return EAI_NONAME; - - if ((entry->h_length != 4) || (entry->h_addrtype != AF_INET)) - return EAI_FAMILY; - - ip = *((u_long *) entry->h_addr); - if (flags & AI_CANONNAME) - name = entry->h_name; - } - - if ((flags & AI_CANONNAME) && (name == NULL)) - name = node; - - /* service resolution */ - if (service == NULL) - port = 0; - else - { - 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; - - port = entry->s_port; - } - else - port = htons ((u_short)d); - } - - /* building results... */ - if ((!protocol) || (protocol == IPPROTO_UDP)) - { - info = makeipv4info (SOCK_DGRAM, IPPROTO_UDP, ip, port, name); - if (info == NULL) - { - errno = ENOMEM; - return EAI_SYSTEM; - } - if (flags & AI_PASSIVE) - info->ai_flags |= AI_PASSIVE; - *res = info; - } - if ((!protocol) || (protocol == IPPROTO_TCP)) - { - info = makeipv4info (SOCK_STREAM, IPPROTO_TCP, ip, port, name); - if (info == NULL) - { - errno = ENOMEM; - return EAI_SYSTEM; - } - info->ai_next = *res; - if (flags & AI_PASSIVE) - info->ai_flags |= AI_PASSIVE; - *res = info; - } - - return 0; -} -#endif /* if !HAVE_GETADDRINFO */ - - int vlc_getnameinfo( const struct sockaddr *sa, int salen, char *host, int hostlen, int *portnum, int flags ) { @@ -566,15 +59,8 @@ int vlc_getnameinfo( const struct sockaddr *sa, int salen, psz_serv = NULL; i_servlen = 0; } -#if defined( WIN32 ) && !defined( UNDER_CE ) - i_val = ws2_getnameinfo( sa, salen, host, hostlen, psz_serv, - i_servlen, flags ); -#endif -#if defined( HAVE_GETNAMEINFO ) || defined( UNDER_CE ) + i_val = 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 ); @@ -583,13 +69,24 @@ int vlc_getnameinfo( const struct sockaddr *sa, int salen, } -/* TODO: support for setting sin6_scope_id */ +/** + * Resolves a host name to a list of socket addresses (like getaddrinfo()). + * + * @param p_this a VLC object + * @param node host name to resolve (encoded as UTF-8), or NULL + * @param i_port port number for the socket addresses + * @param p_hints parameters (see getaddrinfo() manual page) + * @param res pointer set to the resulting chained list. + * @return 0 on success, a getaddrinfo() error otherwise. + * On failure, *res is undefined. On success, it must be freed with + * freeaddrinfo(). + */ int vlc_getaddrinfo( vlc_object_t *p_this, const char *node, int i_port, const struct addrinfo *p_hints, struct addrinfo **res ) { struct addrinfo hints; - char psz_buf[NI_MAXHOST], *psz_node, psz_service[6]; + char psz_buf[NI_MAXHOST], psz_service[6]; /* * In VLC, we always use port number as integer rather than strings @@ -605,26 +102,47 @@ int vlc_getaddrinfo( vlc_object_t *p_this, const char *node, 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; } /* @@ -632,99 +150,138 @@ int vlc_getaddrinfo( vlc_object_t *p_this, const char *node, * - accept "" as NULL * - ignore square brackets */ - if( ( node == NULL ) || (node[0] == '\0' ) ) + if (node != NULL) { - psz_node = NULL; - } - else - { - strlcpy( psz_buf, node, NI_MAXHOST ); - - psz_node = psz_buf; - - if( psz_buf[0] == '[' ) + if (node[0] == '[') { - char *ptr; - - ptr = strrchr( psz_buf, ']' ); - if( ( ptr != NULL ) && (ptr[1] == '\0' ) ) + size_t len = strlen (node + 1); + if ((len <= sizeof (psz_buf)) && (node[len] == ']')) { - *ptr = '\0'; - psz_node++; + assert (len > 0); + memcpy (psz_buf, node + 1, len - 1); + psz_buf[len - 1] = '\0'; + node = psz_buf; } } + if (node[0] == '\0') + node = NULL; } -#if defined( WIN32 ) && !defined( UNDER_CE ) + int ret; + node = ToLocale (node); +#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) - return 0; - + ret = getaddrinfo (node, psz_service, &hints, res); + if (ret == 0) + goto out; hints.ai_flags &= ~AI_NUMERICHOST; } - - return ws2_getaddrinfo (psz_node, psz_service, &hints, res); #endif -#if defined( HAVE_GETADDRINFO ) || defined( UNDER_CE ) -# ifdef AI_IDN +#ifdef AI_IDN /* Run-time I18n Domain Names support */ - { - static vlc_bool_t i_idn = VLC_TRUE; /* beware of thread-safety */ - - if( i_idn ) - { - int i_ret; - - hints.ai_flags |= AI_IDN; - i_ret = getaddrinfo( psz_node, psz_service, &hints, res ); + hints.ai_flags |= AI_IDN; + ret = getaddrinfo (node, psz_service, &hints, res); + if (ret != EAI_BADFLAGS) + goto out; + /* IDN not available: disable and retry without it */ + hints.ai_flags &= ~AI_IDN; +#endif + ret = getaddrinfo (node, psz_service, &hints, res); - if( i_ret != EAI_BADFLAGS ) - return i_ret; +#if defined(AI_IDN) || defined(WIN32) +out: +#endif + LocaleFree (node); + return ret; +} - /* libidn not available: disable and retry without it */ - /* NOTE: Using i_idn here would not be thread-safe */ - hints.ai_flags &= ~AI_IDN; - i_idn = VLC_FALSE; - msg_Dbg( p_this, "International Domain Names not supported - " \ - "disabled" ); - } - } -# endif - return getaddrinfo( psz_node, psz_service, &hints, res ); -#else +/** + * inet_pton() replacement + */ +int vlc_inet_pton (int af, const char *src, void *dst) { - int i_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 ); - - i_ret = __getaddrinfo( psz_node, psz_service, &hints, res ); - vlc_mutex_unlock( lock.p_address ); - return i_ret; -} +#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 */ } - -void vlc_freeaddrinfo( struct addrinfo *infos ) +/** + * inet_ntop() replacement + */ +const char *vlc_inet_ntop (int af, const void *src, char *dst, socklen_t cnt) { -#if defined( WIN32 ) && !defined( UNDER_CE ) - ws2_freeaddrinfo( infos ); -#endif -#if defined( HAVE_GETADDRINFO ) || defined( UNDER_CE ) - freeaddrinfo( infos ); -#else - __freeaddrinfo( infos ); +#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 */ } +