* ipv6.c: IPv6 network abstraction layer
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: ipv6.c,v 1.6 2002/04/23 14:16:20 sam Exp $
+ * $Id: ipv6.c,v 1.10 2002/06/01 16:45:34 sam Exp $
*
* Authors: Alexis Guillard <alexis.guillard@bt.com>
* Christophe Massiot <massiot@via.ecp.fr>
*****************************************************************************/
#include <stdlib.h>
#include <sys/types.h>
-#include <sys/socket.h>
#include <sys/stat.h>
#include <string.h>
#include <errno.h>
#include <fcntl.h>
-#include <videolan/vlc.h>
+
+#include <vlc/vlc.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
* call to get that value from the interface driver. */
#define DEFAULT_MTU 1500
+#if defined(WIN32)
+static const struct in6_addr in6addr_any = {{IN6ADDR_ANY_INIT}};
+#endif
+
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static void getfunctions( function_list_t * );
-static int NetworkOpen( struct network_socket_s * );
+static int NetworkOpen( vlc_object_t *, network_socket_t * );
/*****************************************************************************
* Build configuration tree.
MODULE_INIT_START
SET_DESCRIPTION( _("IPv6 network abstraction layer") )
ADD_CAPABILITY( NETWORK, 40 )
- ADD_SHORTCUT( "ipv6" )
MODULE_INIT_STOP
MODULE_ACTIVATE_START
static int BuildAddr( struct sockaddr_in6 * p_socket,
char * psz_address, int i_port )
{
+#if defined(WIN32)
+ /* Try to get getaddrinfo() and freeaddrinfo() from wship6.dll */
+ typedef int (CALLBACK * GETADDRINFO) ( const char *nodename,
+ const char *servname,
+ const struct addrinfo *hints,
+ struct addrinfo **res );
+ typedef void (CALLBACK * FREEADDRINFO) ( struct addrinfo FAR *ai );
+
+ struct addrinfo hints, *res;
+ GETADDRINFO _getaddrinfo = NULL;
+ FREEADDRINFO _freeaddrinfo = NULL;
+
+ HINSTANCE wship6_dll = LoadLibrary("wship6.dll");
+ if( wship6_dll )
+ {
+ _getaddrinfo = (GETADDRINFO) GetProcAddress( wship6_dll,
+ "getaddrinfo" );
+ _freeaddrinfo = (FREEADDRINFO) GetProcAddress( wship6_dll,
+ "freeaddrinfo" );
+ }
+ if( !_getaddrinfo || !_freeaddrinfo )
+ {
+//X msg_Err( p_this, "no IPv6 stack installed" );
+ if( wship6_dll ) FreeLibrary( wship6_dll );
+ return( -1 );
+ }
+#endif
+
/* Reset struct */
memset( p_socket, 0, sizeof( struct sockaddr_in6 ) );
- p_socket->sin6_family = AF_INET6; /* family */
+ p_socket->sin6_family = AF_INET6; /* family */
p_socket->sin6_port = htons( i_port );
if( !*psz_address )
{
{
psz_address++;
psz_address[strlen(psz_address) - 1] = '\0' ;
+
+#if !defined( WIN32 )
inet_pton(AF_INET6, psz_address, &p_socket->sin6_addr.s6_addr);
+
+#else
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = AF_INET6;
+ hints.ai_flags = AI_NUMERICHOST;
+
+ if( _getaddrinfo( psz_address, NULL, &hints, &res ) )
+ {
+ FreeLibrary( wship6_dll );
+ return( -1 );
+ }
+ memcpy( &p_socket->sin6_addr,
+ &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr,
+ sizeof(struct in6_addr) );
+ _freeaddrinfo( res );
+
+#endif
}
else
{
/* We have a fqdn, try to find its address */
if ( (p_hostent = gethostbyname2( psz_address, AF_INET6 )) == NULL )
{
- intf_ErrMsg( "ipv6 error: unknown host %s", psz_address );
+//X intf_ErrMsg( "ipv6 error: unknown host %s", psz_address );
return( -1 );
}
/* Copy the first address of the host in the socket address */
memcpy( &p_socket->sin6_addr, p_hostent->h_addr_list[0],
p_hostent->h_length );
+
+#elif defined(WIN32)
+ if( _getaddrinfo( psz_address, NULL, &hints, &res ) )
+ {
+ FreeLibrary( wship6_dll );
+ return( -1 );
+ }
+ memcpy( &p_socket->sin6_addr,
+ &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr,
+ sizeof(struct in6_addr) );
+ _freeaddrinfo( res );
+
#else
- intf_ErrMsg( "ipv6 error: IPv6 address %s is invalid", psz_address );
+//X intf_ErrMsg( "ipv6 error: IPv6 address %s is invalid", psz_address );
return( -1 );
#endif
}
+#if defined(WIN32)
+ FreeLibrary( wship6_dll );
+#endif
+
return( 0 );
}
* Its use leads to great confusion and is currently discouraged.
* This function returns -1 in case of error.
*****************************************************************************/
-static int OpenUDP( network_socket_t * p_socket )
+static int OpenUDP( vlc_object_t * p_this, network_socket_t * p_socket )
{
char * psz_bind_addr = p_socket->psz_bind_addr;
int i_bind_port = p_socket->i_bind_port;
if( i_bind_port == 0 )
{
- i_bind_port = config_GetIntVariable( "server-port" );
+//X i_bind_port = config_GetInt( "server-port" );
}
/* Open a SOCK_DGRAM (UDP) socket, in the AF_INET6 domain, automatic (0)
* protocol */
if( (i_handle = socket( AF_INET6, SOCK_DGRAM, 0 )) == -1 )
{
- intf_ErrMsg( "ipv6 error: cannot create socket (%s)", strerror(errno) );
+ msg_Err( p_this, "cannot create socket (%s)", strerror(errno) );
return( -1 );
}
if( setsockopt( i_handle, SOL_SOCKET, SO_REUSEADDR,
(void *) &i_opt, sizeof( i_opt ) ) == -1 )
{
- intf_ErrMsg( "ipv6 error: cannot configure socket (SO_REUSEADDR: %s)",
- strerror(errno));
+ msg_Err( p_this, "cannot configure socket (SO_REUSEADDR: %s)",
+ strerror(errno) );
close( i_handle );
return( -1 );
}
if( setsockopt( i_handle, SOL_SOCKET, SO_RCVBUF,
(void *) &i_opt, sizeof( i_opt ) ) == -1 )
{
- intf_WarnMsg( 1,
- "ipv6 warning: cannot configure socket (SO_RCVBUF: %s)",
- strerror(errno));
+ msg_Warn( p_this, "cannot configure socket (SO_RCVBUF: %s)",
+ strerror(errno) );
}
/* Check if we really got what we have asked for, because Linux, etc.
if( getsockopt( i_handle, SOL_SOCKET, SO_RCVBUF,
(void*) &i_opt, &i_opt_size ) == -1 )
{
- intf_WarnMsg( 1, "ipv6 warning: cannot query socket (SO_RCVBUF: %s)",
- strerror(errno));
+ msg_Warn( p_this, "cannot query socket (SO_RCVBUF: %s)",
+ strerror(errno) );
}
else if( i_opt < 0x80000 )
{
- intf_WarnMsg( 1, "ipv6 warning: socket buffer size is 0x%x"
- " instead of 0x%x", i_opt, 0x80000 );
+ msg_Warn( p_this, "socket buffer size is 0x%x instead of 0x%x",
+ i_opt, 0x80000 );
}
/* Build the local socket */
/* Bind it */
if( bind( i_handle, (struct sockaddr *)&sock, sizeof( sock ) ) < 0 )
{
- intf_ErrMsg( "ipv6 error: cannot bind socket (%s)", strerror(errno) );
+ msg_Err( p_this, "cannot bind socket (%s)", strerror(errno) );
close( i_handle );
return( -1 );
}
if( setsockopt( i_handle, SOL_SOCKET, SO_BROADCAST,
(void*) &i_opt, sizeof( i_opt ) ) == -1 )
{
- intf_WarnMsg( 1,
- "ipv6 warning: cannot configure socket (SO_BROADCAST: %s)",
- strerror(errno));
+ msg_Warn( p_this, "ipv6 warning: cannot configure socket "
+ "(SO_BROADCAST: %s)", strerror(errno) );
}
}
/* Build socket for remote connection */
if ( BuildAddr( &sock, psz_server_addr, i_server_port ) == -1 )
{
- intf_ErrMsg( "ipv6 error: cannot build remote address" );
+ msg_Err( p_this, "cannot build remote address" );
close( i_handle );
return( -1 );
}
if( connect( i_handle, (struct sockaddr *) &sock,
sizeof( sock ) ) == (-1) )
{
- intf_ErrMsg( "ipv6 error: cannot connect socket (%s)",
- strerror(errno) );
+ msg_Err( p_this, "cannot connect socket (%s)", strerror(errno) );
close( i_handle );
return( -1 );
}
* Other parameters are ignored.
* This function returns -1 in case of error.
*****************************************************************************/
-static int OpenTCP( network_socket_t * p_socket )
+static int OpenTCP( vlc_object_t * p_this, network_socket_t * p_socket )
{
char * psz_server_addr = p_socket->psz_server_addr;
int i_server_port = p_socket->i_server_port;
* protocol */
if( (i_handle = socket( AF_INET6, SOCK_STREAM, 0 )) == -1 )
{
- intf_ErrMsg( "ipv6 error: cannot create socket (%s)", strerror(errno) );
+ msg_Err( p_this, "cannot create socket (%s)", strerror(errno) );
return( -1 );
}
if( connect( i_handle, (struct sockaddr *) &sock,
sizeof( sock ) ) == (-1) )
{
- intf_ErrMsg( "ipv6 error: cannot connect socket (%s)",
- strerror(errno) );
+ msg_Err( p_this, "cannot connect socket (%s)", strerror(errno) );
close( i_handle );
return( -1 );
}
/*****************************************************************************
* NetworkOpen: wrapper around OpenUDP and OpenTCP
*****************************************************************************/
-static int NetworkOpen( network_socket_t * p_socket )
+static int NetworkOpen( vlc_object_t * p_this, network_socket_t * p_socket )
{
if( p_socket->i_type == NETWORK_UDP )
{
- return OpenUDP( p_socket );
+ return OpenUDP( p_this, p_socket );
}
else
{
- return OpenTCP( p_socket );
+ return OpenTCP( p_this, p_socket );
}
}
-
-
projects / vlc / blobdiff