* Copyright (C) 2005 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
- * Copyright (C) 2007,2008 Øyvind Harboe *
+ * Copyright (C) 2007,2008 Øyvind Harboe *
* oyvind.harboe@zylin.com *
* *
* Copyright (C) 2008 by Spencer Oliver *
#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;
-
-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 unsigned short telnet_port = 4444;
static char *negotiate =
"\xFF\xFB\x03" /* IAC WILL Suppress Go Ahead */
* we write to it, we will fail. Subsequent write operations will
* succeed. Shudder!
*/
-int telnet_write(connection_t *connection, const void *data, int len)
+int telnet_write(struct connection *connection, const void *data, int len)
{
- telnet_connection_t *t_con = connection->priv;
+ struct telnet_connection *t_con = connection->priv;
if (t_con->closed)
return ERROR_SERVER_REMOTE_CLOSED;
return ERROR_SERVER_REMOTE_CLOSED;
}
-int telnet_prompt(connection_t *connection)
+int telnet_prompt(struct connection *connection)
{
- telnet_connection_t *t_con = connection->priv;
+ struct telnet_connection *t_con = connection->priv;
telnet_write(connection, "\r", 1); /* the prompt is always placed at the line beginning */
return telnet_write(connection, t_con->prompt, strlen(t_con->prompt));
}
-int telnet_outputline(connection_t *connection, const char *line)
+int telnet_outputline(struct connection *connection, const char *line)
{
int len;
if (line_end)
{
telnet_write(connection, "\r\n", 2);
- line += len+1;
+ line += len + 1;
}
else
{
return ERROR_OK;
}
-int telnet_output(struct command_context_s *cmd_ctx, const char* line)
+int telnet_output(struct command_context *cmd_ctx, const char* line)
{
- connection_t *connection = cmd_ctx->output_handler_priv;
+ struct connection *connection = cmd_ctx->output_handler_priv;
return telnet_outputline(connection, line);
}
-void telnet_log_callback(void *priv, const char *file, int line,
+void telnet_log_callback(void *priv, const char *file, unsigned line,
const char *function, const char *string)
{
- connection_t *connection = priv;
- telnet_connection_t *t_con = connection->priv;
+ struct connection *connection = priv;
+ struct telnet_connection *t_con = connection->priv;
int i;
/* if there is no prompt, simply output the message */
/* 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);
}
-int telnet_new_connection(connection_t *connection)
+int telnet_new_connection(struct connection *connection)
{
- telnet_connection_t *telnet_connection = malloc(sizeof(telnet_connection_t));
- telnet_service_t *telnet_service = connection->service->priv;
+ struct telnet_connection *telnet_connection = malloc(sizeof(struct telnet_connection));
+ struct telnet_service *telnet_service = connection->service->priv;
int i;
connection->priv = telnet_connection;
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;
}
-void telnet_clear_line(connection_t *connection, telnet_connection_t *t_con)
+void telnet_clear_line(struct connection *connection, struct telnet_connection *t_con)
{
/* move to end of line */
if (t_con->line_cursor < t_con->line_size)
t_con->line_cursor = 0;
}
-int telnet_input(connection_t *connection)
+int telnet_input(struct connection *connection)
{
int bytes_read;
char buffer[TELNET_BUFFER_SIZE];
char *buf_p;
- telnet_connection_t *t_con = connection->priv;
- command_context_t *command_context = connection->cmd_ctx;
+ struct telnet_connection *t_con = connection->priv;
+ struct command_context *command_context = connection->cmd_ctx;
bytes_read = read_socket(connection->fd, buffer, TELNET_BUFFER_SIZE);
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)
return ERROR_OK;
}
-int telnet_connection_closed(connection_t *connection)
+int telnet_connection_closed(struct connection *connection)
{
- telnet_connection_t *t_con = connection->priv;
+ struct telnet_connection *t_con = connection->priv;
int i;
log_remove_callback(telnet_log_callback, connection);
return ERROR_OK;
}
-int telnet_set_prompt(connection_t *connection, char *prompt)
+int telnet_set_prompt(struct connection *connection, char *prompt)
{
- telnet_connection_t *t_con = connection->priv;
+ struct telnet_connection *t_con = connection->priv;
if (t_con->prompt != NULL)
free(t_con->prompt);
int telnet_init(char *banner)
{
- telnet_service_t *telnet_service = malloc(sizeof(telnet_service_t));
+ struct telnet_service *telnet_service = malloc(sizeof(struct telnet_service));
if (telnet_port == 0)
{
- LOG_WARNING("no telnet port specified, using default port 4444");
- telnet_port = 4444;
+ LOG_INFO("telnet port disabled");
+ free(telnet_service);
+ 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;
}
-int telnet_register_commands(command_context_t *command_context)
+/* daemon configuration command telnet_port */
+COMMAND_HANDLER(handle_telnet_port_command)
{
- register_command(command_context, NULL, "exit", handle_exit_command,
- 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");
+ return CALL_COMMAND_HANDLER(server_port_command, &telnet_port);
+}
- return ERROR_OK;
+COMMAND_HANDLER(handle_exit_command)
+{
+ return ERROR_COMMAND_CLOSE_CONNECTION;
}
-/* daemon configuration command telnet_port */
-int handle_telnet_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+int telnet_register_commands(struct command_context *command_context)
{
- if (argc == 0)
- return ERROR_OK;
+ register_command(command_context, NULL, "exit",
+ &handle_exit_command, COMMAND_EXEC,
+ "exit telnet session");
- telnet_port = strtoul(args[0], NULL, 0);
+ register_command(command_context, NULL, "telnet_port",
+ &handle_telnet_port_command, COMMAND_ANY,
+ "port on which to listen for incoming telnet connections");
return ERROR_OK;
}
-int handle_exit_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
- return ERROR_COMMAND_CLOSE_CONNECTION;
-}
+
Code Review / openocd.git / blobdiff