/*****************************************************************************
* netutils.c: various network functions
*****************************************************************************
- * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: netutils.c,v 1.40 2001/11/12 03:07:13 stef Exp $
+ * Copyright (C) 1999-2001 VideoLAN
+ * $Id: netutils.c,v 1.54 2001/12/30 07:09:56 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Benoit Steiner <benny@via.ecp.fr>
* Henri Fallon <henri@videolan.org>
* Xavier Marchesini <xav@via.ecp.fr>
+ * Christophe Massiot <massiot@via.ecp.fr>
+ * Samuel Hocevar <sam@via.ecp.fr>
*
* 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
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include "defs.h"
-
#include <stdlib.h> /* free(), realloc(), atoi() */
#include <errno.h> /* errno() */
#include <string.h> /* memset() */
+#include <videolan/vlc.h>
+
+#ifdef STRNCASECMP_IN_STRINGS_H
+# include <strings.h>
+#endif
+
#ifdef HAVE_UNISTD_H
-#include <unistd.h> /* gethostname() */
+# include <unistd.h> /* gethostname() */
#elif defined( _MSC_VER ) && defined( _WIN32 )
-#include <io.h>
+# include <io.h>
#endif
#if !defined( _MSC_VER )
#include <sys/time.h> /* gettimeofday */
#endif
-#if !defined( WIN32 )
-#include <netdb.h> /* gethostbyname() */
-#include <netinet/in.h> /* BSD: struct in_addr */
-#include <sys/socket.h> /* BSD: struct sockaddr */
-#endif
-
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h> /* inet_ntoa(), inet_aton() */
+#ifdef WIN32
+# include <winsock2.h>
+#elif !defined( SYS_BEOS ) && !defined( SYS_NTO )
+# include <netdb.h> /* hostent ... */
+# include <sys/socket.h> /* BSD: struct sockaddr */
+# include <netinet/in.h> /* BSD: struct in_addr */
+# ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h> /* inet_ntoa(), inet_aton() */
+# endif
#endif
#ifdef SYS_LINUX
#include <sys/sockio.h>
#endif
-#include "config.h"
-#include "common.h"
-#include "mtime.h"
-#include "threads.h"
-#include "main.h"
-
-#include "intf_msg.h"
-
#include "netutils.h"
+#include "intf_playlist.h"
+
/*****************************************************************************
* input_channel_t: channel library data
*****************************************************************************
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int GetMacAddress ( int i_socket, char *psz_mac );
+static int GetMacAddress ( int i_fd, char *psz_mac );
#ifdef WIN32
static int GetAdapterInfo ( int i_adapter, char *psz_string );
#endif
/*****************************************************************************
- * network_BuildLocalAddr : fill a sockaddr_in structure for local binding
+ * network_BuildAddr : fill a sockaddr_in structure
*****************************************************************************/
-int network_BuildLocalAddr( struct sockaddr_in * p_socket, int i_port,
- char * psz_broadcast )
+int network_BuildAddr( struct sockaddr_in * p_socket,
+ char * psz_address, int i_port )
{
-
- char psz_hostname[INPUT_MAX_SOURCE_LENGTH];
- struct hostent * p_hostent;
-
#if defined( SYS_BEOS )
- intf_ErrMsg( "error: channel changing is not yet supported under BeOS" );
+ intf_ErrMsg( "error: networking is not yet supported under BeOS" );
return( 1 );
-#endif
+#else
/* Reset struct */
memset( p_socket, 0, sizeof( struct sockaddr_in ) );
p_socket->sin_family = AF_INET; /* family */
p_socket->sin_port = htons( i_port );
- if( psz_broadcast == NULL )
+ if( psz_address == NULL )
{
- /* Try to get our own IP */
- if( gethostname( psz_hostname, sizeof(psz_hostname) ) )
- {
- intf_ErrMsg( "BuildLocalAddr : unable to resolve local name : %s",
- strerror( errno ) );
- return( -1 );
- }
-
+ p_socket->sin_addr.s_addr = INADDR_ANY;
}
else
{
- /* I didn't manage to make INADDR_ANYT work, even with setsockopt
- * so, as it's kludgy to try and determine the broadcast addr
- * it is passed as an argument in the command line */
- strncpy( psz_hostname, psz_broadcast, INPUT_MAX_SOURCE_LENGTH );
- }
+ struct hostent * p_hostent;
- /* Try to convert address directly from in_addr - this will work if
- * psz_in_addr is dotted decimal. */
+ /* Try to convert address directly from in_addr - this will work if
+ * psz_broadcast is dotted decimal. */
#ifdef HAVE_ARPA_INET_H
- if( !inet_aton( psz_hostname, &p_socket->sin_addr) )
+ if( !inet_aton( psz_address, &p_socket->sin_addr) )
#else
- if( (p_socket->sin_addr.s_addr = inet_addr( psz_hostname )) == -1 )
+ if( (p_socket->sin_addr.s_addr = inet_addr( psz_address )) == -1 )
#endif
- {
- /* We have a fqdn, try to find its address */
- if ( (p_hostent = gethostbyname( psz_hostname )) == NULL )
{
- intf_ErrMsg( "BuildLocalAddr: unknown host %s", psz_hostname );
- return( -1 );
+ /* We have a fqdn, try to find its address */
+ if ( (p_hostent = gethostbyname( psz_address )) == NULL )
+ {
+ intf_ErrMsg( "BuildLocalAddr: unknown host %s", psz_address );
+ return( -1 );
+ }
+
+ /* Copy the first address of the host in the socket address */
+ memcpy( &p_socket->sin_addr, p_hostent->h_addr_list[0],
+ p_hostent->h_length );
}
-
- /* Copy the first address of the host in the socket address */
- memcpy( &p_socket->sin_addr, p_hostent->h_addr_list[0],
- p_hostent->h_length );
}
return( 0 );
-}
-
-/*****************************************************************************
- * network_BuildRemoteAddr : fill a sockaddr_in structure for remote host
- *****************************************************************************/
-int network_BuildRemoteAddr( struct sockaddr_in * p_socket, char * psz_server )
-{
-
- struct hostent * p_hostent;
-
-#if defined( SYS_BEOS )
- intf_ErrMsg( "error: channel changing is not yet supported under BeOS" );
- return( 1 );
#endif
-
- /* Reset structure */
- memset( p_socket, 0, sizeof( struct sockaddr_in ) );
- p_socket->sin_family = AF_INET; /* family */
- p_socket->sin_port = htons( 0 ); /* This is for remote end */
-
- /* Try to convert address directly from in_addr - this will work if
- * psz_in_addr is dotted decimal. */
-
-#ifdef HAVE_ARPA_INET_H
- if( !inet_aton( psz_server, &p_socket->sin_addr) )
-#else
- if( (p_socket->sin_addr.s_addr = inet_addr( psz_server )) == -1 )
-#endif
- {
- /* We have a fqdn, try to find its address */
- if ( (p_hostent = gethostbyname(psz_server)) == NULL )
- {
- intf_ErrMsg( "BuildRemoteAddr: unknown host %s",
- psz_server );
- return( -1 );
- }
-
- /* Copy the first address of the host in the socket address */
- memcpy( &p_socket->sin_addr, p_hostent->h_addr_list[0],
- p_hostent->h_length );
- }
- return( 0 );
}
/*****************************************************************************
*****************************************************************************/
int network_ChannelCreate( void )
{
-/* Even when BSD are supported, BeOS is not likely to be supported, so
- * I prefer to put it apart */
-#if defined( SYS_BEOS )
- intf_ErrMsg( "error: channel changing is not yet supported under BeOS" );
- return( 1 );
-
-/* FIXME : channel handling only work for linux */
-#elif defined( SYS_LINUX ) || defined( WIN32 )
+#if defined( SYS_LINUX ) || defined( WIN32 )
/* Allocate structure */
p_main->p_channel = malloc( sizeof( input_channel_t ) );
p_main->p_channel->i_channel = 0;
p_main->p_channel->last_change = 0;
- intf_Msg( "network: channels initialized" );
+ intf_WarnMsg( 2, "network: channels initialized" );
return( 0 );
#else
- intf_ErrMsg( "network error : channels not supported" );
+ intf_ErrMsg( "network error : channels not supported on this platform" );
return( 1 );
#endif
* already on the good channel, nothing will be done. Else, and if possible
* (if the interface is not locked), the channel server will be contacted
* and a change will be requested. The function will block until the change
- * is effective. Note that once a channel is no more used, it's interface
+ * is effective. Note that once a channel is no more used, its interface
* should be unlocked using input_ChannelLeave().
* Non 0 will be returned in case of error.
*****************************************************************************/
int network_ChannelJoin( int i_channel )
{
-/* I still prefer to put BeOS a bit apart */
-#if defined( SYS_BEOS )
- intf_ErrMsg( "network error: channels are not yet supported under BeOS" );
- return( -1 );
-
-#elif defined( SYS_LINUX ) || defined( WIN32 )
- int i_socket;
- int i_fromlen;
- struct sockaddr_in sa_server;
- struct sockaddr_in sa_client;
- unsigned int i_version = 12;
- char psz_mess[ 80 ];
- char psz_mac[ 40 ];
- char i_mess_length = 80;
- unsigned long int i_date;
- struct timeval answer_delay;
- int i_nbanswer;
- char i_answer;
- fd_set fds;
- unsigned int i_rc;
- char * psz_channel_server;
+#if defined( SYS_LINUX ) || defined( WIN32 )
+
+#define VLCS_VERSION 13
+#define MESSAGE_LENGTH 256
+
+ char psz_mess[ MESSAGE_LENGTH ];
+ char psz_mac[ 40 ];
+ int i_fd, i_dummy, i_port;
+ char *psz_vlcs;
+ struct sockaddr_in sa_server;
+ struct sockaddr_in sa_client;
+ struct timeval delay;
+ fd_set fds;
if( !main_GetIntVariable( INPUT_NETWORK_CHANNEL_VAR,
INPUT_NETWORK_CHANNEL_DEFAULT ) )
{
intf_ErrMsg( "network: channels disabled, to enable them, use the"
"--channels option" );
- return( -1 );
+ return -1;
}
- /* debug */
- intf_DbgMsg( "network: ChannelJoin : %d", i_channel );
/* If last change is too recent, wait a while */
if( mdate() - p_main->p_channel->last_change < INPUT_CHANNEL_CHANGE_DELAY )
{
intf_WarnMsg( 2, "network: waiting before changing channel" );
+ /* XXX Isn't this completely brain-damaged ??? -- Sam */
mwait( p_main->p_channel->last_change + INPUT_CHANNEL_CHANGE_DELAY );
}
- p_main->p_channel->last_change = mdate();
- p_main->p_channel->i_channel = i_channel;
+ /* Initializing the socket */
+ i_fd = socket( AF_INET, SOCK_DGRAM, 0 );
+ if( i_fd < 0 )
+ {
+ intf_ErrMsg( "network error: unable to create vlcs socket (%s)",
+ strerror( errno ) );
+ return -1;
+ }
- intf_WarnMsg( 2, "network: joining channel %d", i_channel );
+ i_dummy = 1;
+ if( setsockopt( i_fd, SOL_SOCKET, SO_REUSEADDR,
+ (void *) &i_dummy, sizeof( i_dummy ) ) == -1 )
+ {
+ intf_ErrMsg( "network error: can't SO_REUSEADDR vlcs socket (%s)",
+ strerror(errno));
+ close( i_fd );
+ return -1;
+ }
- /*
- * Initializing the socket
- */
- i_socket = socket( AF_INET, SOCK_DGRAM, 0 );
+ /* Getting information about the channel server */
+ psz_vlcs = main_GetPszVariable( INPUT_CHANNEL_SERVER_VAR,
+ INPUT_CHANNEL_SERVER_DEFAULT );
+ i_port = main_GetIntVariable( INPUT_CHANNEL_PORT_VAR,
+ INPUT_CHANNEL_PORT_DEFAULT );
- /*
- * Getting the server's information
- */
- intf_WarnMsg( 6, "Channel server: %s port: %d",
- main_GetPszVariable( INPUT_CHANNEL_SERVER_VAR,
- INPUT_CHANNEL_SERVER_DEFAULT ),
- main_GetIntVariable( INPUT_CHANNEL_PORT_VAR,
- INPUT_CHANNEL_PORT_DEFAULT ) );
+ intf_WarnMsg( 5, "network: socket %i, vlcs '%s', port %d",
+ i_fd, psz_vlcs, i_port );
+ memset( &sa_client, 0x00, sizeof(struct sockaddr_in) );
memset( &sa_server, 0x00, sizeof(struct sockaddr_in) );
- sa_server.sin_family = AF_INET;
- sa_server.sin_port = htons( main_GetIntVariable( INPUT_CHANNEL_PORT_VAR,
- INPUT_CHANNEL_PORT_DEFAULT ) );
-
- psz_channel_server = strdup( main_GetPszVariable( INPUT_CHANNEL_SERVER_VAR,
- INPUT_CHANNEL_SERVER_DEFAULT ) );
+ sa_client.sin_family = AF_INET;
+ sa_server.sin_family = AF_INET;
+ sa_client.sin_port = htons( 4312 );
+ sa_server.sin_port = htons( i_port );
+ sa_client.sin_addr.s_addr = INADDR_ANY;
#ifdef HAVE_ARPA_INET_H
- inet_aton( psz_channel_server, &sa_server.sin_addr );
+ inet_aton( psz_vlcs, &sa_server.sin_addr );
#else
- sa_server.sin_addr.s_addr = inet_addr( psz_channel_server );
+ sa_server.sin_addr.s_addr = inet_addr( psz_vlcs );
#endif
- free( psz_channel_server );
- /*
- * Looking for the interface MAC address
- */
- if( GetMacAddress( i_socket, psz_mac ) )
+ /* Bind the socket */
+ if( bind( i_fd, (struct sockaddr*)(&sa_client), sizeof(sa_client) ) )
+ {
+ intf_ErrMsg( "network: unable to bind vlcs socket (%s)",
+ strerror( errno ) );
+ close( i_fd );
+ return -1;
+ }
+
+ /* Look for the interface MAC address */
+ if( GetMacAddress( i_fd, psz_mac ) )
{
intf_ErrMsg( "network error: failed getting MAC address" );
- return( -1 );
+ close( i_fd );
+ return -1;
}
- /*
- * Getting date of the client in seconds
- */
- i_date = mdate() / 1000000;
- intf_DbgMsg( "vlcs: date %lu", i_date );
+ intf_WarnMsg( 6, "network: MAC address is %s", psz_mac );
- /*
- * Build of the message
- */
- sprintf( psz_mess, "%d %u %lu %s \n",
- i_channel, i_version, i_date, psz_mac );
+ /* Build the message */
+ sprintf( psz_mess, "%d %u %lu %s \n", i_channel, VLCS_VERSION,
+ (unsigned long)(mdate() / (u64)1000000),
+ psz_mac );
- intf_DbgMsg( "vlcs: The message is %s", psz_mess );
+ /* Send the message */
+ sendto( i_fd, psz_mess, MESSAGE_LENGTH, 0,
+ (struct sockaddr *)(&sa_server), sizeof(struct sockaddr) );
- /*
- * Open the socket 2
- */
- memset( &sa_client, 0x00, sizeof(struct sockaddr_in) );
- sa_client.sin_family = AF_INET;
- sa_client.sin_port = htons(4312);
- sa_client.sin_addr.s_addr = INADDR_ANY;
- i_fromlen = sizeof( struct sockaddr );
- i_rc = bind( i_socket, (struct sockaddr *)(&sa_client),\
- sizeof(struct sockaddr) );
- if ( i_rc )
- {
- intf_ErrMsg( "vlcs: Unable to bind socket:%u ", i_rc );
- /* TODO put CS_R_BIND in types.h*/
- /* return CS_R_SOCKET;*/
- return -1;
- }
+ intf_WarnMsg( 2, "network: attempting to join channel %d", i_channel );
- /*
- * Send the message
- */
- sendto( i_socket, psz_mess, i_mess_length, 0, \
- (struct sockaddr *)(&sa_server), \
- sizeof(struct sockaddr) );
+ /* We have changed channels ! (or at least, we tried) */
+ p_main->p_channel->last_change = mdate();
+ p_main->p_channel->i_channel = i_channel;
- /*
- * Waiting 5 sec for one answer from the server
- */
- answer_delay.tv_sec = 5;
- answer_delay.tv_usec = 0;
+ /* Wait 5 sec for an answer from the server */
+ delay.tv_sec = 5;
+ delay.tv_usec = 0;
FD_ZERO( &fds );
- FD_SET( i_socket, &fds );
- i_nbanswer = select( i_socket + 1, &fds, NULL, NULL, &answer_delay );
+ FD_SET( i_fd, &fds );
- switch( i_nbanswer )
+ switch( select( i_fd + 1, &fds, NULL, NULL, &delay ) )
{
- case 0:
- intf_DbgMsg( "vlcs: no answer" );
- break;
-
- case -1:
- intf_DbgMsg( "vlcs: unable to receive the answer ");
- break;
-
- default:
- recvfrom( i_socket, &i_answer, sizeof(char), 0,\
- (struct sockaddr *)(&sa_client), &i_fromlen);
+ case 0:
+ intf_ErrMsg( "network error: no answer from vlcs" );
+ close( i_fd );
+ return -1;
+ break;
+
+ case -1:
+ intf_ErrMsg( "network error: error while listening to vlcs" );
+ close( i_fd );
+ return -1;
+ break;
+ }
- intf_DbgMsg( "vlcs: the answer : %i", i_answer );
+ i_dummy = sizeof( struct sockaddr );
+ recvfrom( i_fd, psz_mess, MESSAGE_LENGTH, 0,
+ (struct sockaddr *)(&sa_client), &i_dummy);
+ psz_mess[ MESSAGE_LENGTH - 1 ] = 0;
- switch( i_answer )
+ if( !strncasecmp( psz_mess, "E: ", 3 ) )
+ {
+ intf_ErrMsg( "network error: vlcs said '%s'", psz_mess + 3 );
+ close( i_fd );
+ return -1;
+ }
+ else if( !strncasecmp( psz_mess, "I: ", 3 ) )
+ {
+ intf_WarnMsg( 2, "network info: vlcs said '%s'", psz_mess + 3 );
+ }
+ else /* We got something to play ! FIXME: not very nice */
+ {
+# define p_item \
+ (&p_main->p_playlist->p_item[ p_main->p_playlist->i_index + 1])
+ vlc_mutex_lock( &p_main->p_playlist->change_lock );
+ if( p_item )
+ {
+ free( p_item->psz_name );
+ p_item->psz_name = strdup( psz_mess );
+ /* Unlock _afterwards_ */
+ vlc_mutex_unlock( &p_main->p_playlist->change_lock );
+ }
+ else
{
- case -1:
- intf_DbgMsg( "vlcs: the server failed to create the thread" );
- break;
- case 0:
- intf_DbgMsg( "vlcs: the server tries to change the channel" );
- break;
- default:
- intf_DbgMsg( "vlcs: unknown answer !" );
- break;
+ /* Unlock _before_ */
+ vlc_mutex_unlock( &p_main->p_playlist->change_lock );
+ intf_PlaylistAdd( p_main->p_playlist, 0, psz_mess );
}
- break;
}
- /*
- * Close the socket
- */
- close( i_socket );
+ /* Close the socket and return nicely */
+ close( i_fd );
- return( 0 );
+ return 0;
#else
- intf_ErrMsg( "network error: channels not supported" );
- return( -1 );
+ intf_ErrMsg( "network error: channels not supported on this platform" );
+ return -1;
#endif
}
/*****************************************************************************
* GetMacAddress: extract the MAC Address
*****************************************************************************/
-static int GetMacAddress( int i_socket, char *psz_mac )
+static int GetMacAddress( int i_fd, char *psz_mac )
{
#if defined( SYS_LINUX )
struct ifreq interface;
strcpy( interface.ifr_name,
main_GetPszVariable( INPUT_IFACE_VAR, INPUT_IFACE_DEFAULT ) );
- i_ret = ioctl( i_socket, SIOCGIFHWADDR, &interface );
+ i_ret = ioctl( i_fd, SIOCGIFHWADDR, &interface );
if( i_ret )
{
projects / vlc / blobdiff