Commit 6414dbd6 authored by Christophe Massiot's avatar Christophe Massiot

* src/misc/net.c: Better fix for Cygwin.

parent c754f632
...@@ -1180,11 +1180,10 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj, ...@@ -1180,11 +1180,10 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj,
int __net_CheckIP( vlc_object_t *p_this, char *psz_ip, char **ppsz_hosts, int __net_CheckIP( vlc_object_t *p_this, char *psz_ip, char **ppsz_hosts,
int i_hosts ) int i_hosts )
{ {
#ifdef HAVE_ARPA_INET_H
struct in_addr ip; struct in_addr ip;
int i; int i;
if( !inet_aton( psz_ip, &ip ) ) if( (ip.s_addr = inet_addr( psz_ip )) == INADDR_NONE )
{ {
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1208,12 +1207,12 @@ int __net_CheckIP( vlc_object_t *p_this, char *psz_ip, char **ppsz_hosts, ...@@ -1208,12 +1207,12 @@ int __net_CheckIP( vlc_object_t *p_this, char *psz_ip, char **ppsz_hosts,
else if( i_mask == 0 ) else if( i_mask == 0 )
mask.s_addr = INADDR_ANY; mask.s_addr = INADDR_ANY;
else else
mask.s_addr = htons( ntohs(INADDR_NONE) << (32 - i_mask) ); mask.s_addr = htonl( ntohl(INADDR_NONE) << (32 - i_mask) );
} }
else else
mask.s_addr = INADDR_NONE; mask.s_addr = INADDR_NONE;
if( !inet_aton( psz_host, &base ) ) if( (base.s_addr = inet_addr( psz_host )) == INADDR_NONE )
{ {
msg_Err( p_this, "invalid base address %s", psz_host ); msg_Err( p_this, "invalid base address %s", psz_host );
free( psz_host ); free( psz_host );
...@@ -1226,10 +1225,5 @@ int __net_CheckIP( vlc_object_t *p_this, char *psz_ip, char **ppsz_hosts, ...@@ -1226,10 +1225,5 @@ int __net_CheckIP( vlc_object_t *p_this, char *psz_ip, char **ppsz_hosts,
} }
return VLC_FALSE; return VLC_FALSE;
#else
msg_Err( p_this, "hosts checking is not supported on this OS" );
return VLC_FALSE;
#endif
} }
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