X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=secnet.c;h=4520b3e5ed91644939a7f9824a8c9a377e564a9a;hb=32fc582f43a9a3841d2782674e055113729c2814;hp=7fabb1b50f473292f64a681d38b7fa43d0c4a59d;hpb=6a06198cde5b96686304a9814dd7aa241adcb448;p=secnet.git

diff --git a/secnet.c b/secnet.c
index 7fabb1b..4520b3e 100644
--- a/secnet.c
+++ b/secnet.c
@@ -39,13 +39,11 @@ struct poll_interest {
     beforepoll_fn *before;
     afterpoll_fn *after;
     void *state;
-    int32_t max_nfds;
     int32_t nfds;
     cstring_t desc;
-    struct poll_interest *next;
+    LIST_ENTRY(poll_interest) entry;
 };
-static struct poll_interest *reg=NULL;
-static int32_t total_nfds=10;
+static LIST_HEAD(, poll_interest) reg = LIST_HEAD_INITIALIZER(&reg);
 
 static bool_t finished=False;
 
@@ -228,7 +226,7 @@ static void setup(dict_t *config)
 }
 
 void register_for_poll(void *st, beforepoll_fn *before,
-		       afterpoll_fn *after, int32_t max_nfds, cstring_t desc)
+		       afterpoll_fn *after, cstring_t desc)
 {
     struct poll_interest *i;
 
@@ -236,13 +234,9 @@ void register_for_poll(void *st, beforepoll_fn *before,
     i->before=before;
     i->after=after;
     i->state=st;
-    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;
+    LIST_INSERT_HEAD(&reg, i, entry);
     return;
 }
 
@@ -295,11 +289,10 @@ uint64_t now_global;
 static void run(void)
 {
     struct poll_interest *i;
-    int rv, nfds, remain, idx;
+    int rv, nfds, idx;
     int timeout;
-    struct pollfd *fds;
-
-    fds=safe_malloc(sizeof(*fds)*total_nfds, "run");
+    struct pollfd *fds=0;
+    int allocdfds=0, shortfall=0;
 
     Message(M_NOTICE,"%s [%d]: starting\n",version,secnet_pid);
 
@@ -310,7 +303,7 @@ static void run(void)
 	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) {
+	LIST_FOREACH(i, &reg, entry) {
 	    int check;
 	    for (check=0; check<i->nfds; check++) {
 		if(fds[idx+check].revents & POLLNVAL) {
@@ -320,23 +313,31 @@ static void run(void)
 	    i->after(i->state, fds+idx, i->nfds);
 	    idx+=i->nfds;
 	}
-	remain=total_nfds;
+	if (shortfall) {
+	    allocdfds *= 2;
+	    allocdfds += shortfall;
+	    fds=safe_realloc_ary(fds,sizeof(*fds),allocdfds, "run");
+	}
+	shortfall=0;
 	idx=0;
 	timeout=-1;
-	for (i=reg; i; i=i->next) {
+	LIST_FOREACH(i, &reg, entry) {
+	    int remain=allocdfds-idx;
 	    nfds=remain;
 	    rv=i->before(i->state, fds+idx, &nfds, &timeout);
 	    if (rv!=0) {
-		/* XXX we need to handle this properly: increase the
-		   nfds available */
-		fatal("run: beforepoll_fn (%s) returns %d",i->desc,rv);
+		if (rv!=ERANGE)
+		    fatal("run: beforepoll_fn (%s) returns %d",i->desc,rv);
+		assert(nfds < INT_MAX/4 - shortfall);
+		shortfall += nfds-remain;
+		nfds=0;
+		timeout=0;
 	    }
 	    if (timeout<-1) {
 		fatal("run: beforepoll_fn (%s) set timeout to %d",
 		      i->desc,timeout);
 	    }
 	    idx+=nfds;
-	    remain-=nfds;
 	    i->nfds=nfds;
 	}
 	do {