Commit adc6177b authored by Christophe Mutricy's avatar Christophe Mutricy

telnet.c: remove the bloat which was needed when strings were localized.

parent b488ac0e
...@@ -267,30 +267,21 @@ static void Run( intf_thread_t *p_intf ) ...@@ -267,30 +267,21 @@ static void Run( intf_thread_t *p_intf )
cl = malloc( sizeof( telnet_client_t )); cl = malloc( sizeof( telnet_client_t ));
if( cl ) if( cl )
{ {
char *psz_pwd = strdup( "Password" );
char *psz_tmp = NULL;
size_t ctrl_len = strlen( ": \xff\xfb\x01" );
size_t passwd_len = strlen( psz_pwd );
memset( cl, 0, sizeof(telnet_client_t) ); memset( cl, 0, sizeof(telnet_client_t) );
cl->i_tel_cmd = 0; cl->i_tel_cmd = 0;
cl->fd = fd; cl->fd = fd;
cl->buffer_write = NULL; cl->buffer_write = NULL;
cl->p_buffer_write = cl->buffer_write; cl->p_buffer_write = cl->buffer_write;
psz_tmp = malloc( passwd_len + ctrl_len + 1 ); Write_message( cl, NULL,
if( !psz_tmp ) "Password: \xff\xfb\x01" , WRITE_MODE_PWD );
TAB_APPEND( p_sys->i_clients, p_sys->clients, cl );
}
else
{ {
free( psz_pwd ); msg_Err( p_intf, "Out of mem");
continue; continue;
} }
memset( psz_tmp, 0, passwd_len + ctrl_len + 1 );
memcpy( psz_tmp, psz_pwd, passwd_len );
memcpy( psz_tmp + passwd_len, ": \xff\xfb\x01", ctrl_len );
Write_message( cl, NULL, psz_tmp, WRITE_MODE_PWD );
TAB_APPEND( p_sys->i_clients, p_sys->clients, cl );
free( psz_pwd );
free( psz_tmp );
}
} }
/* to do a proper select */ /* to do a proper select */
...@@ -414,35 +405,19 @@ static void Run( intf_thread_t *p_intf ) ...@@ -414,35 +405,19 @@ static void Run( intf_thread_t *p_intf )
{ {
telnet_client_t *cl = p_sys->clients[i]; telnet_client_t *cl = p_sys->clients[i];
if( (cl->i_mode >= WRITE_MODE_PWD) && (cl->i_buffer_write == 0) ) if( cl->i_mode >= WRITE_MODE_PWD && cl->i_buffer_write == 0 )
{ {
// we have finished to send // we have finished to send
cl->i_mode -= 2; // corresponding READ MODE cl->i_mode -= 2; // corresponding READ MODE
} }
else if( (cl->i_mode == READ_MODE_PWD) && else if( cl->i_mode == READ_MODE_PWD &&
(*cl->p_buffer_read == '\n') ) *cl->p_buffer_read == '\n' )
{ {
*cl->p_buffer_read = '\0'; *cl->p_buffer_read = '\0';
if( strcmp( psz_password, cl->buffer_read ) == 0 ) if( strcmp( psz_password, cl->buffer_read ) == 0 )
{ {
char *psz_welcome = strdup( "Welcome, Master" ); Write_message( cl, NULL, "\xff\xfc\x01\r\nWelcome, "
char *psz_tmp = NULL; "Master\r\n> ", WRITE_MODE_CMD );
size_t welcome_len = strlen( psz_welcome );
size_t ctrl_len = strlen("\xff\xfc\x01\r\n");
psz_tmp = malloc( welcome_len + ctrl_len + 4 + 1 );
if( !psz_tmp )
{
free( psz_welcome );
continue;
}
memset( psz_tmp, 0, welcome_len + ctrl_len + 4 + 1 );
memcpy( psz_tmp, "\xff\xfc\x01\r\n", ctrl_len );
memcpy( psz_tmp + ctrl_len, psz_welcome, welcome_len );
memcpy( psz_tmp + ctrl_len + welcome_len, "\r\n> ", 4 );
Write_message( cl, NULL, psz_tmp, WRITE_MODE_CMD );
free( psz_welcome );
free( psz_tmp );
} }
else else
{ {
...@@ -452,8 +427,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -452,8 +427,8 @@ static void Run( intf_thread_t *p_intf )
WRITE_MODE_PWD ); WRITE_MODE_PWD );
} }
} }
else if( (cl->i_mode == READ_MODE_CMD) && else if( cl->i_mode == READ_MODE_CMD &&
(*cl->p_buffer_read == '\n') ) *cl->p_buffer_read == '\n' )
{ {
/* ok, here is a command line */ /* ok, here is a command line */
if( !strncmp( cl->buffer_read, "logout", 6 ) || if( !strncmp( cl->buffer_read, "logout", 6 ) ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment