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

remove proxy connect at boot time

Browse Source
This commit is contained in:
Nicolas Viennot 2015-11-02 04:37:28 -05:00
parent f37e5ad855
commit 2d9145cd73
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tmate-ssh-server.c
View File

@ -159,6 +159,14 @@ static void client_bootstrap(struct tmate_session *_session)
alarm(grace_period); alarm(grace_period);
/*
* We should die early if we can't connect to proxy. This way the
* tmate daemon will pick another server to work on.
*/
_session->proxy_fd = -1;
if (tmate_has_proxy())
_session->proxy_fd = tmate_connect_to_proxy();
ssh_server_cb.userdata = client; ssh_server_cb.userdata = client;
ssh_callbacks_init(&ssh_server_cb); ssh_callbacks_init(&ssh_server_cb);
ssh_set_server_callbacks(client->session, &ssh_server_cb); ssh_set_server_callbacks(client->session, &ssh_server_cb);
@ -305,9 +313,6 @@ void tmate_ssh_server_main(struct tmate_session *session,
setup_signals(); setup_signals();
if (tmate_has_proxy())
close(tmate_connect_to_proxy());
bind = prepare_ssh(keys_dir, port); bind = prepare_ssh(keys_dir, port);
for (;;) { for (;;) {
@ -322,14 +327,6 @@ void tmate_ssh_server_main(struct tmate_session *session,
if (ssh_bind_accept(bind, client->session) < 0) if (ssh_bind_accept(bind, client->session) < 0)
tmate_fatal("Error accepting connection: %s", ssh_get_error(bind)); tmate_fatal("Error accepting connection: %s", ssh_get_error(bind));
/*
* We should die if we can't connect to proxy. This way the
* tmate daemon will pick another server to work on.
*/
session->proxy_fd = -1;
if (tmate_has_proxy())
session->proxy_fd = tmate_connect_to_proxy();
if (get_ip(ssh_get_fd(client->session), if (get_ip(ssh_get_fd(client->session),
client->ip_address, sizeof(client->ip_address)) < 0) client->ip_address, sizeof(client->ip_address)) < 0)
tmate_fatal("Error getting IP address from connection"); tmate_fatal("Error getting IP address from connection");
@ -341,7 +338,6 @@ void tmate_ssh_server_main(struct tmate_session *session,
tmate_info("Child spawned pid=%d, ip=%s", tmate_info("Child spawned pid=%d, ip=%s",
pid, client->ip_address); pid, client->ip_address);
ssh_free(client->session); ssh_free(client->session);
close(session->proxy_fd);
} else { } else {
ssh_bind_free(bind); ssh_bind_free(bind);
session->session_token = "init"; session->session_token = "init";