dzwdz
/
catboy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Try successive getaddrinfo results

master
Curtis McEnroe 2018-09-15 23:07:41 -04:00
parent f1cae5194c
commit cca4b3fa10
No known key found for this signature in database
GPG Key ID: CEA2F97ADCFCD77C
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
irc.c
View File

@ -59,25 +59,32 @@ int ircConnect(
if (error) errx(EX_SOFTWARE, "tls_configure"); if (error) errx(EX_SOFTWARE, "tls_configure");
tls_config_free(config); tls_config_free(config);
struct addrinfo *ai; struct addrinfo *head;
struct addrinfo hints = { struct addrinfo hints = {
.ai_family = AF_UNSPEC, .ai_family = AF_UNSPEC,
.ai_socktype = SOCK_STREAM, .ai_socktype = SOCK_STREAM,
.ai_protocol = IPPROTO_TCP, .ai_protocol = IPPROTO_TCP,
}; };
error = getaddrinfo(host, port, &hints, &ai); error = getaddrinfo(host, port, &hints, &head);
if (error) errx(EX_NOHOST, "getaddrinfo: %s", gai_strerror(error)); if (error) errx(EX_NOHOST, "getaddrinfo: %s", gai_strerror(error));
int sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); int sock = -1;
for (struct addrinfo *ai = head; ai; ai = ai->ai_next) {
sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
if (sock < 0) err(EX_OSERR, "socket"); if (sock < 0) err(EX_OSERR, "socket");
error = connect(sock, ai->ai_addr, ai->ai_addrlen);
if (!error) break;
close(sock);
sock = -1;
}
if (sock < 0) err(EX_UNAVAILABLE, "connect");
freeaddrinfo(head);
error = fcntl(sock, F_SETFD, FD_CLOEXEC); error = fcntl(sock, F_SETFD, FD_CLOEXEC);
if (error) err(EX_IOERR, "fcntl"); if (error) err(EX_IOERR, "fcntl");
error = connect(sock, ai->ai_addr, ai->ai_addrlen);
if (error) err(EX_UNAVAILABLE, "connect");
freeaddrinfo(ai);
error = tls_connect_socket(client, sock, host); error = tls_connect_socket(client, sock, host);
if (error) err(EX_PROTOCOL, "tls_connect"); if (error) err(EX_PROTOCOL, "tls_connect");