From 37c3bef5440d8526c4b4fd9a50e9507372e06e62 Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 16 Jan 2009 09:48:40 +0000
Subject: [PATCH] Squelch ipv6 network unreachable from verbosity default (1).

git-svn-id: file:///svn/unbound/trunk@1443 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 doc/Changelog       | 5 +++++
 iterator/iterator.c | 4 +---
 util/netevent.c     | 6 +++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 67ee95743..b2ec1cd9c 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+16 January 2009: Wouter
+	- more quiet about ipv6 network failures, i.e. when ipv6 is not
+	  available (network unreachable). Debug still printed on high
+	  verbosity.
+
 15 January 2009: Wouter
 	- bug #229: fixup configure checks for compilation with Solaris 
 	  Sun cc compiler, ./configure CC=/opt/SUNWspro/bin/cc
diff --git a/iterator/iterator.c b/iterator/iterator.c
index 6df7794f6..66d86cbd6 100644
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -1369,9 +1369,7 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 		iq->chase_flags | (iq->chase_to_rd?BIT_RD:0), EDNS_DO|BIT_CD, 
 		&target->addr, target->addrlen, qstate);
 	if(!outq) {
-		verbose(VERB_OPS, "error sending query to auth server; "
-			"skip this address");
-		log_addr(VERB_OPS, "error for address:", 
+		log_addr(VERB_DETAIL, "error sending query to auth server", 
 			&target->addr, target->addrlen);
 		return next_state(iq, QUERYTARGETS_STATE);
 	}
diff --git a/util/netevent.c b/util/netevent.c
index 8cee50da3..ad6482b44 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -239,13 +239,17 @@ comm_point_send_udp_msg(struct comm_point *c, ldns_buffer* packet,
 	log_assert(c->fd != -1);
 #ifdef UNBOUND_DEBUG
 	if(ldns_buffer_remaining(packet) == 0)
-		log_err("internal error: send empty UDP packet");
+		log_err("error: send empty UDP packet");
 #endif
 	log_assert(addr && addrlen > 0);
 	sent = sendto(c->fd, ldns_buffer_begin(packet), 
 		ldns_buffer_remaining(packet), 0,
 		addr, addrlen);
 	if(sent == -1) {
+#ifdef ENETUNREACH
+		if(errno == ENETUNREACH && verbosity < VERB_ALGO)
+			return 0;
+#endif
 #ifndef USE_WINSOCK
 		verbose(VERB_OPS, "sendto failed: %s", strerror(errno));
 #else