X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/6c5889e68832bfd96fdd1de7e6df4309e7017372..86420bb75f19f628ffd2d8ff9964e59ed99e3187:/udp.c

diff --git a/udp.c b/udp.c
index 4119235..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));
@@ -179,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;
@@ -396,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");
 
@@ -407,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;
@@ -421,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,
@@ -433,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");