Refactor Security::BlindPeerConnector constructor (squid-cache#1511)

Avoid having to include HttpRequest.h in BlindPeerConnector.h by moving the definition of the constructor to the .cc file
squidadm · Nov 18, 2023 · 2c6781d · 2c6781d
1 parent 5fb6afe
commit 2c6781d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/src/security/BlindPeerConnector.cc b/src/security/BlindPeerConnector.cc
@@ -86,3 +86,13 @@ Security::BlindPeerConnector::noteNegotiationDone(ErrorState *error)
     }
 }
 
+Security::BlindPeerConnector::BlindPeerConnector(HttpRequestPointer &aRequest,
+        const Comm::ConnectionPointer &aServerConn,
+        const AsyncCallback<EncryptorAnswer> &aCallback,
+        const AccessLogEntryPointer &alp,
+        time_t timeout) :
+    AsyncJob("Security::BlindPeerConnector"),
+    Security::PeerConnector(aServerConn, aCallback, alp, timeout)
+{
+    request = aRequest;
+}
diff --git a/src/security/BlindPeerConnector.h b/src/security/BlindPeerConnector.h
@@ -10,7 +10,6 @@
 #define SQUID_SRC_SECURITY_BLINDPEERCONNECTOR_H
 
 #include "http/forward.h"
-#include "HttpRequest.h"
 #include "security/PeerConnector.h"
 
 class ErrorState;
@@ -26,12 +25,7 @@ class BlindPeerConnector: public Security::PeerConnector {
                        const Comm::ConnectionPointer &aServerConn,
                        const AsyncCallback<EncryptorAnswer> &aCallback,
                        const AccessLogEntryPointer &alp,
-                       const time_t timeout = 0) :
-        AsyncJob("Security::BlindPeerConnector"),
-        Security::PeerConnector(aServerConn, aCallback, alp, timeout)
-    {
-        request = aRequest;
-    }
+                       time_t timeout = 0);
 
     /* Security::PeerConnector API */
 

diff --git a/src/tests/stub_libsecurity.cc b/src/tests/stub_libsecurity.cc
@@ -18,6 +18,14 @@
 CBDATA_NAMESPACED_CLASS_INIT(Security, BlindPeerConnector);
 namespace Security
 {
+BlindPeerConnector::BlindPeerConnector(HttpRequestPointer &, const Comm::ConnectionPointer & aServerConn,
+                                       const AsyncCallback<EncryptorAnswer> & aCallback,
+                                       const AccessLogEntryPointer &alp,
+                                       time_t) :
+    AsyncJob("Security::BlindPeerConnector"),
+    Security::PeerConnector(aServerConn, aCallback, alp, 0)
+{STUB_NOP}
+
 bool BlindPeerConnector::initialize(Security::SessionPointer &) STUB_RETVAL(false)
 Security::ContextPointer BlindPeerConnector::getTlsContext() STUB_RETVAL(Security::ContextPointer())
 void BlindPeerConnector::noteNegotiationDone(ErrorState *) STUB