X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Ftelnet.c;h=e7bb2e19c9d60fd35d1c61b92dbf5e718f3bfbda;hb=a5c83dda798f93cc7a76bbb50d89352117e6ec46;hp=f799c8080c31851fbaf876faf776dff259048418;hpb=88ad2b6d656bd36894768ee30db59388eca43f71;p=vlc diff --git a/modules/control/telnet.c b/modules/control/telnet.c index f799c8080c..e7bb2e19c9 100644 --- a/modules/control/telnet.c +++ b/modules/control/telnet.c @@ -25,12 +25,17 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include +#include #include #include @@ -43,6 +48,9 @@ #ifdef HAVE_UNISTD_H # include #endif +#ifdef HAVE_POLL +# include +#endif #include #include @@ -86,13 +94,13 @@ vlc_module_begin(); set_category( CAT_INTERFACE ); set_subcategory( SUBCAT_INTERFACE_CONTROL ); add_string( "telnet-host", "", NULL, TELNETHOST_TEXT, - TELNETHOST_LONGTEXT, VLC_TRUE ); + TELNETHOST_LONGTEXT, true ); add_integer( "telnet-port", TELNETPORT_DEFAULT, NULL, TELNETPORT_TEXT, - TELNETPORT_LONGTEXT, VLC_TRUE ); - 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 ); + TELNETPORT_LONGTEXT, true ); + add_password( "telnet-password", TELNETPWD_DEFAULT, NULL, TELNETPWD_TEXT, + TELNETPWD_LONGTEXT, true ); + set_description( N_("VLM remote control interface") ); + add_category_hint( "VLM", NULL, false ); set_capability( "interface", 0 ); set_callbacks( Open , Close ); vlc_module_end(); @@ -116,7 +124,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 { @@ -219,11 +227,11 @@ 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 ); + free( p_sys->clients ); net_ListenClose( p_sys->pi_fd ); @@ -238,101 +246,86 @@ static void Close( vlc_object_t *p_this ) static void Run( intf_thread_t *p_intf ) { intf_sys_t *p_sys = p_intf->p_sys; - struct timeval timeout; char *psz_password; + unsigned nlisten = 0; + + for (const int *pfd = p_sys->pi_fd; *pfd != -1; pfd++) + nlisten++; /* How many listening sockets do we have? */ psz_password = config_GetPsz( p_intf, "telnet-password" ); 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->pi_fd, p_sys->i_clients > 0 ? 0 : -1 ); - if( fd > 0 ) - { - char *psz_pwd = strdup( _("Password")); - telnet_client_t *cl; - - /* to be non blocking */ -#if defined( WIN32 ) || defined( UNDER_CE ) - { - unsigned long i_dummy = 1; - ioctlsocket( fd, FIONBIO, &i_dummy ); - } -#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; - realloc( psz_pwd, strlen(psz_pwd)+ 5 + 1 ); - strncat( psz_pwd, ": \xff\xfb\x01", 5); - Write_message( cl, NULL, psz_pwd, WRITE_MODE_PWD ); - free( psz_pwd ); - TAB_APPEND( p_sys->i_clients, p_sys->clients, cl ); - } + unsigned ncli = p_sys->i_clients; + struct pollfd ufd[ncli + nlisten]; - /* to do a proper select */ - FD_ZERO( &fds_read ); - FD_ZERO( &fds_write ); - - for( i = 0 ; i < p_sys->i_clients ; i++ ) + for (unsigned i = 0; i < ncli; i++) { telnet_client_t *cl = p_sys->clients[i]; - if( cl->i_mode == WRITE_MODE_PWD || cl->i_mode == WRITE_MODE_CMD ) - { - FD_SET( cl->fd , &fds_write ); - } + ufd[i].fd = cl->fd; + if( (cl->i_mode == WRITE_MODE_PWD) || (cl->i_mode == WRITE_MODE_CMD) ) + ufd[i].events = POLLOUT; else - { - FD_SET( cl->fd , &fds_read ); - } - i_handle_max = __MAX( i_handle_max, cl->fd ); + ufd[i].events = POLLIN; + ufd[i].revents = 0; } - timeout.tv_sec = 0; - timeout.tv_usec = 500*1000; - - i_ret = select( i_handle_max + 1, &fds_read, &fds_write, 0, &timeout ); - if( i_ret == -1 && errno != EINTR ) + for (unsigned i = 0; i < nlisten; i++) { - msg_Warn( p_intf, "cannot select sockets" ); - msleep( 1000 ); - continue; + ufd[ncli + i].fd = p_sys->pi_fd[i]; + ufd[ncli + i].events = POLLIN; + ufd[ncli + i].revents = 0; } - else if( i_ret <= 0 ) + + /* FIXME: arbitrary tick */ + switch (poll (ufd, sizeof (ufd) / sizeof (ufd[0]), 500)) { - continue; + case -1: + if (net_errno != EINTR) + { + msg_Err (p_intf, "network poll error"); + msleep (1000); + continue; + } + case 0: + continue; } /* check if there is something to do with the socket */ - for( i = 0 ; i < p_sys->i_clients ; i++ ) + for (unsigned i = 0; i < ncli; i++) { telnet_client_t *cl = p_sys->clients[i]; - if( FD_ISSET(cl->fd , &fds_write) && cl->i_buffer_write > 0 ) + if (ufd[i].revents & (POLLERR|POLLHUP)) { - i_len = send( cl->fd , cl->p_buffer_write , - cl->i_buffer_write , 0 ); + drop: + net_Close( cl->fd ); + TAB_REMOVE( p_intf->p_sys->i_clients , + p_intf->p_sys->clients , cl ); + free( cl ); + continue; + } + + if (ufd[i].revents & POLLOUT && (cl->i_buffer_write > 0)) + { + ssize_t i_len; + + i_len = send( cl->fd, cl->p_buffer_write , + cl->i_buffer_write, 0 ); if( i_len > 0 ) { cl->p_buffer_write += i_len; cl->i_buffer_write -= i_len; } } - else if( FD_ISSET( cl->fd, &fds_read) ) + if (ufd[i].revents & POLLIN) { - int i_end = 0; - int i_recv; + bool end = false; + ssize_t 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 ) { @@ -343,7 +336,7 @@ static void Run( intf_thread_t *p_intf ) break; case '\n': *cl->p_buffer_read = '\n'; - i_end = 1; + end = true; break; case TEL_IAC: // telnet specific command cl->i_tel_cmd = 1; @@ -374,27 +367,22 @@ static void Run( intf_thread_t *p_intf ) break; } - if( i_end != 0 ) break; + if( end ) 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" ), + Write_message( cl, NULL, "Line too long\r\n", cl->i_mode + 2 ); } - if (i_recv == 0) - { - net_Close( cl->fd ); - TAB_REMOVE( p_intf->p_sys->i_clients , - p_intf->p_sys->clients , cl ); - free( cl ); - } + if (i_recv <= 0 && ( end || errno != EAGAIN ) ) + goto drop; } } /* and now we should bidouille the data we received / send */ - for( i = 0 ; i < p_sys->i_clients ; i++ ) + for(int i = 0 ; i < p_sys->i_clients ; i++ ) { telnet_client_t *cl = p_sys->clients[i]; @@ -407,21 +395,16 @@ 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 ) ) { - char *psz_tmp=strdup( _("Welcome, Master") ); - realloc(psz_tmp, 5 + strlen(psz_tmp) + 4 + 1); - memmove( psz_tmp + 5, psz_tmp, strlen(psz_tmp) + 1 ); - memcpy( psz_tmp, "\xff\xfc\x01\r\n",5); - strncat( psz_tmp, "\r\n> ", 4 ); - Write_message( cl, NULL, psz_tmp, WRITE_MODE_CMD ); - free( psz_tmp); + Write_message( cl, NULL, "\xff\xfc\x01\r\nWelcome, " + "Master\r\n> ", WRITE_MODE_CMD ); } else { /* wrong password */ Write_message( cl, NULL, - _( "\r\nWrong password.\r\nPassword: " ), + "\r\nWrong password.\r\nPassword: ", WRITE_MODE_PWD ); } } @@ -441,7 +424,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_libvlc->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 { @@ -460,6 +475,9 @@ static void Run( intf_thread_t *p_intf ) 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 ); @@ -468,17 +486,47 @@ static void Run( intf_thread_t *p_intf ) } } } + + /* handle new connections */ + for (unsigned i = 0; i < nlisten; i++) + { + int fd; + + if (ufd[ncli + i].revents == 0) + continue; + + fd = net_AcceptSingle (VLC_OBJECT(p_intf), ufd[ncli + i].fd); + if (fd == -1) + continue; + + telnet_client_t *cl = malloc( sizeof( telnet_client_t )); + if (cl == NULL) + { + net_Close (fd); + continue; + } + + 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 ); + } } + 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; client->p_buffer_read = client->buffer_read; (client->p_buffer_read)[0] = 0; // if (cl->p_buffer_read)[0] = '\n' - if( client->buffer_write ) free( client->buffer_write ); + free( client->buffer_write ); /* generate the psz_message string */ if( message )