X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=util.c;h=cc2f9fa6b17f2ce43fe0cf5760ed550ed0d1f040;hb=4bc0381500403be5f3e40bc39f65a2d8fb75cf19;hp=5200e18ef3bbb315f9e3a233077883732ff1b3c4;hpb=36a81f9cfda6df8a79169e93a251e8e13b64f09c;p=secnet.git

diff --git a/util.c b/util.c
index 5200e18..cc2f9fa 100644
--- a/util.c
+++ b/util.c
@@ -361,11 +361,82 @@ void buf_append_string(struct buffer_if *buf, cstring_t s)
     BUF_ADD_BYTES(append,buf,s,len);
 }
 
+void truncmsg_add_string(struct buffer_if *buf, cstring_t s)
+{
+    int32_t l = MIN((int32_t)strlen(s), buf_remaining_space(buf));
+    BUF_ADD_BYTES(append, buf, s, l);
+}
+void truncmsg_add_packet_string(struct buffer_if *buf, int32_t l,
+				const uint8_t *s)
+{
+    char c;
+    while (l-- > 0) {
+	c = *s++;
+	if (c >= ' ' && c <= 126 && c != '\\' && c != '"' && c != '\'') {
+	    if (!buf_remaining_space(buf)) break;
+	    buf->start[buf->size++] = c;
+	    continue;
+	}
+	char quoted[5];
+	quoted[0] = '\\';
+	quoted[2] = 0;
+	switch (c) {
+	case '\n': quoted[1] = 'n'; break;
+	case '\r': quoted[1] = 'r'; break;
+	case '\t': quoted[1] = 't'; break;
+	case '\\': case '"': case '\'': quoted[1] = c; break;
+	default: sprintf(quoted, "\\x%02x", (unsigned)c);
+	}
+	truncmsg_add_string(buf, quoted);
+    }
+}
+const char *truncmsg_terminate(const struct buffer_if *buf)
+{
+    if (buf_remaining_space(buf)) {
+	buf->start[buf->size] = 0;
+    } else {
+	assert(buf->size >= 4);
+	strcpy(buf->start + buf->size - 4, "...");
+    }
+    return buf->start;
+}
+
+void priomsg_new(struct priomsg *pm, int32_t maxlen)
+{
+    buffer_new(&pm->m, maxlen);
+    pm->prio = INT_MIN;
+}
+void priomsg_reset(struct priomsg *pm)
+{
+    buffer_init(&pm->m, 0);
+    pm->prio = INT_MIN;
+}
+bool_t priomsg_update_p(struct priomsg *pm, int prio)
+{
+    if (!pm) return False;
+    if (prio <= pm->prio) return False;
+    buffer_init(&pm->m, 0);
+    pm->prio = prio;
+    return True;
+}
+const char *priomsg_getmessage(const struct priomsg *pm, const char *defmsg)
+{
+    if (pm->prio >= INT_MIN)
+	return truncmsg_terminate(&pm->m);
+    else
+	return defmsg;
+}
+
+bool_t priomsg_update_fixed(struct priomsg *pm, int prio, const char *m) {
+    if (!priomsg_update_p(pm, prio)) return False;
+    truncmsg_add_string(&pm->m, m);
+    return True;
+}
+
 void buffer_new(struct buffer_if *buf, int32_t len)
 {
     buf->free=True;
     buf->owner=NULL;
-    buf->flags=0;
     buf->loc.file=NULL;
     buf->loc.line=0;
     buf->size=0;
@@ -378,7 +449,6 @@ void buffer_readonly_view(struct buffer_if *buf, const void *data, int32_t len)
 {
     buf->free=False;
     buf->owner="READONLY";
-    buf->flags=0;
     buf->loc.file=NULL;
     buf->loc.line=0;
     buf->size=buf->alloclen=len;
@@ -461,10 +531,11 @@ void send_nak(const struct comm_addr *dest, uint32_t our_index,
     buf_append_uint32(buf,our_index);
     buf_append_uint32(buf,LABEL_NAK);
     if (logwhy)
-	Message(M_INFO,"%s: %08"PRIx32"<-%08"PRIx32": %08"PRIx32":"
-		" %s; sending NAK\n",
+	Message(M_INFO,"%s: sending NAK for"
+		" %08"PRIx32" %08"PRIx32"<-%08"PRIx32":"
+		" %s\n",
 		comm_addr_to_string(dest),
-		our_index, their_index, msgtype, logwhy);
+		msgtype, our_index, their_index, logwhy);
     dest->comm->sendmsg(dest->comm->st, buf, dest, 0);
 }
 
@@ -484,6 +555,14 @@ int consttime_memeq(const void *s1in, const void *s2in, size_t n)
     return accumulator;
 }
 
+void hash_hash(const struct hash_if *hashi, const void *msg, int32_t len,
+	       uint8_t *digest) {
+    uint8_t hst[hashi->slen];
+    hashi->init(hst);
+    hashi->update(hst,msg,len);
+    hashi->final(hst,digest);
+}
+
 void util_module(dict_t *dict)
 {
     add_closure(dict,"sysbuffer",buffer_apply);
@@ -582,7 +661,7 @@ const char *iaddr_to_string(const union iaddr *ia)
 
     int r = adns_addr2text(&ia->sa, 0, addrbuf, &addrbuflen, &port);
     if (r) {
-	const char fmt[]= "scoped IPv6 addr, error: %.*s";
+	const char fmt[]= "bad addr, error: %.*s";
 	sprintf(addrbuf, fmt,
 		(int)(ADNS_ADDR2TEXT_BUFLEN - sizeof(fmt)) /* underestimate */,
 		strerror(r));
@@ -644,6 +723,15 @@ const char *pollbadbit(int revents)
     return 0;
 }
 
+void pathprefix_template_init(struct pathprefix_template *out,
+			      const char *prefix, int maxsuffix)
+{
+    size_t l=strlen(prefix);
+    NEW_ARY(out->buffer,l+maxsuffix+1);
+    strcpy(out->buffer,prefix);
+    out->write_here=out->buffer+l;
+}
+
 enum async_linebuf_result
 async_linebuf_read(struct pollfd *pfd, struct buffer_if *buf,
 		   const char **emsg_out)