Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
telnet_connection_t -> struct telnet_connection
[openocd.git] / src / server / telnet_server.c
diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index 1209b7a9093c14fe6ed6499957cccaf3f5d111a4..13ac0877a2f7a7452afbfd0b41c306fd9f5cc19e 100644 (file)
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -2,7 +2,7 @@
  *   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                                  *
@@ -27,26 +27,10 @@
 #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 unsigned short telnet_port = 4444;
 
 static char *negotiate =
                "\xFF\xFB\x03"          /* IAC WILL Suppress Go Ahead */
@@ -62,7 +46,7 @@ static char *negotiate =
  */
 int telnet_write(connection_t *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;
 
@@ -76,7 +60,7 @@ int telnet_write(connection_t *connection, const void *data, int len)
 
 int telnet_prompt(connection_t *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));
@@ -99,7 +83,7 @@ int telnet_outputline(connection_t *connection, const char *line)
                if (line_end)
                {
                        telnet_write(connection, "\r\n", 2);
-                       line += len+1;
+                       line += len + 1;
                }
                else
                {
@@ -117,11 +101,11 @@ int telnet_output(struct command_context_s *cmd_ctx, const char* line)
        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 telnet_connection *t_con = connection->priv;
        int i;
 
        /* if there is no prompt, simply output the message */
@@ -133,8 +117,8 @@ void telnet_log_callback(void *priv, const char *file, int line,
 
        /* 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 */
@@ -143,14 +127,14 @@ void telnet_log_callback(void *priv, const char *file, int line,
        /* 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)
 {
-       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;
@@ -191,7 +175,7 @@ int telnet_new_connection(connection_t *connection)
        return ERROR_OK;
 }
 
-void telnet_clear_line(connection_t *connection, telnet_connection_t *t_con)
+void telnet_clear_line(connection_t *connection, struct telnet_connection *t_con)
 {
        /* move to end of line */
        if (t_con->line_cursor < t_con->line_size)
@@ -213,7 +197,7 @@ int telnet_input(connection_t *connection)
        int bytes_read;
        char buffer[TELNET_BUFFER_SIZE];
        char *buf_p;
-       telnet_connection_t *t_con = connection->priv;
+       struct telnet_connection *t_con = connection->priv;
        command_context_t *command_context = connection->cmd_ctx;
 
        bytes_read = read_socket(connection->fd, buffer, TELNET_BUFFER_SIZE);
@@ -555,7 +539,7 @@ int telnet_input(connection_t *connection)
 
 int telnet_connection_closed(connection_t *connection)
 {
-       telnet_connection_t *t_con = connection->priv;
+       struct telnet_connection *t_con = connection->priv;
        int i;
 
        log_remove_callback(telnet_log_callback, connection);
@@ -593,7 +577,7 @@ int telnet_connection_closed(connection_t *connection)
 
 int telnet_set_prompt(connection_t *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);
@@ -605,47 +589,44 @@ int telnet_set_prompt(connection_t *connection, char *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(command_context_t *command_context)
 {
-       if (argc == 0)
-       {
-               command_print(cmd_ctx, "%d", telnet_port);
-               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;
-}
+
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)