X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Ftcl_server.c;h=16710860614c708f21ddb24121aa9686cd90ef91;hp=9aaee5c6cc4f0f94ff3bcab08199b316ba12dec8;hb=d31803d3d9bc4750ff34d14cffb809c916401d1e;hpb=5a41435e45ae18c0823780382c214fb7324dbe7d

diff --git a/src/server/tcl_server.c b/src/server/tcl_server.c
index 9aaee5c6cc..1671086061 100644
--- a/src/server/tcl_server.c
+++ b/src/server/tcl_server.c
@@ -35,7 +35,7 @@ struct tcl_connection {
 	int tc_outerror; /* flag an output error */
 };
 
-static unsigned short tcl_port = 6666;
+static const char *tcl_port;
 
 /* handlers */
 static int tcl_new_connection(struct connection *connection);
@@ -57,7 +57,7 @@ int tcl_output(struct connection *connection, const void *data, ssize_t len)
 	if (tclc->tc_outerror)
 		return ERROR_SERVER_REMOTE_CLOSED;
 
-	wlen = write_socket(connection->fd, data, len);
+	wlen = connection_write(connection, data, len);
 
 	if (wlen == len)
 		return ERROR_OK;
@@ -92,7 +92,7 @@ static int tcl_input(struct connection *connection)
 	struct tcl_connection *tclc;
 	unsigned char in[256];
 
-	rlen = read_socket(connection->fd, &in, sizeof(in));
+	rlen = connection_read(connection, &in, sizeof(in));
 	if (rlen <= 0) {
 		if (rlen < 0)
 			LOG_ERROR("error during read: %s", strerror(errno));
@@ -160,23 +160,20 @@ static int tcl_closed(struct connection *connection)
 
 int tcl_init(void)
 {
-	int retval;
-
-	if (tcl_port == 0)
+	if (strcmp(tcl_port, "disabled") == 0)
 	{
-		LOG_INFO("tcl port disabled");
+		LOG_INFO("tcl server disabled");
 		return ERROR_OK;
 	}
 
-	retval = add_service("tcl", CONNECTION_TCP, tcl_port, 1,
+	return add_service("tcl", tcl_port, 1,
 			&tcl_new_connection, &tcl_input,
 			&tcl_closed, NULL);
-	return retval;
 }
 
 COMMAND_HANDLER(handle_tcl_port_command)
 {
-	return CALL_COMMAND_HANDLER(server_port_command, &tcl_port);
+	return CALL_COMMAND_HANDLER(server_pipe_command, &tcl_port);
 }
 
 static const struct command_registration tcl_command_handlers[] = {
@@ -186,7 +183,7 @@ static const struct command_registration tcl_command_handlers[] = {
 		.mode = COMMAND_CONFIG,
 		.help = "Specify port on which to listen "
 			"for incoming Tcl syntax.  "
-			"No arguments reports Tcl port; zero disables.",
+			"Read help on 'gdb_port'.",
 		.usage = "[port_num]",
 	},
 	COMMAND_REGISTRATION_DONE
@@ -194,5 +191,6 @@ static const struct command_registration tcl_command_handlers[] = {
 
 int tcl_register_commands(struct command_context *cmd_ctx)
 {
+	tcl_port = strdup("6666");
 	return register_commands(cmd_ctx, NULL, tcl_command_handlers);
 }