Merge branch 'inetmanet-2.2' of github.com:aarizaq/inetmanet-2.0 into…

… inetmanet-2.2
privalov1967 · Apr 1, 2014 · 8a8225c · 8a8225c
2 parents 370cbd1 + c3882f1
commit 8a8225c
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 1 deletion.
diff --git a/src/linklayer/ieee80211/mgmt/Ieee80211AgentSTA.cc b/src/linklayer/ieee80211/mgmt/Ieee80211AgentSTA.cc
@@ -62,6 +62,7 @@ void Ieee80211AgentSTA::initialize(int stage)
         scheduleAt(simTime()+startingTime, new cMessage("startUp", MK_STARTUP));
 
         myIface = NULL;
+        isOperational = true;
     }
     else if (stage == 1)
     {
@@ -75,6 +76,9 @@ void Ieee80211AgentSTA::initialize(int stage)
 
 void Ieee80211AgentSTA::handleMessage(cMessage *msg)
 {
+    if (!isOperational)
+        delete msg;
+
     if (msg->isSelfMessage())
         handleTimer(msg);
     else
@@ -122,6 +126,9 @@ void Ieee80211AgentSTA::receiveChangeNotification(int category, const cObject *d
     Enter_Method_Silent();
     printNotificationBanner(category, details);
 
+    if (!isOperational)
+        return;
+
     if (category == NF_L2_BEACON_LOST)
     {
         //XXX should check details if it's about this NIC
@@ -347,3 +354,38 @@ void Ieee80211AgentSTA::processReassociateConfirm(Ieee80211Prim_ReassociateConfi
     }
 }
 
+bool Ieee80211AgentSTA::handleOperationStage(LifecycleOperation *operation, int stage, IDoneCallback *doneCallback)
+{
+    Enter_Method_Silent();
+    if (dynamic_cast<NodeStartOperation *>(operation)) {
+        if (stage == NodeStartOperation::STAGE_PHYSICAL_LAYER)
+            start();
+    }
+    else if (dynamic_cast<NodeShutdownOperation *>(operation)) {
+        if (stage == NodeStartOperation::STAGE_PHYSICAL_LAYER)
+            stop();
+    }
+    else if (dynamic_cast<NodeCrashOperation *>(operation)) {
+        if (stage == NodeStartOperation::STAGE_LOCAL)  // crash is immediate
+            stop();
+    }
+    else
+        throw cRuntimeError("Unsupported operation '%s'", operation->getClassName());
+    return true;
+}
+
+void Ieee80211AgentSTA::start()
+{
+    isOperational = true;
+    simtime_t startingTime = uniform(SIMTIME_ZERO, maxChannelTime);
+    scheduleAt(simTime()+startingTime, new cMessage("startUp", MK_STARTUP));
+}
+
+void Ieee80211AgentSTA::stop()
+{
+    clear();
+    dataQueue.clear();
+    emit(dataQueueLenSignal, dataQueue.length());
+    mgmtQueue.clear();
+    isOperational = false;
+}
diff --git a/src/linklayer/ieee80211/mgmt/Ieee80211AgentSTA.h b/src/linklayer/ieee80211/mgmt/Ieee80211AgentSTA.h
@@ -25,6 +25,7 @@
 #include "Ieee80211Primitives_m.h"
 #include "NotificationBoard.h"
 #include "InterfaceTable.h"
+#include "ILifecycle.h"
 
 
 /**
@@ -36,9 +37,10 @@
  *
  * @author Andras Varga
  */
-class INET_API Ieee80211AgentSTA : public cSimpleModule, public INotifiable
+class INET_API Ieee80211AgentSTA : public cSimpleModule, public INotifiable,  public ILifecycle
 {
   protected:
+    bool isOperational;     // for lifecycle
     InterfaceEntry *myIface;
     NotificationBoard *nb;
     MACAddress prevAP;
@@ -102,6 +104,14 @@ class INET_API Ieee80211AgentSTA : public cSimpleModule, public INotifiable
 
     // utility method, for debugging
     virtual void dumpAPList(Ieee80211Prim_ScanConfirm *resp);
+    /** lifecycle support */
+    //@{
+  protected:
+    virtual void start();
+    virtual void stop();
+  public:
+    virtual bool handleOperationStage(LifecycleOperation *operation, int stage, IDoneCallback *doneCallback);
+    //@}
 };
 
 #endif