SourceFormat Enforcement

[thirdparty/squid.git] / src / mgr / Request.cc

diff --git a/src/mgr/Request.cc b/src/mgr/Request.cc
index 045ea9b45a41b90572aeb61c7858593fa99c94fa..3e6da16d61e845b4ddad11862cff7e746105489d 100644 (file)
--- a/src/mgr/Request.cc
+++ b/src/mgr/Request.cc
@@ -5,32 +5,41 @@
  *
  */
 
-#include "config.h"
+#include "squid.h"
 #include "base/TextException.h"
 #include "comm/Connection.h"
 #include "ipc/Messages.h"
+#include "ipc/TypedMsgHdr.h"
 #include "mgr/ActionParams.h"
 #include "mgr/Request.h"
 
-
-Mgr::Request::Request(int aRequestorId, unsigned int aRequestId, const Comm::ConnectionPointer &conn,
+Mgr::Request::Request(int aRequestorId, unsigned int aRequestId, const Comm::ConnectionPointer &aConn,
                       const ActionParams &aParams):
-        requestorId(aRequestorId), requestId(aRequestId),
-        fd(conn->fd),
+        Ipc::Request(aRequestorId, aRequestId),
+        conn(aConn),
         params(aParams)
 {
     Must(requestorId > 0);
-    Must(requestId != 0);
 }
 
-Mgr::Request::Request(const Ipc::TypedMsgHdr& msg)
+Mgr::Request::Request(const Request& request):
+        Ipc::Request(request.requestorId, request.requestId),
+        conn(request.conn), params(request.params)
+{
+}
+
+Mgr::Request::Request(const Ipc::TypedMsgHdr& msg):
+        Ipc::Request(0, 0)
 {
     msg.checkType(Ipc::mtCacheMgrRequest);
     msg.getPod(requestorId);
     msg.getPod(requestId);
     params = ActionParams(msg);
 
-    fd = msg.getFd();
+    conn = new Comm::Connection;
+    conn->fd = msg.getFd();
+    // For now we just have the FD.
+    // Address and connectio details wil be pulled/imported by the component later
 }
 
 void
@@ -41,5 +50,11 @@ Mgr::Request::pack(Ipc::TypedMsgHdr& msg) const
     msg.putPod(requestId);
     params.pack(msg);
 
-    msg.putFd(fd);
+    msg.putFd(conn->fd);
+}
+
+Ipc::Request::Pointer
+Mgr::Request::clone() const
+{
+    return new Request(*this);
 }