From 2d7478f775f7e150f46f095e8e4db90f24b362b8 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 27 Sep 2014 15:03:34 +0100 Subject: [PATCH] udp: Log transmission and reception errors, at least some of the time We keep a bitmask for each combination of - receive/send - address family - success/failure and log a message the first time each one occurs. We also provide a new utility function `af_name()' which is going to be used by polypath's logging. Signed-off-by: Ian Jackson --- comm-common.h | 10 ++++++++++ udp.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/comm-common.h b/comm-common.h index baeb24e..13709c7 100644 --- a/comm-common.h +++ b/comm-common.h @@ -3,6 +3,7 @@ #define COMM_COMMON_H #include "secnet.h" +#include "util.h" /*----- for all comms -----*/ @@ -62,9 +63,12 @@ void comm_apply(struct commcommon *cc, void *st); #define UDP_MAX_SOCKETS 3 /* 2 ought to do really */ +#define MAX_AF MAX_RAW(AF_INET6,AF_INET) + struct udpsock { union iaddr addr; int fd; + bool_t experienced[/*0=recv,1=send*/2][MAX_AF+1][/*success?*/2]; }; struct udpsocks { @@ -90,6 +94,12 @@ bool_t udp_make_socket(struct udpcommon *uc, struct udpsock *us, void udp_destroy_socket(struct udpcommon *uc, struct udpsock *us); /* Idempotent. No errors are possible. */ +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 /* 0 means any */, + int r, int errnoval); + void udp_socks_register(struct udpcommon *uc, struct udpsocks *socks); void udp_socks_deregister(struct udpcommon *uc, struct udpsocks *socks); diff --git a/udp.c b/udp.c index f710250..706e077 100644 --- a/udp.c +++ b/udp.c @@ -72,6 +72,34 @@ static int udp_socks_beforepoll(void *state, struct pollfd *fds, int *nfds_io, return 0; } +const char *af_name(int af) +{ + switch (af) { + case AF_INET6: return "IPv6"; + case AF_INET: return "IPv4"; + case 0: return "(any)"; + default: abort(); + } +} + +void udp_sock_experienced(struct log_if *lg, struct udpcommon *uc, + const char *socksdesc, struct udpsock *us, + bool_t recvsend, int af, + int r, int errnoval) +{ + bool_t success=r>=0; + if (us->experienced[recvsend][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), + success?"success":"trouble", + recvsend?"transmitting":"receiving", + af?" ":"", af?af_name(af):""); +} + static void udp_socks_afterpoll(void *state, struct pollfd *fds, int nfds) { struct udpsocks *socks=state; @@ -136,6 +164,8 @@ 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); BUF_FREE(cc->rbuf); } } while (rv>=0); @@ -162,8 +192,9 @@ static bool_t udp_sendmsg(void *commst, struct buffer_if *buf, memcpy(sa,&dest->ia.sin.sin_addr,4); memset(sa+4,0,4); memcpy(sa+6,&dest->ia.sin.sin_port,2); - sendto(us->fd,sa,buf->size+8,0,&uc->proxy.sa, + 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); buf_unprepend(buf,8); } else { int i,r; @@ -176,6 +207,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); if (r>=0) return True; if (!(errno==EAFNOSUPPORT || errno==ENETUNREACH)) /* who knows what that error means? */ @@ -208,6 +240,7 @@ bool_t udp_make_socket(struct udpcommon *uc, struct udpsock *us, goto failed; \ }while(0) + FILLZERO(us->experienced); us->fd=socket(addr->sa.sa_family, SOCK_DGRAM, IPPROTO_UDP); if (us->fd<0) FAIL("socket"); setnonblock(us->fd); -- 2.30.2