=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/clientloop.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- src/usr.bin/ssh/clientloop.c 2000/04/14 10:09:15 1.19 +++ src/usr.bin/ssh/clientloop.c 2000/04/14 10:30:30 1.20 @@ -1,22 +1,22 @@ /* - * + * * clientloop.c - * + * * Author: Tatu Ylonen - * + * * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland * All rights reserved - * - * + * + * * Created: Sat Sep 23 12:23:57 1995 ylo - * + * * The main loop for the interactive session (client side). - * + * * SSH2 support added by Markus Friedl. */ #include "includes.h" -RCSID("$Id: clientloop.c,v 1.19 2000/04/14 10:09:15 markus Exp $"); +RCSID("$Id: clientloop.c,v 1.20 2000/04/14 10:30:30 markus Exp $"); #include "xmalloc.h" #include "ssh.h" @@ -83,7 +83,7 @@ /* Returns the user\'s terminal to normal mode if it had been put in raw mode. */ -void +void leave_raw_mode() { if (!in_raw_mode) @@ -97,7 +97,7 @@ /* Puts the user\'s terminal in raw mode. */ -void +void enter_raw_mode() { struct termios tio; @@ -123,7 +123,7 @@ /* Restores stdin to blocking mode. */ -void +void leave_non_blocking() { if (in_non_blocking_mode) { @@ -135,7 +135,7 @@ /* Puts stdin terminal in non-blocking mode. */ -void +void enter_non_blocking() { in_non_blocking_mode = 1; @@ -148,7 +148,7 @@ * flag indicating that the window has changed. */ -void +void window_change_handler(int sig) { received_window_change_signal = 1; @@ -160,7 +160,7 @@ * signals must be trapped to restore terminal modes. */ -void +void signal_handler(int sig) { if (in_raw_mode) @@ -177,7 +177,7 @@ * available resolution. */ -double +double get_current_time() { struct timeval tv; @@ -191,7 +191,7 @@ * not appear to wake up when redirecting from /dev/null. */ -void +void client_check_initial_eof_on_stdin() { int len; @@ -245,7 +245,7 @@ * connection. */ -void +void client_make_packets_from_stdin_data() { unsigned int len; @@ -276,7 +276,7 @@ * appropriate. */ -void +void client_check_window_change() { struct winsize ws; @@ -313,7 +313,7 @@ * one of the file descriptors). */ -void +void client_wait_until_can_do_something(fd_set * readset, fd_set * writeset) { /*debug("client_wait_until_can_do_something"); */ @@ -380,7 +380,7 @@ } } -void +void client_suspend_self() { struct winsize oldws, newws; @@ -425,7 +425,7 @@ enter_raw_mode(); } -void +void client_process_net_input(fd_set * readset) { int len; @@ -468,7 +468,7 @@ } } -void +void client_process_input(fd_set * readset) { int len, pid; @@ -657,7 +657,7 @@ } } -void +void client_process_output(fd_set * writeset) { int len; @@ -717,7 +717,7 @@ * preparatory phase. */ -void +void client_process_buffered_input_packets() { dispatch_run(DISPATCH_NONBLOCK, &quit_pending); @@ -730,7 +730,7 @@ * character for terminating or suspending the session. */ -int +int client_loop(int have_pty, int escape_char_arg) { extern Options options; @@ -953,7 +953,7 @@ quit_pending = 1; } -void +void client_init_dispatch_20() { dispatch_init(&dispatch_protocol_error); @@ -966,7 +966,7 @@ dispatch_set(SSH2_MSG_CHANNEL_REQUEST, &channel_input_channel_request); dispatch_set(SSH2_MSG_CHANNEL_WINDOW_ADJUST, &channel_input_window_adjust); } -void +void client_init_dispatch_13() { dispatch_init(NULL); @@ -983,14 +983,14 @@ dispatch_set(SSH_SMSG_STDOUT_DATA, &client_input_stdout_data); dispatch_set(SSH_SMSG_X11_OPEN, &x11_input_open); } -void +void client_init_dispatch_15() { client_init_dispatch_13(); dispatch_set(SSH_MSG_CHANNEL_CLOSE, &channel_input_ieof); dispatch_set(SSH_MSG_CHANNEL_CLOSE_CONFIRMATION, & channel_input_oclose); } -void +void client_init_dispatch() { if (compat20)