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

Diff for /src/usr.bin/ssh/sshconnect.c between version 1.206 and 1.207

version 1.206, 2008/06/12 00:13:55 version 1.207, 2008/06/12 20:38:28
Line 64 
Line 64 
 static int show_other_keys(const char *, Key *);  static int show_other_keys(const char *, Key *);
 static void warn_changed_key(Key *);  static void warn_changed_key(Key *);
   
 static void  
 ms_subtract_diff(struct timeval *start, int *ms)  
 {  
         struct timeval diff, finish;  
   
         gettimeofday(&finish, NULL);  
         timersub(&finish, start, &diff);  
         *ms -= (diff.tv_sec * 1000) + (diff.tv_usec / 1000);  
 }  
   
 static void  
 ms_to_timeval(struct timeval *tv, int ms)  
 {  
         tv->tv_sec = ms / 1000;  
         tv->tv_usec = (ms % 1000) * 1000;  
 }  
   
 /*  /*
  * Connect to the given ssh server using a proxy command.   * Connect to the given ssh server using a proxy command.
  */   */
Line 165 
Line 148 
   
         /* Set the connection file descriptors. */          /* Set the connection file descriptors. */
         packet_set_connection(pout[0], pin[1]);          packet_set_connection(pout[0], pin[1]);
           packet_set_timeout(options.server_alive_interval,
               options.server_alive_count_max);
   
         /* Indicate OK return */          /* Indicate OK return */
         return 0;          return 0;
Line 409 
Line 394 
   
         /* Set the connection. */          /* Set the connection. */
         packet_set_connection(sock, sock);          packet_set_connection(sock, sock);
           packet_set_timeout(options.server_alive_interval,
               options.server_alive_count_max);
   
         return 0;          return 0;
 }  }

Legend:
Removed from v.1.206  
changed lines
  Added in v.1.207