Factor out xconnect(), plus some other small cleanups to telnet.c.

1 files changed, 27 insertions, 0 deletions

diff --git a/lib/net.c b/lib/net.c
index 5d3ea4a8..fc97a262 100644
--- a/lib/net.c
+++ b/lib/net.c
@@ -12,3 +12,30 @@ 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, int port, int family, int socktype, int protocol,
+             int flags)
+{
+  char buf[32];
+  struct addrinfo info, *ai;
+  int fd;
+
+  memset(&info, 0, sizeof(struct addrinfo));
+  info.ai_family = family;
+  info.ai_socktype = socktype;
+  info.ai_protocol = protocol;
+  info.ai_flags = flags;
+
+  sprintf(buf, "%d", port);
+  fd = getaddrinfo(host, port ? buf : 0, &info, &ai);
+
+  if (fd || !ai)
+    error_exit("Connect '%s:%d': %s", host, port,
+      fd ? gai_strerror(fd) : "not found");
+
+  fd = xsocket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+  if (connect(fd, ai->ai_addr, ai->ai_addrlen)) perror_exit("connect");
+  freeaddrinfo(ai);
+
+  return fd;
+}