From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 26 Jun 2017 12:31:49 +0000 (+0000)
Subject: - unbound-control dump_infra prints port number for address if not 53.
X-Git-Tag: release-1.6.6rc1~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5573d7508b0e545bfd304285b4b6af524fb37add;p=thirdparty%2Funbound.git

- unbound-control dump_infra prints port number for address if not 53.


git-svn-id: file:///svn/unbound/trunk@4248 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/daemon/remote.c b/daemon/remote.c
index bb41cc5df..fbfe1a1b7 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -2389,10 +2389,16 @@ dump_infra_host(struct lruhash_entry* e, void* arg)
 	struct infra_data* d = (struct infra_data*)e->data;
 	char ip_str[1024];
 	char name[257];
+	int port;
 	if(a->ssl_failed)
 		return;
 	addr_to_str(&k->addr, k->addrlen, ip_str, sizeof(ip_str));
 	dname_str(k->zonename, name);
+	port = (int)ntohs(((struct sockaddr_in*)&k->addr)->sin_port);
+	if(port != UNBOUND_DNS_PORT) {
+		snprintf(ip_str+strlen(ip_str), sizeof(ip_str)-strlen(ip_str),
+			"@%d", port);
+	}
 	/* skip expired stuff (only backed off) */
 	if(d->ttl < a->now) {
 		if(d->rtt.rto >= USEFUL_SERVER_TOP_TIMEOUT) {
diff --git a/doc/Changelog b/doc/Changelog
index 95f197c0f..f0c0fdbda 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 26 June 2017: Wouter
 	- Better fixup of dnscrypt_cert_chacha test for different escapes.
 	- First fix for zero b64 and hex text zone format in sldns.
+	- unbound-control dump_infra prints port number for address if not 53.
 
 23 June 2017: Wouter
 	- (for 1.6.5): fixup of dnscrypt_cert_chacha test (from Manu Bretelle).