From 92bf230b8ac78a5497464936e1da7be17a23f742 Mon Sep 17 00:00:00 2001 From: Nicolas Viennot Date: Wed, 6 Nov 2013 19:07:47 -0500 Subject: [PATCH] Can't use the legacy logging callbacks of libssh, it's broken --- tmate-session.c | 7 +++++++ tmate-ssh-client.c | 8 -------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tmate-session.c b/tmate-session.c index 4f8e77a5..40ac2d7a 100644 --- a/tmate-session.c +++ b/tmate-session.c @@ -100,8 +100,15 @@ static void lookup_and_connect(void) &hints, dns_cb, tmate_server_host); } +static void ssh_log_function(int priority, const char *function, + const char *buffer, void *userdata) +{ + tmate_debug("[%d] [%s] %s", priority, function, buffer); +} + void tmate_session_init(void) { + ssh_set_log_callback(ssh_log_function); tmate_catch_sigsegv(); tmate_encoder_init(&tmate_session.encoder); diff --git a/tmate-ssh-client.c b/tmate-ssh-client.c index c4ad1de3..1c346e85 100644 --- a/tmate-ssh-client.c +++ b/tmate-ssh-client.c @@ -16,13 +16,6 @@ static void printflike2 reconnect_session(struct tmate_ssh_client *client, const char *fmt, ...); static void on_session_event(struct tmate_ssh_client *client); -static void log_function(ssh_session session, int priority, - const char *message, void *userdata) -{ - struct tmate_ssh_client *client = userdata; - tmate_debug("[%s] [%d] %s", client->server_ip, priority, message); -} - static void register_session_fd_event(struct tmate_ssh_client *client) { if (!event_initialized(&client->ev_ssh)) { @@ -479,7 +472,6 @@ struct tmate_ssh_client *tmate_ssh_client_alloc(struct tmate_session *session, memset(&client->ssh_callbacks, 0, sizeof(client->ssh_callbacks)); ssh_callbacks_init(&client->ssh_callbacks); - client->ssh_callbacks.log_function = log_function; client->ssh_callbacks.userdata = client; client->ssh_callbacks.auth_function = passphrase_callback;