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 c377c0c98cbef70f38585613cd4f93067a3d5bcd..17e3af77926b6fd65f048afdc551c70dca5a5a9f 100644 (file)
--- 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 5cfd05da97769cf86cef9359b6bed41e00db93da..10a4a74f1c79f4efbbb20a5f2ab2cfab2b01508d 100644 (file)
--- 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;