From 42f89040397ec65a68dfb7ee72bb140e0b6ab042 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 2 Oct 2014 00:55:28 +0100 Subject: [PATCH] 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 --- comm-common.h | 6 ++++-- polypath.c | 4 ++-- udp.c | 21 +++++++++++++-------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/comm-common.h b/comm-common.h index 472cbbd..4036f16 100644 --- a/comm-common.h +++ b/comm-common.h @@ -67,6 +67,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 { @@ -91,11 +92,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 61e301b..1f7abf3 100644 --- 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 40348fc..9088d85 100644 --- a/udp.c +++ b/udp.c @@ -71,7 +71,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) { @@ -82,7 +82,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):""); @@ -140,7 +140,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)) @@ -156,7 +159,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); @@ -186,7 +189,7 @@ static bool_t udp_sendmsg(void *commst, struct buffer_if *buf, int r=sendto(us->fd,sa,buf->size+8,0, (struct sockaddr *)&uc->proxy, sizeof(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; @@ -199,7 +202,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) return True; if (!(errno==EAFNOSUPPORT || errno==ENETUNREACH)) /* who knows what that error means? */ @@ -339,9 +342,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"); } @@ -374,7 +379,7 @@ static void udp_phase_hook(void *sst, uint32_t new_phase) for (i=0; in_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); } -- 2.30.2