Commit aa9562a3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Presumptively avoid using getaddrinfo for the Windows 2000

parent c2df0b03
...@@ -688,3 +688,85 @@ void vlc_freeaddrinfo( struct addrinfo *infos ) ...@@ -688,3 +688,85 @@ void vlc_freeaddrinfo( struct addrinfo *infos )
{ {
freeaddrinfo (infos); 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 -1;
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:
return -1;
}
memcpy (dst, data, len);
return 0;
#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 */
}
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
# include "config.h" # include "config.h"
#endif #endif
#define _WIN32_WINNT 0x0501
#include <vlc_common.h> #include <vlc_common.h>
#include <stdlib.h> #include <stdlib.h>
...@@ -552,106 +551,6 @@ ssize_t __net_vaPrintf( vlc_object_t *p_this, int fd, const v_socket_t *p_vs, ...@@ -552,106 +551,6 @@ ssize_t __net_vaPrintf( vlc_object_t *p_this, int fd, const v_socket_t *p_vs,
return i_ret; return i_ret;
} }
/*****************************************************************************
* inet_pton replacement for obsolete and/or crap operating systems
*****************************************************************************/
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 -1;
const void *data;
size_t len;
switch (af)
{
case AF_INET:
data = &((const struct sockaddr_in *)res->ai_addr)->sin_addr;
len = 4;
break;
#ifdef AF_INET6
case AF_INET6:
data = &((const struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
len = 16;
break;
#endif
default:
errno = EAFNOSUPPORT;
return -1;
}
memcpy (dst, data, len);
return 0;
#else /* HAVE_INET_PTON */
return inet_pton( af, src, dst );
#endif /* HAVE_INET_PTON */
}
const char *vlc_inet_ntop(int af, const void * src,
char * dst, socklen_t cnt)
{
#ifndef HAVE_INET_NTOP
#ifdef WIN32
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);
if( 0 == WSAAddressToStringA((LPSOCKADDR)&addr,
sizeof(struct sockaddr_in6),
NULL, dst, &cnt) )
{
dst[cnt] = '\0';
return dst;
}
errno = WSAGetLastError();
return NULL;
}
#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);
if( 0 == WSAAddressToStringA((LPSOCKADDR)&addr,
sizeof(struct sockaddr_in),
NULL, dst, &cnt) )
{
dst[cnt] = '\0';
return dst;
}
errno = WSAGetLastError();
return NULL;
}
}
errno = EAFNOSUPPORT;
return NULL;
#else /* WIN32 */
return NULL;
#endif /* WIN32 */
#else /* HAVE_INET_NTOP */
return inet_ntop( af, src, dst, cnt );
#endif /* HAVE_INET_NTOP */
}
#ifdef WIN32 #ifdef WIN32
/* vlc_sendmsg, vlc_recvmsg Defined in winsock.c */ /* vlc_sendmsg, vlc_recvmsg Defined in winsock.c */
#else /* !WIN32 */ #else /* !WIN32 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment