X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=util.c;h=94f9e35679acf34c7d500fade5e25919087cd9cc;hp=3d119874eb1c11c7d7b9e367a6bf1a2bef6c4b4b;hb=c7396710e7bf07f947ec6e8623144acff130d920;hpb=5ad34db2ccbbfbc936cd16121bed2110b70594ba

diff --git a/util.c b/util.c
index 3d11987..94f9e35 100644
--- a/util.c
+++ b/util.c
@@ -38,6 +38,7 @@
 #include <sys/wait.h>
 #include "util.h"
 #include "unaligned.h"
+#include "magic.h"
 
 #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) {
-	fatal_perror(message);
+	fatal_perror("%s",message);
     }
     return d;
 }
@@ -70,7 +71,7 @@ void *safe_malloc(size_t size, const char *message)
     void *r;
     r=malloc(size);
     if (!r) {
-	fatal_perror(message);
+	fatal_perror("%s",message);
     }
     return r;
 }
@@ -161,6 +162,20 @@ int32_t write_mpbin(MP_INT *a, uint8_t *buffer, int32_t buflen)
     return i;
 }
 
+void setcloexec(int fd) {
+    int r=fcntl(fd, F_GETFD);
+    if (r<0) fatal_perror("fcntl(,F_GETFD) failed");
+    r=fcntl(fd, F_SETFD, r|FD_CLOEXEC);
+    if (r<0) fatal_perror("fcntl(,F_SETFD,|FD_CLOEXEC) failed");
+}
+
+void pipe_cloexec(int fd[2]) {
+    int r=pipe(fd);
+    if (r) fatal_perror("pipe");
+    setcloexec(fd[0]);
+    setcloexec(fd[1]);
+}
+
 static const char *phases[NR_PHASES]={
     "PHASE_INIT",
     "PHASE_GETOPTS",
@@ -207,7 +222,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)
 {
-    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, ...)
@@ -246,13 +261,14 @@ void buffer_assert_used(struct buffer_if *buffer, cstring_t file,
 
 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;
-    assert(buf->size <= buf->len - amount);
+    assert(amount <= buf_remaining_space(buf));
     p=buf->start + buf->size;
     buf->size+=amount;
     return p;
@@ -287,7 +303,7 @@ void buf_append_string(struct buffer_if *buf, cstring_t s)
     len=strlen(s);
     /* fixme: if string is longer than 65535, result is a corrupted packet */
     buf_append_uint16(buf,len);
-    memcpy(buf_append(buf,len),s,len);
+    BUF_ADD_BYTES(append,buf,s,len);
 }
 
 void buffer_new(struct buffer_if *buf, int32_t len)
@@ -298,7 +314,7 @@ void buffer_new(struct buffer_if *buf, int32_t len)
     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");
 }
@@ -310,7 +326,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->size=buf->len=len;
+    buf->size=buf->alloclen=len;
     buf->base=buf->start=(uint8_t*)data;
 }
 
@@ -321,10 +337,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)
 {
-    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");
-	dst->len = src->len;
+	dst->alloclen = src->alloclen;
     }
     dst->start = dst->base + (src->start - src->base);
     dst->size = src->size;
@@ -381,6 +397,22 @@ static list_t *buffer_apply(closure_t *self, struct cloc loc, dict_t *context,
     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;
@@ -401,3 +433,46 @@ void util_module(dict_t *dict)
 {
     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);
+}