[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.264 and 1.265

version 1.264, 2015/01/19 20:07:45 version 1.265, 2015/01/19 20:16:15
Line 1401 
Line 1401 
 static void  static void
 client_process_buffered_input_packets(void)  client_process_buffered_input_packets(void)
 {  {
         dispatch_run(DISPATCH_NONBLOCK, &quit_pending,          dispatch_run(DISPATCH_NONBLOCK, &quit_pending, active_state);
             compat20 ? active_state->kex : NULL);  
 }  }
   
 /* scan buf[] for '~' before sending data to the peer */  /* scan buf[] for '~' before sending data to the peer */
Line 1456 
Line 1455 
 {  {
         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, max_fd2 = 0, len, rekeying = 0;          int r, max_fd = 0, max_fd2 = 0, len, rekeying = 0;
         u_int64_t ibytes, obytes;          u_int64_t ibytes, obytes;
         u_int nalloc = 0;          u_int nalloc = 0;
         char buf[100];          char buf[100];
Line 1586 
Line 1585 
                         if (need_rekeying || packet_need_rekeying()) {                          if (need_rekeying || packet_need_rekeying()) {
                                 debug("need rekeying");                                  debug("need rekeying");
                                 active_state->kex->done = 0;                                  active_state->kex->done = 0;
                                 kex_send_kexinit(active_state->kex);                                  if ((r = kex_send_kexinit(active_state)) != 0)
                                           fatal("%s: kex_send_kexinit: %s",
                                               __func__, ssh_err(r));
                                 need_rekeying = 0;                                  need_rekeying = 0;
                         }                          }
                 }                  }

Legend:
Removed from v.1.264  
changed lines
  Added in v.1.265