From bef17e9e7cebc02e0bdaecfb68a6a7e2d1aab785 Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 15 Oct 2007 09:10:26 +0000
Subject: [PATCH] fixup ip6 tcp.

git-svn-id: file:///svn/unbound/trunk@675 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 doc/Changelog              |   4 ++++
 iterator/iter_utils.c      |   3 ++-
 services/outside_network.c |   4 ++--
 testdata/fwd_tcp_tc6.tpkg  | Bin 0 -> 1659 bytes
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 testdata/fwd_tcp_tc6.tpkg

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 0000000000000000000000000000000000000000..6d6547cfffba35196a8638fd6594756c81c9712a
GIT binary patch
literal 1659
zc-jGb288(^iwFQAE)z!p1ML`VbJ|AGUv<A?BQtg~u7t!xbY#Pr0B+pIKtQgWX*)!g
z4p0n|B8d?C`0w32ArKhbnTbuClpT;xyL-ELySKM{*Pq(G$nx>8$+i<@_nrV0gi@&(
zzqP{3dk%Z5Qc?<9uB7Didy1MbD#bl0KE+_xVG>4W0I)apCJ_zp=6i_#l|p~b|LO0D
zhLIb7xen%FZO!j#|7)r?_rHqEL_z<TR88Fj<;zt+4F7ZgAA@U-X-I>QGyvvs=sP1y
zGOf<}59dvwpUkm8qO#?UWs)(B*O1o~g^)(m=)CQ{Y#<N0s2a6b;Q5wkQ}__ge0(yY
za9MAYPNV($ExhSKwF*WJnyp5s)9R3F{m09$0hZ^_dX7!Hjhb=ZYQme#Mwd0nbUGEz
zn?iL#sW!V;jm`ousEV9Z<h&vml=)y9&H87K%c!l6>q!Q+0jX|6=F-F8zW?uwf6H_G
zkD=qC_|Iv%WdB!`qK5IW6^n&k{BHx|$k&O0&ucGqqL~gkBJ6`Z8B5VHpr#$_pc29N
zf=GwccB^BY5&?}d@Ems_&C#t(V@{cbR0?O|$Q$V3dPJ~2$?*%Rwx+|3hJ^IJU}^@o
z^oQqC)XySQ2T>M@kWft94iKg5>glP`;_}6RBSyYuxG(<wfIf<j2jV}k7S`)Ot)Lcn
z@xKk&hkZ$cHLpw3KG}!Rn*<hxXh>mfhB$fnh?ZjI0ZfO~1t&TT88x8fSCIN3%UL<{
zZw4~5$@3n+!@)r!XagO!;C=y1bX<XW0XS}4jUdu7uTiCMh9Pb^b5*MyR<x{;2<bHI
zJ+^g}GtZwxrc-U!TNiKy#eA^<FJ6$#=F8UQf+b-lXIIN!3oLe1u?y~X3tGZ=#0b<H
zdLXV!On-?`sjQDL?z2>vv^McFpWtHU24Wi|+7H<qo$|<bLn*G-iPMh__l(&|d^a6B
z)(|qB@11ze{N)lM?v@>TW15W@cJ|tFvuQbfhs3==@?kM7kTke`M1Tt7WZd#0S2<AO
zAU5B5y_|WLo*+Za8+S}^Y~D~{Wrs6}>(G$eAW=9Bvpn<scA7n0G3jCUFrmj8f^#IJ
zO;P6wijxxuGV%$mS3FRG$u(~+>^*U>y@_k{MTyaHZCW>jfMH0x(<qB<VPoFP;72xL
zmGEaJf}k=-r){*DM%qp*$kfM1ds$|*!G=@Qi9;wU>OB~EF!8_RAp|El1ZG;6Z!2&T
zMgc|@W15<gHLQ^S#I+*FbGe*eETcE^pTB@ViEvT<rFYrxVZB;ba|#izs^><}c-3ii
z%Xx(-Zonvuf>~LCWA=uVGGvy$V&u^gMjke8ED3~Uz2a)ks4R~AgMj)VW^y7!RI)bx
zm~|(kQL=UgAvTqbbpzlynU)MbL`J&Cg5~BITey6evKbi{!iV%w*2Q&WYoUu#tL@lW
zutc%po^i>{*cp}ce?kMRcPJT9$Ske0R1%IT&PttkVq+(NuXt+_)65rm+@h$NFF@{}
z!`BY(mo97Klv&Yr$cBo(l*y{2APGhBRu^$aVX{&;s_XJ~@Adg2ax8kMw)Dal!?j+!
zYVAJ{58eMfhK`5Me<dxyIRB~n9IO8{rL?R6wgI>6zj!zPhAO~xj^4+l!{?JKzACug
z4`4c-%IVuKkudBj9zJ;ilrB1M@xosy50lX(;zdg$mZgk&whcv|t&_c(f26j~WtSnf
zZoqWIDGfwc%f-nsbzLMTYLeU%cWwP75;_WL^4-Mj#c=a%#mYIto672zeDC?s+fMvz
zd1dYXSJQI2UHoqYHk|*wEysUKOA_$+>G<rx-;bkxhC~#MwUsw@feS*yjWZgtY2yfZ
zQ&J&0n<VFuaDuFym{3yHD6irdg65&T6qPF7H;7A7Z;9L#q)!O<#lIa|kD}wD_%9So
z%lluI-~SerUHoqaUYa3o@~hXB=gH4B2=NT4gDNYePD3kj{D>pY;$sQ~lpS|4M;o;^
zoVPU?dp4Cx4bNYUv2I2v@&XSYEeq365mZH2zQ-Tb8eId>&n0qUI&Or28t7mLGF-_u
zxr#66y*n^bM@VWYW#9!f9Z1a^`*>(_Bc0U7cAfgvWf#+A*?L7szE0Y~>QvZu7HQ*_
zrr+A+h(XuUeBY=}KAo|YjWXL<a!^|*XQng4@YQ$6nH}t42Rqoo4tDVM!#`}a@kjtD
F001M_KBxcy

literal 0
Hc-jL100001

-- 
2.47.2