[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.376 and 1.377

version 1.376, 2022/01/11 01:26:47 version 1.377, 2022/01/21 07:04:19
Line 181 
Line 181 
     TAILQ_HEAD_INITIALIZER(global_confirms);      TAILQ_HEAD_INITIALIZER(global_confirms);
   
 void ssh_process_session2_setup(int, int, int, struct sshbuf *);  void ssh_process_session2_setup(int, int, int, struct sshbuf *);
   static void quit_message(const char *fmt, ...)
       __attribute__((__format__ (printf, 1, 2)));
   
   static void
   quit_message(const char *fmt, ...)
   {
           char *msg;
           va_list args;
           int r;
   
           va_start(args, fmt);
           xvasprintf(&msg, fmt, args);
           va_end(args);
   
           if ((r = sshbuf_putf(stderr_buffer, "%s\r\n", msg)) != 0)
                   fatal_fr(r, "sshbuf_putf");
           quit_pending = 1;
   }
   
 /*  /*
  * 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 491 
Line 509 
 {  {
         int timeout_secs, pollwait;          int timeout_secs, pollwait;
         time_t minwait_secs = 0, now = monotime();          time_t minwait_secs = 0, now = monotime();
         int r, ret;          int ret;
         u_int p;          u_int p;
   
         *conn_in_readyp = *conn_out_readyp = 0;          *conn_in_readyp = *conn_out_readyp = 0;
Line 558 
Line 576 
                 if (errno == EINTR)                  if (errno == EINTR)
                         return;                          return;
                 /* Note: we might still have data in the buffers. */                  /* Note: we might still have data in the buffers. */
                 if ((r = sshbuf_putf(stderr_buffer,                  quit_message("poll: %s", strerror(errno));
                     "poll: %s\r\n", strerror(errno))) != 0)  
                         fatal_fr(r, "sshbuf_putf");  
                 quit_pending = 1;  
                 return;                  return;
         }          }
   
Line 609 
Line 624 
 client_process_net_input(struct ssh *ssh)  client_process_net_input(struct ssh *ssh)
 {  {
         char buf[8192];          char buf[8192];
         int r, len;          int len;
   
         /*          /*
          * Read input from the server, and add any such data to the buffer of           * Read input from the server, and add any such data to the buffer of
Line 620 
Line 635 
         len = read(connection_in, buf, sizeof(buf));          len = read(connection_in, buf, sizeof(buf));
         if (len == 0) {          if (len == 0) {
                 /* Received EOF. The remote host has closed the connection. */                  /* Received EOF. The remote host has closed the connection. */
                 if ((r = sshbuf_putf(stderr_buffer,                  quit_message("Connection to %.300s closed by remote host.",
                     "Connection to %.300s closed by remote host.\r\n",                      host);
                     host)) != 0)  
                         fatal_fr(r, "sshbuf_putf");  
                 quit_pending = 1;  
                 return;                  return;
         }          }
         /*          /*
Line 639 
Line 651 
                  * An error has encountered.  Perhaps there is a                   * An error has encountered.  Perhaps there is a
                  * network problem.                   * network problem.
                  */                   */
                 if ((r = sshbuf_putf(stderr_buffer,                  quit_message("Read from remote host %s: %s",
                     "Read from remote host %.300s: %.100s\r\n",                      host, strerror(errno));
                     host, strerror(errno))) != 0)  
                         fatal_fr(r, "sshbuf_putf");  
                 quit_pending = 1;  
                 return;                  return;
         }          }
         ssh_packet_process_incoming(ssh, buf, len);          ssh_packet_process_incoming(ssh, buf, len);
Line 1422 
Line 1431 
          * In interactive mode (with pseudo tty) display a message indicating           * In interactive mode (with pseudo tty) display a message indicating
          * that the connection has been closed.           * that the connection has been closed.
          */           */
         if (have_pty && options.log_level >= SYSLOG_LEVEL_INFO) {          if (have_pty && options.log_level >= SYSLOG_LEVEL_INFO)
                 if ((r = sshbuf_putf(stderr_buffer,                  quit_message("Connection to %s closed.", host);
                     "Connection to %.64s closed.\r\n", host)) != 0)  
                         fatal_fr(r, "sshbuf_putf");  
         }  
   
         /* Output any buffered data for stderr. */          /* Output any buffered data for stderr. */
         if (sshbuf_len(stderr_buffer) > 0) {          if (sshbuf_len(stderr_buffer) > 0) {
Legend:
Removed from v.1.376  
changed lines
  Added in v.1.377