X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=secnet.c;h=756ab62b78aa27f3d7734ec671ef4cb11da0c697;hp=7a9d3f009274176620f36f4b8cc5f807c7362278;hb=423936d35d7671fd017d2d611d418d1b8eeb6195;hpb=67be07ed798122634472d467f42727f2e92a8f40

diff --git a/secnet.c b/secnet.c
index 7a9d3f0..756ab62 100644
--- a/secnet.c
+++ b/secnet.c
@@ -36,16 +36,20 @@ static pid_t secnet_pid;
 
 /* Structures dealing with poll() call */
 struct poll_interest {
-    beforepoll_fn *before;
+    beforepoll_fn *before; /* 0 if deregistered and waiting to be deleted */
     afterpoll_fn *after;
     void *state;
-    int32_t max_nfds;
     int32_t nfds;
     cstring_t desc;
     LIST_ENTRY(poll_interest) entry;
 };
 static LIST_HEAD(, poll_interest) reg = LIST_HEAD_INITIALIZER(&reg);
 
+static bool_t interest_isregistered(const struct poll_interest *i)
+{
+    return !!i->before;
+}
+
 static bool_t finished=False;
 
 /* Parse the command line options */
@@ -226,20 +230,27 @@ 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)
+struct poll_interest *register_for_poll(void *st, beforepoll_fn *before,
+		       afterpoll_fn *after, cstring_t desc)
 {
     struct poll_interest *i;
 
-    i=safe_malloc(sizeof(*i),"register_for_poll");
+    NEW(i);
     i->before=before;
     i->after=after;
     i->state=st;
-    i->max_nfds=max_nfds;
     i->nfds=0;
     i->desc=desc;
     LIST_INSERT_HEAD(&reg, i, entry);
-    return;
+    return i;
+}
+
+void deregister_for_poll(struct poll_interest *i)
+{
+    /* We cannot simply throw this away because we're reentrantly
+     * inside the main loop, which needs to remember which range of
+     * fds corresponds to this now-obsolete interest */
+    i->before=0;
 }
 
 static void system_phase_hook(void *sst, uint32_t newphase)
@@ -290,8 +301,8 @@ uint64_t now_global;
 
 static void run(void)
 {
-    struct poll_interest *i;
-    int rv, nfds, remain, idx;
+    struct poll_interest *i, *itmp;
+    int rv, nfds, idx;
     int timeout;
     struct pollfd *fds=0;
     int allocdfds=0, shortfall=0;
@@ -307,40 +318,52 @@ static void run(void)
 	idx=0;
 	LIST_FOREACH(i, &reg, entry) {
 	    int check;
-	    for (check=0; check<i->nfds; check++) {
-		if(fds[idx+check].revents & POLLNVAL) {
-		    fatal("run: poll (%s#%d) set POLLNVAL", i->desc, check);
+	    if (interest_isregistered(i)) {
+		for (check=0; check<i->nfds; check++) {
+		    if(fds[idx+check].revents & POLLNVAL) {
+			fatal("run: poll (%s#%d) set POLLNVAL", i->desc, check);
+		    }
 		}
+		i->after(i->state, fds+idx, i->nfds);
 	    }
-	    i->after(i->state, fds+idx, i->nfds);
 	    idx+=i->nfds;
 	}
 	if (shortfall) {
 	    allocdfds *= 2;
 	    allocdfds += shortfall;
-	    fds=safe_realloc_ary(fds,sizeof(*fds),allocdfds, "run");
+	    REALLOC_ARY(fds,allocdfds);
 	}
-	remain=allocdfds;
 	shortfall=0;
 	idx=0;
 	timeout=-1;
-	LIST_FOREACH(i, &reg, entry) {
+	LIST_FOREACH_SAFE(i, &reg, entry, itmp) {
+	    int remain=allocdfds-idx;
 	    nfds=remain;
-	    rv=i->before(i->state, fds+idx, &nfds, &timeout);
-	    if (rv!=0) {
-		if (rv!=ERANGE)
-		    fatal("run: beforepoll_fn (%s) returns %d",i->desc,rv);
-		assert(nfds < INT_MAX/4 - shortfall);
-		shortfall += nfds-remain;
+	    if (interest_isregistered(i)) {
+		rv=i->before(i->state, fds+idx, &nfds, &timeout);
+		if (rv!=0) {
+		    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;
+		}
+	    } else {
 		nfds=0;
-		timeout=0;
 	    }
 	    if (timeout<-1) {
 		fatal("run: beforepoll_fn (%s) set timeout to %d",
 		      i->desc,timeout);
 	    }
+	    if (!interest_isregistered(i)) {
+		/* check this here, rather than earlier, so that we
+		   handle the case where i->before() calls deregister */
+		LIST_REMOVE(i, entry);
+		free(i);
+		continue;
+	    }
 	    idx+=nfds;
-	    remain-=nfds;
 	    i->nfds=nfds;
 	}
 	do {
@@ -360,6 +383,12 @@ static void run(void)
     free(fds);
 }
 
+bool_t will_droppriv(void)
+{
+    assert(current_phase >= PHASE_SETUP);
+    return !!uid;
+}
+
 /* Surrender privileges, if necessary */
 static void droppriv(void)
 {
@@ -446,6 +475,8 @@ int main(int argc, char **argv)
 {
     dict_t *config;
 
+    phase_hooks_init();
+
     enter_phase(PHASE_GETOPTS);
     parse_options(argc,argv);