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

add new channel after authentication

Browse Source 
With libssh commit 8a885f0b ("channels: Add check if we are authenticated
before we create a channel") connection fails if channel is added before
successful authentication. So add the channel after authentication.

Fixes #154
This commit is contained in:
Christian Hesse 2019-07-30 08:15:59 +02:00 committed by Nicolas Viennot
parent fd4ac27d59
commit 299c7c670c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tmate-ssh-client.c
View File

@ -241,12 +241,6 @@ static void on_ssh_client_event(struct tmate_ssh_client *client)
ssh_set_callbacks(session, &client->ssh_callbacks); ssh_set_callbacks(session, &client->ssh_callbacks);
client->channel = channel = ssh_channel_new(session);
if (!channel) {
tmate_fatal("cannot initialize");
return;
}
ssh_set_blocking(session, 0); ssh_set_blocking(session, 0);
ssh_options_set(session, SSH_OPTIONS_HOST, client->server_ip); ssh_options_set(session, SSH_OPTIONS_HOST, client->server_ip);
ssh_options_set(session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity); ssh_options_set(session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);
@ -370,6 +364,12 @@ static void on_ssh_client_event(struct tmate_ssh_client *client)
case SSH_AUTH_SUCCESS: case SSH_AUTH_SUCCESS:
tmate_debug("Auth successful"); tmate_debug("Auth successful");
client->state = SSH_OPEN_CHANNEL; client->state = SSH_OPEN_CHANNEL;
client->channel = channel = ssh_channel_new(session);
if (!channel) {
tmate_fatal("cannot initialize");
return;
}
/* fall through */ /* fall through */
} }