X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=udp.c;h=1535f290c587a9efaa261d1ad2da740283ad024e;hp=70928a8109fb130edd5fa53c977cc41fbeb551de;hb=2d80199d7bc25b4c6e4a5ac986f8902770e82d96;hpb=bfc34affaf5e80fe6a85bbcc4c302005154b4531

diff --git a/udp.c b/udp.c
index 70928a8..1535f29 100644
--- a/udp.c
+++ b/udp.c
@@ -1,5 +1,24 @@
 /* UDP send/receive module for secnet */
 
+/*
+ * This file is part of secnet.
+ * See README for full list of copyright holders.
+ *
+ * secnet is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version d of the License, or
+ * (at your option) any later version.
+ * 
+ * secnet is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with secnet; if not, see
+ * https://www.gnu.org/licenses/gpl.html.
+ */
+
 /* This module enables sites to communicate by sending UDP
  * packets. When an instance of the module is created we can
  * optionally bind to a particular local IP address (not implemented
@@ -30,6 +49,8 @@ static comm_sendmsg_fn udp_sendmsg;
 struct udp {
     struct udpcommon uc;
     struct udpsocks socks;
+    bool_t addr_configured;
+    unsigned counter;
 };
 
 /*
@@ -52,7 +73,8 @@ static const char *udp_addr_to_string(void *commst, const struct comm_addr *ca)
     int ix=ca->ix>=0 ? ca->ix : 0;
 
     assert(ix>=0 && ix<socks->n_socks);
-    snprintf(sbuf, sizeof(sbuf), "udp:%s%s-%s",
+    snprintf(sbuf, sizeof(sbuf), "udp#%u@l%d:%s%s-%s",
+	     st->counter, st->uc.cc.loc.line,
 	     iaddr_to_string(&socks->socks[ix].addr),
 	     ca->ix<0 && socks->n_socks>1 ? "&" : "",
 	     iaddr_to_string(&ca->ia));
@@ -84,20 +106,23 @@ const char *af_name(int af)
 
 void udp_sock_experienced(struct log_if *lg, struct udpcommon *uc,
 			  struct udpsocks *socks, struct udpsock *us,
-			  bool_t recvsend, int af,
+			  const union iaddr *dest, int af,
 			  int r, int errnoval)
 {
     bool_t success=r>=0;
-    if (us->experienced[recvsend][af][success]++)
+    if (us->experienced[!!dest][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",
+	      "%s %s experiencing some %s %s%s%s%s%s%s",
 	      socks->desc,iaddr_to_string(&us->addr),
 	      success?"success":"trouble",
-	      recvsend?"transmitting":"receiving",
-	      af?" ":"", af?af_name(af):"");
+	      dest?"transmitting":"receiving",
+	      af?" ":"", af?af_name(af):"",
+	      dest?" (to ":"",
+	      dest?iaddr_to_string(dest):"",
+	      dest?")":"");
 }
 
 static void udp_socks_afterpoll(void *state, struct pollfd *fds, int nfds)
@@ -176,7 +201,8 @@ static void udp_socks_afterpoll(void *state, struct pollfd *fds, int nfds)
 }
 
 static bool_t udp_sendmsg(void *commst, struct buffer_if *buf,
-			  const struct comm_addr *dest)
+			  const struct comm_addr *dest,
+			  struct comm_clientinfo *clientinfo)
 {
     struct udp *st=commst;
     struct udpcommon *uc=&st->uc;
@@ -197,7 +223,7 @@ static bool_t udp_sendmsg(void *commst, struct buffer_if *buf,
 	memcpy(sa+6,&dest->ia.sin.sin_port,2);
 	int r=sendto(us->fd,sa,buf->size+8,0,&uc->proxy.sa,
 	       iaddr_socklen(&uc->proxy));
-	udp_sock_experienced(0,uc,socks,us, 1,0, r,errno);
+	udp_sock_experienced(0,uc,socks,us, &dest->ia,0, r,errno);
 	buf_unprepend(buf,8);
     } else {
 	int i,r;
@@ -210,7 +236,7 @@ static bool_t udp_sendmsg(void *commst, struct buffer_if *buf,
 		continue;
 	    r=sendto(us->fd, buf->start, buf->size, 0,
 		     &dest->ia.sa, iaddr_socklen(&dest->ia));
-	    udp_sock_experienced(0,uc,socks,us, 1,af, r,errno);
+	    udp_sock_experienced(0,uc,socks,us, &dest->ia,af, r,errno);
 	    if (r>=0) return True;
 	    if (!(errno==EAFNOSUPPORT || errno==ENETUNREACH))
 		/* who knows what that error means? */
@@ -283,6 +309,9 @@ bool_t udp_make_socket(struct udpcommon *uc, struct udpsock *us,
     if (uc->authbind) {
 	pid_t c;
 	int status;
+	char desc[200];
+	snprintf(desc,sizeof(desc),"authbind for %s: %s",
+		 iaddr_to_string(addr), uc->authbind);
 
 	/* XXX this fork() and waitpid() business needs to be hidden
 	   in some system-specific library functions. */
@@ -332,10 +361,10 @@ bool_t udp_make_socket(struct udpcommon *uc, struct udpsock *us,
 	    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);
+			  "%s exited with error exit status %d;"
+			  " indicates error",desc,es);
 	    } else {
-		lg_exitstatus(FAIL_LG,status,"authbind");
+		lg_exitstatus(FAIL_LG,status,desc);
 	    }
 	    goto failed;
 	}
@@ -390,8 +419,14 @@ static void udp_phase_hook(void *sst, uint32_t new_phase)
     struct udpsocks *socks=&st->socks;
     struct udpcommon *uc=&st->uc;
     int i;
-    for (i=0; i<socks->n_socks; i++)
-	udp_make_socket(uc,&socks->socks[i],M_FATAL);
+    bool_t anydone=0;
+
+    for (i=0; i<socks->n_socks; i++) {
+	bool_t required=st->addr_configured
+	    || (!anydone && i==socks->n_socks-1);
+	anydone += udp_make_socket(uc,&socks->socks[i],
+				   required ? M_FATAL : M_WARNING);
+    }
 
     udp_socks_register(uc,socks, uc->use_proxy ? "proxy" : "socket");
 
@@ -401,6 +436,8 @@ static void udp_phase_hook(void *sst, uint32_t new_phase)
 static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
 			 list_t *args)
 {
+    static unsigned counter;
+
     struct udp *st;
     list_t *caddrl;
     list_t *l;
@@ -415,6 +452,8 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
     struct udpsocks *socks=&st->socks;
     struct commcommon *cc=&uc->cc;
 
+    st->counter=counter++;
+
     union iaddr defaultaddrs[] = {
 #ifdef CONFIG_IPV6
 	{ .sin6 = { .sin6_family=AF_INET6,
@@ -427,14 +466,16 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
     };
 
     caddrl=dict_lookup(d,"address");
-    socks->n_socks=caddrl ? list_length(caddrl) : (int)ARRAY_SIZE(defaultaddrs);
+    st->addr_configured=!!caddrl;
+    socks->n_socks=st->addr_configured ? list_length(caddrl)
+	: (int)ARRAY_SIZE(defaultaddrs);
     if (socks->n_socks<=0 || socks->n_socks>UDP_MAX_SOCKETS)
 	cfgfatal(cc->loc,"udp","`address' must be 1..%d addresses",
 		 UDP_MAX_SOCKETS);
 
     for (i=0; i<socks->n_socks; i++) {
 	struct udpsock *us=&socks->socks[i];
-	if (!list_length(caddrl)) {
+	if (!st->addr_configured) {
 	    us->addr=defaultaddrs[i];
 	} else {
 	    string_item_to_iaddr(list_elem(caddrl,i),uc->port,&us->addr,"udp");