/*
- * $Id$
- *
* DEBUG: section 54 Interprocess Communication
*
*/
-#include "config.h"
+#include "squid.h"
+#include "base/Subscription.h"
#include "base/TextException.h"
-#include "ipc/Strand.h"
-#include "ipc/StrandCoord.h"
+#include "CacheManager.h"
+#include "comm/Connection.h"
+#include "globals.h"
+#include "ipc/Kids.h"
#include "ipc/Messages.h"
#include "ipc/SharedListen.h"
-#include "ipc/Kids.h"
+#include "ipc/Strand.h"
+#include "ipc/StrandCoord.h"
+#include "ipc/StrandSearch.h"
+#include "mgr/Forwarder.h"
#include "mgr/Request.h"
#include "mgr/Response.h"
-#include "mgr/Forwarder.h"
-#include "DiskIO/IpcIo/IpcIoFile.h" /* XXX: scope boundary violation */
#include "SwapDir.h" /* XXX: scope boundary violation */
-#include "CacheManager.h"
-
+#if USE_DISKIO_IPCIO
+#include "DiskIO/IpcIo/IpcIoFile.h" /* XXX: scope boundary violation */
+#endif
+#if SQUID_SNMP
+#include "snmp/Forwarder.h"
+#include "snmp/Request.h"
+#include "snmp/Response.h"
+#endif
CBDATA_NAMESPACED_CLASS_INIT(Ipc, Strand);
-
Ipc::Strand::Strand():
Port(MakeAddr(strandAddrPfx, KidIdentifier)),
isRegistered(false)
SharedListenJoined(SharedListenResponse(message));
break;
- case mtIpcIoRequest:
- IpcIoFile::HandleRequest(IpcIoRequest(message));
+#if USE_DISKIO_IPCIO
+ case mtStrandSearchResponse:
+ IpcIoFile::HandleOpenResponse(StrandSearchResponse(message));
break;
- case mtIpcIoResponse:
- IpcIoFile::HandleResponse(message);
+ case mtIpcIoNotification:
+ IpcIoFile::HandleNotification(message);
break;
+#endif /* USE_DISKIO_IPCIO */
- case mtCacheMgrRequest:
- handleCacheMgrRequest(Mgr::Request(message));
- break;
+ case mtCacheMgrRequest: {
+ const Mgr::Request req(message);
+ handleCacheMgrRequest(req);
+ }
+ break;
- case mtCacheMgrResponse:
- handleCacheMgrResponse(Mgr::Response(message));
- break;
+ case mtCacheMgrResponse: {
+ const Mgr::Response resp(message);
+ handleCacheMgrResponse(resp);
+ }
+ break;
+
+#if SQUID_SNMP
+ case mtSnmpRequest: {
+ const Snmp::Request req(message);
+ handleSnmpRequest(req);
+ }
+ break;
+
+ case mtSnmpResponse: {
+ const Snmp::Response resp(message);
+ handleSnmpResponse(resp);
+ }
+ break;
+#endif
default:
- debugs(54, 1, HERE << "Unhandled message type: " << message.type());
+ debugs(54, DBG_IMPORTANT, HERE << "Unhandled message type: " << message.type());
break;
}
}
Mgr::Forwarder::HandleRemoteAck(response.requestId);
}
+#if SQUID_SNMP
+void Ipc::Strand::handleSnmpRequest(const Snmp::Request& request)
+{
+ debugs(54, 6, HERE);
+ Snmp::SendResponse(request.requestId, request.pdu);
+}
+
+void Ipc::Strand::handleSnmpResponse(const Snmp::Response& response)
+{
+ debugs(54, 6, HERE);
+ Snmp::Forwarder::HandleRemoteAck(response.requestId);
+}
+#endif
+
void Ipc::Strand::timedout()
{
debugs(54, 6, HERE << isRegistered);