[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.39.2.4 and 1.39.2.5

version 1.39.2.4, 2001/05/07 21:09:28 version 1.39.2.5, 2001/09/27 00:15:41
Line 35 
Line 35 
  *   *
  *   *
  * SSH2 support added by Markus Friedl.   * SSH2 support added by Markus Friedl.
  * Copyright (c) 1999,2000 Markus Friedl.  All rights reserved.   * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions   * modification, are permitted provided that the following conditions
Line 102 
Line 102 
  * because this is updated in a signal handler.   * because this is updated in a signal handler.
  */   */
 static volatile int received_window_change_signal = 0;  static volatile int received_window_change_signal = 0;
   static volatile int received_signal = 0;
   
 /* Flag indicating whether the user\'s terminal is in non-blocking mode. */  /* Flag indicating whether the user\'s terminal is in non-blocking mode. */
 static int in_non_blocking_mode = 0;  static int in_non_blocking_mode = 0;
Line 123 
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 131 
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 143 
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 156 
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 168 
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)
 {  {
         if (in_raw_mode())          received_signal = sig;
                 leave_raw_mode();          quit_pending = 1;
         if (in_non_blocking_mode)  
                 leave_non_blocking();  
         channel_stop_listening();  
         packet_close();  
         fatal("Killed by signal %d.", sig);  
 }  }
   
 /*  /*
Line 185 
Line 181 
  * available resolution.   * available resolution.
  */   */
   
 double  static double
 get_current_time(void)  get_current_time(void)
 {  {
         struct timeval tv;          struct timeval tv;
Line 199 
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 251 
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 283 
Line 279 
  * appropriate.   * appropriate.
  */   */
   
 void  static void
 client_check_window_change(void)  client_check_window_change(void)
 {  {
         struct winsize ws;          struct winsize ws;
Line 320 
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 *nallocp, int rekeying)
 {  {
         /* Add any selections by the channel mechanism. */          /* Add any selections by the channel mechanism. */
         channel_prepare_select(readsetp, writesetp, maxfdp, rekeying);          channel_prepare_select(readsetp, writesetp, maxfdp, nallocp, rekeying);
   
         if (!compat20) {          if (!compat20) {
                 /* Read from the connection, unless our buffers are full. */                  /* Read from the connection, unless our buffers are full. */
Line 346 
Line 342 
                 if (buffer_len(&stderr_buffer) > 0)                  if (buffer_len(&stderr_buffer) > 0)
                         FD_SET(fileno(stderr), *writesetp);                          FD_SET(fileno(stderr), *writesetp);
         } else {          } else {
                 FD_SET(connection_in, *readsetp);                  /* channel_prepare_select could have closed the last channel */
                   if (session_closed && !channel_still_open()) {
                           if (!packet_have_data_to_write())
                                   return;
                   } else {
                           FD_SET(connection_in, *readsetp);
                   }
         }          }
   
         /* Select server connection if have data to write to the server. */          /* Select server connection if have data to write to the server. */
Line 382 
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 425 
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 466 
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 544 
Line 546 
                                 leave_raw_mode();                                  leave_raw_mode();
   
                                 /* Stop listening for new connections. */                                  /* Stop listening for new connections. */
                                 channel_stop_listening();                                  channel_close_all();    /* proto1 only XXXX */
   
                                 printf("%c& [backgrounded]\n", escape_char);                                  printf("%c& [backgrounded]\n", escape_char);
   
Line 566 
Line 568 
 "%c?\r\n\  "%c?\r\n\
 Supported escape sequences:\r\n\  Supported escape sequences:\r\n\
 ~.  - terminate connection\r\n\  ~.  - terminate connection\r\n\
 ~R - Request rekey (SSH protocol 2 only)\r\n\  ~R  - Request rekey (SSH protocol 2 only)\r\n\
 ~^Z - suspend ssh\r\n\  ~^Z - suspend ssh\r\n\
 ~#  - list forwarded connections\r\n\  ~#  - list forwarded connections\r\n\
 ~&  - background ssh (when waiting for connections to terminate)\r\n\  ~&  - background ssh (when waiting for connections to terminate)\r\n\
Line 616 
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 651 
Line 653 
                                 packet_start(SSH_CMSG_EOF);                                  packet_start(SSH_CMSG_EOF);
                                 packet_send();                                  packet_send();
                         }                          }
                 } else if (escape_char == -1) {                  } else if (escape_char == SSH_ESCAPECHAR_NONE) {
                         /*                          /*
                          * Normal successful read, and no escape character.                           * Normal successful read, and no escape character.
                          * Just append the data to buffer.                           * Just append the data to buffer.
Line 669 
Line 671 
         }          }
 }  }
   
 void  static void
 client_process_output(fd_set * writeset)  client_process_output(fd_set * writeset)
 {  {
         int len;          int len;
Line 730 
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 738 
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 759 
Line 761 
 /*  /*
  * Implements the interactive session with the server.  This is called after   * Implements the interactive session with the server.  This is called after
  * the user has been authenticated, and a command has been started on the   * the user has been authenticated, and a command has been started on the
  * remote host.  If escape_char != -1, it is the character used as an escape   * remote host.  If escape_char != SSH_ESCAPECHAR_NONE, it is the character
  * character for terminating or suspending the session.   * used as an escape character for terminating or suspending the session.
  */   */
   
 int  int
Line 768 
Line 770 
 {  {
         fd_set *readset = NULL, *writeset = NULL;          fd_set *readset = NULL, *writeset = NULL;
         double start_time, total_time;          double start_time, total_time;
         int max_fd = 0, len, rekeying = 0;          int max_fd = 0, max_fd2 = 0, len, rekeying = 0, nalloc = 0;
         char buf[100];          char buf[100];
   
         debug("Entering interactive session.");          debug("Entering interactive session.");
Line 823 
Line 825 
   
         if (compat20) {          if (compat20) {
                 session_ident = ssh2_chan_id;                  session_ident = ssh2_chan_id;
                 if (escape_char != -1)                  if (escape_char != SSH_ESCAPECHAR_NONE)
                         channel_register_filter(session_ident,                          channel_register_filter(session_ident,
                             simple_escape_filter);                              simple_escape_filter);
                 if (session_ident != -1)                  if (session_ident != -1)
Line 875 
Line 877 
                  * Wait until we have something to do (something becomes                   * Wait until we have something to do (something becomes
                  * available on one of the descriptors).                   * available on one of the descriptors).
                  */                   */
                   max_fd2 = max_fd;
                 client_wait_until_can_do_something(&readset, &writeset,                  client_wait_until_can_do_something(&readset, &writeset,
                     &max_fd, rekeying);                      &max_fd2, &nalloc, rekeying);
   
                 if (quit_pending)                  if (quit_pending)
                         break;                          break;
Line 924 
Line 927 
         if (have_pty)          if (have_pty)
                 signal(SIGWINCH, SIG_DFL);                  signal(SIGWINCH, SIG_DFL);
   
         /* Stop listening for connections. */          channel_free_all();
         channel_stop_listening();  
   
           if (have_pty)
                   leave_raw_mode();
   
           /* restore blocking io */
           if (!isatty(fileno(stdin)))
                   unset_nonblock(fileno(stdin));
           if (!isatty(fileno(stdout)))
                   unset_nonblock(fileno(stdout));
           if (!isatty(fileno(stderr)))
                   unset_nonblock(fileno(stderr));
   
           if (received_signal) {
                   if (in_non_blocking_mode)       /* XXX */
                           leave_non_blocking();
                   fatal("Killed by signal %d.", received_signal);
           }
   
         /*          /*
          * In interactive mode (with pseudo tty) display a message indicating           * In interactive mode (with pseudo tty) display a message indicating
          * that the connection has been closed.           * that the connection has been closed.
Line 935 
Line 954 
                 snprintf(buf, sizeof buf, "Connection to %.64s closed.\r\n", host);                  snprintf(buf, sizeof buf, "Connection to %.64s closed.\r\n", host);
                 buffer_append(&stderr_buffer, buf, strlen(buf));                  buffer_append(&stderr_buffer, buf, strlen(buf));
         }          }
   
         /* Output any buffered data for stdout. */          /* Output any buffered data for stdout. */
         while (buffer_len(&stdout_buffer) > 0) {          while (buffer_len(&stdout_buffer) > 0) {
                 len = write(fileno(stdout), buffer_ptr(&stdout_buffer),                  len = write(fileno(stdout), buffer_ptr(&stdout_buffer),
Line 959 
Line 979 
                 stderr_bytes += len;                  stderr_bytes += len;
         }          }
   
         if (have_pty)  
                 leave_raw_mode();  
   
         /* Clear and free any buffers. */          /* Clear and free any buffers. */
         memset(buf, 0, sizeof(buf));          memset(buf, 0, sizeof(buf));
         buffer_free(&stdin_buffer);          buffer_free(&stdin_buffer);
Line 984 
Line 1001 
   
 /*********/  /*********/
   
 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 994 
Line 1011 
         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 1004 
Line 1021 
         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 1021 
Line 1038 
         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;
         char *listen_address, *originator_address;          char *listen_address, *originator_address;
         int listen_port, originator_port;          int listen_port, originator_port;
         int sock, newch;          int sock;
   
         /* Get rest of the packet */          /* Get rest of the packet */
         listen_address = packet_get_string(NULL);          listen_address = packet_get_string(NULL);
Line 1039 
Line 1056 
         debug("client_request_forwarded_tcpip: listen %s port %d, originator %s port %d",          debug("client_request_forwarded_tcpip: listen %s port %d, originator %s port %d",
             listen_address, listen_port, originator_address, originator_port);              listen_address, listen_port, originator_address, originator_port);
   
         sock = channel_connect_by_listen_adress(listen_port);          sock = channel_connect_by_listen_address(listen_port);
         if (sock >= 0) {          if (sock < 0) {
                 newch = channel_new("forwarded-tcpip",                  xfree(originator_address);
                     SSH_CHANNEL_CONNECTING, sock, sock, -1,                  xfree(listen_address);
                     CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0,                  return NULL;
                     xstrdup(originator_address), 1);  
                 c = channel_lookup(newch);  
         }          }
           c = channel_new("forwarded-tcpip",
               SSH_CHANNEL_CONNECTING, sock, sock, -1,
               CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0,
               xstrdup(originator_address), 1);
           if (c == NULL) {
                   error("client_request_forwarded_tcpip: channel_new failed");
                   close(sock);
           }
         xfree(originator_address);          xfree(originator_address);
         xfree(listen_address);          xfree(listen_address);
         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;
         char *originator;          char *originator;
         int originator_port;          int originator_port;
         int sock, newch;          int sock;
   
         if (!options.forward_x11) {          if (!options.forward_x11) {
                 error("Warning: ssh server tried X11 forwarding.");                  error("Warning: ssh server tried X11 forwarding.");
Line 1076 
Line 1099 
         /* XXX check permission */          /* XXX check permission */
         debug("client_request_x11: request from %s %d", originator,          debug("client_request_x11: request from %s %d", originator,
             originator_port);              originator_port);
           xfree(originator);
         sock = x11_connect_display();          sock = x11_connect_display();
         if (sock >= 0) {          if (sock < 0)
                 newch = channel_new("x11",                  return NULL;
                     SSH_CHANNEL_X11_OPEN, sock, sock, -1,          c = channel_new("x11",
                     CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0,              SSH_CHANNEL_X11_OPEN, sock, sock, -1,
                     xstrdup("x11"), 1);              CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0,
                 c = channel_lookup(newch);              xstrdup("x11"), 1);
           if (c == NULL) {
                   error("client_request_x11: channel_new failed");
                   close(sock);
         }          }
         xfree(originator);          c->force_drain = 1;
         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;
         int sock, newch;          int sock;
   
         if (!options.forward_agent) {          if (!options.forward_agent) {
                 error("Warning: ssh server tried agent forwarding.");                  error("Warning: ssh server tried agent forwarding.");
Line 1100 
Line 1127 
                 return NULL;                  return NULL;
         }          }
         sock =  ssh_get_authentication_socket();          sock =  ssh_get_authentication_socket();
         if (sock >= 0) {          if (sock < 0)
                 newch = channel_new("authentication agent connection",                  return NULL;
                     SSH_CHANNEL_OPEN, sock, sock, -1,          c = channel_new("authentication agent connection",
                     CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0,              SSH_CHANNEL_OPEN, sock, sock, -1,
                     xstrdup("authentication agent connection"), 1);              CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0,
                 c = channel_lookup(newch);              xstrdup("authentication agent connection"), 1);
           if (c == NULL) {
                   error("client_request_agent: channel_new failed");
                   close(sock);
         }          }
           c->force_drain = 1;
         return c;          return c;
 }  }
   
 /* 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 1142 
Line 1173 
                 c->remote_id = rchan;                  c->remote_id = rchan;
                 c->remote_window = rwindow;                  c->remote_window = rwindow;
                 c->remote_maxpacket = rmaxpack;                  c->remote_maxpacket = rmaxpack;
                   if (c->type != SSH_CHANNEL_CONNECTING) {
                 packet_start(SSH2_MSG_CHANNEL_OPEN_CONFIRMATION);                          packet_start(SSH2_MSG_CHANNEL_OPEN_CONFIRMATION);
                 packet_put_int(c->remote_id);                          packet_put_int(c->remote_id);
                 packet_put_int(c->self);                          packet_put_int(c->self);
                 packet_put_int(c->local_window);                          packet_put_int(c->local_window);
                 packet_put_int(c->local_maxpacket);                          packet_put_int(c->local_maxpacket);
                 packet_send();                          packet_send();
                   }
         } else {          } else {
                 debug("failure %s", ctype);                  debug("failure %s", ctype);
                 packet_start(SSH2_MSG_CHANNEL_OPEN_FAILURE);                  packet_start(SSH2_MSG_CHANNEL_OPEN_FAILURE);
                 packet_put_int(rchan);                  packet_put_int(rchan);
                 packet_put_int(SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED);                  packet_put_int(SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED);
                 packet_put_cstring("bla bla");                  if (!(datafellows & SSH_BUG_OPENFAILURE)) {
                 packet_put_cstring("");                          packet_put_cstring("open failed");
                           packet_put_cstring("");
                   }
                 packet_send();                  packet_send();
         }          }
         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 1197 
Line 1231 
         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 1214 
Line 1248 
         /* 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 1233 
Line 1267 
         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();
         dispatch_set(SSH_MSG_CHANNEL_CLOSE, &channel_input_ieof);          dispatch_set(SSH_MSG_CHANNEL_CLOSE, &channel_input_ieof);
         dispatch_set(SSH_MSG_CHANNEL_CLOSE_CONFIRMATION, & channel_input_oclose);          dispatch_set(SSH_MSG_CHANNEL_CLOSE_CONFIRMATION, & channel_input_oclose);
 }  }
 void  static void
 client_init_dispatch(void)  client_init_dispatch(void)
 {  {
         if (compat20)          if (compat20)
Legend:
Removed from v.1.39.2.4  
changed lines
  Added in v.1.39.2.5