X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=site.c;h=c2a230383bc3ad45020091726364f26130d849c2;hb=6fbd4b99bc50cf9cd54a1b6e2b2c96c4ba4a9b19;hp=2fafd915b4beeacfa069c9efe8e83f516799bced;hpb=040ee979539e88ef71fb21a80d4a05d24961ae70;p=secnet.git

diff --git a/site.c b/site.c
index 2fafd91..c2a2303 100644
--- a/site.c
+++ b/site.c
@@ -197,7 +197,7 @@ struct site {
 static void slog(struct site *st, uint32_t event, cstring_t msg, ...)
 {
     va_list ap;
-    uint8_t buf[240];
+    char buf[240];
     uint32_t class;
 
     va_start(ap,msg);
@@ -936,7 +936,8 @@ static inline void site_settimeout(uint64_t timeout, uint64_t *now,
 				   int *timeout_io)
 {
     if (timeout) {
-	uint64_t offset=timeout-*now;
+	int64_t offset=timeout-*now;
+	if (offset<0) offset=0;
 	if (offset>INT_MAX) offset=INT_MAX;
 	if (*timeout_io<0 || offset<*timeout_io)
 	    *timeout_io=offset;
@@ -1266,6 +1267,8 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
     sprintf(st->tunname,"%s<->%s",st->localname,st->remotename);
 
     /* The information we expect to see in incoming messages of type 1 */
+    /* fixme: lots of unchecked overflows here, but the results are only
+       corrupted packets rather than undefined behaviour */
     st->setupsiglen=strlen(st->remotename)+strlen(st->localname)+8;
     st->setupsig=safe_malloc(st->setupsiglen,"site_apply");
     put_uint32(st->setupsig+0,LABEL_MSG1);
@@ -1308,7 +1311,6 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
     return new_closure(&st->cl);
 }
 
-init_module site_module;
 void site_module(dict_t *dict)
 {
     add_closure(dict,"site",site_apply);