diff options
author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-03-07 21:41:34 +0000 |
---|---|---|
committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-03-07 21:41:34 +0000 |
commit | 29fc9b2596a4c92c5512d305b1addb4a8c224e26 (patch) | |
tree | d9fab55e95bad8021e21e6f25f86f9796b0cbaee | |
parent | a3f35e348e535c2610e67390d466f49c3f0d9f42 (diff) | |
download | openocd+libswd-29fc9b2596a4c92c5512d305b1addb4a8c224e26.tar.gz openocd+libswd-29fc9b2596a4c92c5512d305b1addb4a8c224e26.tar.bz2 openocd+libswd-29fc9b2596a4c92c5512d305b1addb4a8c224e26.tar.xz openocd+libswd-29fc9b2596a4c92c5512d305b1addb4a8c224e26.zip |
Asynchronous output information from e.g. a halt is now displayed again.
git-svn-id: svn://svn.berlios.de/openocd/trunk@474 b42882b7-edfa-0310-969c-e2dbd0fdcd60
-rw-r--r-- | src/server/telnet_server.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c index 38213f80..c0d78501 100644 --- a/src/server/telnet_server.c +++ b/src/server/telnet_server.c @@ -172,6 +172,10 @@ int telnet_new_connection(connection_t *connection) target_register_event_callback(telnet_target_callback_event_handler, connection->cmd_ctx); + log_add_callback(telnet_log_callback, connection); + + + return ERROR_OK; } @@ -286,12 +290,8 @@ int telnet_input(connection_t *connection) continue; } - log_add_callback(telnet_log_callback, connection); - retval = command_run_line(command_context, t_con->line); - log_remove_callback(telnet_log_callback, connection); - if (retval == ERROR_COMMAND_CLOSE_CONNECTION) { return ERROR_SERVER_REMOTE_CLOSED; @@ -535,6 +535,8 @@ int telnet_connection_closed(connection_t *connection) telnet_connection_t *t_con = connection->priv; int i; + log_remove_callback(telnet_log_callback, connection); + if (t_con->prompt) { free(t_con->prompt); |