From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 1 Jul 2011 23:01:31 +0000 (+0100)
Subject: resolver: support IPv4 address literals
X-Git-Tag: v0.2.0~42
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=commitdiff_plain;h=d1e8fd826059fd04e01a818766a8215c685cab56

resolver: support IPv4 address literals

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

IP ADDR LIT size_t strlen
---

diff --git a/resolver.c b/resolver.c
index f60b112..033ddc1 100644
--- a/resolver.c
+++ b/resolver.c
@@ -6,6 +6,8 @@
 #error secnet requires ADNS version 1.0 or above
 #endif
 #include <adns.h>
+#include <arpa/inet.h>
+#include <string.h>
 
 
 struct adns {
@@ -28,6 +30,20 @@ static bool_t resolve_request(void *sst, cstring_t name,
     struct adns *st=sst;
     struct query *q;
     int rv;
+    const int maxlitlen=50;
+
+    ssize_t l=strlen(name);
+    if (name[0]=='[' && l<maxlitlen && l>2 && name[l-1]==']') {
+	char trimmed[maxlitlen+1];
+	memcpy(trimmed,name+1,l-2);
+	trimmed[l-2]=0;
+	struct in_addr ia;
+	if (inet_aton(trimmed,&ia))
+	    cb(cst,&ia);
+	else
+	    cb(cst,0);
+	return True;
+    }
 
     q=safe_malloc(sizeof *q,"resolve_request");
     q->cst=cst;