diff options
Diffstat (limited to 'lib/net.c')
| -rw-r--r-- | lib/net.c | 28 |
1 files changed, 18 insertions, 10 deletions
@@ -15,11 +15,11 @@ void xsetsockopt(int fd, int level, int opt, void *val, socklen_t len) if (-1 == setsockopt(fd, level, opt, val, len)) perror_exit("setsockopt"); } -int xconnect(char *host, char *port, int family, int socktype, int protocol, - int flags) +struct addrinfo *xgetaddrinfo(char *host, char *port, int family, int socktype, + int protocol, int flags) { - struct addrinfo info, *ai, *ai2; - int fd; + struct addrinfo info, *ai; + int rc; memset(&info, 0, sizeof(struct addrinfo)); info.ai_family = family; @@ -27,20 +27,28 @@ int xconnect(char *host, char *port, int family, int socktype, int protocol, info.ai_protocol = protocol; info.ai_flags = flags; - fd = getaddrinfo(host, port, &info, &ai); - if (fd || !ai) - error_exit("Connect '%s%s%s': %s", host, port ? ":" : "", port ? port : "", - fd ? gai_strerror(fd) : "not found"); + rc = getaddrinfo(host, port, &info, &ai); + if (rc || !ai) + error_exit("%s%s%s: %s", host, port ? ":" : "", port ? port : "", + rc ? gai_strerror(rc) : "not found"); + + return ai; +} + +int xconnect(struct addrinfo *ai_arg) +{ + struct addrinfo *ai; + int fd = -1; // Try all the returned addresses. Report errors if last entry can't connect. - for (ai2 = ai; ai; ai = ai->ai_next) { + for (ai = ai_arg; ai; ai = ai->ai_next) { fd = (ai->ai_next ? socket : xsocket)(ai->ai_family, ai->ai_socktype, ai->ai_protocol); if (!connect(fd, ai->ai_addr, ai->ai_addrlen)) break; else if (!ai->ai_next) perror_exit("connect"); close(fd); } - freeaddrinfo(ai2); + freeaddrinfo(ai_arg); return fd; } |