rollback to the v2.0.11

src/mme/s1ap-handler.c

@@ -669,6 +669,8 @@ void s1ap_handle_initial_context_setup_failure(
                 Cause->present, (int)Cause->choice.radioNetwork);
     }
 
+    mme_ue = enb_ue->mme_ue;
+
     if (mme_ue)
         CLEAR_SERVICE_INDICATOR(mme_ue);
 
@@ -682,7 +684,18 @@ void s1ap_handle_initial_context_setup_failure(
      * may in principle be adopted. The eNB should ensure
      * that no hanging resources remain at the eNB.
      */
+#if 1
+    if (mme_ue && SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) {
+        mme_gtp_send_delete_all_sessions(mme_ue);
+    } else {
+        s1ap_send_ue_context_release_command(enb_ue,
+                S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
+                S1AP_UE_CTX_REL_S1_CONTEXT_REMOVE, 0);
+    }
+#else
+    /* In Issues #568, v2.0.12 is not working. */
     mme_send_release_access_bearer_or_ue_context_release(enb_ue);
+#endif
 }
 
 void s1ap_handle_ue_context_modification_response(

tests/attach/ue-context-test.c

@@ -999,14 +999,20 @@ static void test3_func(abts_case *tc, void *data)
     ABTS_PTR_NOTNULL(tc, recvbuf);
     tests1ap_recv(test_ue, recvbuf);
 
-    /* Send Service Request - INVALID Security MAC */
+    /* Send Service Request */
     emmbuf = testemm_build_service_request(test_ue);
     ABTS_PTR_NOTNULL(tc, emmbuf);
+#if 0
+    /*
+     * In s1ap_handle_initial_context_setup_failure(),
+     * Use mme_send_release_access_bearer_or_ue_context_release(enb_ue);
+     */
     {
         unsigned char *data = emmbuf->data;
         ogs_assert(data);
         data[3]++;
     }
+#endif
     sendbuf = test_s1ap_build_initial_ue_message(
             test_ue, emmbuf, S1AP_RRC_Establishment_Cause_mo_Data, true);
     ABTS_PTR_NOTNULL(tc, sendbuf);
@@ -1063,6 +1069,7 @@ static void test3_func(abts_case *tc, void *data)
 
     test_ue_remove(test_ue);
 }
+
 abts_suite *test_ue_context(abts_suite *suite)
 {
     suite = ADD_SUITE(suite)