changelog: start 0.6.8

[secnet.git] / util.c

diff --git a/util.c b/util.c
index 2ce3ade37e1228b2effe9f84671dd1efdc0eb76d..3e8d56eaebbc50855ed2cde7026b5bf5be7c0767 100644 (file)
--- a/util.c
+++ b/util.c
@@ -183,15 +183,6 @@ char *write_mpstring(MP_INT *a)
     return buff;
 }
 
-int32_t write_mpbin(MP_INT *a, uint8_t *buffer, int32_t buflen)
-{
-    char *hb = write_mpstring(a);
-    int32_t len;
-    hex_decode(buffer, buflen, &len, hb, True);
-    free(hb);
-    return len;
-}
-
 #define DEFINE_SETFDFLAG(fn,FL,FLAG)                                   \
 void fn(int fd) {                                                      \
     int r=fcntl(fd, F_GET##FL);                                                \
@@ -361,11 +352,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 +440,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 +522,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);
 }
 
@@ -652,6 +714,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)