X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=util.c;h=6742dad52de4d000b3b2476040c1dd2cca148aaa;hp=d843859f40dcb5fe6593592547888c98b63bbda2;hb=94ca562bb14422940ff1986ce8dfca87c222cb59;hpb=32654a316b5925914f5e5f481971d47f9728edab

diff --git a/util.c b/util.c
index d843859..6742dad 100644
--- a/util.c
+++ b/util.c
@@ -240,7 +240,7 @@ bool_t add_hook(uint32_t phase, hook_fn *fn, void *state)
 {
     struct phase_hook *h;
 
-    h=safe_malloc(sizeof(*h),"add_hook");
+    NEW(h);
     h->fn=fn;
     h->state=state;
     LIST_INSERT_HEAD(&hooks[phase],h,entry);
@@ -398,7 +398,7 @@ static list_t *buffer_apply(closure_t *self, struct cloc loc, dict_t *context,
     bool_t lockdown=False;
     uint32_t len=DEFAULT_BUFFER_SIZE;
     
-    st=safe_malloc(sizeof(*st),"buffer_apply");
+    NEW(st);
     st->cl.description="buffer";
     st->cl.type=CL_BUFFER;
     st->cl.apply=NULL;
@@ -526,6 +526,7 @@ void string_item_to_iaddr(const item_t *item, uint16_t port, union iaddr *ia,
 
     ia->sin.sin_family=AF_INET;
     ia->sin.sin_addr.s_addr=string_item_to_ipaddr(item,desc);
+    ia->sin.sin_port=htons(port);
 
 #else /* CONFIG_IPV6 => we have adns_text2addr */
 
@@ -542,33 +543,27 @@ void string_item_to_iaddr(const item_t *item, uint16_t port, union iaddr *ia,
 #endif /* CONFIG_IPV6 */
 }
 
-#define IADDR_NBUFS_SHIFT 3
-#define IADDR_NBUFS (1 << IADDR_NBUFS_SHIFT)
+#define IADDR_NBUFS 8
 
 const char *iaddr_to_string(const union iaddr *ia)
 {
-    static int b;
-
-    b++;
-    b &= IADDR_NBUFS-1;
-
 #ifndef CONFIG_IPV6
 
-    static char bufs[IADDR_NBUFS][100];
+    SBUF_DEFINE(IADDR_NBUFS, 100);
 
     assert(ia->sa.sa_family == AF_INET);
 
-    snprintf(bufs[b], sizeof(bufs[b]), "[%s]:%d",
+    snprintf(SBUF, sizeof(SBUF), "[%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];
+    SBUF_DEFINE(IADDR_NBUFS, 1+ADNS_ADDR2TEXT_BUFLEN+20);
 
     int port;
 
-    char *addrbuf = bufs[b];
+    char *addrbuf = SBUF;
     *addrbuf++ = '[';
     int addrbuflen = ADNS_ADDR2TEXT_BUFLEN;
 
@@ -576,7 +571,7 @@ const char *iaddr_to_string(const union iaddr *ia)
     if (r) {
 	const char fmt[]= "scoped IPv6 addr, error: %.*s";
 	sprintf(addrbuf, fmt,
-		ADNS_ADDR2TEXT_BUFLEN - sizeof(fmt) /* underestimate */,
+		(int)(ADNS_ADDR2TEXT_BUFLEN - sizeof(fmt)) /* underestimate */,
 		strerror(r));
     }
 
@@ -584,26 +579,29 @@ const char *iaddr_to_string(const union iaddr *ia)
     int addrl = strlen(addrbuf);
     portbuf += addrl;
 
-    snprintf(portbuf, sizeof(bufs[b])-addrl, "]:%d", port);
+    snprintf(portbuf, sizeof(SBUF)-addrl, "]:%d", port);
 
 #endif /* CONFIG_IPV6 */
 
-    return bufs[b];
+    return SBUF;
 }
 
-bool_t iaddr_equal(const union iaddr *ia, const union iaddr *ib)
+bool_t iaddr_equal(const union iaddr *ia, const union iaddr *ib,
+		   bool_t ignoreport)
 {
     if (ia->sa.sa_family != ib->sa.sa_family)
 	return 0;
     switch (ia->sa.sa_family) {
     case AF_INET:
 	return ia->sin.sin_addr.s_addr == ib->sin.sin_addr.s_addr
-	    && ia->sin.sin_port        == ib->sin.sin_port;
+           && (ignoreport ||
+	       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
+	   &&  ia->sin6.sin6_scope_id  == ib->sin6.sin6_scope_id
+           && (ignoreport ||
+	       ia->sin6.sin6_port      == ib->sin6.sin6_port)
 	    /* we ignore the flowinfo field */;
 #endif /* CONFIG_IPV6 */
     default: