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 918540252e2f84b7a1dbc7e7e485919d777da2b4..604f0200c90f7b4e5052897f4101d603e1c76bbf 100644 (file)
--- 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 33d6e1f33c94388fda3446db13de1ad80307a2e2..bfa266ea1d75252bbc8b4e41a7217854b3bc2b50 100644 (file)
--- 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 150fd47def0cd71ea77c3f0056557d9532fa661a..8e91050952300e691ce6ea7e1b90ea7ce9894f14 100644 (file)
--- 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 (file)
index 0000000..6d6547c
Binary files /dev/null and b/testdata/fwd_tcp_tc6.tpkg differ