udp, polypath: Log `experiencing success receiving', etc.

We want to use the `experienced' mechanism to report success while
receiving.

But, previously, the udp_socks_afterpoll function which does the
reciving didn't have a suitable description (`socksdesc') available:
in particular, for polypath, it should print the interface name.

Solve this as follows:
 * Add a `desc' field to struct udpsocks, set by udp_socks_register
   (for polypath this duplicates interf->name, but we don't really
   care much about that as it's only one pointer).
 * Add a new argument to udp_socks_register to ensure we catch
   all the creation sites.
 * Have have udp_sock_experienced take a struct udpsocks*.

After all that, the new call to udp_sock_experienced is trivial.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/comm-common.h b/comm-common.h
index 5087ad9..6dad9ef 100644 (file)
--- a/comm-common.h
+++ b/comm-common.h
@@ -77,6 +77,7 @@ struct udpsocks {
     /* private for udp_socks_* */
     struct udpcommon *uc; /* link to parent, for cfg, notify list, etc. */
     struct poll_interest *interest;
+    const char *desc;
 };
 
 struct udpcommon {
@@ -101,11 +102,12 @@ void udp_destroy_socket(struct udpcommon *uc, struct udpsock *us);
 
 const char *af_name(int af);
 void udp_sock_experienced(struct log_if *lg, struct udpcommon *uc,
-                         const char *socksdesc, struct udpsock *us,
+                         struct udpsocks *socks, struct udpsock *us,
                          bool_t recvsend, int af /* 0 means any */,
                          int r, int errnoval);
 
-void udp_socks_register(struct udpcommon *uc, struct udpsocks *socks);
+void udp_socks_register(struct udpcommon *uc, struct udpsocks *socks,
+                       const char *desc);
 void udp_socks_deregister(struct udpcommon *uc, struct udpsocks *socks);
 void udp_socks_childpersist(struct udpcommon *uc, struct udpsocks *socks);
 

diff --git a/polypath.c b/polypath.c
index 9d5c1b9..af52473 100644 (file)
--- a/polypath.c
+++ b/polypath.c
@@ -321,8 +321,8 @@ static void polypath_record_ifaddr(struct polypath *st,
     interf->socks.n_socks=0;
     FILLZERO(interf->experienced_xmit_noaf);
     LIST_INSERT_HEAD(&st->interfs,interf,entry);
-    udp_socks_register(&st->uc,&interf->socks);
     interf->name=strdup(ifname);
+    udp_socks_register(&st->uc,&interf->socks,interf->name);
     if (!interf->name) BADE("strdup interface name",errno);
  found_interf:
 
@@ -439,7 +439,7 @@ static bool_t polypath_sendmsg(void *commst, struct buffer_if *buf,
            attempted=True;
            int r=sendto(us->fd,buf->start,buf->size,
                         0,&dest->ia.sa,iaddr_socklen(&dest->ia));
-           udp_sock_experienced(0,&st->uc, interf->name,us,
+           udp_sock_experienced(0,&st->uc,&interf->socks,us,
                                 1,af, r,errno);
            if (r>=0) {
                reasonable=True;

diff --git a/udp.c b/udp.c
index aef962d..06acf33 100644 (file)
--- a/udp.c
+++ b/udp.c
@@ -83,7 +83,7 @@ const char *af_name(int af)
 }
 
 void udp_sock_experienced(struct log_if *lg, struct udpcommon *uc,
-                         const char *socksdesc, struct udpsock *us,
+                         struct udpsocks *socks, struct udpsock *us,
                          bool_t recvsend, int af,
                          int r, int errnoval)
 {
@@ -94,7 +94,7 @@ void udp_sock_experienced(struct log_if *lg, struct udpcommon *uc,
              success ? M_INFO : M_WARNING,
              success ? 0 : errnoval,
              "%s %s experiencing some %s %s%s%s",
-             socksdesc,iaddr_to_string(&us->addr),
+             socks->desc,iaddr_to_string(&us->addr),
              success?"success":"trouble",
              recvsend?"transmitting":"receiving",
              af?" ":"", af?af_name(af):"");
@@ -149,7 +149,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 +168,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 +197,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, 1,0, r,errno);
        buf_unprepend(buf,8);
     } else {
        int i,r;
@@ -207,7 +210,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, 1,af, r,errno);
            if (r>=0) return True;
            if (!(errno==EAFNOSUPPORT || errno==ENETUNREACH))
                /* who knows what that error means? */
@@ -353,9 +356,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");
 }
@@ -388,7 +393,7 @@ static void udp_phase_hook(void *sst, uint32_t new_phase)
     for (i=0; i<socks->n_socks; i++)
        udp_make_socket(uc,&socks->socks[i],M_FATAL);
 
-    udp_socks_register(uc,socks);
+    udp_socks_register(uc,socks, uc->use_proxy ? "proxy" : "socket");
 
     add_hook(PHASE_CHILDPERSIST,udp_childpersist_hook,st);
 }