merge

2012-12-14 13:02:51 +01:00
parent ec7fac9f5c 63ed77709e
commit 5a58dd7269
3 changed files with 2 additions and 4 deletions
--- a/src/lte/model/epc-ue-nas.cc
+++ b/src/lte/model/epc-ue-nas.cc
@@ -217,6 +217,7 @@ void
 EpcUeNas::DoNotifyConnectionReleased ()
 {
  NS_LOG_FUNCTION (this);
+  SwitchToState (OFF);
 }

 void 
--- a/src/lte/model/lte-ue-rrc.cc
+++ b/src/lte/model/lte-ue-rrc.cc
@@ -99,8 +99,7 @@ const char* g_ueRrcStateName[LteUeRrc::NUM_STATES] =
    "IDLE_CONNECTING",
    "CONNECTED_NORMALLY",
    "CONNECTED_REESTABLISHING",
-    "CONNECTED_HANDOVER",
-    "OFF"
+    "CONNECTED_HANDOVER"
  };

 std::string ToString (LteUeRrc::State s)
@@ -694,7 +693,6 @@ void
 LteUeRrc::DoRecvRrcConnectionReject (LteRrcSap::RrcConnectionReject msg)
 {
  NS_LOG_FUNCTION (this);
-  SwitchToState (OFF);
 }


--- a/src/lte/model/lte-ue-rrc.h
+++ b/src/lte/model/lte-ue-rrc.h
@@ -72,7 +72,6 @@ public:
      CONNECTED_NORMALLY,
      CONNECTED_REESTABLISHING,
      CONNECTED_HANDOVER,
-      OFF,
      NUM_STATES
    };