From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 15 Oct 2007 09:10:26 +0000 (+0000)
Subject: fixup ip6 tcp.
X-Git-Tag: release-0.6~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bef17e9e7cebc02e0bdaecfb68a6a7e2d1aab785;p=thirdparty%2Funbound.git

fixup ip6 tcp.


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

diff --git a/doc/Changelog b/doc/Changelog
index 918540252..604f0200c 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+15 October 2007: Wouter
+	- nicer warning.
+	- fix IP6 TCP, wrong definition check. With test package.
+
 8 October 2007: Wouter
 	- --disable-rpath option in configure for 64bit systems with
 	  several dynamic lib dirs.
diff --git a/iterator/iter_utils.c b/iterator/iter_utils.c
index 33d6e1f33..bfa266ea1 100644
--- a/iterator/iter_utils.c
+++ b/iterator/iter_utils.c
@@ -318,7 +318,8 @@ iter_mark_cycle_targets(struct module_qstate* qstate, struct delegpt* dp)
 			LDNS_RR_TYPE_A, qstate->qinfo.qclass)) {
 			log_nametypeclass(VERB_DETAIL, "skipping target due "
 			 	"to dependency cycle (harden-glue: no may "
-				"fix this)", ns->name, LDNS_RR_TYPE_A, 
+				"fix some of the cycles)", 
+				ns->name, LDNS_RR_TYPE_A, 
 				qstate->qinfo.qclass);
 			ns->resolved = 1;
 		}
diff --git a/services/outside_network.c b/services/outside_network.c
index 150fd47de..8e9105095 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -123,8 +123,8 @@ outnet_tcp_take_into_use(struct waiting_tcp* w, uint8_t* pkt, size_t pkt_len)
 	log_assert(pend);
 	log_assert(pkt);
 	/* open socket */
-#ifndef INET6
-	if(addr_is_ip6(addr))
+#ifdef INET6
+	if(addr_is_ip6(&w->addr))
 		s = socket(PF_INET6, SOCK_STREAM, IPPROTO_TCP);
 	else
 #endif
diff --git a/testdata/fwd_tcp_tc6.tpkg b/testdata/fwd_tcp_tc6.tpkg
new file mode 100644
index 000000000..6d6547cff
Binary files /dev/null and b/testdata/fwd_tcp_tc6.tpkg differ