X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=secnet.c;h=274d35a5bc9ff8a5b7860e9f29da1469e42e5a72;hp=16fa198161d414e3071842eb98f283ac7d8c2dbc;hb=b1a0f651d803e1c1ff50f559b50de5c2dd6236d4;hpb=fcbc59051841c6e76a6737acf8ccaac4afd98666

diff --git a/secnet.c b/secnet.c
index 16fa198..274d35a 100644
--- a/secnet.c
+++ b/secnet.c
@@ -1,5 +1,7 @@
 #include "secnet.h"
 #include <stdio.h>
+#include <assert.h>
+#include <limits.h>
 #include <string.h>
 #include <getopt.h>
 #include <errno.h>
@@ -30,13 +32,13 @@ struct poll_interest {
     beforepoll_fn *before;
     afterpoll_fn *after;
     void *state;
-    uint32_t max_nfds;
-    uint32_t nfds;
+    int32_t max_nfds;
+    int32_t nfds;
     cstring_t desc;
     struct poll_interest *next;
 };
 static struct poll_interest *reg=NULL;
-static uint32_t total_nfds=10;
+static int32_t total_nfds=10;
 
 static bool_t finished=False;
 
@@ -219,7 +221,7 @@ static void setup(dict_t *config)
 }
 
 void register_for_poll(void *st, beforepoll_fn *before,
-		       afterpoll_fn *after, uint32_t max_nfds, cstring_t desc)
+		       afterpoll_fn *after, int32_t max_nfds, cstring_t desc)
 {
     struct poll_interest *i;
 
@@ -230,6 +232,7 @@ void register_for_poll(void *st, beforepoll_fn *before,
     i->max_nfds=max_nfds;
     i->nfds=0;
     i->desc=desc;
+    assert(total_nfds < INT_MAX - max_nfds);
     total_nfds+=max_nfds;
     i->next=reg;
     reg=i;
@@ -244,10 +247,11 @@ static void system_phase_hook(void *sst, uint32_t newphase)
     }
 }
 
+struct timeval tv_now_global;
+uint64_t now_global;
+
 static void run(void)
 {
-    struct timeval tv_now;
-    uint64_t now;
     struct poll_interest *i;
     int rv, nfds, remain, idx;
     int timeout;
@@ -258,14 +262,14 @@ static void run(void)
     Message(M_NOTICE,"%s [%d]: starting\n",version,secnet_pid);
 
     do {
-	if (gettimeofday(&tv_now, NULL)!=0) {
+	if (gettimeofday(&tv_now_global, NULL)!=0) {
 	    fatal_perror("main loop: gettimeofday");
 	}
-	now=((uint64_t)tv_now.tv_sec*(uint64_t)1000)+
-	    ((uint64_t)tv_now.tv_usec/(uint64_t)1000);
+	now_global=((uint64_t)tv_now_global.tv_sec*(uint64_t)1000)+
+	           ((uint64_t)tv_now_global.tv_usec/(uint64_t)1000);
 	idx=0;
 	for (i=reg; i; i=i->next) {
-	    i->after(i->state, fds+idx, i->nfds, &tv_now, &now);
+	    i->after(i->state, fds+idx, i->nfds);
 	    idx+=i->nfds;
 	}
 	remain=total_nfds;
@@ -273,7 +277,7 @@ static void run(void)
 	timeout=-1;
 	for (i=reg; i; i=i->next) {
 	    nfds=remain;
-	    rv=i->before(i->state, fds+idx, &nfds, &timeout, &tv_now, &now);
+	    rv=i->before(i->state, fds+idx, &nfds, &timeout);
 	    if (rv!=0) {
 		/* XXX we need to handle this properly: increase the
 		   nfds available */