Commit 9bd5dd03 authored by Jean-Paul Saman's avatar Jean-Paul Saman

Revert [21457] it was completely wrong.

parent ca9643b0
......@@ -289,7 +289,7 @@ static int WSAAPI
getaddrinfo (const char *node, const char *service,
const struct addrinfo *hints, struct addrinfo **res)
#else
static int
static int
getaddrinfo (const char *node, const char *service,
const struct addrinfo *hints, struct addrinfo **res)
#endif
......@@ -558,6 +558,7 @@ int vlc_getnameinfo( const struct sockaddr *sa, int salen,
return i_val;
}
int vlc_getaddrinfo( vlc_object_t *p_this, const char *node,
int i_port, const struct addrinfo *p_hints,
struct addrinfo **res )
......@@ -580,15 +581,12 @@ int vlc_getaddrinfo( vlc_object_t *p_this, const char *node,
/* Check if we have to force ipv4 or ipv6 */
memset (&hints, 0, sizeof (hints));
if( p_hints != NULL )
if (p_hints != NULL)
{
int ai_flags = AI_NUMERICHOST|AI_PASSIVE;
if( node )
ai_flags |= AI_CANONNAME;
hints.ai_family = p_hints->ai_family;
hints.ai_socktype = p_hints->ai_socktype;
hints.ai_protocol = p_hints->ai_protocol;
hints.ai_flags = p_hints->ai_flags & (ai_flags);
hints.ai_flags = p_hints->ai_flags & (AI_NUMERICHOST|AI_PASSIVE|AI_CANONNAME);
}
#ifdef AI_NUMERICSERV
/* we only ever use port *numbers* */
......@@ -620,7 +618,6 @@ int vlc_getaddrinfo( vlc_object_t *p_this, const char *node,
if( ( node == NULL ) || (node[0] == '\0' ) )
{
psz_node = NULL;
hints.ai_flags &= ~AI_CANONNAME;
}
else
{
......
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