[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.385 and 1.386

version 1.385, 2022/11/29 22:41:14 version 1.386, 2023/01/06 02:38:23
Line 509 
Line 509 
     u_int *npfd_allocp, u_int *npfd_activep, int rekeying,      u_int *npfd_allocp, u_int *npfd_activep, int rekeying,
     int *conn_in_readyp, int *conn_out_readyp)      int *conn_in_readyp, int *conn_out_readyp)
 {  {
         int timeout_secs, pollwait;          struct timespec timeout;
         time_t minwait_secs = 0, now = monotime();  
         int ret;          int ret;
         u_int p;          u_int p;
   
         *conn_in_readyp = *conn_out_readyp = 0;          *conn_in_readyp = *conn_out_readyp = 0;
   
         /* Prepare channel poll. First two pollfd entries are reserved */          /* Prepare channel poll. First two pollfd entries are reserved */
         channel_prepare_poll(ssh, pfdp, npfd_allocp, npfd_activep, 2,          ptimeout_init(&timeout);
             &minwait_secs);          channel_prepare_poll(ssh, pfdp, npfd_allocp, npfd_activep, 2, &timeout);
         if (*npfd_activep < 2)          if (*npfd_activep < 2)
                 fatal_f("bad npfd %u", *npfd_activep); /* shouldn't happen */                  fatal_f("bad npfd %u", *npfd_activep); /* shouldn't happen */
   
Line 542 
Line 541 
          * some polled descriptor can be read, written, or has some other           * some polled descriptor can be read, written, or has some other
          * event pending, or a timeout expires.           * event pending, or a timeout expires.
          */           */
           set_control_persist_exit_time(ssh);
         timeout_secs = INT_MAX; /* we use INT_MAX to mean no timeout */          if (control_persist_exit_time > 0)
                   ptimeout_deadline_monotime(&timeout, control_persist_exit_time);
         if (options.server_alive_interval > 0)          if (options.server_alive_interval > 0)
                 timeout_secs = MAXIMUM(server_alive_time - now, 0);                  ptimeout_deadline_monotime(&timeout, server_alive_time);
         if (options.rekey_interval > 0 && !rekeying)          if (options.rekey_interval > 0 && !rekeying) {
                 timeout_secs = MINIMUM(timeout_secs,                  ptimeout_deadline_sec(&timeout,
                     ssh_packet_get_rekey_timeout(ssh));                      ssh_packet_get_rekey_timeout(ssh));
         set_control_persist_exit_time(ssh);  
         if (control_persist_exit_time > 0) {  
                 timeout_secs = MINIMUM(timeout_secs,  
                         control_persist_exit_time - now);  
                 if (timeout_secs < 0)  
                         timeout_secs = 0;  
         }          }
         if (minwait_secs != 0)  
                 timeout_secs = MINIMUM(timeout_secs, (int)minwait_secs);  
         if (timeout_secs == INT_MAX)  
                 pollwait = -1;  
         else if (timeout_secs >= INT_MAX / 1000)  
                 pollwait = INT_MAX;  
         else  
                 pollwait = timeout_secs * 1000;  
   
         ret = poll(*pfdp, *npfd_activep, pollwait);          ret = poll(*pfdp, *npfd_activep, ptimeout_get_ms(&timeout));
   
         if (ret == -1) {          if (ret == -1) {
                 /*                  /*
Legend:
Removed from v.1.385  
changed lines
  Added in v.1.386