update it

src/mme/emm_sm.c

@@ -70,7 +70,7 @@ void emm_state_operational(fsm_t *s, event_t *e)
                     while(esm)
                     {
                         event_t e;
-                        event_set(&e, EVT_LO_MME_ESM_INFO_REQ);
+                        event_set(&e, MME_EVT_ESM_LO_INFO_REQ);
                         event_set_param1(&e, (c_uintptr_t)esm->index);
                         mme_event_send(&e);
 

src/mme/esm_sm.c

@@ -41,8 +41,8 @@ void esm_state_operational(fsm_t *s, event_t *e)
         {
             break;
         }
-        case EVT_LO_MME_ESM_INFO_REQ:
-        case EVT_LO_MME_ESM_CREATE_SESSION:
+        case MME_EVT_ESM_LO_INFO_REQ:
+        case MME_EVT_ESM_LO_CREATE_SESSION:
         {
             index_t index = event_get_param1(e);
             mme_esm_t *esm = NULL;
@@ -56,7 +56,7 @@ void esm_state_operational(fsm_t *s, event_t *e)
 
             switch(event_get(e))
             {
-                case EVT_LO_MME_ESM_INFO_REQ:
+                case MME_EVT_ESM_LO_INFO_REQ:
                 {
                     pkbuf_t *pkbuf = NULL;
                     status_t rv;
@@ -69,7 +69,7 @@ void esm_state_operational(fsm_t *s, event_t *e)
                             "UE[%s] <--- ESM[%d]", ue->imsi_bcd, esm->pti);
                     break;
                 }
-                case EVT_LO_MME_ESM_CREATE_SESSION:
+                case MME_EVT_ESM_LO_CREATE_SESSION:
                 {
 #if 0
                     pkbuf_t *pkbuf = NULL;

src/mme/mme_event.c

@@ -12,8 +12,6 @@ static char EVT_NAME_LO_MME_S1AP_ACCEPT[] = "LO_MME_S1AP_ACCEPT";
 static char EVT_NAME_LO_MME_S1AP_CONNREFUSED[] = "LO_MME_S1AP_CONNREFUSED";
 static char EVT_NAME_LO_MME_EMM_AUTH_REQ[] = "LO_MME_EMM_AUTH_REQ";
 static char EVT_NAME_LO_MME_EMM_LOCATION_UPDATE[] = "LO_MME_EMM_LOCATION_UPDATE";
-static char EVT_NAME_LO_MME_ESM_CREATE_SESSION[] = "LO_MME_ESM_CREATE_SESSION";
-static char EVT_NAME_LO_MME_ESM_INFO_REQ[] = "LO_MME_ESM_INFO_REQ";
 
 static char EVT_NAME_TM_MME_S11_T3[] = "TM_MME_S11_T3";
 
@@ -34,6 +32,34 @@ char* mme_event_get_name(event_t *e)
         case FSM_EXIT_SIG: 
             return FSM_NAME_EXIT_SIG;
 
+        case MME_EVT_S1AP_MSG:
+            return "S1AP_MSG";
+        case MME_EVT_S1AP_FROM_EMM:
+            return "S1AP_FROM_EMM";
+        case MME_EVT_S1AP_LO_ACCEPT:
+            return "S1AP_LO_ACCEPT";
+        case MME_EVT_S1AP_LO_CONNREFUSED:
+            return "S1AP_LO_CONNREFUSED";
+
+        case MME_EVT_EMM_MSG:
+            return "EMM_MSG";
+        case MME_EVT_EMM_FROM_ESM:
+            return "EMM_FROM_ESM";
+        case MME_EVT_EMM_LO_AUTH_REQ:
+            return "EMM_LO_AUTH_REQ";
+        case MME_EVT_EMM_LO_LOCATION_UPDATE:
+            return "EMM_LO_LOCATION_UPDATE";
+
+        case MME_EVT_ESM_MSG:
+            return "ESM_MSG";
+        case MME_EVT_ESM_LO_CREATE_SESSION:
+            return "ESM_LO_CREATE_SESSION";
+        case MME_EVT_ESM_LO_INFO_REQ:
+            return "ESM_LO_INFO_REQ";
+
+        case MME_EVT_S11_T3:
+            return "ESM_EVT_S11_T3";
+
         case EVT_LO_MME_S1AP_ACCEPT: 
            return EVT_NAME_LO_MME_S1AP_ACCEPT;
         case EVT_LO_MME_S1AP_CONNREFUSED: 
@@ -42,10 +68,6 @@ char* mme_event_get_name(event_t *e)
            return EVT_NAME_LO_MME_EMM_AUTH_REQ;
         case EVT_LO_MME_EMM_LOCATION_UPDATE: 
            return EVT_NAME_LO_MME_EMM_LOCATION_UPDATE;
-        case EVT_LO_MME_ESM_CREATE_SESSION: 
-           return EVT_NAME_LO_MME_ESM_CREATE_SESSION;
-        case EVT_LO_MME_ESM_INFO_REQ: 
-           return EVT_NAME_LO_MME_ESM_INFO_REQ;
 
         case EVT_TM_MME_S11_T3: 
            return EVT_NAME_TM_MME_S11_T3;

src/mme/mme_event.h

@@ -17,12 +17,27 @@ typedef struct OCTET_STRING S1ap_NAS_PDU_t;
 typedef enum {
     MME_EVT_BASE = FSM_USER_SIG,
 
+    MME_EVT_S1AP_MSG,
+    MME_EVT_S1AP_FROM_EMM,
+    MME_EVT_S1AP_LO_ACCEPT,
+    MME_EVT_S1AP_LO_CONNREFUSED,
+
+    MME_EVT_EMM_MSG,
+    MME_EVT_EMM_FROM_ESM,
+    MME_EVT_EMM_LO_AUTH_REQ,
+    MME_EVT_EMM_LO_LOCATION_UPDATE,
+
+    MME_EVT_ESM_MSG,
+    MME_EVT_ESM_LO_CREATE_SESSION,
+    MME_EVT_ESM_LO_INFO_REQ,
+
+    MME_EVT_S11_T3,
+
+    /* FIXME : remove below */
     EVT_LO_MME_S1AP_ACCEPT,
     EVT_LO_MME_S1AP_CONNREFUSED,
     EVT_LO_MME_EMM_AUTH_REQ,
     EVT_LO_MME_EMM_LOCATION_UPDATE,
-    EVT_LO_MME_ESM_CREATE_SESSION,
-    EVT_LO_MME_ESM_INFO_REQ,
 
     EVT_TM_MME_S11_T3,
 

src/mme/mme_s11_handler.c

@@ -56,7 +56,7 @@ void mme_s11_handle_create_session_response(
     esm->sgw_s1u_teid = ntohl(sgw_s1u_teid->teid);
     esm->sgw_s1u_addr = sgw_s1u_teid->ipv4_addr;
 
-    event_set(&e, EVT_LO_MME_ESM_CREATE_SESSION);
+    event_set(&e, MME_EVT_ESM_LO_CREATE_SESSION);
     event_set_param1(&e, (c_uintptr_t)esm->index);
     mme_event_send(&e);
 }

src/mme/mme_sm.c

@@ -182,8 +182,8 @@ void mme_state_operational(fsm_t *s, event_t *e)
             pkbuf_free(pkbuf);
             break;
         }
-        case EVT_LO_MME_ESM_INFO_REQ:
-        case EVT_LO_MME_ESM_CREATE_SESSION:
+        case MME_EVT_ESM_LO_INFO_REQ:
+        case MME_EVT_ESM_LO_CREATE_SESSION:
         {
             index_t index = event_get_param1(e);
             mme_esm_t *esm = NULL;