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

diff --git a/udp.c b/udp.c
index 4119235..26853b7 100644
--- a/udp.c
+++ b/udp.c
@@ -30,6 +30,8 @@ static comm_sendmsg_fn udp_sendmsg;
 struct udp {
     struct udpcommon uc;
     struct udpsocks socks;
+    bool_t addr_configured;
+    unsigned counter;
 };
 
 /*
@@ -52,7 +54,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));
@@ -396,8 +399,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 +416,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 +432,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 +446,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");