X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/05b3f1f69c02a260bb8315dcedd60d35daf1875c..5f624baebe43889bb2810720cb9cc6d0812f49cb:/lib/addr.c

diff --git a/lib/addr.c b/lib/addr.c
index bb4f06c..0ba88f1 100644
--- a/lib/addr.c
+++ b/lib/addr.c
@@ -20,6 +20,8 @@
 
 #include "common.h"
 
+#include <stddef.h>
+
 #include <sys/types.h>
 #if HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
@@ -33,6 +35,9 @@
 #if HAVE_SYS_UN_H
 # include <sys/un.h>
 #endif
+#if HAVE_WS2TCPIP_H
+# include <Ws2tcpip.h>
+#endif
 
 #include "log.h"
 #include "printf.h"
@@ -170,12 +175,12 @@ static inline char *format_sockaddr4(const struct sockaddr_in *sin4) {
 
   if(sin4->sin_port)
     byte_xasprintf(&r, "%s port %u",
-		   inet_ntop(sin4->sin_family, &sin4->sin_addr,
+		   inet_ntop(sin4->sin_family, (void *)&sin4->sin_addr,
 			     buffer, sizeof buffer),
 		   ntohs(sin4->sin_port));
   else
     byte_xasprintf(&r, "%s",
-		   inet_ntop(sin4->sin_family, &sin4->sin_addr,
+		   inet_ntop(sin4->sin_family, (void *)&sin4->sin_addr,
 			     buffer, sizeof buffer));
   return r;
 }
@@ -186,12 +191,12 @@ static inline char *format_sockaddr6(const struct sockaddr_in6 *sin6) {
 
   if(sin6->sin6_port)
     byte_xasprintf(&r, "%s port %u",
-		   inet_ntop(sin6->sin6_family, &sin6->sin6_addr,
+		   inet_ntop(sin6->sin6_family, (void *)&sin6->sin6_addr,
 			     buffer, sizeof buffer),
 		   ntohs(sin6->sin6_port));
   else
     byte_xasprintf(&r, "%s",
-		   inet_ntop(sin6->sin6_family, &sin6->sin6_addr,
+		   inet_ntop(sin6->sin6_family, (void *)&sin6->sin6_addr,
 			     buffer, sizeof buffer));
   return r;
 }
@@ -321,7 +326,7 @@ void netaddress_format(const struct netaddress *na,
   if(na->port != -1) {
     char buffer[64];
 
-    snprintf(buffer, sizeof buffer, "%d", na->port);
+    byte_snprintf(buffer, sizeof buffer, "%d", na->port);
     vector_append(v, xstrdup(buffer));
   }
   vector_terminate(v);
@@ -334,31 +339,76 @@ void netaddress_format(const struct netaddress *na,
 /** @brief Resolve a network address
  * @param na Address structure
  * @param passive True if passive (bindable) address is desired
- * @param protocol Protocol number desired (e.g. @c IPPROTO_TCP)
- * @return List of suitable addresses or NULL
+ * @param type Socket type (e.g., @c SOCK_STREAM, @c SOCK_DGRAM)
+ * @param[out] raddr_out Vector of address/length pairs
+ * @param[out] nraddr_out Length of output vector
+ * @return Zero on success, -1 on error
+ *
+ * Call netaddress_free_resolved() to free the resolved addresses.
  */
-struct addrinfo *netaddress_resolve(const struct netaddress *na,
-				    int passive,
-				    int protocol) {
-  struct addrinfo *res, hints[1];
+int netaddress_resolve(const struct netaddress *na, int passive, int type,
+		       struct resolved **raddr_out, size_t *nraddr_out) {
+  struct resolved *raddr;
+  size_t i, nraddr;
+  struct addrinfo *res, *ai, hints[1];
+  struct sockaddr_un *sun;
   char service[64];
   int rc;
   char errbuf[1024];
 
-  memset(hints, 0, sizeof hints);
-  hints->ai_family = na->af;
-  hints->ai_protocol = protocol;
-  hints->ai_flags = passive ? AI_PASSIVE : 0;
-  snprintf(service, sizeof service, "%d", na->port);
-  rc = getaddrinfo(na->address, service, hints, &res);
-  if(rc) {
-    disorder_error(0, "getaddrinfo %s %d: %s",
-		   na->address ? na->address : "*",
-                   na->port,
-                   format_error(ec_getaddrinfo, rc, errbuf, sizeof errbuf));
-    return NULL;
+#if HAVE_SYS_UN_H
+  if (na->af == AF_UNIX) {
+    /* `getaddrinfo' won't work, so we make our own one */
+    raddr = xmalloc(sizeof(*raddr));
+    raddr->len = offsetof(struct sockaddr_un, sun_path) +
+      strlen(na->address) + 1;
+    sun = xmalloc_noptr(raddr->len);
+    sun->sun_family = AF_UNIX;
+    strcpy(sun->sun_path, na->address);
+    raddr->sa = (struct sockaddr *)sun;
+    nraddr = 1;
+  } else
+#endif
+  {
+    /* get the system to do the heavy lifting */
+    memset(hints, 0, sizeof hints);
+    hints->ai_family = na->af;
+    hints->ai_socktype = type;
+    hints->ai_flags = passive ? AI_PASSIVE : 0;
+    byte_snprintf(service, sizeof service, "%d", na->port);
+    rc = getaddrinfo(na->address, service, hints, &res);
+    if(rc) {
+      disorder_error(0, "getaddrinfo %s %d: %s",
+		     na->address ? na->address : "*",
+		     na->port,
+		     format_error(ec_getaddrinfo, rc, errbuf, sizeof errbuf));
+      return -1;
+    }
+    /* copy the addresses into an output vector */
+    for(ai = res, nraddr = 0; ai; ai = ai->ai_next, nraddr++);
+    raddr = xmalloc(nraddr*sizeof(*raddr));
+    for(ai = res, i = 0; ai; ai = ai->ai_next, i++) {
+      raddr[i].sa = xmalloc_noptr(ai->ai_addrlen);
+      raddr[i].len = ai->ai_addrlen;
+      memcpy(raddr[i].sa, ai->ai_addr, ai->ai_addrlen);
+    }
+    freeaddrinfo(res);
   }
-  return res;
+  *raddr_out = raddr;
+  *nraddr_out = nraddr;
+  return 0;
+}
+
+/** @brief Free a vector of resolved addresses */
+void netaddress_free_resolved(struct resolved *raddr, size_t nraddr)
+{
+  size_t i;
+
+  if (!raddr)
+    return;
+  for(i = 0; i < nraddr; i++)
+    xfree(raddr[i].sa);
+  xfree(raddr);
 }
 
 /*