X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fnetutils.c;h=9ad5cf63448b8fcfc286a76a30e710c6247d58e8;hb=d532cf3cad2ff8594510e8720b7c02ddc4c40311;hp=561e436140b13d4ab9e4dd343502d59426fa817b;hpb=939b6ea13666603f8cd8bb999c9dd15ab64311ca;p=vlc diff --git a/src/misc/netutils.c b/src/misc/netutils.c index 561e436140..9ad5cf6344 100644 --- a/src/misc/netutils.c +++ b/src/misc/netutils.c @@ -2,14 +2,15 @@ * netutils.c: various network functions ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: netutils.c,v 1.61 2002/03/19 00:30:44 sam Exp $ + * $Id: netutils.c,v 1.74 2002/10/05 19:26:23 jlj Exp $ * * Authors: Vincent Seguin * Benoit Steiner * Henri Fallon - * Xavier Marchesini + * Xavier Marchesini * Christophe Massiot * Samuel Hocevar + * Jon Lech Johansen * * 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 @@ -33,7 +34,7 @@ #include /* errno() */ #include /* memset() */ -#include +#include #ifdef HAVE_UNISTD_H # include /* gethostname() */ @@ -60,6 +61,12 @@ #include /* ioctl() */ #endif +#ifdef SYS_DARWIN +#include +#include +#include +#endif + #if defined( WIN32 ) /* tools to get the MAC adress from */ #include /* the interface under Windows */ #include @@ -75,8 +82,8 @@ #endif #include "netutils.h" +#include "vlc_playlist.h" -#include "intf_playlist.h" #include "network.h" /***************************************************************************** @@ -87,17 +94,20 @@ * as it depends on the VideoLAN channel server, which isn't frozen for * the time being. *****************************************************************************/ -typedef struct input_channel_s +struct input_channel_t { int i_channel; /* current channel number */ mtime_t last_change; /* last change date */ -} input_channel_t; +}; /***************************************************************************** * Local prototypes *****************************************************************************/ -static int GetMacAddress ( int i_fd, char *psz_mac ); -#ifdef WIN32 +static int GetMacAddress ( vlc_object_t *, int i_fd, char *psz_mac ); +#ifdef SYS_DARWIN +static int GetNetIntfCtrl ( const char *psz_interface, + io_object_t *ctrl_service ); +#elif defined( WIN32 ) static int GetAdapterInfo ( int i_adapter, char *psz_string ); #endif @@ -108,26 +118,26 @@ static int GetAdapterInfo ( int i_adapter, char *psz_string ); * once before any input thread is created or any call to other * input_Channel*() function is attempted. *****************************************************************************/ -int network_ChannelCreate( void ) +int __network_ChannelCreate( vlc_object_t *p_this ) { #if !defined( SYS_LINUX ) && !defined( WIN32 ) - intf_ErrMsg( "channel warning: VLAN-based channels are not supported" - " under this architecture" ); + msg_Err( p_this, "VLAN-based channels are not supported " + "on this architecture" ); #endif /* Allocate structure */ - p_main->p_channel = malloc( sizeof( input_channel_t ) ); - if( p_main->p_channel == NULL ) + p_this->p_vlc->p_channel = malloc( sizeof( input_channel_t ) ); + if( p_this->p_vlc->p_channel == NULL ) { - intf_ErrMsg( "network error: could not create channel bank" ); + msg_Err( p_this, "out of memory" ); return( -1 ); } /* Initialize structure */ - p_main->p_channel->i_channel = 0; - p_main->p_channel->last_change = 0; + p_this->p_vlc->p_channel->i_channel = 0; + p_this->p_vlc->p_channel->last_change = 0; - intf_WarnMsg( 2, "network: channels initialized" ); + msg_Dbg( p_this, "channels initialized" ); return( 0 ); } @@ -142,14 +152,14 @@ int network_ChannelCreate( void ) * should be unlocked using input_ChannelLeave(). * Non 0 will be returned in case of error. *****************************************************************************/ -int network_ChannelJoin( int i_channel ) +int __network_ChannelJoin( vlc_object_t *p_this, int i_channel ) { #define VLCS_VERSION 13 #define MESSAGE_LENGTH 256 - struct module_s * p_network; - char * psz_network = NULL; - network_socket_t socket_desc; + module_t * p_network; + char * psz_network = NULL; + network_socket_t socket_desc; char psz_mess[ MESSAGE_LENGTH ]; char psz_mac[ 40 ]; int i_fd, i_port; @@ -157,43 +167,37 @@ int network_ChannelJoin( int i_channel ) struct timeval delay; fd_set fds; - if( !config_GetIntVariable( "network_channel" ) ) + if( p_this->p_vlc->p_channel->i_channel == i_channel ) { - intf_ErrMsg( "network: channels disabled, to enable them, use the" - "--channels option" ); - return -1; + return 0; } - /* If last change is too recent, wait a while */ - if( mdate() - p_main->p_channel->last_change < INPUT_CHANNEL_CHANGE_DELAY ) + if( !config_GetInt( p_this, "network-channel" ) ) { - intf_WarnMsg( 2, "network: waiting before changing channel" ); - /* XXX Isn't this completely brain-damaged ??? -- Sam */ - /* Yes it is. I don't think this is still justified with the new - * vlanserver --Meuuh */ - mwait( p_main->p_channel->last_change + INPUT_CHANNEL_CHANGE_DELAY ); + msg_Err( p_this, "channels disabled, to enable them, use the" + " --channels option" ); + return -1; } - if( config_GetIntVariable( "ipv4" ) ) + if( config_GetInt( p_this, "ipv4" ) ) { psz_network = "ipv4"; } - if( config_GetIntVariable( "ipv6" ) ) + if( config_GetInt( p_this, "ipv6" ) ) { psz_network = "ipv6"; } /* Getting information about the channel server */ - if( !(psz_vlcs = config_GetPszVariable( "channel_server" )) ) + if( !(psz_vlcs = config_GetPsz( p_this, "channel-server" )) ) { - intf_ErrMsg( "network: configuration variable channel_server empty" ); + msg_Err( p_this, "configuration variable channel-server empty" ); return -1; } - i_port = config_GetIntVariable( "channel_port" ); + i_port = config_GetInt( p_this, "channel-port" ); - intf_WarnMsg( 5, "channel: connecting to %s:%d", - psz_vlcs, i_port ); + msg_Dbg( p_this, "connecting to %s:%d", psz_vlcs, i_port ); /* Prepare the network_socket_t structure */ socket_desc.i_type = NETWORK_UDP; @@ -203,26 +207,25 @@ int network_ChannelJoin( int i_channel ) socket_desc.i_server_port = i_port; /* Find an appropriate network module */ - p_network = module_Need( MODULE_CAPABILITY_NETWORK, psz_network, - &socket_desc ); + p_network = module_Need( p_this, "network", psz_network/*, &socket_desc*/ ); if( p_network == NULL ) { return( -1 ); } - module_Unneed( p_network ); + module_Unneed( p_this, p_network ); free( psz_vlcs ); /* Do we really need this ? -- Meuuh */ i_fd = socket_desc.i_handle; /* Look for the interface MAC address */ - if( GetMacAddress( i_fd, psz_mac ) ) + if( GetMacAddress( p_this, i_fd, psz_mac ) ) { - intf_ErrMsg( "network error: failed getting MAC address" ); + msg_Err( p_this, "failed getting MAC address" ); close( i_fd ); return -1; } - intf_WarnMsg( 6, "network: MAC address is %s", psz_mac ); + msg_Dbg( p_this, "MAC address is %s", psz_mac ); /* Build the message */ sprintf( psz_mess, "%d %u %lu %s \n", i_channel, VLCS_VERSION, @@ -232,11 +235,11 @@ int network_ChannelJoin( int i_channel ) /* Send the message */ send( i_fd, psz_mess, MESSAGE_LENGTH, 0 ); - intf_WarnMsg( 2, "network: attempting to join channel %d", i_channel ); + msg_Dbg( p_this, "attempting to join channel %d", i_channel ); /* We have changed channels ! (or at least, we tried) */ - p_main->p_channel->last_change = mdate(); - p_main->p_channel->i_channel = i_channel; + p_this->p_vlc->p_channel->last_change = mdate(); + p_this->p_vlc->p_channel->i_channel = i_channel; /* Wait 5 sec for an answer from the server */ delay.tv_sec = 5; @@ -247,53 +250,49 @@ int network_ChannelJoin( int i_channel ) switch( select( i_fd + 1, &fds, NULL, NULL, &delay ) ) { case 0: - intf_ErrMsg( "network error: no answer from vlcs" ); + msg_Err( p_this, "no answer from vlcs" ); close( i_fd ); return -1; - break; case -1: - intf_ErrMsg( "network error: error while listening to vlcs" ); + msg_Err( p_this, "error while listening to vlcs" ); close( i_fd ); return -1; - break; } recv( i_fd, psz_mess, MESSAGE_LENGTH, 0 ); psz_mess[ MESSAGE_LENGTH - 1 ] = '\0'; - if( !strncasecmp( psz_mess, "E: ", 3 ) ) + if( !strncasecmp( psz_mess, "E:", 2 ) ) { - intf_ErrMsg( "network error: vlcs said '%s'", psz_mess + 3 ); + msg_Err( p_this, "vlcs said '%s'", psz_mess + 2 ); close( i_fd ); return -1; } - else if( !strncasecmp( psz_mess, "I: ", 3 ) ) + else if( !strncasecmp( psz_mess, "I:", 2 ) ) { - intf_WarnMsg( 2, "network info: vlcs said '%s'", psz_mess + 3 ); + msg_Dbg( p_this, "vlcs said '%s'", psz_mess + 2 ); } - else /* We got something to play ! FIXME: not very nice */ + else { -# 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 + /* We got something to play ! */ + playlist_t *p_playlist; + p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + if( p_playlist != NULL ) { - /* Unlock _before_ */ - vlc_mutex_unlock( &p_main->p_playlist->change_lock ); - intf_PlaylistAdd( p_main->p_playlist, 0, psz_mess ); + playlist_Add( p_playlist, psz_mess, + PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END ); + vlc_object_release( p_playlist ); } } /* Close the socket and return nicely */ +#ifndef WIN32 close( i_fd ); +#else + closesocket( i_fd ); +#endif return 0; } @@ -303,7 +302,7 @@ int network_ChannelJoin( int i_channel ) /***************************************************************************** * GetMacAddress: extract the MAC Address *****************************************************************************/ -static int GetMacAddress( int i_fd, char *psz_mac ) +static int GetMacAddress( vlc_object_t *p_this, int i_fd, char *psz_mac ) { #if defined( SYS_LINUX ) struct ifreq interface; @@ -314,9 +313,9 @@ static int GetMacAddress( int i_fd, char *psz_mac ) * Looking for information about the eth0 interface */ interface.ifr_addr.sa_family = AF_INET; - if( !(psz_interface = config_GetPszVariable( "iface" )) ) + if( !(psz_interface = config_GetPsz( p_this, "iface" )) ) { - intf_ErrMsg( "network error: configuration variable iface empty" ); + msg_Err( p_this, "configuration variable iface empty" ); return -1; } strcpy( interface.ifr_name, psz_interface ); @@ -326,7 +325,7 @@ static int GetMacAddress( int i_fd, char *psz_mac ) if( i_ret ) { - intf_ErrMsg( "network error: ioctl SIOCGIFHWADDR failed" ); + msg_Err( p_this, "ioctl SIOCGIFHWADDR failed" ); return( i_ret ); } @@ -340,6 +339,47 @@ static int GetMacAddress( int i_fd, char *psz_mac ) return( 0 ); +#elif defined( SYS_DARWIN ) + char *psz_interface; + io_object_t ctrl_service; + CFTypeRef cfd_mac_address; + UInt8 ui_mac_address[kIOEthernetAddressSize]; + + if( !(psz_interface = config_GetPsz( p_this, "iface" )) ) + { + msg_Err( p_this, "configuration variable iface empty" ); + return( -1 ); + } + + if( GetNetIntfCtrl( psz_interface, &ctrl_service ) ) + { + msg_Err( p_this, "GetNetIntfCtrl failed" ); + return( -1 ); + } + + cfd_mac_address = IORegistryEntryCreateCFProperty( ctrl_service, + CFSTR(kIOMACAddress), + kCFAllocatorDefault, + 0 ); + IOObjectRelease( ctrl_service ); + if( cfd_mac_address == NULL ) + { + msg_Err( p_this, "IORegistryEntryCreateCFProperty failed" ); + return( -1 ); + } + + CFDataGetBytes( cfd_mac_address, + CFRangeMake(0, kIOEthernetAddressSize), + ui_mac_address ); + CFRelease( cfd_mac_address ); + + sprintf( psz_mac, "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x", + ui_mac_address[0], ui_mac_address[1], + ui_mac_address[2], ui_mac_address[3], + ui_mac_address[4], ui_mac_address[5] ); + + return( 0 ); + #elif defined( WIN32 ) int i, i_ret = -1; @@ -347,7 +387,7 @@ static int GetMacAddress( int i_fd, char *psz_mac ) LANA_ENUM AdapterList; NCB Ncb; - intf_WarnMsg( 2, "network: looking for MAC address" ); + msg_Dbg( p_this, "looking for MAC address" ); memset( &Ncb, 0, sizeof( NCB ) ); Ncb.ncb_command = NCBENUM; @@ -373,7 +413,51 @@ static int GetMacAddress( int i_fd, char *psz_mac ) #endif } -#ifdef WIN32 +#ifdef SYS_DARWIN +/***************************************************************************** + * GetNetIntfCtrl : get parent controller for network interface + *****************************************************************************/ +static int GetNetIntfCtrl( const char *psz_interface, + io_object_t *ctrl_service ) +{ + mach_port_t port; + kern_return_t ret; + io_object_t intf_service; + io_iterator_t intf_iterator; + + /* get port for IOKit communication */ + if( ( ret = IOMasterPort( MACH_PORT_NULL, &port ) ) != KERN_SUCCESS ) + { + return( -1 ); + } + + /* look up the IOService object for the interface */ + ret = IOServiceGetMatchingServices( port, IOBSDNameMatching( port, 0, + psz_interface ), &intf_iterator ); + if( ret != KERN_SUCCESS ) + { + return( -1 ); + } + + intf_service = IOIteratorNext( intf_iterator ); + if( intf_service == NULL ) + { + return( -1 ); + } + + ret = IORegistryEntryGetParentEntry( intf_service, + kIOServicePlane, + ctrl_service ); + IOObjectRelease( intf_service ); + if( ret != KERN_SUCCESS ) + { + return( -1 ); + } + + return( 0 ); +} + +#elif defined( WIN32 ) /***************************************************************************** * GetAdapterInfo : gets some informations about the interface using NETBIOS *****************************************************************************/ @@ -393,7 +477,7 @@ static int GetAdapterInfo( int i_adapter, char *psz_string ) if( Netbios( &Ncb ) != NRC_GOODRET ) { - intf_ErrMsg( "network error: reset returned %i", Ncb.ncb_retcode ); +//X intf_ErrMsg( "network error: reset returned %i", Ncb.ncb_retcode ); return -1; } @@ -420,13 +504,13 @@ static int GetAdapterInfo( int i_adapter, char *psz_string ) (int) ( Adapter.adapt.adapter_address[4] ), (int) ( Adapter.adapt.adapter_address[5] ) ); - intf_WarnMsg( 2, "network: found MAC address %s", psz_string ); +//X intf_WarnMsg( 2, "network: found MAC address %s", psz_string ); return 0; } else { - intf_ErrMsg( "network error: ASTAT returned %i", Ncb.ncb_retcode ); +//X intf_ErrMsg( "network error: ASTAT returned %i", Ncb.ncb_retcode ); return -1; } }