changelog, Makefile.in: finalise 0.3.3

[secnet.git] / util.c

diff --git a/util.c b/util.c
index 3d119874eb1c11c7d7b9e367a6bf1a2bef6c4b4b..094870ff213cbc41c9f011aa1b316f646ee30992 100644 (file)
--- a/util.c
+++ b/util.c
@@ -38,6 +38,7 @@
 #include <sys/wait.h>
 #include "util.h"
 #include "unaligned.h"
 #include <sys/wait.h>
 #include "util.h"
 #include "unaligned.h"

+#include "magic.h"

 
 #define MIN_BUFFER_SIZE 64
 #define DEFAULT_BUFFER_SIZE 4096
 
 #define MIN_BUFFER_SIZE 64
 #define DEFAULT_BUFFER_SIZE 4096


@@ -60,7 +61,7 @@ char *safe_strdup(const char *s, const char *message)
     char *d;
     d=strdup(s);
     if (!d) {
     char *d;
     d=strdup(s);
     if (!d) {

-       fatal_perror(message);
+       fatal_perror("%s",message);

     }
     return d;
 }
     }
     return d;
 }


@@ -70,7 +71,7 @@ void *safe_malloc(size_t size, const char *message)
     void *r;
     r=malloc(size);
     if (!r) {
     void *r;
     r=malloc(size);
     if (!r) {

-       fatal_perror(message);
+       fatal_perror("%s",message);

     }
     return r;
 }
     }
     return r;
 }


@@ -207,7 +208,7 @@ bool_t remove_hook(uint32_t phase, hook_fn *fn, void *state)
 
 void vslilog(struct log_if *lf, int priority, const char *message, va_list ap)
 {
 
 void vslilog(struct log_if *lf, int priority, const char *message, va_list ap)
 {

-    lf->vlog(lf->st,priority,message,ap);
+    lf->vlogfn(lf->st,priority,message,ap);

 }
 
 void slilog(struct log_if *lf, int priority, const char *message, ...)
 }
 
 void slilog(struct log_if *lf, int priority, const char *message, ...)


@@ -246,13 +247,14 @@ void buffer_assert_used(struct buffer_if *buffer, cstring_t file,
 
 void buffer_init(struct buffer_if *buffer, int32_t max_start_pad)
 {
 
 void buffer_init(struct buffer_if *buffer, int32_t max_start_pad)
 {

+    assert(max_start_pad<=buffer->alloclen);

     buffer->start=buffer->base+max_start_pad;
     buffer->size=0;
 }
 
 void *buf_append(struct buffer_if *buf, int32_t amount) {
     void *p;
     buffer->start=buffer->base+max_start_pad;
     buffer->size=0;
 }
 
 void *buf_append(struct buffer_if *buf, int32_t amount) {
     void *p;

-    assert(buf->size <= buf->len - amount);
+    assert(amount <= buf_remaining_space(buf));

     p=buf->start + buf->size;
     buf->size+=amount;
     return p;
     p=buf->start + buf->size;
     buf->size+=amount;
     return p;


@@ -298,7 +300,7 @@ void buffer_new(struct buffer_if *buf, int32_t len)
     buf->loc.file=NULL;
     buf->loc.line=0;
     buf->size=0;
     buf->loc.file=NULL;
     buf->loc.line=0;
     buf->size=0;

-    buf->len=len;
+    buf->alloclen=len;

     buf->start=NULL;
     buf->base=safe_malloc(len,"buffer_new");
 }
     buf->start=NULL;
     buf->base=safe_malloc(len,"buffer_new");
 }


@@ -310,7 +312,7 @@ void buffer_readonly_view(struct buffer_if *buf, const void *data, int32_t len)
     buf->flags=0;
     buf->loc.file=NULL;
     buf->loc.line=0;
     buf->flags=0;
     buf->loc.file=NULL;
     buf->loc.line=0;

-    buf->size=buf->len=len;
+    buf->size=buf->alloclen=len;

     buf->base=buf->start=(uint8_t*)data;
 }
 
     buf->base=buf->start=(uint8_t*)data;
 }
 


@@ -321,10 +323,10 @@ void buffer_readonly_clone(struct buffer_if *out, const struct buffer_if *in)
 
 void buffer_copy(struct buffer_if *dst, const struct buffer_if *src)
 {
 
 void buffer_copy(struct buffer_if *dst, const struct buffer_if *src)
 {

-    if (dst->len < src->len) {
-       dst->base=realloc(dst->base,src->len);
+    if (dst->alloclen < src->alloclen) {
+       dst->base=realloc(dst->base,src->alloclen);

        if (!dst->base) fatal_perror("buffer_copy");
        if (!dst->base) fatal_perror("buffer_copy");

-       dst->len = src->len;
+       dst->alloclen = src->alloclen;

     }
     dst->start = dst->base + (src->start - src->base);
     dst->size = src->size;
     }
     dst->start = dst->base + (src->start - src->base);
     dst->size = src->size;


@@ -381,6 +383,22 @@ static list_t *buffer_apply(closure_t *self, struct cloc loc, dict_t *context,
     return new_closure(&st->cl);
 }
 
     return new_closure(&st->cl);
 }
 

+void send_nak(const struct comm_addr *dest, uint32_t our_index,
+             uint32_t their_index, uint32_t msgtype,
+             struct buffer_if *buf, const char *logwhy)
+{
+    buffer_init(buf,calculate_max_start_pad());
+    buf_append_uint32(buf,their_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",
+               comm_addr_to_string(dest),
+               our_index, their_index, msgtype, logwhy);
+    dest->comm->sendmsg(dest->comm->st, buf, dest);
+}
+

 int consttime_memeq(const void *s1in, const void *s2in, size_t n)
 {
     const uint8_t *s1=s1in, *s2=s2in;
 int consttime_memeq(const void *s1in, const void *s2in, size_t n)
 {
     const uint8_t *s1=s1in, *s2=s2in;


@@ -401,3 +419,46 @@ void util_module(dict_t *dict)
 {
     add_closure(dict,"sysbuffer",buffer_apply);
 }
 {
     add_closure(dict,"sysbuffer",buffer_apply);
 }

+
+void update_max_start_pad(int32_t *our_module_global, int32_t our_instance)
+{
+    if (*our_module_global < our_instance)
+       *our_module_global=our_instance;
+}
+
+int32_t        transform_max_start_pad, comm_max_start_pad;
+
+int32_t calculate_max_start_pad(void)
+{
+    return
+       site_max_start_pad +
+       transform_max_start_pad +
+       comm_max_start_pad;
+}
+
+void vslilog_part(struct log_if *lf, int priority, const char *message, va_list ap)
+{
+    char *buff=lf->buff;
+    size_t bp;
+    char *nlp;
+
+    bp=strlen(buff);
+    assert(bp < LOG_MESSAGE_BUFLEN);
+    vsnprintf(buff+bp,LOG_MESSAGE_BUFLEN-bp,message,ap);
+    buff[LOG_MESSAGE_BUFLEN-1] = '\n';
+    buff[LOG_MESSAGE_BUFLEN] = '\0';
+    /* Each line is sent separately */
+    while ((nlp=strchr(buff,'\n'))) {
+       *nlp=0;
+       slilog(lf,priority,"%s",buff);
+       memmove(buff,nlp+1,strlen(nlp+1)+1);
+    }
+}
+
+extern void slilog_part(struct log_if *lf, int priority, const char *message, ...)
+{
+    va_list ap;
+    va_start(ap,message);
+    vslilog_part(lf,priority,message,ap);
+    va_end(ap);
+}