From 6c137a2fc0bf53b9c0b8eda51e6f5361552b0112 Mon Sep 17 00:00:00 2001 From: Øyvind Harboe Date: Mon, 27 Sep 2010 08:48:31 +0200 Subject: server: specify port as a string MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will allow switching to using named pipes. Split this out as a seperate commit to make changes easier to follow. Signed-off-by: Øyvind Harboe --- src/server/tcl_server.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/server/tcl_server.c') diff --git a/src/server/tcl_server.c b/src/server/tcl_server.c index 7d84de73..f82cafef 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); @@ -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_pipe("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[] = { @@ -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); } -- cgit v1.2.3