v/tmate-ssh-server
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate-ssh-server.git synced 2020-11-18 19:53:51 -08:00
Code Issues Releases Wiki Activity

Can't use the legacy logging callbacks of libssh, it's broken

Browse Source
This commit is contained in:
Nicolas Viennot 2013-11-06 19:12:32 -05:00
parent 0bac9f0eaa
commit ed6224ba73
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tmate-ssh-server.c
View File

@ -208,16 +208,6 @@ static void setup_signals(void)
signal(SIGUSR1, signal_handler);
}
static void ssh_log_cb(ssh_session session, int priority,
const char *message, void *userdata)
{
tmate_debug("[%d] %s", priority, message);
}
static struct ssh_callbacks_struct ssh_session_callbacks = {
.log_function = ssh_log_cb
};
static pid_t namespace_fork(void)
{
/* XXX we are breaking getpid() libc cache. Bad libc. */
@ -255,6 +245,12 @@ static int get_ip(int fd, char *dst, size_t len)
struct tmate_ssh_client tmate_client;
static void ssh_log_function(int priority, const char *function,
const char *buffer, void *userdata)
{
tmate_debug("[%d] [%s] %s", priority, function, buffer);
}
static ssh_bind prepare_ssh(const char *keys_dir, int port)
{
ssh_bind bind;
@ -262,7 +258,7 @@ static ssh_bind prepare_ssh(const char *keys_dir, int port)
int verbosity = SSH_LOG_NOLOG;
//int verbosity = SSH_LOG_PACKET;
ssh_callbacks_init(&ssh_session_callbacks);
ssh_set_log_callback(ssh_log_function);
bind = ssh_bind_new();
if (!bind)
@ -301,8 +297,6 @@ void tmate_ssh_server_main(const char *keys_dir, int port)
if (!client->session)
tmate_fatal("Cannot initialize session");
ssh_set_callbacks(client->session, &ssh_session_callbacks);
if (ssh_bind_accept(bind, client->session) < 0)
tmate_fatal("Error accepting connection: %s", ssh_get_error(bind));