X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/adns/blobdiff_plain/e1d31292a9c52afb49d6dcbb5dc140289774f8c7..62e2764d90d496e46a62e6a2bc1ff1c5ecda908d:/src/setup.c diff --git a/src/setup.c b/src/setup.c index 21db53c..267f3da 100644 --- a/src/setup.c +++ b/src/setup.c @@ -60,26 +60,27 @@ static void addserver(adns_state ads, struct sockaddr *sa, int n) { int i; adns_rr_addr *ss; const afinfo *ai; + char buf[MAX_ADDRSTRLEN]; ai = find_afinfo(sa->sa_family); if (!ai) { adns__diag(ads,-1,0, "nameserver %s for unknown address family %d ignored", - adns__sockaddr_ntoa(sa, n), sa->sa_family); + adns__sockaddr_ntoa(sa, n, buf), sa->sa_family); } for (i=0; inservers; i++) { if (ads->servers[i].addr.sa.sa_family == sa->sa_family && ai->sockaddr_equalp(sa, &ads->servers[i].addr.sa)) { adns__debug(ads,-1,0,"duplicate nameserver %s ignored", - adns__sockaddr_ntoa(sa, n)); + adns__sockaddr_ntoa(sa, n, buf)); return; } } if (ads->nservers>=MAXSERVERS) { adns__diag(ads,-1,0,"too many nameservers, ignoring %s", - adns__sockaddr_ntoa(sa, n)); + adns__sockaddr_ntoa(sa, n, buf)); return; } @@ -134,6 +135,7 @@ static int nextword(const char **bufp_io, const char **word_r, int *l_r) { static void ccf_nameserver(adns_state ads, const char *fn, int lno, const char *buf) { struct addrinfo *ai, ai_hint = { 0 }; + char addrbuf[MAX_ADDRSTRLEN]; int err; ai_hint.ai_family = AF_UNSPEC; @@ -148,7 +150,7 @@ static void ccf_nameserver(adns_state ads, const char *fn, } adns__debug(ads,-1,0,"using nameserver %s", - adns__sockaddr_ntoa(ai->ai_addr, ai->ai_addrlen)); + adns__sockaddr_ntoa(ai->ai_addr, ai->ai_addrlen, addrbuf)); addserver(ads, ai->ai_addr, ai->ai_addrlen); freeaddrinfo(ai); }