rename

src/mme/Makefile.am

@@ -4,18 +4,18 @@ noinst_LTLIBRARIES = libmme.la
 
 libmme_la_SOURCES = \
 	kdf.h kasumi.h snow_3g.h zuc.h \
-    event.h context.h \
+    mme_event.h mme_ctx.h \
 	s1ap_build.h s1ap_handler.h s1ap_conv.h s1ap_path.h \
 	nas_conv.h nas_security.h emm_handler.h esm_handler.h \
-	s11_path.h s11_build.h \
-	sm.h s6a_sm.h
+	mme_s11_path.h mme_s11_build.h \
+	mme_sm.h s6a_sm.h
 
 nodist_libmme_la_SOURCES = \
 	kdf.c kasumi.c snow_3g.c zuc.c \
-    init.c event.c context.c \
+    mme_init.c mme_event.c mme_ctx.c \
 	s1ap_sm.c s1ap_build.c s1ap_handler.c s1ap_conv.c s1ap_path.c \
 	nas_conv.c nas_security.c emm_sm.c emm_handler.c esm_sm.c esm_handler.c \
-	s11_path.c s11_build.c s11_sm.c \
+	mme_s11_path.c mme_s11_build.c \
 	mme_sm.c s6a_sm.c 
 
 libmme_la_DEPENDENCIES = \

src/mme/emm_handler.c

@@ -4,7 +4,7 @@
 
 #include "nas_message.h"
 
-#include "event.h"
+#include "mme_event.h"
 
 #include "kdf.h"
 #include "nas_security.h"

src/mme/emm_handler.h

@@ -3,7 +3,7 @@
 
 #include "nas_message.h"
 
-#include "context.h"
+#include "mme_ctx.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/emm_sm.c

@@ -4,7 +4,7 @@
 
 #include "nas_message.h"
 
-#include "event.h"
+#include "mme_event.h"
 #include "nas_security.h"
 #include "emm_handler.h"
 

src/mme/esm_handler.c

@@ -4,7 +4,7 @@
 
 #include "nas_message.h"
 
-#include "event.h"
+#include "mme_event.h"
 
 #include "kdf.h"
 #include "nas_security.h"

src/mme/esm_sm.c

@@ -4,7 +4,7 @@
 
 #include "nas_message.h"
 
-#include "event.h"
+#include "mme_event.h"
 #include "nas_security.h"
 #include "emm_handler.h"
 

src/mme/mme_ctx.c

@@ -7,7 +7,7 @@
 #include "gtp_path.h"
 #include "s1ap_message.h"
 
-#include "context.h"
+#include "mme_ctx.h"
 
 #define CELL_PER_ENB                8
 #define UE_PER_ENB                  128

src/mme/mme_ctx.h

@@ -11,7 +11,7 @@
 #include "nas_types.h"
 #include "gtp_xact.h"
 
-#include "sm.h"
+#include "mme_sm.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/mme_event.c

@@ -2,8 +2,9 @@
 
 #include "core_debug.h"
 
-#include "event.h"
+#include "mme_event.h"
 #include "s1ap_path.h"
+#include "s1ap_message.h"
 #include "nas_message.h"
 
 static char EVT_NAME_LO_ENB_S1AP_ACCEPT[] = "LO_ENB_S1AP_ACCEPT";

src/mme/mme_event.h

@@ -4,13 +4,13 @@
 #include "core_event.h"
 #include "core_pkbuf.h"
 
-#include "s1ap_message.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
+/* forward declaration */
 typedef struct _ue_ctx_t ue_ctx_t;
+typedef struct OCTET_STRING S1ap_NAS_PDU_t;
 
 typedef enum {
     MME_EVT_BASE = FSM_USER_SIG,

src/mme/mme_init.c

@@ -3,7 +3,7 @@
 #include "core_debug.h"
 #include "core_thread.h"
 
-#include "event.h"
+#include "mme_event.h"
 
 #include "s6a_sm.h"
 

src/mme/mme_s11_build.c

@@ -1,14 +1,15 @@
-#define TRACE_MODULE _s11_build
+#define TRACE_MODULE _mme_s11_build
 
 #include "core_debug.h"
 
-#include "context.h"
-
 #include "3gpp_conv.h"
 #include "gtp_types.h"
 #include "gtp_tlv.h"
 
-status_t s11_build_create_session_req(gtp_message_t *gtp_message, ue_ctx_t *ue)
+#include "mme_ctx.h"
+
+status_t mme_s11_build_create_session_req(
+        gtp_message_t *gtp_message, ue_ctx_t *ue)
 {
     gtp_create_session_request_t *req = &gtp_message->create_session_request;
     gtp_uli_t uli;

src/mme/mme_s11_build.h

@@ -1,5 +1,5 @@
-#ifndef __S11_BUILD_H__
-#define __S11_BUILD_H__
+#ifndef __MME_S11_BUILD_H__
+#define __MME_S11_BUILD_H__
 
 #include "gtp_tlv.h"
 
@@ -7,11 +7,11 @@
 extern "C" {
 #endif /* __cplusplus */
 
-CORE_DECLARE(status_t) s11_build_create_session_req(
+CORE_DECLARE(status_t) mme_s11_build_create_session_req(
                         gtp_message_t *gtp_message, ue_ctx_t *ue);
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __S11_BUILD_H__ */
+#endif /* __MME_S11_BUILD_H__ */

src/mme/mme_s11_path.c

@@ -3,9 +3,9 @@
 #include "core_pkbuf.h"
 #include "core_net.h"
 
-#include "event.h"
-#include "context.h"
-#include "s11_path.h"
+#include "mme_event.h"
+#include "mme_ctx.h"
+#include "mme_s11_path.h"
 
 static int _gtpv2_c_recv_cb(net_sock_t *sock, void *data)
 {
@@ -98,12 +98,12 @@ status_t mme_s11_send_to_sgw(
     return CORE_OK;
 }
 
-#include "s11_build.h"
+#include "mme_s11_build.h"
 void test_send()
 {
     gtp_message_t gtp_message;
 
-    s11_build_create_session_req(&gtp_message, NULL);
+    mme_s11_build_create_session_req(&gtp_message, NULL);
 
     mme_s11_send_to_sgw(mme_ctx_sgw_first(), 
             GTP_CREATE_SESSION_REQUEST_TYPE, &gtp_message);

src/mme/mme_sm.c

@@ -1,10 +1,10 @@
 #define TRACE_MODULE _mme_sm
 #include "core_debug.h"
 
-#include "event.h"
+#include "mme_event.h"
 
 #include "s1ap_path.h"
-#include "s11_path.h"
+#include "mme_s11_path.h"
 
 void mme_state_initial(mme_sm_t *s, event_t *e)
 {

src/mme/nas_security.c

@@ -2,7 +2,6 @@
 
 #include "core_debug.h"
 
-#include "context.h"
 #include "nas_message.h"
 #include "nas_security.h"
 

src/mme/nas_security.h

@@ -5,7 +5,7 @@
 #include "core_aes.h"
 #include "core_aes_cmac.h"
 
-#include "context.h"
+#include "mme_ctx.h"
 #include "snow_3g.h"
 #include "zuc.h"
 

src/mme/s11_sm.c

@@ -1,79 +0,0 @@
-#define TRACE_MODULE _mme_s11_sm
-
-#include "core_debug.h"
-
-#include "event.h"
-#include "context.h"
-
-void mme_s11_state_initial(s11_sm_t *s, event_t *e)
-{
-    d_assert(s, return, "Null param");
-
-    mme_sm_trace(1, e);
-
-    FSM_TRAN(s, &mme_s11_state_operational);
-}
-
-void mme_s11_state_final(s11_sm_t *s, event_t *e)
-{
-    d_assert(s, return, "Null param");
-
-    mme_sm_trace(1, e);
-}
-
-void mme_s11_state_operational(s11_sm_t *s, event_t *e)
-{
-    d_assert(s, return, "Null param");
-    d_assert(e, return, "Null param");
-
-    s11_ctx_t *s11 = s->ctx;
-    d_assert(s11, return, "Null param");
-
-    mme_sm_trace(1, e);
-
-    switch (event_get(e))
-    {
-        case FSM_ENTRY_SIG:
-        {
-            break;
-        }
-        case FSM_EXIT_SIG:
-        {
-            break;
-        }
-        case EVT_MSG_MME_S11:
-        {
-            break;
-        }
-        default:
-        {
-            d_error("Unknown event %s", mme_event_get_name(e));
-            break;
-        }
-    }
-}
-
-void mme_s11_state_exception(s11_sm_t *s, event_t *e)
-{
-    d_assert(s, return, "Null param");
-    d_assert(e, return, "Null param");
-
-    mme_sm_trace(1, e);
-
-    switch (event_get(e))
-    {
-        case FSM_ENTRY_SIG:
-        {
-            break;
-        }
-        case FSM_EXIT_SIG:
-        {
-            break;
-        }
-        default:
-        {
-            d_error("Unknown event %s", mme_event_get_name(e));
-            break;
-        }
-    }
-}

src/mme/s1ap_build.c

@@ -2,7 +2,7 @@
 
 #include "core_debug.h"
 
-#include "context.h"
+#include "mme_ctx.h"
 
 #include "s1ap_build.h"
 #include "s1ap_conv.h"

src/mme/s1ap_conv.h

@@ -3,7 +3,7 @@
 
 #include "s1ap_message.h"
 
-#include "context.h"
+#include "mme_ctx.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/s1ap_handler.c

@@ -2,7 +2,7 @@
 
 #include "core_debug.h"
 
-#include "event.h"
+#include "mme_event.h"
 
 #include "s1ap_conv.h"
 #include "s1ap_build.h"
@@ -99,15 +99,6 @@ void s1ap_handle_initial_ue_message(enb_ctx_t *enb, s1ap_message_t *message)
     ue->esm_sm.ctx = ue;
     fsm_init((fsm_t*)&ue->esm_sm, 0);
 
-    /* FIXME */
-    {
-        s11_ctx_t *s11 = mme_ctx_s11_add(ue);
-        d_assert(s11, return, "Null param");
-        fsm_create((fsm_t*)&s11->s11_sm, 
-                mme_s11_state_initial, mme_s11_state_final);
-        s11->s11_sm.ctx = s11;
-        fsm_init((fsm_t*)&s11->s11_sm, 0);
-    }
     mme_event_s1ap_to_nas(ue, &ies->nas_pdu);
 }
 

src/mme/s1ap_handler.h

@@ -1,7 +1,7 @@
 #ifndef __S1AP_HANDLER_H__
 #define __S1AP_HANDLER_H__
 
-#include "context.h"
+#include "mme_ctx.h"
 #include "s1ap_message.h"
 
 #ifdef __cplusplus

src/mme/s1ap_path.c

@@ -2,7 +2,7 @@
 
 #include "core_debug.h"
 
-#include "event.h"
+#include "mme_event.h"
 
 #include "s1ap_path.h"
 

src/mme/s1ap_path.h

@@ -4,7 +4,7 @@
 #include "core_pkbuf.h"
 #include "core_net.h"
 
-#include "context.h"
+#include "mme_ctx.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/s1ap_sm.c

@@ -2,7 +2,7 @@
 
 #include "core_debug.h"
 
-#include "event.h"
+#include "mme_event.h"
 
 #include "s1ap_build.h"
 #include "s1ap_handler.h"

src/mme/s6a_sm.c

@@ -3,7 +3,7 @@
 #include "core_debug.h"
 #include "core_pool.h"
 
-#include "event.h"
+#include "mme_event.h"
 
 #include "nas_message.h"
 #include "s6a_lib.h"

src/mme/s6a_sm.h

@@ -3,7 +3,7 @@
 
 #include "core_errno.h"
 
-#include "context.h"
+#include "mme_ctx.h"
 
 #ifdef __cplusplus
 extern "C" {

test/nas_sm_test.c

@@ -2,7 +2,7 @@
 #include "core_pkbuf.h"
 #include "core_lib.h"
 
-#include "mme/context.h"
+#include "mme_ctx.h"
 #include "s1ap_message.h"
 
 #include "testutil.h"

test/tests1ap.c

@@ -4,7 +4,7 @@
 #include "core_pkbuf.h"
 #include "core_lib.h"
 
-#include "context.h"
+#include "mme_ctx.h"
 #include "s1ap_build.h"
 #include "s1ap_conv.h"
 #include "s1ap_path.h"

test/testutil.c

@@ -17,7 +17,7 @@
 #include "core_debug.h"
 
 #include "cellwire.h"
-#include "context.h"
+#include "mme_ctx.h"
 #include "abts.h"
 #include "testutil.h"