stream reuse, fix review comments.

diff --git a/services/outside_network.h b/services/outside_network.h
index 5ca0741831804082005b939a563cd29a86ee27ca..15b33094fc0a9f25521347291083f338115aaff8 100644 (file)
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -233,8 +233,11 @@ struct port_comm {
 struct reuse_tcp {
        /** rbtree node with links in tcp_reuse tree. key is NULL when not
         * in tree. Both active and empty connections are in the tree.
-        * key is this structure, the sockaddr and and then is-ssl bool,
-        * and then ptr value for several times same address in tree */
+        * key is a pointer to this structure, the members used to compare
+        * are the sockaddr and and then is-ssl bool, and then ptr value is
+        * used in case the same address exists several times in the tree
+        * when there are multiple connections to the same destination to
+        * make the rbtree items unique. */
        rbnode_type node;
        /** the key for the tcp_reuse tree. address of peer, ip4 or ip6,
         * and port number of peer */

diff --git a/testdata/tls_reuse.tdir/tls_reuse.conf b/testdata/tls_reuse.tdir/tls_reuse.conf
index 52857ca37bd408ef436136f91161ef6b6810ae9d..e8200b28b7aee0b67832478dc610b4fce14e9a2b 100644 (file)
--- a/testdata/tls_reuse.tdir/tls_reuse.conf
+++ b/testdata/tls_reuse.tdir/tls_reuse.conf
@@ -11,7 +11,7 @@ server:
        do-not-query-localhost: no
 
        tls-cert-bundle: "unbound_server.pem"
-       ssl-upstream: yes
+       tls-upstream: yes
 
 forward-zone:
        name: "."

diff --git a/testdata/tls_reuse.tdir/tls_reuse.test b/testdata/tls_reuse.tdir/tls_reuse.test
index fe488cbb26caed87b7be2aa4612e85e64e045450..0f392fba81fe52c3f82e8423858f12c90e8772f4 100644 (file)
--- a/testdata/tls_reuse.tdir/tls_reuse.test
+++ b/testdata/tls_reuse.tdir/tls_reuse.test
@@ -190,7 +190,7 @@ for x in a1.more.net a2.more.net a3.more.net a4.more.net a5.more.net; do
 done
 
 # make the server timeout to drop the upstream connection
-echo "> sleep 20"
+echo "> sleep 15"
 sleep 15
 # see if we are still up.
 echo "> query a7.more.net"