summaryrefslogtreecommitdiff
path: root/clientloop.c
diff options
context:
space:
mode:
Diffstat (limited to 'clientloop.c')
-rw-r--r--clientloop.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/clientloop.c b/clientloop.c
index 845307eba..90a781ec4 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.36 2000/09/21 11:25:33 markus Exp $"); 62RCSID("$OpenBSD: clientloop.c,v 1.37 2000/09/26 19:59:58 markus Exp $");
63 63
64#include "xmalloc.h" 64#include "xmalloc.h"
65#include "ssh.h" 65#include "ssh.h"
@@ -333,7 +333,7 @@ client_check_window_change()
333 if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) < 0) 333 if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) < 0)
334 return; 334 return;
335 335
336 debug("client_check_window_change: changed"); 336 debug2("client_check_window_change: changed");
337 337
338 if (compat20) { 338 if (compat20) {
339 channel_request_start(session_ident, "window-change", 0); 339 channel_request_start(session_ident, "window-change", 0);
@@ -360,8 +360,6 @@ client_check_window_change()
360void 360void
361client_wait_until_can_do_something(fd_set * readset, fd_set * writeset) 361client_wait_until_can_do_something(fd_set * readset, fd_set * writeset)
362{ 362{
363 /*debug("client_wait_until_can_do_something"); */
364
365 /* Initialize select masks. */ 363 /* Initialize select masks. */
366 FD_ZERO(readset); 364 FD_ZERO(readset);
367 FD_ZERO(writeset); 365 FD_ZERO(writeset);
@@ -480,7 +478,6 @@ client_process_net_input(fd_set * readset)
480 if (FD_ISSET(connection_in, readset)) { 478 if (FD_ISSET(connection_in, readset)) {
481 /* Read as much as possible. */ 479 /* Read as much as possible. */
482 len = read(connection_in, buf, sizeof(buf)); 480 len = read(connection_in, buf, sizeof(buf));
483/*debug("read connection_in len %d", len); XXX */
484 if (len == 0) { 481 if (len == 0) {
485 /* Received EOF. The remote host has closed the connection. */ 482 /* Received EOF. The remote host has closed the connection. */
486 snprintf(buf, sizeof buf, "Connection to %.300s closed by remote host.\r\n", 483 snprintf(buf, sizeof buf, "Connection to %.300s closed by remote host.\r\n",
@@ -852,7 +849,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
852 client_process_buffered_input_packets(); 849 client_process_buffered_input_packets();
853 850
854 if (compat20 && !channel_still_open()) { 851 if (compat20 && !channel_still_open()) {
855 debug("!channel_still_open."); 852 debug2("!channel_still_open.");
856 break; 853 break;
857 } 854 }
858 855
@@ -1042,7 +1039,7 @@ client_input_channel_open(int type, int plen, void *ctxt)
1042 int originator_port; 1039 int originator_port;
1043 originator = packet_get_string(NULL); 1040 originator = packet_get_string(NULL);
1044 if (datafellows & SSH_BUG_X11FWD) { 1041 if (datafellows & SSH_BUG_X11FWD) {
1045 debug("buggy server: x11 request w/o originator_port"); 1042 debug2("buggy server: x11 request w/o originator_port");
1046 originator_port = 0; 1043 originator_port = 0;
1047 } else { 1044 } else {
1048 originator_port = packet_get_int(); 1045 originator_port = packet_get_int();
@@ -1172,7 +1169,7 @@ client_input_channel_req(int id, void *arg)
1172void 1169void
1173client_set_session_ident(int id) 1170client_set_session_ident(int id)
1174{ 1171{
1175 debug("client_set_session_ident: id %d", id); 1172 debug2("client_set_session_ident: id %d", id);
1176 session_ident = id; 1173 session_ident = id;
1177 channel_register_callback(id, SSH2_MSG_CHANNEL_REQUEST, 1174 channel_register_callback(id, SSH2_MSG_CHANNEL_REQUEST,
1178 client_input_channel_req, (void *)0); 1175 client_input_channel_req, (void *)0);