Switch to OFF state in NAS, not in RRC.
authorLluis Parcerisa <parcerisa@gmail.com>
Fri, 14 Dec 2012 11:31:08 +0100
changeset 9539 8ae380bcb768
parent 9536 da6e0a3c432b
child 9540 85c58844662e
Switch to OFF state in NAS, not in RRC.
src/lte/model/epc-ue-nas.cc
src/lte/model/lte-ue-rrc.cc
src/lte/model/lte-ue-rrc.h
--- a/src/lte/model/epc-ue-nas.cc	Fri Dec 14 09:48:02 2012 +0100
+++ b/src/lte/model/epc-ue-nas.cc	Fri Dec 14 11:31:08 2012 +0100
@@ -217,6 +217,7 @@
 EpcUeNas::DoNotifyConnectionReleased ()
 {
   NS_LOG_FUNCTION (this);
+  SwitchToState (OFF);
 }
 
 void 
--- a/src/lte/model/lte-ue-rrc.cc	Fri Dec 14 09:48:02 2012 +0100
+++ b/src/lte/model/lte-ue-rrc.cc	Fri Dec 14 11:31:08 2012 +0100
@@ -99,8 +99,7 @@
     "IDLE_CONNECTING",
     "CONNECTED_NORMALLY",
     "CONNECTED_REESTABLISHING",
-    "CONNECTED_HANDOVER",
-    "OFF"
+    "CONNECTED_HANDOVER"
   };
 
 std::string ToString (LteUeRrc::State s)
@@ -694,7 +693,6 @@
 LteUeRrc::DoRecvRrcConnectionReject (LteRrcSap::RrcConnectionReject msg)
 {
   NS_LOG_FUNCTION (this);
-  SwitchToState (OFF);
 }
 
 
--- a/src/lte/model/lte-ue-rrc.h	Fri Dec 14 09:48:02 2012 +0100
+++ b/src/lte/model/lte-ue-rrc.h	Fri Dec 14 11:31:08 2012 +0100
@@ -72,7 +72,6 @@
       CONNECTED_NORMALLY,
       CONNECTED_REESTABLISHING,
       CONNECTED_HANDOVER,
-      OFF,
       NUM_STATES
     };