server: use register_commands

[fw/openocd] / src / server / telnet_server.c

diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index 84959e3a0f37a547ca203ddf77d48df190e90b4b..8a86efa0ca1a6956c872d4669d4f7e2349c7f498 100644 (file)
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -44,9 +44,9 @@ static char *negotiate =
  * 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;
 
@@ -58,15 +58,15 @@ int telnet_write(connection_t *connection, const void *data, int len)
        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;
 
@@ -94,18 +94,18 @@ int telnet_outputline(connection_t *connection, const char *line)
        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 */
@@ -131,10 +131,10 @@ void telnet_log_callback(void *priv, const char *file, int line,
                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;
@@ -175,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(struct connection *connection, struct telnet_connection *t_con)
 {
        /* move to end of line */
        if (t_con->line_cursor < t_con->line_size)
@@ -192,13 +192,13 @@ void telnet_clear_line(connection_t *connection, telnet_connection_t *t_con)
        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);
 
@@ -537,9 +537,9 @@ int telnet_input(connection_t *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);
@@ -575,9 +575,9 @@ int telnet_connection_closed(connection_t *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);
@@ -589,7 +589,7 @@ 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)
        {
@@ -606,29 +606,35 @@ int telnet_init(char *banner)
 }
 
 /* daemon configuration command telnet_port */
-static int handle_telnet_port_command(struct command_context_s *cmd_ctx,
-               char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_telnet_port_command)
 {
-       return server_port_command(cmd_ctx, cmd, args, argc, &telnet_port);
+       return CALL_COMMAND_HANDLER(server_port_command, &telnet_port);
 }
 
-static int handle_exit_command(struct command_context_s *cmd_ctx,
-               char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_exit_command)
 {
        return ERROR_COMMAND_CLOSE_CONNECTION;
 }
 
-int telnet_register_commands(command_context_t *command_context)
+static const struct command_registration telnet_command_handlers[] = {
+       {
+               .name = "exit",
+               .handler = &handle_exit_command,
+               .mode = COMMAND_EXEC,
+               .help = "exit telnet session",
+       },
+       {
+               .name = "telnet_port",
+               .handler = &handle_telnet_port_command,
+               .mode = COMMAND_ANY,
+               .help = "port on which to listen "
+                       "for incoming telnet connections",
+               .usage = "<port>",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
+int telnet_register_commands(struct command_context *cmd_ctx)
 {
-       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_ANY,
-                       "port on which to listen for incoming telnet connections");
-
-       return ERROR_OK;
+       return register_commands(cmd_ctx, NULL, telnet_command_handlers);
 }
-
-