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

diff --git a/secnet.c b/secnet.c
index 16fa198..f9808b7 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>
@@ -12,6 +14,11 @@
 #include "conffile.h"
 #include "process.h"
 
+#if __APPLE__
+/* apple's poll() does not work on char devs */
+# define USE_SELECT 1
+#endif
+
 /* XXX should be from autoconf */
 static const char *configfile="/etc/secnet/secnet.conf";
 static const char *sites_key="sites";
@@ -30,13 +37,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;
 
@@ -55,7 +62,7 @@ static void parse_options(int argc, char **argv)
 	    {"nodetach", 0, 0, 'n'},
 	    {"silent", 0, 0, 'f'},
 	    {"quiet", 0, 0, 'f'},
-	    {"debug", 1, 0, 'd'},
+	    {"debug", 0, 0, 'd'},
 	    {"config", 1, 0, 'c'},
 	    {"just-check-config", 0, 0, 'j'},
 	    {"sites-key", 1, 0, 's'},
@@ -80,7 +87,7 @@ static void parse_options(int argc, char **argv)
 		   "  -s, --sites-key=name    configuration key that "
 		   "specifies active sites\n"
 		   "  -n, --nodetach          do not run in background\n"
-		   "  -d, --debug=item,...    set debug options\n"
+		   "  -d, --debug             output debug messages\n"
 		   "      --help              display this help and exit\n"
 		   "      --version           output version information "
 		   "and exit\n"
@@ -134,6 +141,7 @@ static void parse_options(int argc, char **argv)
 	    break;
 
 	case '?':
+	    exit(1);
 	    break;
 
 	default:
@@ -219,7 +227,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 +238,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 +253,46 @@ static void system_phase_hook(void *sst, uint32_t newphase)
     }
 }
 
+#if USE_SELECT
+static int fakepoll(struct pollfd *fds, int nfds, int timeout) {
+    fd_set infds[1], outfds[1];
+    int maxfd = -1, i, rc;
+    struct timeval tvtimeout;
+    FD_ZERO(infds);
+    FD_ZERO(outfds);
+    for(i = 0; i < nfds; ++i) {
+	if(fds[i].events & POLLIN)
+	    FD_SET(fds[i].fd, infds);
+	if(fds[i].events & POLLOUT)
+	    FD_SET(fds[i].fd, outfds);
+	if(fds[i].fd > maxfd)
+	    maxfd = fds[i].fd;
+    }
+    if(timeout != -1) {
+	tvtimeout.tv_sec = timeout / 1000;
+	tvtimeout.tv_usec = 1000 * (timeout % 1000);
+    }
+    rc = select(maxfd + 1, infds, outfds, NULL, 
+		timeout == -1 ? NULL : &tvtimeout);
+    if(rc >= 0) {
+	for(i = 0; i < nfds; ++i) {
+	    int revents = 0;
+	    if(FD_ISSET(fds[i].fd, infds))
+		revents |= POLLIN;
+	    if(FD_ISSET(fds[i].fd, outfds))
+		revents |= POLLOUT;
+	    fds[i].revents = revents;
+	}
+    }
+    return rc;
+}
+#endif
+
+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 +303,20 @@ 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);
+	    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);
+		}
+	    }
+	    i->after(i->state, fds+idx, i->nfds);
 	    idx+=i->nfds;
 	}
 	remain=total_nfds;
@@ -273,7 +324,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 */
@@ -288,7 +339,11 @@ static void run(void)
 	}
 	do {
 	    if (finished) break;
+#if USE_SELECT
+	    rv=fakepoll(fds, idx, timeout);
+#else
 	    rv=poll(fds, idx, timeout);
+#endif
 	    if (rv<0) {
 		if (errno!=EINTR) {
 		    fatal_perror("run: poll");