From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 18 Dec 2015 13:10:26 +0000 (+1300)
Subject: Convert ClientSocketContext to MEMPROXY class
X-Git-Tag: SQUID_4_0_4~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=252e50cf830477bc288315c108fbbf4dc55aa067;p=thirdparty%2Fsquid.git

Convert ClientSocketContext to MEMPROXY class

CBDATA and RefCountable are not very compatible. With the recent I/O
callback shuffling there appears to no longer be any reason for this
class to be CBDATA.
---

diff --git a/src/client_side.cc b/src/client_side.cc
index c377c0c98c..17e3af7792 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -171,11 +171,6 @@ private:
 
 static void clientListenerConnectionOpened(AnyP::PortCfgPointer &s, const Ipc::FdNoteId portTypeNote, const Subscription::Pointer &sub);
 
-/* our socket-related context */
-
-CBDATA_CLASS_INIT(ClientSocketContext);
-
-/* Local functions */
 static IOACB httpAccept;
 #if USE_OPENSSL
 static IOACB httpsAccept;
diff --git a/src/client_side.h b/src/client_side.h
index 5cfd05da97..10a4a74f1c 100644
--- a/src/client_side.h
+++ b/src/client_side.h
@@ -83,7 +83,7 @@ class PortCfg;
  */
 class ClientSocketContext : public RefCountable
 {
-    CBDATA_CLASS(ClientSocketContext);
+    MEMPROXY_CLASS(ClientSocketContext);
 
 public:
     typedef RefCount<ClientSocketContext> Pointer;