X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=udp.c;h=e62f5c146332852fb9a4d083d50b2ecce0e15c14;hb=b85fe3f90b025a3742bf1c0ea91bc213a421f74d;hp=9101e497a5097bb760214c830507b69ed9ca34c7;hpb=763e458ff3a1cb4f9d11226db91f17069f7b8f7a;p=secnet.git

diff --git a/udp.c b/udp.c
index 9101e49..e62f5c1 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,38 @@ int udp_socks_beforepoll(struct udpsocks *socks,
     return 0;
 }
 
-static int udp_beforepoll(void *state, struct pollfd *fds, int *nfds_io,
-			  int *timeout_io)
+const char *af_name(int af)
 {
-    struct udp *st=state;
-    return udp_socks_beforepoll(&st->socks,fds,nfds_io,timeout_io);
+    switch (af) {
+    case AF_INET6: return "IPv6";
+    case AF_INET:  return "IPv4";
+    case 0:        return "(any)";
+    default: abort();
+    }
+}
+
+void udp_sock_experienced(struct log_if *lg, struct udpcommon *uc,
+			  const char *socksdesc, struct udpsock *us,
+			  bool_t recvsend, int af,
+			  int r, int errnoval)
+{
+    bool_t success=r>=0;
+    if (us->experienced[recvsend][af][success]++)
+	return;
+    lg_perror(lg, uc->cc.cl.description, &uc->cc.loc,
+	      success ? M_INFO : M_WARNING,
+	      success ? 0 : errnoval,
+	      "%s %s experiencing some %s %s%s%s",
+	      socksdesc,iaddr_to_string(&us->addr),
+	      success?"success":"trouble",
+	      recvsend?"transmitting":"receiving",
+	      af?" ":"", af?af_name(af):"");
 }
 
-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;
@@ -93,10 +113,11 @@ void udp_socks_afterpoll(struct udpcommon *uc, struct udpsocks *socks,
     struct commcommon *cc=&uc->cc;
 
     for (i=0; i<socks->n_socks; i++) {
+	struct udpsock *us=&socks->socks[i];
 	if (i>=nfds) continue;
 	if (!(fds[i].revents & POLLIN)) continue;
-	assert(fds[i].fd == socks->socks[i].fd);
-	int fd=socks->socks[i].fd;
+	assert(fds[i].fd == us->fd);
+	int fd=us->fd;
 	do {
 	    fromlen=sizeof(from);
 	    BUF_ASSERT_FREE(cc->rbuf);
@@ -142,19 +163,15 @@ void udp_socks_afterpoll(struct udpcommon *uc, struct udpsocks *socks,
 		    BUF_FREE(cc->rbuf);
 		}
 		BUF_ASSERT_FREE(cc->rbuf);
-	    } else {
+	    } else { /* rv<=0 */
+		if (errno!=EINTR && !iswouldblock(errno))
+		    udp_sock_experienced(0,uc, "socket",us, 0,0, rv,errno);
 		BUF_FREE(cc->rbuf);
 	    }
 	} while (rv>=0);
     }
 }
 
-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)
 {
@@ -164,6 +181,7 @@ static bool_t udp_sendmsg(void *commst, struct buffer_if *buf,
     uint8_t *sa;
 
     if (uc->use_proxy) {
+	struct udpsock *us=&socks->socks[0];
 	sa=buf_prepend(buf,8);
 	if (dest->ia.sa.sa_family != AF_INET) {
 	    Message(M_INFO,
@@ -174,18 +192,22 @@ static bool_t udp_sendmsg(void *commst, struct buffer_if *buf,
 	memcpy(sa,&dest->ia.sin.sin_addr,4);
 	memset(sa+4,0,4);
 	memcpy(sa+6,&dest->ia.sin.sin_port,2);
-	sendto(socks->socks[0].fd,sa,buf->size+8,0,&uc->proxy.sa,
+	int r=sendto(us->fd,sa,buf->size+8,0,&uc->proxy.sa,
 	       iaddr_socklen(&uc->proxy));
+	udp_sock_experienced(0,uc, "proxy",us, 1,0, r,errno);
 	buf_unprepend(buf,8);
     } else {
 	int i,r;
 	bool_t allunsupported=True;
+	int af=dest->ia.sa.sa_family;
 	for (i=0; i<socks->n_socks; i++) {
-	    if (dest->ia.sa.sa_family != socks->socks[i].addr.sa.sa_family)
+	    struct udpsock *us=&socks->socks[i];
+	    if (us->addr.sa.sa_family != af)
 		/* no point even trying */
 		continue;
-	    r=sendto(socks->socks[i].fd, buf->start, buf->size, 0,
+	    r=sendto(us->fd, buf->start, buf->size, 0,
 		     &dest->ia.sa, iaddr_socklen(&dest->ia));
+	    udp_sock_experienced(0,uc, "socket",us, 1,af, r,errno);
 	    if (r>=0) return True;
 	    if (!(errno==EAFNOSUPPORT || errno==ENETUNREACH))
 		/* who knows what that error means? */
@@ -197,20 +219,31 @@ static bool_t udp_sendmsg(void *commst, struct buffer_if *buf,
     return True;
 }
 
-static void udp_make_socket(struct udp *st, struct udpsock *us)
+void udp_destroy_socket(struct udpcommon *uc, struct udpsock *us)
+{
+    if (us->fd>=0) {
+	close(us->fd);
+	us->fd=-1;
+    }
+}
+
+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)
 
+    FILLZERO(us->experienced);
     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");
+    setnonblock(us->fd);
     setcloexec(us->fd);
 #ifdef CONFIG_IPV6
     if (addr->sa.sa_family==AF_INET6) {
@@ -218,8 +251,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,13 +262,13 @@ 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;
 	    int port;
+	    afterfork();
 	    switch (addr->sa.sa_family) {
 	    case AF_INET:
 		sprintf(addrstr,"%08lX",(long)addr->sin.sin_addr.s_addr);
@@ -269,32 +301,70 @@ 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);
-	}
-	if (WIFSIGNALED(status)) {
-	    fatal("udp (%s:%d): authbind died on signal %d",cc->loc.file,
-		  cc->loc.line, WTERMSIG(status));
+	    FAIL("waitpid for authbind");
 	}
-	if (WIFEXITED(status) && WEXITSTATUS(status)!=0) {
-	    fatal("udp (%s:%d): authbind died with status %d",cc->loc.file,
-		  cc->loc.line, WEXITSTATUS(status));
+	if (status) {
+	    if (WIFEXITED(status) && WEXITSTATUS(status)<127) {
+		int es=WEXITSTATUS(status);
+		lg_perror(FAIL_LG,es,
+			  "authbind exited with error exit status %d;"
+			  " indicates error",es);
+	    } else {
+		lg_exitstatus(FAIL_LG,status,"authbind");
+	    }
+	    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:
+    udp_destroy_socket(uc,us);
+    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);
+}
+
+void udp_socks_childpersist(struct udpcommon *uc, struct udpsocks *socks)
+{
+    int i;
+    for (i=0; i<socks->n_socks; i++)
+	udp_destroy_socket(uc,&socks->socks[i]);
+}
+
+static void udp_childpersist_hook(void *sst, uint32_t new_phase)
+{
+    struct udp *st=sst;
+    udp_socks_childpersist(&st->uc,&st->socks);
 }
 
 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);
+
+    udp_socks_register(uc,socks);
 
-    register_for_poll(st,udp_beforepoll,udp_afterpoll,"udp");
+    add_hook(PHASE_CHILDPERSIST,udp_childpersist_hook,st);
 }
 
 static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,