SRTCP support

[vlc] / modules / control / telnet.c

diff --git a/modules/control/telnet.c b/modules/control/telnet.c
index f799c8080c31851fbaf876faf776dff259048418..e390a13cdc29eacf0cee41abdb2c356388ed7710 100644 (file)
--- a/modules/control/telnet.c
+++ b/modules/control/telnet.c
@@ -219,9 +219,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 );
 
@@ -251,30 +251,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 )
         {
-            char   *psz_pwd = strdup( _("Password"));
-            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;
-            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 );
         }
 
         /* to do a proper select */
@@ -285,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 );
             }
@@ -300,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 );
@@ -316,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;
@@ -331,8 +327,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 +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" ),
+                    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,21 +403,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 );
                 }
             }
@@ -469,6 +460,8 @@ static void Run( intf_thread_t *p_intf )
             }
         }
     }
+    if( psz_password )
+        free( psz_password );
 }
 
 static void Write_message( telnet_client_t *client, vlm_message_t *message,