X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Ftelnet_server.c;h=9c6115588f43bd4e696d3f3d3d16ffd03d3d6205;hb=f2cbaba3cc4af99db7b4f2682c2e0dd4467655e3;hp=c9c60bbda4e69723196b0f210a1a4500ff6099a2;hpb=2b78a4e82b1845ee7cc89f6e31d7b49e9299cb32;p=openocd.git

diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index c9c60bbda4..9c6115588f 100644
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -32,9 +32,6 @@
 
 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 char *negotiate =
 		"\xFF\xFB\x03"		/* IAC WILL Suppress Go Ahead */
 		"\xFF\xFB\x01"		/* IAC WILL Echo */
@@ -104,7 +101,7 @@ 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;
@@ -137,7 +134,7 @@ void telnet_log_callback(void *priv, const char *file, int line,
 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_service *telnet_service = connection->service->priv;
 	int i;
 
 	connection->priv = telnet_connection;
@@ -592,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)
 	{
@@ -608,24 +605,28 @@ int telnet_init(char *banner)
 	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_ANY, "port on which to listen for incoming telnet connections");
-
-	return ERROR_OK;
+	return CALL_COMMAND_HANDLER(server_port_command, &telnet_port);
 }
 
-/* daemon configuration command telnet_port */
-int handle_telnet_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_exit_command)
 {
-	return server_port_command(cmd_ctx, cmd, args, argc, &telnet_port);
+	return ERROR_COMMAND_CLOSE_CONNECTION;
 }
 
-int handle_exit_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+int telnet_register_commands(command_context_t *command_context)
 {
-	return ERROR_COMMAND_CLOSE_CONNECTION;
+	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;
 }
+
+