[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.339 and 1.340

version 1.339, 2020/10/07 02:26:28 version 1.340, 2020/10/12 08:36:37
Line 420 
Line 420 
  */   */
 static int  static int
 ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop,  ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop,
     struct sockaddr_storage *hostaddr, u_short port, int family,      struct sockaddr_storage *hostaddr, u_short port, int connection_attempts,
     int connection_attempts, int *timeout_ms, int want_keepalive)      int *timeout_ms, int want_keepalive)
 {  {
         int on = 1, saved_timeout_ms = *timeout_ms;          int on = 1, saved_timeout_ms = *timeout_ms;
         int oerrno, sock = -1, attempt;          int oerrno, sock = -1, attempt;
Line 511 
Line 511 
 int  int
 ssh_connect(struct ssh *ssh, const char *host, const char *host_arg,  ssh_connect(struct ssh *ssh, const char *host, const char *host_arg,
     struct addrinfo *addrs, struct sockaddr_storage *hostaddr, u_short port,      struct addrinfo *addrs, struct sockaddr_storage *hostaddr, u_short port,
     int family, int connection_attempts, int *timeout_ms, int want_keepalive)      int connection_attempts, int *timeout_ms, int want_keepalive)
 {  {
         int in, out;          int in, out;
   
         if (options.proxy_command == NULL) {          if (options.proxy_command == NULL) {
                 return ssh_connect_direct(ssh, host, addrs, hostaddr, port,                  return ssh_connect_direct(ssh, host, addrs, hostaddr, port,
                     family, connection_attempts, timeout_ms, want_keepalive);                      connection_attempts, timeout_ms, want_keepalive);
         } else if (strcmp(options.proxy_command, "-") == 0) {          } else if (strcmp(options.proxy_command, "-") == 0) {
                 if ((in = dup(STDIN_FILENO)) == -1 ||                  if ((in = dup(STDIN_FILENO)) == -1 ||
                     (out = dup(STDOUT_FILENO)) == -1) {                      (out = dup(STDOUT_FILENO)) == -1) {
Legend:
Removed from v.1.339  
changed lines
  Added in v.1.340