--- a/src/DAF/IRM/ConnectionTableEntry.cc
+++ b/src/DAF/IRM/ConnectionTableEntry.cc
@@ -16,7 +16,8 @@
#include <ConnectionTableEntry.h>
ConnectionTableEntry::ConnectionTableEntry()
- : FlowObject(NULL), conStatus(CON_ERROR),
+ : //FlowObject(NULL)
+ apni(APNamingInfo()), conStatus(CON_ERROR),
northGateIn(NULL), northGateOut(NULL),
southGateIn(NULL), southGateOut(NULL),
FlowAlloc(NULL)
@@ -24,23 +25,16 @@
}
ConnectionTableEntry::ConnectionTableEntry(Flow* flow)
- : FlowObject(flow), conStatus(CON_FLOWPENDING),
+ : conStatus(CON_FLOWPENDING),
northGateIn(NULL), northGateOut(NULL),
southGateIn(NULL), southGateOut(NULL),
FlowAlloc(NULL)
{
-}
-
-ConnectionTableEntry::ConnectionTableEntry(Flow* flow, cGate* nIn, cGate* nOut)
-: FlowObject(flow), conStatus(CON_FLOWPENDING),
- northGateIn(nIn), northGateOut(nOut),
- southGateIn(NULL), southGateOut(NULL),
- FlowAlloc(NULL)
-{
+ apni = flow->getSrcApni();
}
ConnectionTableEntry::~ConnectionTableEntry() {
- this->FlowObject = NULL;
+ //this->FlowObject = NULL;
this->conStatus = CON_ERROR;
this->northGateIn = NULL;
this->northGateOut = NULL;
@@ -51,8 +45,7 @@
std::string ConnectionTableEntry::info() const {
std::ostringstream os;
- if (FlowObject)
- os << FlowObject->info() << "\n";
+ os << apni.info() << "\n";
if (FlowAlloc)
os << "FA path: " << FlowAlloc->getFullPath() << "\n";
if (northGateIn && northGateOut)
@@ -69,8 +62,8 @@
switch(this->conStatus)
{
case CON_NIL: return "NULL";
- case CON_FLOWPENDING: return "flowpending";
- case CON_CONNECTPENDING: return "connectpending";
+ case CON_FLOWPENDING: return "flow pending";
+ case CON_CONNECTPENDING: return "connect pending";
case CON_AUTHENTICATING: return "authenticating";
case CON_ESTABLISHED: return "established";
case CON_RELEASING: return "releasing";
@@ -93,14 +86,6 @@
void ConnectionTableEntry::setFlowAlloc(FABase* flowAlloc) {
FlowAlloc = flowAlloc;
-}
-
-Flow* ConnectionTableEntry::getFlowObject() const {
- return FlowObject;
-}
-
-void ConnectionTableEntry::setFlowObject(Flow* flowObject) {
- FlowObject = flowObject;
}
cGate* ConnectionTableEntry::getNorthGateIn() const {
@@ -138,3 +123,11 @@
cModule* ConnectionTableEntry::getIpc() const {
return FlowAlloc->getParentModule()->getParentModule();
}
+
+const APNamingInfo& ConnectionTableEntry::getApni() const {
+ return apni;
+}
+
+void ConnectionTableEntry::setApni(const APNamingInfo& apni) {
+ this->apni = apni;
+}