X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fcontrol%2Ftelnet.c;h=e390a13cdc29eacf0cee41abdb2c356388ed7710;hb=e5c071abd8c79d19f3f6e19f626540e241c36849;hp=6e7bdfdfaad8f0adc928036200e4f73c70c444f9;hpb=ba9826cacf6f17a741a88e9346a6cd674d7f0e29;p=vlc diff --git a/modules/control/telnet.c b/modules/control/telnet.c index 6e7bdfdfaa..e390a13cdc 100644 --- a/modules/control/telnet.c +++ b/modules/control/telnet.c @@ -1,7 +1,7 @@ /***************************************************************************** * telnet.c: VLM interface plugin ***************************************************************************** - * Copyright (C) 2000, 2001 VideoLAN + * Copyright (C) 2000-2006 the VideoLAN team * $Id$ * * Authors: Simon Latapie @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -28,9 +28,8 @@ #include /* malloc(), free() */ #include -#include - -#include +#include +#include #include @@ -45,17 +44,9 @@ # include #endif -#if defined( UNDER_CE ) -# include -#elif defined( WIN32 ) -# include -#else -# include -#endif - -#include "network.h" - -#include "vlc_vlm.h" +#include +#include +#include #define READ_MODE_PWD 1 #define READ_MODE_CMD 2 @@ -76,18 +67,29 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -#define TELNETPORT_TEXT N_( "Telnet Interface port" ) -#define TELNETPORT_LONGTEXT N_( "Default to 4212" ) -#define TELNETPWD_TEXT N_( "Telnet Interface password" ) -#define TELNETPWD_LONGTEXT N_( "Default to admin" ) +#define TELNETHOST_TEXT N_( "Host" ) +#define TELNETHOST_LONGTEXT N_( "This is the host on which the " \ + "interface will listen. It defaults to all network interfaces (0.0.0.0)." \ + " If you want this interface to be available only on the local " \ + "machine, enter \"127.0.0.1\"." ) +#define TELNETPORT_TEXT N_( "Port" ) +#define TELNETPORT_LONGTEXT N_( "This is the TCP port on which this " \ + "interface will listen. It defaults to 4212." ) +#define TELNETPORT_DEFAULT 4212 +#define TELNETPWD_TEXT N_( "Password" ) +#define TELNETPWD_LONGTEXT N_( "A single administration password is used " \ + "to protect this interface. The default value is \"admin\"." ) +#define TELNETPWD_DEFAULT "admin" vlc_module_begin(); - set_shortname( _("Telnet")); + set_shortname( "Telnet" ); set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_GENERAL ); - add_integer( "telnet-port", 4212, NULL, TELNETPORT_TEXT, + set_subcategory( SUBCAT_INTERFACE_CONTROL ); + add_string( "telnet-host", "", NULL, TELNETHOST_TEXT, + TELNETHOST_LONGTEXT, VLC_TRUE ); + add_integer( "telnet-port", TELNETPORT_DEFAULT, NULL, TELNETPORT_TEXT, TELNETPORT_LONGTEXT, VLC_TRUE ); - add_string( "telnet-password", "admin", NULL, TELNETPWD_TEXT, + add_string( "telnet-password", TELNETPWD_DEFAULT, NULL, TELNETPWD_TEXT, TELNETPWD_LONGTEXT, VLC_TRUE ); set_description( _("VLM remote control interface") ); add_category_hint( "VLM", NULL, VLC_FALSE ); @@ -104,10 +106,10 @@ typedef struct { int i_mode; /* read or write */ int fd; - uint8_t buffer_read[1000]; // 1000 byte per command should be sufficient + char buffer_read[1000]; // 1000 byte per command should be sufficient char *buffer_write; - uint8_t *p_buffer_read; - uint8_t *p_buffer_write; // the position in the buffer + char *p_buffer_read; + char *p_buffer_write; // the position in the buffer int i_buffer_write; // the number of byte we still have to send int i_tel_cmd; // for specific telnet commands @@ -120,10 +122,39 @@ struct intf_sys_t { telnet_client_t **clients; int i_clients; - int fd; + int *pi_fd; vlm_t *mediatheque; }; +/* + * getPort: Decide which port to use. There are two possibilities to + * specify a port: integrated in the --telnet-host option with :PORT + * or using the --telnet-port option. The --telnet-port option has + * precedence. + * This code relies upon the fact the url.i_port is 0 if the :PORT + * option is missing from --telnet-host. + */ +static int getPort(intf_thread_t *p_intf, vlc_url_t url, int i_port) +{ + // Print error if two different ports have been specified + if (url.i_port != 0 && + i_port != TELNETPORT_DEFAULT && + url.i_port != i_port ) + { + msg_Err( p_intf, "ignoring port %d and using %d", url.i_port, + i_port); + } + if (i_port != TELNETPORT_DEFAULT) + { + return i_port; + } + if (url.i_port != 0) + { + return url.i_port; + } + return i_port; +} + /***************************************************************************** * Open: initialize dummy interface *****************************************************************************/ @@ -131,6 +162,8 @@ static int Open( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t*) p_this; vlm_t *mediatheque; + char *psz_address; + vlc_url_t url; int i_telnetport; if( !(mediatheque = vlm_New( p_intf )) ) @@ -139,24 +172,38 @@ static int Open( vlc_object_t *p_this ) return VLC_EGENERIC; } - msg_Info( p_intf, "Using the VLM interface plugin..." ); + msg_Info( p_intf, "using the VLM interface plugin..." ); i_telnetport = config_GetInt( p_intf, "telnet-port" ); + psz_address = config_GetPsz( p_intf, "telnet-host" ); + + vlc_UrlParse(&url, psz_address, 0); + + // There might be two ports given, resolve any potentially + // conflict + url.i_port = getPort(p_intf, url, i_telnetport); p_intf->p_sys = malloc( sizeof( intf_sys_t ) ); - if( ( p_intf->p_sys->fd = net_ListenTCP( p_intf , "", i_telnetport ) ) < 0 ) + if( ( p_intf->p_sys->pi_fd = net_ListenTCP( p_intf, url.psz_host, url.i_port ) ) + == NULL ) { msg_Err( p_intf, "cannot listen for telnet" ); + vlc_UrlClean(&url); + free( psz_address ); free( p_intf->p_sys ); return VLC_EGENERIC; } - msg_Info( p_intf, "Telnet interface started on port: %d", i_telnetport ); + msg_Info( p_intf, + "telnet interface started on interface %s %d", + url.psz_host, url.i_port ); p_intf->p_sys->i_clients = 0; p_intf->p_sys->clients = NULL; p_intf->p_sys->mediatheque = mediatheque; p_intf->pf_run = Run; + vlc_UrlClean(&url); + free( psz_address ); return VLC_SUCCESS; } @@ -172,13 +219,13 @@ static void Close( vlc_object_t *p_this ) for( i = 0; i < p_sys->i_clients; i++ ) { telnet_client_t *cl = p_sys->clients[i]; - net_Close( cl->fd ); free( cl ); + p_sys->clients[i] = NULL; } if( p_sys->clients != NULL ) free( p_sys->clients ); - net_Close( p_sys->fd ); + net_ListenClose( p_sys->pi_fd ); vlm_Delete( p_sys->mediatheque ); @@ -196,35 +243,34 @@ static void Run( intf_thread_t *p_intf ) psz_password = config_GetPsz( p_intf, "telnet-password" ); - while( !p_intf->b_die ) + while( !intf_ShouldDie( p_intf ) ) { fd_set fds_read, fds_write; int i_handle_max = 0; int i_ret, i_len, fd, i; /* if a new client wants to communicate */ - fd = net_Accept( p_intf, p_sys->fd, p_sys->i_clients > 0 ? 0 : -1 ); - if( fd > 0 ) + fd = net_Accept( p_intf, p_sys->pi_fd, p_sys->i_clients > 0 ? 0 : -1 ); + if( fd != -1 ) { - telnet_client_t *cl; - - /* to be non blocking */ -#if defined( WIN32 ) || defined( UNDER_CE ) + telnet_client_t *cl = malloc( sizeof( telnet_client_t )); + if( cl ) { - unsigned long i_dummy = 1; - ioctlsocket( fd, FIONBIO, &i_dummy ); + memset( cl, 0, sizeof(telnet_client_t) ); + cl->i_tel_cmd = 0; + cl->fd = fd; + cl->buffer_write = NULL; + cl->p_buffer_write = cl->buffer_write; + Write_message( cl, NULL, + "Password: \xff\xfb\x01" , WRITE_MODE_PWD ); + + TAB_APPEND( p_sys->i_clients, p_sys->clients, cl ); + } + else + { + net_Close( fd ); + continue; } -#else - fcntl( fd, F_SETFL, O_NONBLOCK ); -#endif - cl = malloc( sizeof( telnet_client_t )); - cl->i_tel_cmd = 0; - cl->fd = fd; - cl->buffer_write = NULL; - cl->p_buffer_write = cl->buffer_write; - Write_message( cl, NULL, "Password:\xff\xfb\x01", WRITE_MODE_PWD ); - - TAB_APPEND( p_sys->i_clients, p_sys->clients, cl ); } /* to do a proper select */ @@ -235,7 +281,7 @@ static void Run( intf_thread_t *p_intf ) { telnet_client_t *cl = p_sys->clients[i]; - if( cl->i_mode == WRITE_MODE_PWD || cl->i_mode == WRITE_MODE_CMD ) + if( (cl->i_mode == WRITE_MODE_PWD) || (cl->i_mode == WRITE_MODE_CMD) ) { FD_SET( cl->fd , &fds_write ); } @@ -250,7 +296,7 @@ static void Run( intf_thread_t *p_intf ) timeout.tv_usec = 500*1000; i_ret = select( i_handle_max + 1, &fds_read, &fds_write, 0, &timeout ); - if( i_ret == -1 && errno != EINTR ) + if( (i_ret == -1) && (errno != EINTR) ) { msg_Warn( p_intf, "cannot select sockets" ); msleep( 1000 ); @@ -266,10 +312,10 @@ static void Run( intf_thread_t *p_intf ) { telnet_client_t *cl = p_sys->clients[i]; - if( FD_ISSET(cl->fd , &fds_write) && cl->i_buffer_write > 0 ) + if( FD_ISSET(cl->fd , &fds_write) && (cl->i_buffer_write > 0) ) { - i_len = send( cl->fd , cl->p_buffer_write , - cl->i_buffer_write , 0 ); + i_len = send( cl->fd, cl->p_buffer_write , + cl->i_buffer_write, 0 ); if( i_len > 0 ) { cl->p_buffer_write += i_len; @@ -281,13 +327,13 @@ static void Run( intf_thread_t *p_intf ) int i_end = 0; int i_recv; - while( (i_recv=recv( cl->fd, cl->p_buffer_read, 1, 0 )) > 0 && - cl->p_buffer_read - cl->buffer_read < 999 ) + while( ((i_recv=recv( cl->fd, cl->p_buffer_read, 1, 0 )) > 0) && + ((cl->p_buffer_read - cl->buffer_read) < 999) ) { switch( cl->i_tel_cmd ) { case 0: - switch( *cl->p_buffer_read ) + switch( *(uint8_t *)cl->p_buffer_read ) { case '\r': break; @@ -305,7 +351,7 @@ static void Run( intf_thread_t *p_intf ) } break; case 1: - switch( *cl->p_buffer_read ) + switch( *(uint8_t *)cl->p_buffer_read ) { case TEL_WILL: case TEL_WONT: case TEL_DO: case TEL_DONT: @@ -327,13 +373,13 @@ static void Run( intf_thread_t *p_intf ) if( i_end != 0 ) break; } - if( cl->p_buffer_read - cl->buffer_read == 999 ) + if( (cl->p_buffer_read - cl->buffer_read) == 999 ) { Write_message( cl, NULL, "Line too long\r\n", cl->i_mode + 2 ); } - if (i_recv == 0) + if( i_recv == 0 || ( i_recv == -1 && errno != EAGAIN && errno != 0 ) ) { net_Close( cl->fd ); TAB_REMOVE( p_intf->p_sys->i_clients , @@ -357,7 +403,7 @@ static void Run( intf_thread_t *p_intf ) *cl->p_buffer_read == '\n' ) { *cl->p_buffer_read = '\0'; - if( strcmp( psz_password, cl->buffer_read ) == 0 ) + if( !psz_password || !strcmp( psz_password, cl->buffer_read ) ) { Write_message( cl, NULL, "\xff\xfc\x01\r\nWelcome, " "Master\r\n> ", WRITE_MODE_CMD ); @@ -365,7 +411,8 @@ static void Run( intf_thread_t *p_intf ) else { /* wrong password */ - Write_message( cl, NULL, "\r\nTry again, you polio:", + Write_message( cl, NULL, + "\r\nWrong password.\r\nPassword: ", WRITE_MODE_PWD ); } } @@ -385,7 +432,7 @@ static void Run( intf_thread_t *p_intf ) else if( !strncmp( cl->buffer_read, "shutdown", 8 ) ) { msg_Err( p_intf, "shutdown requested" ); - p_intf->p_vlc->b_die = VLC_TRUE; + p_intf->p_libvlc->b_die = VLC_TRUE; } else { @@ -396,12 +443,25 @@ static void Run( intf_thread_t *p_intf ) vlm_ExecuteCommand( p_sys->mediatheque, cl->buffer_read, &message ); + if( !strncmp( cl->buffer_read, "help", 4 ) ) + { + vlm_message_t *p_my_help = + vlm_MessageNew( "Telnet Specific Commands:", NULL ); + vlm_MessageAdd( p_my_help, + vlm_MessageNew( "logout, quit, exit" , NULL ) ); + vlm_MessageAdd( p_my_help, + vlm_MessageNew( "shutdown" , NULL ) ); + vlm_MessageAdd( message, p_my_help ); + } Write_message( cl, message, NULL, WRITE_MODE_CMD ); vlm_MessageDelete( message ); + } } } } + if( psz_password ) + free( psz_password ); } static void Write_message( telnet_client_t *client, vlm_message_t *message, @@ -447,11 +507,12 @@ static char *MessageToString( vlm_message_t *message, int i_level ) else if( !i_level && !message->i_child && !message->psz_value ) { /* A command is successful. Don't write anything */ - return strdup( STRING_CR STRING_TAIL ); + return strdup( /*STRING_CR*/ STRING_TAIL ); } i_message += strlen( message->psz_name ) + i_level * sizeof( " " ) + 1; - psz_message = malloc( i_message ); *psz_message = 0; + psz_message = malloc( i_message ); + *psz_message = 0; for( i = 0; i < i_level; i++ ) strcat( psz_message, " " ); strcat( psz_message, message->psz_name );