[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.99 and 1.99.2.5

version 1.99, 2002/03/21 23:07:37 version 1.99.2.5, 2003/04/03 22:35:17
Line 481 
Line 481 
         int local = 0;          int local = 0;
   
         leave_raw_mode();          leave_raw_mode();
         handler = signal(SIGINT, SIG_IGN);          handler = signal(SIGINT, SIG_IGN);
         cmd = s = read_passphrase("\r\nssh> ", RP_ECHO);          cmd = s = read_passphrase("\r\nssh> ", RP_ECHO);
         if (s == NULL)          if (s == NULL)
                 goto out;                  goto out;
Line 635 
Line 635 
                                 snprintf(string, sizeof string,                                  snprintf(string, sizeof string,
 "%c?\r\n\  "%c?\r\n\
 Supported escape sequences:\r\n\  Supported escape sequences:\r\n\
 ~.  - terminate connection\r\n\  %c.  - terminate connection\r\n\
 ~C  - open a command line\r\n\  %cC  - open a command line\r\n\
 ~R  - Request rekey (SSH protocol 2 only)\r\n\  %cR  - Request rekey (SSH protocol 2 only)\r\n\
 ~^Z - suspend ssh\r\n\  %c^Z - suspend ssh\r\n\
 ~#  - list forwarded connections\r\n\  %c#  - list forwarded connections\r\n\
 ~&  - background ssh (when waiting for connections to terminate)\r\n\  %c&  - background ssh (when waiting for connections to terminate)\r\n\
 ~?  - this message\r\n\  %c?  - this message\r\n\
 ~~  - send the escape character by typing it twice\r\n\  %c%c  - send the escape character by typing it twice\r\n\
 (Note that escapes are only recognized immediately after newline.)\r\n",  (Note that escapes are only recognized immediately after newline.)\r\n",
                                          escape_char);                                      escape_char, escape_char, escape_char, escape_char,
                                       escape_char, escape_char, escape_char, escape_char,
                                       escape_char, escape_char);
                                 buffer_append(berr, string, strlen(string));                                  buffer_append(berr, string, strlen(string));
                                 continue;                                  continue;
   
Line 886 
Line 888 
   
         client_init_dispatch();          client_init_dispatch();
   
         /* Set signal handlers to restore non-blocking mode.  */          /*
         signal(SIGINT, signal_handler);           * Set signal handlers, (e.g. to restore non-blocking mode)
         signal(SIGQUIT, signal_handler);           * but don't overwrite SIG_IGN, matches behaviour from rsh(1)
         signal(SIGTERM, signal_handler);           */
           if (signal(SIGINT, SIG_IGN) != SIG_IGN)
                   signal(SIGINT, signal_handler);
           if (signal(SIGQUIT, SIG_IGN) != SIG_IGN)
                   signal(SIGQUIT, signal_handler);
           if (signal(SIGTERM, SIG_IGN) != SIG_IGN)
                   signal(SIGTERM, signal_handler);
         if (have_pty)          if (have_pty)
                 signal(SIGWINCH, window_change_handler);                  signal(SIGWINCH, window_change_handler);
   
Line 1114 
Line 1122 
 static 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;          int sock;
Line 1144 
Line 1152 
         return c;          return c;
 }  }
   
 static 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 1180 
Line 1188 
         return c;          return c;
 }  }
   
 static 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 1208 
Line 1216 
 {  {
         Channel *c = NULL;          Channel *c = NULL;
         char *ctype;          char *ctype;
         u_int len;  
         int rchan;          int rchan;
         int rmaxpack;          u_int rmaxpack, rwindow, len;
         int rwindow;  
   
         ctype = packet_get_string(&len);          ctype = packet_get_string(&len);
         rchan = packet_get_int();          rchan = packet_get_int();
Line 1314 
Line 1320 
 client_init_dispatch_20(void)  client_init_dispatch_20(void)
 {  {
         dispatch_init(&dispatch_protocol_error);          dispatch_init(&dispatch_protocol_error);
   
         dispatch_set(SSH2_MSG_CHANNEL_CLOSE, &channel_input_oclose);          dispatch_set(SSH2_MSG_CHANNEL_CLOSE, &channel_input_oclose);
         dispatch_set(SSH2_MSG_CHANNEL_DATA, &channel_input_data);          dispatch_set(SSH2_MSG_CHANNEL_DATA, &channel_input_data);
         dispatch_set(SSH2_MSG_CHANNEL_EOF, &channel_input_ieof);          dispatch_set(SSH2_MSG_CHANNEL_EOF, &channel_input_ieof);
Line 1327 
Line 1334 
   
         /* rekeying */          /* rekeying */
         dispatch_set(SSH2_MSG_KEXINIT, &kex_input_kexinit);          dispatch_set(SSH2_MSG_KEXINIT, &kex_input_kexinit);
   
           /* global request reply messages */
           dispatch_set(SSH2_MSG_REQUEST_FAILURE, &client_global_request_reply);
           dispatch_set(SSH2_MSG_REQUEST_SUCCESS, &client_global_request_reply);
 }  }
 static void  static void
 client_init_dispatch_13(void)  client_init_dispatch_13(void)
Legend:
Removed from v.1.99  
changed lines
  Added in v.1.99.2.5