src/usr.bin/ssh/sshconnect.c - diff

Return to sshconnect.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/sshconnect.c between version 1.289 and 1.290

version 1.289, 2017/12/06 05:06:21

version 1.290, 2018/01/23 05:17:04

Line 404

int connection_attempts, int *timeout_ms, int want_keepalive, int needpriv)

{

int on = 1;

int sock = -1, attempt;

int oerrno, sock = -1, attempt;

char ntop[NI_MAXHOST], strport[NI_MAXSERV];

struct addrinfo *ai;

Line 424

for (ai = aitop; ai; ai = ai->ai_next) {

if (ai->ai_family != AF_INET &&

ai->ai_family != AF_INET6)

ai->ai_family != AF_INET6) {

errno = EAFNOSUPPORT;

continue;

}

if (getnameinfo(ai->ai_addr, ai->ai_addrlen,

ntop, sizeof(ntop), strport, sizeof(strport),

NI_NUMERICHOST|NI_NUMERICSERV) != 0) {

oerrno = errno;

error("%s: getnameinfo failed", __func__);

errno = oerrno;

continue;

}

debug("Connecting to %.200s [%.100s] port %s.",

Line 439

Line 443

sock = ssh_create_socket(needpriv, ai);

if (sock < 0)

/* Any error is already output */

errno = 0;

continue;

if (timeout_connect(sock, ai->ai_addr, ai->ai_addrlen,

Line 447

Line 452

memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen);

break;

} else {

oerrno = errno;

debug("connect to address %s port %s: %s",

ntop, strport, strerror(errno));

close(sock);

sock = -1;

errno = oerrno;

}

if (sock != -1)

Line 460

Line 467

/* Return failure if we didn't get a successful connection. */

if (sock == -1) {

error("ssh: connect to host %s port %s: %s",

host, strport, strerror(errno));

host, strport, errno == 0 ? "failure" : strerror(errno));

return (-1);

return -1;

}

debug("Connection established.");