--- a/src/policies/DIF/RMT/Monitor/RMTQMonitorBase.h
+++ b/src/policies/DIF/RMT/Monitor/RMTQMonitorBase.h
@@ -1,5 +1,5 @@
//
-// Copyright © 2014 PRISTINE Consortium (http://ict-pristine.eu)
+// Copyright © 2014 - 2015 PRISTINE Consortium (http://ict-pristine.eu)
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
@@ -20,10 +20,14 @@
#include <omnetpp.h>
#include "RMTSchedulingBase.h"
+#include "AddressComparatorBase.h"
+#include "RMTModuleAllocator.h"
#include "RMTQueue.h"
#include "PDU.h"
-class RMTSchedulingBase; /* FIXME: circular dependency */
+/* FIXME: circular dependencies */
+class RMTSchedulingBase;
+class RMTModuleAllocator;
/**
* Noop base class for the RMT monitoring policy.
@@ -55,7 +59,7 @@
* @param queue pointer to the queue
* @param pdu PDU being dropped
*/
- virtual void onMessageDrop(RMTQueue* queue, const cMessage* pdu);
+ virtual void onMessageDrop(RMTQueue* queue, const cPacket* pdu);
/**
* A hook method invoked after a queue is created.
@@ -84,9 +88,19 @@
virtual void handleMessage(cMessage* msg);
/**
+ * Pointer to the RMT allocator module (also providing queue<->port mappings).
+ */
+ RMTModuleAllocator* rmtAllocator;
+
+ /**
* Pointer to a scheduling policy module.
*/
RMTSchedulingBase* schedPolicy;
+
+ /**
+ * Pointer to an address comparator module.
+ */
+ AddressComparatorBase* addrComparator;
private: