From a059f89a8ba310d187882eeaa5808c874fd8893e Mon Sep 17 00:00:00 2001
From: Lluis Parcerisa <parcerisa@gmail.com>
Date: Thu, 13 Dec 2012 18:27:24 +0100
Subject: [PATCH] Add OFF state for Ue (switched to this state upon connection
 reject). Remove assert against connection failed.

---
 src/lte/model/epc-ue-nas.cc | 2 +-
 src/lte/model/lte-ue-rrc.cc | 5 +++--
 src/lte/model/lte-ue-rrc.h  | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/lte/model/epc-ue-nas.cc b/src/lte/model/epc-ue-nas.cc
index 08422446a..b603d4335 100644
--- a/src/lte/model/epc-ue-nas.cc
+++ b/src/lte/model/epc-ue-nas.cc
@@ -216,7 +216,7 @@ EpcUeNas::DoRecvData (Ptr<Packet> packet)
 void 
 EpcUeNas::DoNotifyConnectionReleased ()
 {
-  NS_FATAL_ERROR ("connection failed, it should not happen with the current model");
+  NS_LOG_FUNCTION (this);
 }
 
 void 
diff --git a/src/lte/model/lte-ue-rrc.cc b/src/lte/model/lte-ue-rrc.cc
index 12cba45dc..3411f7d80 100644
--- a/src/lte/model/lte-ue-rrc.cc
+++ b/src/lte/model/lte-ue-rrc.cc
@@ -99,7 +99,8 @@ const char* g_ueRrcStateName[LteUeRrc::NUM_STATES] =
     "IDLE_CONNECTING",
     "CONNECTED_NORMALLY",
     "CONNECTED_REESTABLISHING",
-    "CONNECTED_HANDOVER"
+    "CONNECTED_HANDOVER",
+    "OFF"
   };
 
 std::string ToString (LteUeRrc::State s)
@@ -693,7 +694,7 @@ void
 LteUeRrc::DoRecvRrcConnectionReject (LteRrcSap::RrcConnectionReject msg)
 {
   NS_LOG_FUNCTION (this);
-  LeaveConnectedMode();
+  SwitchToState (OFF);
 }
 
 
diff --git a/src/lte/model/lte-ue-rrc.h b/src/lte/model/lte-ue-rrc.h
index 46d04163d..0b7ff0a22 100644
--- a/src/lte/model/lte-ue-rrc.h
+++ b/src/lte/model/lte-ue-rrc.h
@@ -72,6 +72,7 @@ public:
       CONNECTED_NORMALLY,
       CONNECTED_REESTABLISHING,
       CONNECTED_HANDOVER,
+      OFF,
       NUM_STATES
     };