- Fix an issue when removing UE contexts in S1AP layer after eNB disconnection

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4348 818b1a75-f10b-46b9-bf7c-635c3b92a50f

openair-cn/S1AP/s1ap_mme.h

@@ -55,8 +55,7 @@ enum s1_ue_state_s {
  *  Generated every time a new InitialUEMessage is received
  **/
 typedef struct ue_description_s {
-    struct ue_description_s  *next_ue;       ///< Next UE in the list
-    struct ue_description_s  *previous_ue;   ///< Previous UE in the list
+    STAILQ_ENTRY(ue_description_s) ue_entries;
 
     struct eNB_description_s *eNB;           ///< Which eNB this UE is attached to
 
@@ -86,8 +85,7 @@ typedef struct ue_description_s {
  * Generated (or updated) every time a new S1SetupRequest is received.
  */
 typedef struct eNB_description_s {
-    struct eNB_description_s *next_eNB;         ///< Next eNB in the list of eNB
-    struct eNB_description_s *previous_eNB;     ///< Previous eNB in the list of eNB
+    STAILQ_ENTRY(eNB_description_s) eNB_entries;
 
     enum s1_eNB_state_s s1_state;         ///< State of the eNB S1AP association over MME
 
@@ -101,8 +99,7 @@ typedef struct eNB_description_s {
     /** UE list for this eNB **/
     /*@{*/
     uint32_t nb_ue_associated; ///< Number of NAS associated UE on this eNB
-    ue_description_t *ue_list_head;     ///< List head of NAS associated UE on this eNB
-    ue_description_t *ue_list_tail;     ///< List tail of NAS associated UE on this eNB
+    STAILQ_HEAD(ue_list_s, ue_description_s) ue_list_head;
     /*@}*/
 
     /** SCTP stuff **/

openair-cn/S1AP/s1ap_mme_nas_procedures.c

@@ -282,12 +282,12 @@ int s1ap_handle_attach_accepted(nas_attach_accept_t *attach_accept_p)
     /* Start the outcome response timer.
      * When time is reached, MME consider that procedure outcome has failed.
      */
-    timer_setup(mme_config.s1ap_config.outcome_drop_timer_sec, 0, TASK_S1AP, INSTANCE_DEFAULT,
-                TIMER_ONE_SHOT,
-                NULL,
-                &ue_ref->outcome_response_timer_id);
+//     timer_setup(mme_config.s1ap_config.outcome_drop_timer_sec, 0, TASK_S1AP, INSTANCE_DEFAULT,
+//                 TIMER_ONE_SHOT,
+//                 NULL,
+//                 &ue_ref->outcome_response_timer_id);
     /* Insert the timer in the MAP of mme_ue_s1ap_id <-> timer_id */
-    s1ap_timer_insert(ue_ref->mme_ue_s1ap_id, ue_ref->outcome_response_timer_id);
+//     s1ap_timer_insert(ue_ref->mme_ue_s1ap_id, ue_ref->outcome_response_timer_id);
 
     memset(&message, 0, sizeof(s1ap_message));
     memset(&e_RABToBeSetup, 0, sizeof(E_RABToBeSetupItemCtxtSUReq_t));