summaryrefslogtreecommitdiff
path: root/clientloop.c
diff options
context:
space:
mode:
Diffstat (limited to 'clientloop.c')
-rw-r--r--clientloop.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/clientloop.c b/clientloop.c
index 79aabbe06..def4d8a7b 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
59 */ 59 */
60 60
61#include "includes.h" 61#include "includes.h"
62RCSID("$OpenBSD: clientloop.c,v 1.128 2004/06/18 11:11:54 djm Exp $"); 62RCSID("$OpenBSD: clientloop.c,v 1.129 2004/07/11 17:48:47 deraadt Exp $");
63 63
64#include "ssh.h" 64#include "ssh.h"
65#include "ssh1.h" 65#include "ssh1.h"
@@ -402,7 +402,7 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp,
402 402
403 if (options.server_alive_interval == 0 || !compat20) 403 if (options.server_alive_interval == 0 || !compat20)
404 tvp = NULL; 404 tvp = NULL;
405 else { 405 else {
406 tv.tv_sec = options.server_alive_interval; 406 tv.tv_sec = options.server_alive_interval;
407 tv.tv_usec = 0; 407 tv.tv_usec = 0;
408 tvp = &tv; 408 tvp = &tv;
@@ -517,7 +517,7 @@ client_subsystem_reply(int type, u_int32_t seq, void *ctxt)
517{ 517{
518 int id; 518 int id;
519 Channel *c; 519 Channel *c;
520 520
521 id = packet_get_int(); 521 id = packet_get_int();
522 packet_check_eom(); 522 packet_check_eom();
523 523
@@ -540,13 +540,13 @@ client_extra_session2_setup(int id, void *arg)
540 struct confirm_ctx *cctx = arg; 540 struct confirm_ctx *cctx = arg;
541 Channel *c; 541 Channel *c;
542 int i; 542 int i;
543 543
544 if (cctx == NULL) 544 if (cctx == NULL)
545 fatal("%s: cctx == NULL", __func__); 545 fatal("%s: cctx == NULL", __func__);
546 if ((c = channel_lookup(id)) == NULL) 546 if ((c = channel_lookup(id)) == NULL)
547 fatal("%s: no channel for id %d", __func__, id); 547 fatal("%s: no channel for id %d", __func__, id);
548 548
549 client_session2_setup(id, cctx->want_tty, cctx->want_subsys, 549 client_session2_setup(id, cctx->want_tty, cctx->want_subsys,
550 cctx->term, &cctx->tio, c->rfd, &cctx->cmd, cctx->env, 550 cctx->term, &cctx->tio, c->rfd, &cctx->cmd, cctx->env,
551 client_subsystem_reply); 551 client_subsystem_reply);
552 552
@@ -557,7 +557,7 @@ client_extra_session2_setup(int id, void *arg)
557 for (i = 0; cctx->env[i] != NULL; i++) 557 for (i = 0; cctx->env[i] != NULL; i++)
558 xfree(cctx->env[i]); 558 xfree(cctx->env[i]);
559 xfree(cctx->env); 559 xfree(cctx->env);
560 } 560 }
561 xfree(cctx); 561 xfree(cctx);
562} 562}
563 563
@@ -614,7 +614,7 @@ client_process_control(fd_set * readset)
614 * Accept empty responses and responses consisting 614 * Accept empty responses and responses consisting
615 * of the word "yes" as affirmative. 615 * of the word "yes" as affirmative.
616 */ 616 */
617 if (*p == '\0' || *p == '\n' || 617 if (*p == '\0' || *p == '\n' ||
618 strcasecmp(p, "yes") == 0) 618 strcasecmp(p, "yes") == 0)
619 allowed = 1; 619 allowed = 1;
620 xfree(p); 620 xfree(p);
@@ -714,7 +714,7 @@ client_process_control(fd_set * readset)
714 714
715 set_nonblock(client_fd); 715 set_nonblock(client_fd);
716 716
717 c = channel_new("session", SSH_CHANNEL_OPENING, 717 c = channel_new("session", SSH_CHANNEL_OPENING,
718 new_fd[0], new_fd[1], new_fd[2], 718 new_fd[0], new_fd[1], new_fd[2],
719 CHAN_SES_WINDOW_DEFAULT, CHAN_SES_PACKET_DEFAULT, 719 CHAN_SES_WINDOW_DEFAULT, CHAN_SES_PACKET_DEFAULT,
720 CHAN_EXTENDED_WRITE, "client-session", /*nonblock*/0); 720 CHAN_EXTENDED_WRITE, "client-session", /*nonblock*/0);
@@ -1673,7 +1673,7 @@ client_input_global_request(int type, u_int32_t seq, void *ctxt)
1673} 1673}
1674 1674
1675void 1675void
1676client_session2_setup(int id, int want_tty, int want_subsystem, 1676client_session2_setup(int id, int want_tty, int want_subsystem,
1677 const char *term, struct termios *tiop, int in_fd, Buffer *cmd, char **env, 1677 const char *term, struct termios *tiop, int in_fd, Buffer *cmd, char **env,
1678 dispatch_fn *subsys_repl) 1678 dispatch_fn *subsys_repl)
1679{ 1679{