* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Mathias Kretschmer <mathias@research.att.com>
* Alexis de Lattre <alexis@via.ecp.fr>
+ * Rémi Denis-Courmont <rem # videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
# endif
# include <winsock2.h>
# include <ws2tcpip.h>
-# define close closesocket
+# include <iphlpapi.h>
+# if !defined(INCL_WINSOCK_API_PROTOTYPES)
+# define close closesocket
+# endif
# if defined(UNDER_CE)
# undef IP_MULTICAST_TTL
# define IP_MULTICAST_TTL 3
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int NetOpen( vlc_object_t * );
+static int OpenUDP( vlc_object_t * );
/*****************************************************************************
* Module descriptor
vlc_module_begin();
set_shortname( "IPv4" );
- set_description( _("IPv4 network abstraction layer") );
+ set_description( _("UDP/IPv4 network abstraction layer") );
set_capability( "network", 50 );
set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_ADVANCED );
- set_callbacks( NetOpen, NULL );
+ set_subcategory( SUBCAT_INPUT_GENERAL );
+ set_callbacks( OpenUDP, NULL );
add_string( "miface-addr", NULL, NULL, MIFACE_TEXT, MIFACE_LONGTEXT, VLC_TRUE );
vlc_module_end();
return( 0 );
}
+#if defined(WIN32) || defined(UNDER_CE)
+# define WINSOCK_STRERROR_SIZE 20
+static const char *winsock_strerror( char *buf )
+{
+ snprintf( buf, WINSOCK_STRERROR_SIZE, "Winsock error %d",
+ WSAGetLastError( ) );
+ buf[WINSOCK_STRERROR_SIZE - 1] = '\0';
+ return buf;
+}
+#endif
+
+
/*****************************************************************************
* OpenUDP: open a UDP socket
*****************************************************************************
* psz_bind_addr, i_bind_port : address and port used for the bind()
* system call. If psz_bind_addr == "", the socket is bound to
- * INADDR_ANY and broadcast reception is enabled. If i_bind_port == 0,
- * 1234 is used. If psz_bind_addr is a multicast (class D) address,
- * join the multicast group.
+ * INADDR_ANY and broadcast reception is enabled. If psz_bind_addr is a
+ * multicast (class D) address, join the multicast group.
* psz_server_addr, i_server_port : address and port used for the connect()
* system call. It can avoid receiving packets from unauthorized IPs.
* Its use leads to great confusion and is currently discouraged.
* This function returns -1 in case of error.
*****************************************************************************/
-static int OpenUDP( vlc_object_t * p_this, network_socket_t * p_socket )
+static int OpenUDP( vlc_object_t * p_this )
{
- char * psz_bind_addr = p_socket->psz_bind_addr;
+ network_socket_t * p_socket = p_this->p_private;
+ const char * psz_bind_addr = p_socket->psz_bind_addr;
int i_bind_port = p_socket->i_bind_port;
- char * psz_server_addr = p_socket->psz_server_addr;
+ const char * psz_server_addr = p_socket->psz_server_addr;
int i_server_port = p_socket->i_server_port;
int i_handle, i_opt;
struct sockaddr_in sock;
vlc_value_t val;
+#if defined(WIN32) || defined(UNDER_CE)
+ char strerror_buf[WINSOCK_STRERROR_SIZE];
+# define strerror( x ) winsock_strerror( strerror_buf )
+#endif
/* If IP_ADD_SOURCE_MEMBERSHIP is not defined in the headers
(because it's not in glibc for example), we have to define the
};
#endif
+ p_socket->i_handle = -1;
+
/* Open a SOCK_DGRAM (UDP) socket, in the AF_INET domain, automatic (0)
* protocol */
if( (i_handle = socket( AF_INET, SOCK_DGRAM, 0 )) == -1 )
{
-#if defined(WIN32) || defined(UNDER_CE)
- msg_Warn( p_this, "cannot create socket (%i)", WSAGetLastError() );
-#else
msg_Warn( p_this, "cannot create socket (%s)", strerror(errno) );
-#endif
- return( -1 );
+ return 0;
}
/* We may want to reuse an already used socket */
if( setsockopt( i_handle, SOL_SOCKET, SO_REUSEADDR,
(void *) &i_opt, sizeof( i_opt ) ) == -1 )
{
-#if defined(WIN32) || defined(UNDER_CE)
- msg_Warn( p_this, "cannot configure socket (SO_REUSEADDR: %i)",
- WSAGetLastError() );
-#else
msg_Warn( p_this, "cannot configure socket (SO_REUSEADDR: %s)",
strerror(errno));
-#endif
close( i_handle );
- return( -1 );
+ return 0;
}
#ifdef SO_REUSEPORT
/* Increase the receive buffer size to 1/2MB (8Mb/s during 1/2s) to avoid
* packet loss caused by scheduling problems */
- i_opt = 0x80000;
#if !defined( SYS_BEOS )
- if( setsockopt( i_handle, SOL_SOCKET, SO_RCVBUF, (void *) &i_opt, sizeof( i_opt ) ) == -1 )
- {
-#if defined(WIN32) || defined(UNDER_CE)
- msg_Dbg( p_this, "cannot configure socket (SO_RCVBUF: %i)",
- WSAGetLastError() );
-#else
+ i_opt = 0x80000;
+ if( setsockopt( i_handle, SOL_SOCKET, SO_RCVBUF, (void *) &i_opt,
+ sizeof( i_opt ) ) == -1 )
msg_Dbg( p_this, "cannot configure socket (SO_RCVBUF: %s)",
strerror(errno));
-#endif
- }
+ i_opt = 0x80000;
+ if( setsockopt( i_handle, SOL_SOCKET, SO_SNDBUF, (void *) &i_opt,
+ sizeof( i_opt ) ) == -1 )
+ msg_Dbg( p_this, "cannot configure socket (SO_SNDBUF: %s)",
+ strerror(errno));
#endif
/* Build the local socket */
{
msg_Dbg( p_this, "could not build local address" );
close( i_handle );
- return( -1 );
+ return 0;
}
/* Bind it */
if( bind( i_handle, (struct sockaddr *)&sock, sizeof( sock ) ) < 0 )
{
-#if defined(WIN32) || defined(UNDER_CE)
- msg_Warn( p_this, "cannot bind socket (%i)", WSAGetLastError() );
-#else
msg_Warn( p_this, "cannot bind socket (%s)", strerror(errno) );
-#endif
close( i_handle );
- return( -1 );
+ return 0;
}
#if defined( WIN32 ) || defined( UNDER_CE )
{
msg_Dbg( p_this, "could not build local address" );
close( i_handle );
- return( -1 );
+ return 0;
}
}
#endif
if( !*psz_bind_addr )
{
i_opt = 1;
- if( setsockopt( i_handle, SOL_SOCKET, SO_BROADCAST, (void*) &i_opt, sizeof( i_opt ) ) == -1 )
- {
-#if defined(WIN32) || defined(UNDER_CE)
- msg_Warn( p_this, "cannot configure socket (SO_BROADCAST: %i)",
- WSAGetLastError() );
-#else
+ if( setsockopt( i_handle, SOL_SOCKET, SO_BROADCAST, (void*) &i_opt,
+ sizeof( i_opt ) ) == -1 )
msg_Warn( p_this, "cannot configure socket (SO_BROADCAST: %s)",
strerror(errno) );
-#endif
- }
}
#endif
if( IN_MULTICAST( ntohl(sock.sin_addr.s_addr) ) )
{
/* Determine interface to be used for multicast */
- char * psz_if_addr = config_GetPsz( p_this, "iface-addr" );
+ char * psz_if_addr = config_GetPsz( p_this, "miface-addr" );
/* If we have a source address, we use IP_ADD_SOURCE_MEMBERSHIP
so that IGMPv3 aware OSes running on IGMPv3 aware networks
(char*)&imr,
sizeof(struct ip_mreq_source) ) == -1 )
{
-#if defined(WIN32) || defined(UNDER_CE)
- msg_Err( p_this, "failed to join IP multicast group (%i)",
- WSAGetLastError() );
-#else
msg_Err( p_this, "failed to join IP multicast group (%s)",
strerror(errno) );
-#endif
msg_Err( p_this, "are you sure your OS supports IGMPv3?" );
close( i_handle );
- return( -1 );
+ return 0;
}
}
/* If there is no source address, we use IP_ADD_MEMBERSHIP */
{
struct ip_mreq imr;
+ imr.imr_interface.s_addr = INADDR_ANY;
imr.imr_multiaddr.s_addr = sock.sin_addr.s_addr;
if( psz_if_addr != NULL && *psz_if_addr
&& inet_addr(psz_if_addr) != INADDR_NONE )
{
imr.imr_interface.s_addr = inet_addr(psz_if_addr);
}
+#if defined (WIN32) || defined (UNDER_CE)
else
{
- imr.imr_interface.s_addr = INADDR_ANY;
+ typedef DWORD (CALLBACK * GETBESTINTERFACE) ( IPAddr, PDWORD );
+ typedef DWORD (CALLBACK * GETIPADDRTABLE) ( PMIB_IPADDRTABLE, PULONG, BOOL );
+
+ GETBESTINTERFACE OurGetBestInterface;
+ GETIPADDRTABLE OurGetIpAddrTable;
+ HINSTANCE hiphlpapi = LoadLibrary(_T("Iphlpapi.dll"));
+ DWORD i_index;
+
+ if( hiphlpapi )
+ {
+ OurGetBestInterface =
+ (void *)GetProcAddress( hiphlpapi,
+ _T("GetBestInterface") );
+ OurGetIpAddrTable =
+ (void *)GetProcAddress( hiphlpapi,
+ _T("GetIpAddrTable") );
+ }
+
+ if( hiphlpapi && OurGetBestInterface && OurGetIpAddrTable &&
+ OurGetBestInterface( sock.sin_addr.s_addr,
+ &i_index ) == NO_ERROR )
+ {
+ PMIB_IPADDRTABLE p_table;
+ DWORD i = 0;
+
+ msg_Dbg( p_this, "Winsock best interface is %lu",
+ (unsigned long)i_index );
+ OurGetIpAddrTable( NULL, &i, 0 );
+
+ p_table = (PMIB_IPADDRTABLE)malloc( i );
+ if( p_table != NULL )
+ {
+ if( OurGetIpAddrTable( p_table, &i, 0 ) == NO_ERROR )
+ {
+ for( i = 0; i < p_table->dwNumEntries; i-- )
+ {
+ if( p_table->table[i].dwIndex == i_index )
+ {
+ imr.imr_interface.s_addr =
+ p_table->table[i].dwAddr;
+ msg_Dbg( p_this, "using interface 0x%08x",
+ p_table->table[i].dwAddr );
+ }
+ }
+ }
+ else msg_Warn( p_this, "GetIpAddrTable failed" );
+ free( p_table );
+ }
+ }
+ else msg_Dbg( p_this, "GetBestInterface failed" );
+
+ if( hiphlpapi ) FreeLibrary( hiphlpapi );
}
+#endif
if( psz_if_addr != NULL ) free( psz_if_addr );
msg_Dbg( p_this, "IP_ADD_MEMBERSHIP multicast request" );
if( setsockopt( i_handle, IPPROTO_IP, IP_ADD_MEMBERSHIP,
(char*)&imr, sizeof(struct ip_mreq) ) == -1 )
{
-#if defined(WIN32) || defined(UNDER_CE)
- msg_Err( p_this, "failed to join IP multicast group (%i)",
- WSAGetLastError() );
-#else
msg_Err( p_this, "failed to join IP multicast group (%s)",
strerror(errno) );
-#endif
close( i_handle );
- return( -1 );
+ return 0;
}
}
}
{
msg_Warn( p_this, "cannot build remote address" );
close( i_handle );
- return( -1 );
+ return 0;
}
/* Connect the socket */
if( connect( i_handle, (struct sockaddr *) &sock,
sizeof( sock ) ) == (-1) )
{
-#if defined(WIN32) || defined(UNDER_CE)
- msg_Warn( p_this, "cannot connect socket (%i)", WSAGetLastError());
-#else
msg_Warn( p_this, "cannot connect socket (%s)", strerror(errno) );
-#endif
close( i_handle );
- return( -1 );
+ return 0;
}
#if !defined( SYS_BEOS )
{
msg_Dbg( p_this, "failed to set multicast interface (%s).", strerror(errno) );
close( i_handle );
- return ( -1 );
+ return 0;
}
}
msg_Err( p_this, "failed to set ttl (%s)",
strerror(errno) );
close( i_handle );
- return( -1 );
+ return 0;
}
}
}
var_Get( p_this, "mtu", &val );
}
p_socket->i_mtu = val.i_int;
- return( 0 );
-}
-
-/*****************************************************************************
- * NetOpen: wrapper around OpenUDP, ListenTCP and OpenTCP
- *****************************************************************************/
-static int NetOpen( vlc_object_t * p_this )
-{
- network_socket_t * p_socket = p_this->p_private;
- return OpenUDP( p_this, p_socket );
+ return 0;
}
projects / vlc / blobdiff