udp: Insist on only one successful default socket setup

[secnet.git] / udp.c

diff --git a/udp.c b/udp.c
index aef962daa9d8cb03985ad5536238d466963aa887..dde73efb53eb4fe8d0af4555ff30f492bfbab82d 100644 (file)
--- a/udp.c
+++ b/udp.c
@@ -30,6 +30,7 @@ static comm_sendmsg_fn udp_sendmsg;
 struct udp {
     struct udpcommon uc;
     struct udpsocks socks;
+    bool_t addr_configured;
 };
 
 /*
@@ -54,7 +55,7 @@ static const char *udp_addr_to_string(void *commst, const struct comm_addr *ca)
     assert(ix>=0 && ix<socks->n_socks);
     snprintf(sbuf, sizeof(sbuf), "udp:%s%s-%s",
             iaddr_to_string(&socks->socks[ix].addr),
-            ca->ix<0 ? "&" : "",
+            ca->ix<0 && socks->n_socks>1 ? "&" : "",
             iaddr_to_string(&ca->ia));
     return sbuf;
 }
@@ -83,21 +84,24 @@ const char *af_name(int af)
 }
 
 void udp_sock_experienced(struct log_if *lg, struct udpcommon *uc,
-                         const char *socksdesc, struct udpsock *us,
-                         bool_t recvsend, int af,
+                         struct udpsocks *socks, struct udpsock *us,
+                         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",
-             socksdesc,iaddr_to_string(&us->addr),
+             "%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)
@@ -149,7 +153,10 @@ static void udp_socks_afterpoll(void *state, struct pollfd *fds, int nfds)
                ca.ia=from;
                ca.ix=i;
                done=comm_notify(&cc->notify, cc->rbuf, &ca);
-               if (!done) {
+               if (done) {
+                   udp_sock_experienced(0,uc,socks,us,0,
+                                        from.sa.sa_family,0,0);
+               } else {
                    uint32_t msgtype;
                    if (cc->rbuf->size>12 /* prevents traffic amplification */
                        && ((msgtype=get_uint32(cc->rbuf->start+8))
@@ -165,7 +172,7 @@ static void udp_socks_afterpoll(void *state, struct pollfd *fds, int nfds)
                BUF_ASSERT_FREE(cc->rbuf);
            } else { /* rv<=0 */
                if (errno!=EINTR && !iswouldblock(errno))
-                   udp_sock_experienced(0,uc, "socket",us, 0,0, rv,errno);
+                   udp_sock_experienced(0,uc,socks,us, 0,0, rv,errno);
                BUF_FREE(cc->rbuf);
            }
        } while (rv>=0);
@@ -194,7 +201,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, "proxy",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;
@@ -207,7 +214,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, "socket",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? */
@@ -280,6 +287,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. */
@@ -329,10 +339,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;
        }
@@ -353,9 +363,11 @@ failed:
 
 #undef FAIL
 
-void udp_socks_register(struct udpcommon *uc, struct udpsocks *socks)
+void udp_socks_register(struct udpcommon *uc, struct udpsocks *socks,
+                       const char *desc)
 {
     socks->uc=uc;
+    socks->desc=desc;
     socks->interest=
        register_for_poll(socks,udp_socks_beforepoll,udp_socks_afterpoll,"udp");
 }
@@ -385,10 +397,16 @@ 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);
+    udp_socks_register(uc,socks, uc->use_proxy ? "proxy" : "socket");
 
     add_hook(PHASE_CHILDPERSIST,udp_childpersist_hook,st);
 }
@@ -422,14 +440,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");