X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Ftelnet.c;h=5be5579dff02b8ff585b86f96a95429cc45ca657;hb=00aa3ff1c3da442f986b51f2277936d6629b1666;hp=751c501920121a8669a84f376ed294653c5c6d51;hpb=778a77df2dca3071da3262c0bf7368511164b136;p=vlc diff --git a/modules/control/telnet.c b/modules/control/telnet.c index 751c501920..5be5579dff 100644 --- a/modules/control/telnet.c +++ b/modules/control/telnet.c @@ -25,12 +25,10 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ #include -#include - -#include +#include +#include #include @@ -45,10 +43,9 @@ # include #endif -#include "network.h" -#include "vlc_url.h" - -#include "vlc_vlm.h" +#include +#include +#include #define READ_MODE_PWD 1 #define READ_MODE_CMD 2 @@ -91,7 +88,7 @@ vlc_module_begin(); TELNETHOST_LONGTEXT, VLC_TRUE ); add_integer( "telnet-port", TELNETPORT_DEFAULT, NULL, TELNETPORT_TEXT, TELNETPORT_LONGTEXT, VLC_TRUE ); - add_string( "telnet-password", TELNETPWD_DEFAULT, NULL, TELNETPWD_TEXT, + add_password( "telnet-password", TELNETPWD_DEFAULT, NULL, TELNETPWD_TEXT, TELNETPWD_LONGTEXT, VLC_TRUE ); set_description( _("VLM remote control interface") ); add_category_hint( "VLM", NULL, VLC_FALSE ); @@ -118,7 +115,7 @@ typedef struct } telnet_client_t; static char *MessageToString( vlm_message_t *, int ); -static void Write_message( telnet_client_t *, vlm_message_t *, char *, int ); +static void Write_message( telnet_client_t *, vlm_message_t *, const char *, int ); struct intf_sys_t { @@ -128,33 +125,32 @@ struct intf_sys_t 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 + * 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 && + i_port != TELNETPORT_DEFAULT && url.i_port != i_port ) { - msg_Err( p_intf, "ignoring port %d and using %d", url.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; + return i_port; } if (url.i_port != 0) { - return url.i_port; + return url.i_port; } - // return default return i_port; } @@ -196,7 +192,7 @@ static int Open( vlc_object_t *p_this ) free( p_intf->p_sys ); return VLC_EGENERIC; } - msg_Info( p_intf, + msg_Info( p_intf, "telnet interface started on interface %s %d", url.psz_host, url.i_port ); @@ -222,9 +218,9 @@ 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 ); @@ -246,7 +242,7 @@ 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; @@ -254,27 +250,26 @@ static void Run( intf_thread_t *p_intf ) /* if a new client wants to communicate */ fd = net_Accept( p_intf, p_sys->pi_fd, p_sys->i_clients > 0 ? 0 : -1 ); - if( fd > 0 ) + 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 */ @@ -285,7 +280,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 ); } @@ -300,7 +295,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 ); @@ -316,10 +311,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; @@ -331,8 +326,8 @@ 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 ) { @@ -377,13 +372,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 , @@ -407,7 +402,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 ); @@ -436,7 +431,39 @@ 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; + vlc_object_kill( p_intf->p_libvlc ); + } + else if( *cl->buffer_read == '@' + && strchr( cl->buffer_read, ' ' ) ) + { + /* Module specific commands (use same syntax as in the + * rc interface) */ + char *psz_name = cl->buffer_read + 1; + char *psz_cmd, *psz_arg, *psz_msg; + int i_ret; + + psz_cmd = strchr( cl->buffer_read, ' ' ); + *psz_cmd = '\0'; psz_cmd++; + if( ( psz_arg = strchr( psz_cmd, '\n' ) ) ) *psz_arg = '\0'; + if( ( psz_arg = strchr( psz_cmd, '\r' ) ) ) *psz_arg = '\0'; + if( ( psz_arg = strchr( psz_cmd, ' ' ) ) + && *psz_arg ) + { + *psz_arg = '\0'; + psz_arg++; + } + + i_ret = var_Command( p_intf, psz_name, psz_cmd, psz_arg, + &psz_msg ); + + if( psz_msg ) + { + vlm_message_t *message; + message = vlm_MessageNew( "Module command", psz_msg ); + Write_message( cl, message, NULL, WRITE_MODE_CMD ); + vlm_MessageDelete( message ); + free( psz_msg ); + } } else { @@ -447,16 +474,32 @@ 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( p_my_help, + vlm_MessageNew( "@moduleinstance command argument", + 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, - char *string_message, int i_mode ) + const char *string_message, int i_mode ) { char *psz_message;