#include "config.h"
#endif
-#include "replacements.h"
-
#include "telnet_server.h"
-
-#include "server.h"
-#include "log.h"
-#include "command.h"
-#include "target.h"
#include "target_request.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <ctype.h>
-
-static unsigned short telnet_port = 0;
+static unsigned short telnet_port = 4444;
int handle_exit_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
int handle_telnet_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int telnet_async()
-{
- return jim_global_long("telnet_async_state");
-}
-
static char *negotiate =
"\xFF\xFB\x03" /* IAC WILL Suppress Go Ahead */
"\xFF\xFB\x01" /* IAC WILL Echo */
if (line_end)
{
telnet_write(connection, "\r\n", 2);
- line += len+1;
+ line += len + 1;
}
else
{
/* clear the command line */
telnet_write(connection, "\r", 1);
- for (i = strlen(t_con->prompt) + t_con->line_size; i>0; i-=16)
- telnet_write(connection, " ", i>16 ? 16 : i);
+ for (i = strlen(t_con->prompt) + t_con->line_size; i > 0; i -= 16)
+ telnet_write(connection, " ", i > 16 ? 16 : i);
telnet_write(connection, "\r", 1);
/* output the message */
/* put the command line to its previous state */
telnet_prompt(connection);
telnet_write(connection, t_con->line, t_con->line_size);
- for (i=t_con->line_size; i>t_con->line_cursor; i--)
+ for (i = t_con->line_size; i > t_con->line_cursor; i--)
telnet_write(connection, "\b", 1);
}
telnet_connection->next_history = 0;
telnet_connection->current_history = 0;
- if (telnet_async())
- log_add_callback(telnet_log_callback, connection);
-
-
+ log_add_callback(telnet_log_callback, connection);
return ERROR_OK;
}
t_con->line_cursor = -1; /* to supress prompt in log callback during command execution */
- if (!telnet_async())
- log_add_callback(telnet_log_callback, connection);
-
retval = command_run_line(command_context, t_con->line);
- if (!telnet_async())
- log_remove_callback(telnet_log_callback, connection);
-
t_con->line_cursor = 0;
if (retval == ERROR_COMMAND_CLOSE_CONNECTION)
if (telnet_port == 0)
{
- LOG_WARNING("no telnet port specified, using default port 4444");
- telnet_port = 4444;
+ LOG_INFO("telnet port disabled");
+ return ERROR_OK;
}
telnet_service->banner = banner;
- add_service("telnet", CONNECTION_TELNET, telnet_port, 1, telnet_new_connection, telnet_input, telnet_connection_closed, telnet_service);
+ add_service("telnet", CONNECTION_TCP, telnet_port, 1, telnet_new_connection, telnet_input, telnet_connection_closed, telnet_service);
return ERROR_OK;
}
COMMAND_EXEC, "exit telnet session");
register_command(command_context, NULL, "telnet_port", handle_telnet_port_command,
- COMMAND_CONFIG, "port on which to listen for incoming telnet connections");
+ COMMAND_ANY, "port on which to listen for incoming telnet connections");
return ERROR_OK;
}
int handle_telnet_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
if (argc == 0)
+ {
+ command_print(cmd_ctx, "%d", telnet_port);
return ERROR_OK;
+ }
telnet_port = strtoul(args[0], NULL, 0);