[BACK]Return to clientloop.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/clientloop.c between version 1.76 and 1.77

version 1.76, 2001/06/20 13:56:39 version 1.77, 2001/06/23 15:12:18
Line 124 
Line 124 
 static int need_rekeying;       /* Set to non-zero if rekeying is requested. */  static int need_rekeying;       /* Set to non-zero if rekeying is requested. */
 static int session_closed = 0;  /* In SSH2: login session closed. */  static int session_closed = 0;  /* In SSH2: login session closed. */
   
 void    client_init_dispatch(void);  static void client_init_dispatch(void);
 int     session_ident = -1;  int     session_ident = -1;
   
 /*XXX*/  /*XXX*/
Line 132 
Line 132 
   
 /* Restores stdin to blocking mode. */  /* Restores stdin to blocking mode. */
   
 void  static void
 leave_non_blocking(void)  leave_non_blocking(void)
 {  {
         if (in_non_blocking_mode) {          if (in_non_blocking_mode) {
Line 144 
Line 144 
   
 /* Puts stdin terminal in non-blocking mode. */  /* Puts stdin terminal in non-blocking mode. */
   
 void  static void
 enter_non_blocking(void)  enter_non_blocking(void)
 {  {
         in_non_blocking_mode = 1;          in_non_blocking_mode = 1;
Line 157 
Line 157 
  * flag indicating that the window has changed.   * flag indicating that the window has changed.
  */   */
   
 void  static void
 window_change_handler(int sig)  window_change_handler(int sig)
 {  {
         received_window_change_signal = 1;          received_window_change_signal = 1;
Line 169 
Line 169 
  * signals must be trapped to restore terminal modes.   * signals must be trapped to restore terminal modes.
  */   */
   
 void  static void
 signal_handler(int sig)  signal_handler(int sig)
 {  {
         received_signal = sig;          received_signal = sig;
Line 181 
Line 181 
  * available resolution.   * available resolution.
  */   */
   
 double  static double
 get_current_time(void)  get_current_time(void)
 {  {
         struct timeval tv;          struct timeval tv;
Line 195 
Line 195 
  * not appear to wake up when redirecting from /dev/null.   * not appear to wake up when redirecting from /dev/null.
  */   */
   
 void  static void
 client_check_initial_eof_on_stdin(void)  client_check_initial_eof_on_stdin(void)
 {  {
         int len;          int len;
Line 247 
Line 247 
  * connection.   * connection.
  */   */
   
 void  static void
 client_make_packets_from_stdin_data(void)  client_make_packets_from_stdin_data(void)
 {  {
         u_int len;          u_int len;
Line 279 
Line 279 
  * appropriate.   * appropriate.
  */   */
   
 void  static void
 client_check_window_change(void)  client_check_window_change(void)
 {  {
         struct winsize ws;          struct winsize ws;
Line 316 
Line 316 
  * one of the file descriptors).   * one of the file descriptors).
  */   */
   
 void  static void
 client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp,  client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp,
     int *maxfdp, int rekeying)      int *maxfdp, int rekeying)
 {  {
Line 384 
Line 384 
         }          }
 }  }
   
 void  static void
 client_suspend_self(Buffer *bin, Buffer *bout, Buffer *berr)  client_suspend_self(Buffer *bin, Buffer *bout, Buffer *berr)
 {  {
         struct winsize oldws, newws;          struct winsize oldws, newws;
Line 427 
Line 427 
         enter_raw_mode();          enter_raw_mode();
 }  }
   
 void  static void
 client_process_net_input(fd_set * readset)  client_process_net_input(fd_set * readset)
 {  {
         int len;          int len;
Line 468 
Line 468 
 }  }
   
 /* process the characters one by one */  /* process the characters one by one */
 int  static int
 process_escapes(Buffer *bin, Buffer *bout, Buffer *berr, char *buf, int len)  process_escapes(Buffer *bin, Buffer *bout, Buffer *berr, char *buf, int len)
 {  {
         char string[1024];          char string[1024];
Line 618 
Line 618 
         return bytes;          return bytes;
 }  }
   
 void  static void
 client_process_input(fd_set * readset)  client_process_input(fd_set * readset)
 {  {
         int len;          int len;
Line 671 
Line 671 
         }          }
 }  }
   
 void  static void
 client_process_output(fd_set * writeset)  client_process_output(fd_set * writeset)
 {  {
         int len;          int len;
Line 732 
Line 732 
  * preparatory phase.   * preparatory phase.
  */   */
   
 void  static void
 client_process_buffered_input_packets(void)  client_process_buffered_input_packets(void)
 {  {
         dispatch_run(DISPATCH_NONBLOCK, &quit_pending, compat20 ? xxx_kex : NULL);          dispatch_run(DISPATCH_NONBLOCK, &quit_pending, compat20 ? xxx_kex : NULL);
Line 740 
Line 740 
   
 /* scan buf[] for '~' before sending data to the peer */  /* scan buf[] for '~' before sending data to the peer */
   
 int  static int
 simple_escape_filter(Channel *c, char *buf, int len)  simple_escape_filter(Channel *c, char *buf, int len)
 {  {
         /* XXX we assume c->extended is writeable */          /* XXX we assume c->extended is writeable */
         return process_escapes(&c->input, &c->output, &c->extended, buf, len);          return process_escapes(&c->input, &c->output, &c->extended, buf, len);
 }  }
   
 void  static void
 client_channel_closed(int id, void *arg)  client_channel_closed(int id, void *arg)
 {  {
         if (id != session_ident)          if (id != session_ident)
Line 1000 
Line 1000 
   
 /*********/  /*********/
   
 void  static void
 client_input_stdout_data(int type, int plen, void *ctxt)  client_input_stdout_data(int type, int plen, void *ctxt)
 {  {
         u_int data_len;          u_int data_len;
Line 1010 
Line 1010 
         memset(data, 0, data_len);          memset(data, 0, data_len);
         xfree(data);          xfree(data);
 }  }
 void  static void
 client_input_stderr_data(int type, int plen, void *ctxt)  client_input_stderr_data(int type, int plen, void *ctxt)
 {  {
         u_int data_len;          u_int data_len;
Line 1020 
Line 1020 
         memset(data, 0, data_len);          memset(data, 0, data_len);
         xfree(data);          xfree(data);
 }  }
 void  static void
 client_input_exit_status(int type, int plen, void *ctxt)  client_input_exit_status(int type, int plen, void *ctxt)
 {  {
         packet_integrity_check(plen, 4, type);          packet_integrity_check(plen, 4, type);
Line 1037 
Line 1037 
         quit_pending = 1;          quit_pending = 1;
 }  }
   
 Channel *  static Channel *
 client_request_forwarded_tcpip(const char *request_type, int rchan)  client_request_forwarded_tcpip(const char *request_type, int rchan)
 {  {
         Channel* c = NULL;          Channel* c = NULL;
Line 1074 
Line 1074 
         return c;          return c;
 }  }
   
 Channel*  static Channel*
 client_request_x11(const char *request_type, int rchan)  client_request_x11(const char *request_type, int rchan)
 {  {
         Channel *c = NULL;          Channel *c = NULL;
Line 1113 
Line 1113 
         return c;          return c;
 }  }
   
 Channel*  static Channel*
 client_request_agent(const char *request_type, int rchan)  client_request_agent(const char *request_type, int rchan)
 {  {
         Channel *c = NULL;          Channel *c = NULL;
Line 1139 
Line 1139 
 }  }
   
 /* XXXX move to generic input handler */  /* XXXX move to generic input handler */
 void  static void
 client_input_channel_open(int type, int plen, void *ctxt)  client_input_channel_open(int type, int plen, void *ctxt)
 {  {
         Channel *c = NULL;          Channel *c = NULL;
Line 1191 
Line 1191 
         }          }
         xfree(ctype);          xfree(ctype);
 }  }
 void  static void
 client_input_channel_req(int type, int plen, void *ctxt)  client_input_channel_req(int type, int plen, void *ctxt)
 {  {
         Channel *c = NULL;          Channel *c = NULL;
Line 1228 
Line 1228 
         xfree(rtype);          xfree(rtype);
 }  }
   
 void  static void
 client_init_dispatch_20(void)  client_init_dispatch_20(void)
 {  {
         dispatch_init(&dispatch_protocol_error);          dispatch_init(&dispatch_protocol_error);
Line 1245 
Line 1245 
         /* rekeying */          /* rekeying */
         dispatch_set(SSH2_MSG_KEXINIT, &kex_input_kexinit);          dispatch_set(SSH2_MSG_KEXINIT, &kex_input_kexinit);
 }  }
 void  static void
 client_init_dispatch_13(void)  client_init_dispatch_13(void)
 {  {
         dispatch_init(NULL);          dispatch_init(NULL);
Line 1264 
Line 1264 
         dispatch_set(SSH_SMSG_X11_OPEN, options.forward_x11 ?          dispatch_set(SSH_SMSG_X11_OPEN, options.forward_x11 ?
             &x11_input_open : &deny_input_open);              &x11_input_open : &deny_input_open);
 }  }
 void  static void
 client_init_dispatch_15(void)  client_init_dispatch_15(void)
 {  {
         client_init_dispatch_13();          client_init_dispatch_13();
Legend:
Removed from v.1.76  
changed lines
  Added in v.1.77