X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=util.c;h=e34336c77e4cc171f69555ad87b00d1e6f762e5d;hp=5658aa3ca62c0efe9dce7b048bb08dade1e5906d;hb=4ac7fd3ff73c98100d8a8546668d0212e4af3ffa;hpb=771a583af1a28d23506e557d1f9c83296b0d1d35;ds=sidebyside

diff --git a/util.c b/util.c
index 5658aa3..e34336c 100644
--- a/util.c
+++ b/util.c
@@ -36,9 +36,11 @@
 #include <limits.h>
 #include <assert.h>
 #include <sys/wait.h>
+#include <adns.h>
 #include "util.h"
 #include "unaligned.h"
 #include "magic.h"
+#include "ipaddr.h"
 
 #define MIN_BUFFER_SIZE 64
 #define DEFAULT_BUFFER_SIZE 4096
@@ -69,17 +71,30 @@ char *safe_strdup(const char *s, const char *message)
 void *safe_malloc(size_t size, const char *message)
 {
     void *r;
+    if (!size)
+	return 0;
     r=malloc(size);
     if (!r) {
 	fatal_perror("%s",message);
     }
     return r;
 }
-void *safe_malloc_ary(size_t size, size_t count, const char *message) {
+void *safe_realloc_ary(void *p, size_t size, size_t count,
+		       const char *message) {
     if (count >= INT_MAX/size) {
 	fatal("array allocation overflow: %s", message);
     }
-    return safe_malloc(size*count, message);
+    assert(size && count);
+    p = realloc(p, size*count);
+    if (!p)
+	fatal_perror("%s", message);
+    return p;
+}
+
+void *safe_malloc_ary(size_t size, size_t count, const char *message) {
+    if (!size || !count)
+	return 0;
+    return safe_realloc_ary(0,size,count,message);
 }
 
 /* Convert a buffer into its MP_INT representation */
@@ -477,22 +492,75 @@ extern void slilog_part(struct log_if *lf, int priority, const char *message, ..
     va_end(ap);
 }
 
+void string_item_to_iaddr(const item_t *item, uint16_t port, union iaddr *ia,
+			  const char *desc)
+{
+#ifndef CONFIG_IPV6
+
+    ia->sin.sin_family=AF_INET;
+    ia->sin.sin_addr.s_addr=string_item_to_ipaddr(item,desc);
+
+#else /* CONFIG_IPV6 => we have adns_text2addr */
+
+    if (item->type!=t_string)
+	cfgfatal(item->loc,desc,"expecting a string IP (v4 or v6) address\n");
+    socklen_t salen=sizeof(*ia);
+    int r=adns_text2addr(item->data.string, port,
+			 adns_qf_addrlit_ipv4_quadonly,
+			 &ia->sa, &salen);
+    assert(r!=ENOSPC);
+    if (r) cfgfatal(item->loc,desc,"invalid IP (v4 or v6) address: %s\n",
+		    strerror(r));
+
+#endif /* CONFIG_IPV6 */
+}
+
 #define IADDR_NBUFS_SHIFT 3
 #define IADDR_NBUFS (1 << IADDR_NBUFS_SHIFT)
 
 const char *iaddr_to_string(const union iaddr *ia)
 {
-    static char bufs[IADDR_NBUFS][100];
     static int b;
 
     b++;
     b &= IADDR_NBUFS-1;
 
+#ifndef CONFIG_IPV6
+
+    static char bufs[IADDR_NBUFS][100];
+
     assert(ia->sa.sa_family == AF_INET);
 
     snprintf(bufs[b], sizeof(bufs[b]), "[%s]:%d",
 	     inet_ntoa(ia->sin.sin_addr),
 	     ntohs(ia->sin.sin_port));
+
+#else /* CONFIG_IPV6 => we have adns_addr2text */
+
+    static char bufs[IADDR_NBUFS][1+ADNS_ADDR2TEXT_BUFLEN+20];
+
+    int port;
+
+    char *addrbuf = bufs[b];
+    *addrbuf++ = '[';
+    int addrbuflen = ADNS_ADDR2TEXT_BUFLEN;
+
+    int r = adns_addr2text(&ia->sa, 0, addrbuf, &addrbuflen, &port);
+    if (r) {
+	const char fmt[]= "scoped IPv6 addr, error: %.*s";
+	sprintf(addrbuf, fmt,
+		ADNS_ADDR2TEXT_BUFLEN - sizeof(fmt) /* underestimate */,
+		strerror(r));
+    }
+
+    char *portbuf = addrbuf;
+    int addrl = strlen(addrbuf);
+    portbuf += addrl;
+
+    snprintf(portbuf, sizeof(bufs[b])-addrl, "]:%d", port);
+
+#endif /* CONFIG_IPV6 */
+
     return bufs[b];
 }
 
@@ -504,6 +572,13 @@ bool_t iaddr_equal(const union iaddr *ia, const union iaddr *ib)
     case AF_INET:
 	return ia->sin.sin_addr.s_addr == ib->sin.sin_addr.s_addr
 	    && ia->sin.sin_port        == ib->sin.sin_port;
+#ifdef CONFIG_IPV6
+    case AF_INET6:
+	return !memcmp(&ia->sin6.sin6_addr, &ib->sin6.sin6_addr, 16)
+	    && ia->sin6.sin6_scope_id  == ib->sin6.sin6_scope_id
+	    && ia->sin6.sin6_port      == ib->sin6.sin6_port
+	    /* we ignore the flowinfo field */;
+#endif /* CONFIG_IPV6 */
     default:
 	abort();
     }
@@ -513,6 +588,9 @@ int iaddr_socklen(const union iaddr *ia)
 {
     switch (ia->sa.sa_family) {
     case AF_INET:  return sizeof(ia->sin);
+#ifdef CONFIG_IPV6
+    case AF_INET6: return sizeof(ia->sin6);
+#endif /* CONFIG_IPV6 */
     default:       abort();
     }
 }