From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 14 Jan 2017 15:32:11 +0000 (+1300)
Subject: Move handshaek IN/OUT debug to avoid 'Error' wording
X-Git-Tag: M-staged-PR71~284^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d193e738c32dd988ee90e4bf95a1101734e9950b;p=thirdparty%2Fsquid.git

Move handshaek IN/OUT debug to avoid 'Error' wording
---

diff --git a/src/security/PeerConnector.cc b/src/security/PeerConnector.cc
index bfc3f323ca..e81df2d431 100644
--- a/src/security/PeerConnector.cc
+++ b/src/security/PeerConnector.cc
@@ -199,6 +199,11 @@ Security::PeerConnector::negotiate()
     }
 
     if (result != GNUTLS_E_SUCCESS) {
+        // debug the TLS session state so far
+        auto descIn = gnutls_handshake_get_last_in(session.get());
+        debugs(83, 2, "handshake IN: " << gnutls_handshake_description_get_name(descIn));
+        auto descOut = gnutls_handshake_get_last_out(session.get());
+        debugs(83, 2, "handshake OUT: " << gnutls_handshake_description_get_name(descOut));
 #else
     if (const int result = -1) {
 #endif
@@ -417,13 +422,6 @@ Security::PeerConnector::handleNegotiateError(const int ret)
 
     case GNUTLS_E_AGAIN:
     case GNUTLS_E_INTERRUPTED:
-        {
-            auto descIn = gnutls_handshake_get_last_in(session.get());
-            debugs(83, 2, "handshake IN: " << gnutls_handshake_description_get_name(descIn));
-            auto descOut = gnutls_handshake_get_last_out(session.get());
-            debugs(83, 2, "handshake OUT: " << gnutls_handshake_description_get_name(descOut));
-        }
-
         if (gnutls_record_get_direction(session.get()) == 0)
             noteWantRead();
         else