X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=udp.c;h=945d1d053749269a67d29d3cecfd8a2a1c8c302c;hb=a25b1149662cae9a8fad70405d195b73f74f3fdd;hp=39888268241895241d1b0c61f16c5264a3131e46;hpb=ff05a229397c75142725f45cad191ce4a00625ce;p=secnet.git

diff --git a/udp.c b/udp.c
index 3988826..945d1d0 100644
--- a/udp.c
+++ b/udp.c
@@ -36,6 +36,7 @@ struct udp {
     closure_t cl;
     struct comm_if ops;
     struct cloc loc;
+    uint32_t addr;
     uint16_t port;
     int fd;
     string_t authbind;
@@ -46,8 +47,7 @@ struct udp {
 };
 
 static int udp_beforepoll(void *state, struct pollfd *fds, int *nfds_io,
-			  int *timeout_io, const struct timeval *tv,
-			  uint64_t *now)
+			  int *timeout_io)
 {
     struct udp *st=state;
     if (*nfds_io<1) {
@@ -60,12 +60,11 @@ static int udp_beforepoll(void *state, struct pollfd *fds, int *nfds_io,
     return 0;
 }
 
-static void udp_afterpoll(void *state, struct pollfd *fds, int nfds,
-			  const struct timeval *tv, uint64_t *now)
+static void udp_afterpoll(void *state, struct pollfd *fds, int nfds)
 {
     struct udp *st=state;
     struct sockaddr_in from;
-    int fromlen;
+    socklen_t fromlen;
     struct notify_list *n;
     bool_t done;
     int rv;
@@ -182,7 +181,7 @@ static void udp_phase_hook(void *sst, uint32_t new_phase)
     struct udp *st=sst;
     struct sockaddr_in addr;
 
-    st->fd=socket(AF_INET, SOCK_DGRAM, 0);
+    st->fd=socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
     if (st->fd<0) {
 	fatal_perror("udp (%s:%d): socket",st->loc.file,st->loc.line);
     }
@@ -195,8 +194,9 @@ static void udp_phase_hook(void *sst, uint32_t new_phase)
 		     st->loc.file,st->loc.line);
     }
 
-    memset(&addr, 0, sizeof(addr));
+    FILLZERO(addr);
     addr.sin_family=AF_INET;
+    addr.sin_addr.s_addr=htonl(st->addr);
     addr.sin_port=htons(st->port);
     if (st->authbind) {
 	pid_t c;
@@ -209,22 +209,29 @@ static void udp_phase_hook(void *sst, uint32_t new_phase)
 	    fatal_perror("udp_phase_hook: fork() for authbind");
 	}
 	if (c==0) {
-	    char *argv[4];
+	    char *argv[4], addrstr[9], portstr[5];
+	    sprintf(addrstr,"%08lX",(long)st->addr);
+	    sprintf(portstr,"%04X",st->port);
 	    argv[0]=st->authbind;
-	    argv[1]="00000000";
-	    argv[2]=alloca(8);
-	    if (!argv[2]) exit(ENOMEM);
-	    sprintf(argv[2],"%04X",htons(st->port));
+	    argv[1]=addrstr;
+	    argv[2]=portstr;
 	    argv[3]=NULL;
 	    dup2(st->fd,0);
 	    execvp(st->authbind,argv);
-	    exit(ENOEXEC);
+	    _exit(255);
 	}
-	waitpid(c,&status,0);
-	if (WEXITSTATUS(status)!=0) {
-	    errno=WEXITSTATUS(status);
+	while (waitpid(c,&status,0)==-1) {
+	    if (errno==EINTR) continue;
 	    fatal_perror("udp (%s:%d): authbind",st->loc.file,st->loc.line);
 	}
+	if (WIFSIGNALED(status)) {
+	    fatal("udp (%s:%d): authbind died on signal %d",st->loc.file,
+		  st->loc.line, WTERMSIG(status));
+	}
+	if (WIFEXITED(status) && WEXITSTATUS(status)!=0) {
+	    fatal("udp (%s:%d): authbind died with status %d",st->loc.file,
+		  st->loc.line, WEXITSTATUS(status));
+	}
     } else {
 	if (bind(st->fd, (struct sockaddr *)&addr, sizeof(addr))!=0) {
 	    fatal_perror("udp (%s:%d): bind",st->loc.file,st->loc.line);
@@ -238,7 +245,7 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
 			 list_t *args)
 {
     struct udp *st;
-    item_t *i;
+    item_t *i,*j;
     dict_t *d;
     list_t *l;
     uint32_t a;
@@ -264,13 +271,15 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
     }
     d=i->data.dict;
 
+    j=dict_find_item(d,"address",False,"udp",st->loc);
+    st->addr=j?string_item_to_ipaddr(j, "udp"):INADDR_ANY;
     st->port=dict_read_number(d,"port",True,"udp",st->loc,0);
     st->rbuf=find_cl_if(d,"buffer",CL_BUFFER,True,"udp",st->loc);
     st->authbind=dict_read_string(d,"authbind",False,"udp",st->loc);
     l=dict_lookup(d,"proxy");
     if (l) {
 	st->use_proxy=True;
-	memset(&st->proxy,0,sizeof(st->proxy));
+	FILLZERO(st->proxy);
 	st->proxy.sin_family=AF_INET;
 	i=list_elem(l,0);
 	if (!i || i->type!=t_string) {
@@ -291,7 +300,6 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
     return new_closure(&st->cl);
 }
 
-init_module udp_module;
 void udp_module(dict_t *dict)
 {
     add_closure(dict,"udp",udp_apply);