RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-11 04:01:31 +00:00
Code Issues Releases Wiki Activity

calling bind with multicast addresses doesn't work on windows, patch by Martin Decky <deckm1am at ss1000.ms.mff.cuni.cz>

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12611 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
faust3 2004-06-18 14:31:10 +00:00
parent c281648a95
commit 6bfc62a9b9
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libmpdemux/network.c
View File

@ -1080,6 +1080,7 @@ rtp_open_socket( URL_t *url ) {
struct sockaddr_in server_address; struct sockaddr_in server_address;
struct ip_mreq mcast; struct ip_mreq mcast;
struct timeval tv; struct timeval tv;
struct hostent *hp;
mp_msg(MSGT_NETWORK,MSGL_V,"Listening for traffic on %s:%d ...\n", url->hostname, url->port ); mp_msg(MSGT_NETWORK,MSGL_V,"Listening for traffic on %s:%d ...\n", url->hostname, url->port );
@ -1091,12 +1092,16 @@ rtp_open_socket( URL_t *url ) {
} }
if( isalpha(url->hostname[0]) ) { if( isalpha(url->hostname[0]) ) {
struct hostent *hp =(struct hostent*)gethostbyname( url->hostname ); #ifndef HAVE_WINSOCK2
hp =(struct hostent*)gethostbyname( url->hostname );
if( hp==NULL ) { if( hp==NULL ) {
mp_msg(MSGT_NETWORK,MSGL_ERR,"Counldn't resolve name: %s\n", url->hostname); mp_msg(MSGT_NETWORK,MSGL_ERR,"Counldn't resolve name: %s\n", url->hostname);
return -1; return -1;
} }
memcpy( (void*)&server_address.sin_addr.s_addr, (void*)hp->h_addr, hp->h_length ); memcpy( (void*)&server_address.sin_addr.s_addr, (void*)hp->h_addr, hp->h_length );
#else
server_address.sin_addr.s_addr = htonl(INADDR_ANY);
#endif
} else { } else {
#ifndef HAVE_WINSOCK2 #ifndef HAVE_WINSOCK2
#ifdef USE_ATON #ifdef USE_ATON
@ -1105,8 +1110,7 @@ rtp_open_socket( URL_t *url ) {
inet_pton(AF_INET, url->hostname, &server_address.sin_addr); inet_pton(AF_INET, url->hostname, &server_address.sin_addr);
#endif #endif
#else #else
unsigned int addr = inet_addr(url->hostname); server_address.sin_addr.s_addr = htonl(INADDR_ANY);
memcpy( (void*)&server_address.sin_addr, (void*)&addr, sizeof(addr) );
#endif #endif
} }
server_address.sin_family=AF_INET; server_address.sin_family=AF_INET;
@ -1123,6 +1127,20 @@ rtp_open_socket( URL_t *url ) {
return -1; return -1;
} }
} }
#ifdef HAVE_WINSOCK2
if (isalpha(url->hostname[0])) {
hp =(struct hostent*)gethostbyname( url->hostname );
if( hp==NULL ) {
mp_msg(MSGT_NETWORK,MSGL_ERR,"Counldn't resolve name: %s\n", url->hostname);
return -1;
}
memcpy( (void*)&server_address.sin_addr.s_addr, (void*)hp->h_addr, hp->h_length );
} else {
unsigned int addr = inet_addr(url->hostname);
memcpy( (void*)&server_address.sin_addr, (void*)&addr, sizeof(addr) );
}
#endif
// Increase the socket rx buffer size to maximum -- this is UDP // Increase the socket rx buffer size to maximum -- this is UDP
rxsockbufsz = 240 * 1024; rxsockbufsz = 240 * 1024;