L3 RRC/NAS developments

src/ue/nas/mm/interface.cpp

@@ -50,6 +50,10 @@ void NasMm::handleRrcEvent(const NwUeRrcToNas &msg)
         handleActiveCellChange();
         break;
     }
+    case NwUeRrcToNas::RRC_ESTABLISHMENT_FAILURE: {
+        handleRrcEstablishmentFailure();
+        break;
+    }
     }
 }
 

src/ue/nas/mm/mm.hpp

@@ -164,6 +164,7 @@ class NasMm
     void handleActiveCellChange();
     void handleRrcConnectionSetup();
     void handleRrcConnectionRelease();
+    void handleRrcEstablishmentFailure();
     void handleRadioLinkFailure();
     void handlePaging(const std::vector<GutiMobileIdentity> &tmsiIds);
 

src/ue/nas/mm/radio.cpp

@@ -221,6 +221,11 @@ void NasMm::handleRrcConnectionRelease()
     switchCmState(ECmState::CM_IDLE);
 }
 
+void NasMm::handleRrcEstablishmentFailure()
+{
+
+}
+
 void NasMm::handleRadioLinkFailure()
 {
     if (m_cmState == ECmState::CM_CONNECTED)

src/ue/nts.hpp

@@ -64,12 +64,13 @@ struct NwUeRrcToNas : NtsMessage
 {
     enum PR
     {
+        NAS_NOTIFY,
         NAS_DELIVERY,
         RRC_CONNECTION_SETUP,
         RRC_CONNECTION_RELEASE,
+        RRC_ESTABLISHMENT_FAILURE,
         RADIO_LINK_FAILURE,
         PAGING,
-        NAS_NOTIFY,
         ACTIVE_CELL_CHANGED
     } present;
 

src/ue/rrc/connection.cpp

@@ -96,8 +96,8 @@ void UeRrcTask::receiveRrcReject(int cellId, const ASN_RRC_RRCReject &msg)
     if (!isActiveCell(cellId))
         return;
 
-    // TODO
     m_logger->err("RRC Reject received");
+    m_base->nasTask->push(new NwUeRrcToNas(NwUeRrcToNas::RRC_ESTABLISHMENT_FAILURE));
 }
 
 void UeRrcTask::receiveRrcRelease(const ASN_RRC_RRCRelease &msg)