X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/763e458ff3a1cb4f9d11226db91f17069f7b8f7a..45736f7396593c2f4ef9ebf35c561e7a32111f63:/udp.c

diff --git a/udp.c b/udp.c
index 9101e49..a58690e 100644
--- a/udp.c
+++ b/udp.c
@@ -25,8 +25,6 @@
 #include "magic.h"
 #include "comm-common.h"
 
-static beforepoll_fn udp_beforepoll;
-static afterpoll_fn udp_afterpoll;
 static comm_sendmsg_fn udp_sendmsg;
 
 struct udp {
@@ -61,10 +59,10 @@ static const char *udp_addr_to_string(void *commst, const struct comm_addr *ca)
     return sbuf;
 }
 
-int udp_socks_beforepoll(struct udpsocks *socks,
-			 struct pollfd *fds, int *nfds_io,
-			 int *timeout_io)
+static int udp_socks_beforepoll(void *state, struct pollfd *fds, int *nfds_io,
+				int *timeout_io)
 {
+    struct udpsocks *socks=state;
     int i;
     BEFOREPOLL_WANT_FDS(socks->n_socks);
     for (i=0; i<socks->n_socks; i++) {
@@ -74,16 +72,10 @@ int udp_socks_beforepoll(struct udpsocks *socks,
     return 0;
 }
 
-static int udp_beforepoll(void *state, struct pollfd *fds, int *nfds_io,
-			  int *timeout_io)
-{
-    struct udp *st=state;
-    return udp_socks_beforepoll(&st->socks,fds,nfds_io,timeout_io);
-}
-
-void udp_socks_afterpoll(struct udpcommon *uc, struct udpsocks *socks,
-			 struct pollfd *fds, int nfds)
+static void udp_socks_afterpoll(void *state, struct pollfd *fds, int nfds)
 {
+    struct udpsocks *socks=state;
+    struct udpcommon *uc=socks->uc;
     union iaddr from;
     socklen_t fromlen;
     bool_t done;
@@ -149,12 +141,6 @@ void udp_socks_afterpoll(struct udpcommon *uc, struct udpsocks *socks,
     }
 }
 
-static void udp_afterpoll(void *state, struct pollfd *fds, int nfds)
-{
-    struct udp *st=state;
-    return udp_socks_afterpoll(&st->uc,&st->socks,fds,nfds);
-}
-
 static bool_t udp_sendmsg(void *commst, struct buffer_if *buf,
 			  const struct comm_addr *dest)
 {
@@ -197,20 +183,23 @@ static bool_t udp_sendmsg(void *commst, struct buffer_if *buf,
     return True;
 }
 
-static void udp_make_socket(struct udp *st, struct udpsock *us)
+bool_t udp_make_socket(struct udpcommon *uc, struct udpsock *us,
+		       int failmsgclass)
 {
     const union iaddr *addr=&us->addr;
-    struct udpcommon *uc=&st->uc;
     struct commcommon *cc=&uc->cc;
+    us->fd=-1;
+
+#define FAIL_LG 0, cc->cl.description, &cc->loc, failmsgclass
+#define FAIL(...) do{						\
+        lg_perror(FAIL_LG,errno,__VA_ARGS__);	\
+	goto failed;						\
+    }while(0)
 
     us->fd=socket(addr->sa.sa_family, SOCK_DGRAM, IPPROTO_UDP);
-    if (us->fd<0) {
-	fatal_perror("udp (%s:%d): socket",cc->loc.file,cc->loc.line);
-    }
-    if (fcntl(us->fd, F_SETFL, fcntl(us->fd, F_GETFL)|O_NONBLOCK)==-1) {
-	fatal_perror("udp (%s:%d): fcntl(set O_NONBLOCK)",
-		     cc->loc.file,cc->loc.line);
-    }
+    if (us->fd<0) FAIL("socket");
+    if (fcntl(us->fd, F_SETFL, fcntl(us->fd, F_GETFL)|O_NONBLOCK)==-1)
+	FAIL("fcntl(set O_NONBLOCK)");
     setcloexec(us->fd);
 #ifdef CONFIG_IPV6
     if (addr->sa.sa_family==AF_INET6) {
@@ -218,8 +207,7 @@ static void udp_make_socket(struct udp *st, struct udpsock *us)
 	int optval=1;
 	socklen_t optlen=sizeof(optval);
 	r=setsockopt(us->fd,IPPROTO_IPV6,IPV6_V6ONLY,&optval,optlen);
-	if (r) fatal_perror("udp (%s:%d): setsockopt(,IPV6_V6ONLY,&1,)",
-			    cc->loc.file,cc->loc.line);
+	if (r) FAIL("setsockopt(,IPV6_V6ONLY,&1,)");
     }
 #endif
 
@@ -230,9 +218,8 @@ static void udp_make_socket(struct udp *st, struct udpsock *us)
 	/* XXX this fork() and waitpid() business needs to be hidden
 	   in some system-specific library functions. */
 	c=fork();
-	if (c==-1) {
-	    fatal_perror("udp_phase_hook: fork() for authbind");
-	}
+	if (c==-1)
+	    FAIL("fork() for authbind");
 	if (c==0) {
 	    char *argv[5], addrstr[33], portstr[5];
 	    const char *addrfam;
@@ -269,32 +256,58 @@ static void udp_make_socket(struct udp *st, struct udpsock *us)
 	}
 	while (waitpid(c,&status,0)==-1) {
 	    if (errno==EINTR) continue;
-	    fatal_perror("udp (%s:%d): authbind",cc->loc.file,cc->loc.line);
+	    FAIL("waitpid for authbind");
 	}
 	if (WIFSIGNALED(status)) {
-	    fatal("udp (%s:%d): authbind died on signal %d",cc->loc.file,
-		  cc->loc.line, WTERMSIG(status));
+	    lg_perror(FAIL_LG,0,"authbind died on signal %s (%d)",
+			strsignal(WTERMSIG(status)),WTERMSIG(status));
+	    goto failed;
 	}
 	if (WIFEXITED(status) && WEXITSTATUS(status)!=0) {
-	    fatal("udp (%s:%d): authbind died with status %d",cc->loc.file,
-		  cc->loc.line, WEXITSTATUS(status));
+	    lg_perror(FAIL_LG,0,
+		      "authbind died with error exit status %d",
+		      WEXITSTATUS(status));
+	    goto failed;
 	}
     } else {
-	if (bind(us->fd, &addr->sa, iaddr_socklen(addr))!=0) {
-	    fatal_perror("udp (%s:%d): bind",cc->loc.file,cc->loc.line);
-	}
+	if (bind(us->fd, &addr->sa, iaddr_socklen(addr))!=0)
+	    FAIL("bind (%s)",iaddr_to_string(addr));
     }
+    return True;
+
+failed:
+    if (us->fd>=0) {
+	close(us->fd);
+	us->fd=-1;
+    }
+    return False;
+
+#undef FAIL
+}
+
+void udp_socks_register(struct udpcommon *uc, struct udpsocks *socks)
+{
+    socks->uc=uc;
+    socks->interest=
+	register_for_poll(socks,udp_socks_beforepoll,udp_socks_afterpoll,"udp");
+}
+
+void udp_socks_deregister(struct udpcommon *uc, struct udpsocks *socks)
+{
+    socks->uc=uc;
+    deregister_for_poll(socks->interest);
 }
 
 static void udp_phase_hook(void *sst, uint32_t new_phase)
 {
     struct udp *st=sst;
     struct udpsocks *socks=&st->socks;
+    struct udpcommon *uc=&st->uc;
     int i;
     for (i=0; i<socks->n_socks; i++)
-	udp_make_socket(st,&socks->socks[i]);
+	udp_make_socket(uc,&socks->socks[i],M_FATAL);
 
-    register_for_poll(st,udp_beforepoll,udp_afterpoll,"udp");
+    udp_socks_register(uc,socks);
 }
 
 static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,