From e9c9020e67f3eaec34f591d80f8fb20eeaaec334 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 11 May 2014 19:12:56 +0100 Subject: [PATCH 1/1] site logging: Log peer addresses on timeout Signed-off-by: Ian Jackson --- site.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/site.c b/site.c index 1d8c777..fe0e1a7 100644 --- a/site.c +++ b/site.c @@ -347,9 +347,27 @@ static void logtimeout(struct site *st, const char *fmt, ...) FORMAT(printf,2,3); static void logtimeout(struct site *st, const char *fmt, ...) { + uint32_t class=event_log_priority(st,LOG_SETUP_TIMEOUT); + if (!class) + return; + va_list ap; va_start(ap,fmt); - vslog(st,LOG_SETUP_TIMEOUT,fmt,ap); + + slilog_part(st->log,class,"%s: ",st->tunname); + vslilog_part(st->log,class,fmt,ap); + + const char *delim; + int i; + for (i=0, delim=" (tried "; + isetup_peers.npeers; + i++, delim=", ") { + transport_peer *peer=&st->setup_peers.peers[i]; + const char *s=comm_addr_to_string(&peer->addr); + slilog_part(st->log,class,"%s%s",delim,s); + } + + slilog_part(st->log,class,")\n"); va_end(ap); } -- 2.30.2