[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.343 and 1.344

version 1.343, 2020/04/03 02:40:32 version 1.344, 2020/04/24 02:19:40
Line 142 
Line 142 
 static volatile sig_atomic_t received_window_change_signal = 0;  static volatile sig_atomic_t received_window_change_signal = 0;
 static volatile sig_atomic_t received_signal = 0;  static volatile sig_atomic_t received_signal = 0;
   
 /* Flag indicating whether the user's terminal is in non-blocking mode. */  
 static int in_non_blocking_mode = 0;  
   
 /* Time when backgrounded control master using ControlPersist should exit */  /* Time when backgrounded control master using ControlPersist should exit */
 static time_t control_persist_exit_time = 0;  static time_t control_persist_exit_time = 0;
   
Line 189 
Line 186 
   
 void ssh_process_session2_setup(int, int, int, struct sshbuf *);  void ssh_process_session2_setup(int, int, int, struct sshbuf *);
   
 /* Restores stdin to blocking mode. */  
   
 static void  
 leave_non_blocking(void)  
 {  
         if (in_non_blocking_mode) {  
                 unset_nonblock(fileno(stdin));  
                 in_non_blocking_mode = 0;  
         }  
 }  
   
 /*  /*
  * Signal handler for the window change signal (SIGWINCH).  This just sets a   * Signal handler for the window change signal (SIGWINCH).  This just sets a
  * flag indicating that the window has changed.   * flag indicating that the window has changed.
Line 2444 
Line 2430 
 cleanup_exit(int i)  cleanup_exit(int i)
 {  {
         leave_raw_mode(options.request_tty == REQUEST_TTY_FORCE);          leave_raw_mode(options.request_tty == REQUEST_TTY_FORCE);
         leave_non_blocking();  
         if (options.control_path != NULL && muxserver_sock != -1)          if (options.control_path != NULL && muxserver_sock != -1)
                 unlink(options.control_path);                  unlink(options.control_path);
         ssh_kill_proxy_command();          ssh_kill_proxy_command();

Legend:
Removed from v.1.343  
changed lines
  Added in v.1.344