From 67fb7cf8f2b4a004b82f3b379ed00a6b354aa5bb Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Tue, 4 Apr 2017 10:49:19 +0900 Subject: [PATCH] rename --- src/mme/Makefile.am | 10 +-- src/mme/emm_handler.c | 2 +- src/mme/emm_handler.h | 2 +- src/mme/emm_sm.c | 2 +- src/mme/esm_handler.c | 2 +- src/mme/esm_sm.c | 2 +- src/mme/{context.c => mme_ctx.c} | 2 +- src/mme/{context.h => mme_ctx.h} | 2 +- src/mme/{event.c => mme_event.c} | 3 +- src/mme/{event.h => mme_event.h} | 4 +- src/mme/{init.c => mme_init.c} | 2 +- src/mme/{s11_build.c => mme_s11_build.c} | 9 +-- src/mme/{s11_build.h => mme_s11_build.h} | 8 +-- src/mme/{s11_path.c => mme_s11_path.c} | 10 +-- src/mme/{s11_path.h => mme_s11_path.h} | 0 src/mme/mme_sm.c | 4 +- src/mme/{sm.h => mme_sm.h} | 0 src/mme/nas_security.c | 1 - src/mme/nas_security.h | 2 +- src/mme/s11_sm.c | 79 ------------------------ src/mme/s1ap_build.c | 2 +- src/mme/s1ap_conv.h | 2 +- src/mme/s1ap_handler.c | 11 +--- src/mme/s1ap_handler.h | 2 +- src/mme/s1ap_path.c | 2 +- src/mme/s1ap_path.h | 2 +- src/mme/s1ap_sm.c | 2 +- src/mme/s6a_sm.c | 2 +- src/mme/s6a_sm.h | 2 +- test/nas_sm_test.c | 2 +- test/tests1ap.c | 2 +- test/testutil.c | 2 +- 32 files changed, 46 insertions(+), 133 deletions(-) rename src/mme/{context.c => mme_ctx.c} (99%) rename src/mme/{context.h => mme_ctx.h} (99%) rename src/mme/{event.c => mme_event.c} (98%) rename src/mme/{event.h => mme_event.h} (91%) rename src/mme/{init.c => mme_init.c} (98%) rename src/mme/{s11_build.c => mme_s11_build.c} (97%) rename src/mme/{s11_build.h => mme_s11_build.h} (57%) rename src/mme/{s11_path.c => mme_s11_path.c} (94%) rename src/mme/{s11_path.h => mme_s11_path.h} (100%) rename src/mme/{sm.h => mme_sm.h} (100%) delete mode 100644 src/mme/s11_sm.c diff --git a/src/mme/Makefile.am b/src/mme/Makefile.am index 1cb7e2990d..9b0a1036a5 100644 --- a/src/mme/Makefile.am +++ b/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 = \ diff --git a/src/mme/emm_handler.c b/src/mme/emm_handler.c index 9fad63fb65..53f5c8aee0 100644 --- a/src/mme/emm_handler.c +++ b/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" diff --git a/src/mme/emm_handler.h b/src/mme/emm_handler.h index 540889db72..bad9e04e1c 100644 --- a/src/mme/emm_handler.h +++ b/src/mme/emm_handler.h @@ -3,7 +3,7 @@ #include "nas_message.h" -#include "context.h" +#include "mme_ctx.h" #ifdef __cplusplus extern "C" { diff --git a/src/mme/emm_sm.c b/src/mme/emm_sm.c index 8c54c2c38d..0264d020b9 100644 --- a/src/mme/emm_sm.c +++ b/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" diff --git a/src/mme/esm_handler.c b/src/mme/esm_handler.c index a7f9af761d..fddde7762e 100644 --- a/src/mme/esm_handler.c +++ b/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" diff --git a/src/mme/esm_sm.c b/src/mme/esm_sm.c index 34e84bf7e7..09dcb09a9b 100644 --- a/src/mme/esm_sm.c +++ b/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" diff --git a/src/mme/context.c b/src/mme/mme_ctx.c similarity index 99% rename from src/mme/context.c rename to src/mme/mme_ctx.c index ce3f94ad81..fc72306e60 100644 --- a/src/mme/context.c +++ b/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 diff --git a/src/mme/context.h b/src/mme/mme_ctx.h similarity index 99% rename from src/mme/context.h rename to src/mme/mme_ctx.h index ff2fbb4b7a..3dd4f1091d 100644 --- a/src/mme/context.h +++ b/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" { diff --git a/src/mme/event.c b/src/mme/mme_event.c similarity index 98% rename from src/mme/event.c rename to src/mme/mme_event.c index a81d61a780..a26973d132 100644 --- a/src/mme/event.c +++ b/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"; diff --git a/src/mme/event.h b/src/mme/mme_event.h similarity index 91% rename from src/mme/event.h rename to src/mme/mme_event.h index 28e25dd769..a0f2094152 100644 --- a/src/mme/event.h +++ b/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, diff --git a/src/mme/init.c b/src/mme/mme_init.c similarity index 98% rename from src/mme/init.c rename to src/mme/mme_init.c index ca37f2be21..74a25a6e26 100644 --- a/src/mme/init.c +++ b/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" diff --git a/src/mme/s11_build.c b/src/mme/mme_s11_build.c similarity index 97% rename from src/mme/s11_build.c rename to src/mme/mme_s11_build.c index cb9ec77e6e..8daaea2160 100644 --- a/src/mme/s11_build.c +++ b/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 = >p_message->create_session_request; gtp_uli_t uli; diff --git a/src/mme/s11_build.h b/src/mme/mme_s11_build.h similarity index 57% rename from src/mme/s11_build.h rename to src/mme/mme_s11_build.h index 5fd6809f65..84ea5cd454 100644 --- a/src/mme/s11_build.h +++ b/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__ */ diff --git a/src/mme/s11_path.c b/src/mme/mme_s11_path.c similarity index 94% rename from src/mme/s11_path.c rename to src/mme/mme_s11_path.c index fd6f5e333d..c7e7d90b17 100644 --- a/src/mme/s11_path.c +++ b/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(>p_message, NULL); + mme_s11_build_create_session_req(>p_message, NULL); mme_s11_send_to_sgw(mme_ctx_sgw_first(), GTP_CREATE_SESSION_REQUEST_TYPE, >p_message); diff --git a/src/mme/s11_path.h b/src/mme/mme_s11_path.h similarity index 100% rename from src/mme/s11_path.h rename to src/mme/mme_s11_path.h diff --git a/src/mme/mme_sm.c b/src/mme/mme_sm.c index 3092f06647..d04233e381 100644 --- a/src/mme/mme_sm.c +++ b/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) { diff --git a/src/mme/sm.h b/src/mme/mme_sm.h similarity index 100% rename from src/mme/sm.h rename to src/mme/mme_sm.h diff --git a/src/mme/nas_security.c b/src/mme/nas_security.c index e63770e003..3c10a6a316 100644 --- a/src/mme/nas_security.c +++ b/src/mme/nas_security.c @@ -2,7 +2,6 @@ #include "core_debug.h" -#include "context.h" #include "nas_message.h" #include "nas_security.h" diff --git a/src/mme/nas_security.h b/src/mme/nas_security.h index 1f5051780f..817c27d810 100644 --- a/src/mme/nas_security.h +++ b/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" diff --git a/src/mme/s11_sm.c b/src/mme/s11_sm.c deleted file mode 100644 index 87be613c2b..0000000000 --- a/src/mme/s11_sm.c +++ /dev/null @@ -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; - } - } -} diff --git a/src/mme/s1ap_build.c b/src/mme/s1ap_build.c index 748723897b..413b837c8a 100644 --- a/src/mme/s1ap_build.c +++ b/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" diff --git a/src/mme/s1ap_conv.h b/src/mme/s1ap_conv.h index 231f1ffdbb..238ecffc7d 100644 --- a/src/mme/s1ap_conv.h +++ b/src/mme/s1ap_conv.h @@ -3,7 +3,7 @@ #include "s1ap_message.h" -#include "context.h" +#include "mme_ctx.h" #ifdef __cplusplus extern "C" { diff --git a/src/mme/s1ap_handler.c b/src/mme/s1ap_handler.c index 65f458e419..861be6377f 100644 --- a/src/mme/s1ap_handler.c +++ b/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); } diff --git a/src/mme/s1ap_handler.h b/src/mme/s1ap_handler.h index c3a7abd116..f7433ee764 100644 --- a/src/mme/s1ap_handler.h +++ b/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 diff --git a/src/mme/s1ap_path.c b/src/mme/s1ap_path.c index 1727fe16b1..abdd5d91bf 100644 --- a/src/mme/s1ap_path.c +++ b/src/mme/s1ap_path.c @@ -2,7 +2,7 @@ #include "core_debug.h" -#include "event.h" +#include "mme_event.h" #include "s1ap_path.h" diff --git a/src/mme/s1ap_path.h b/src/mme/s1ap_path.h index c6dc1a24f3..84c341718e 100644 --- a/src/mme/s1ap_path.h +++ b/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" { diff --git a/src/mme/s1ap_sm.c b/src/mme/s1ap_sm.c index 1d0fb03368..53021e0c02 100644 --- a/src/mme/s1ap_sm.c +++ b/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" diff --git a/src/mme/s6a_sm.c b/src/mme/s6a_sm.c index 6a2915f2fa..e271e40449 100644 --- a/src/mme/s6a_sm.c +++ b/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" diff --git a/src/mme/s6a_sm.h b/src/mme/s6a_sm.h index 3447dc6c76..7a071b32ce 100644 --- a/src/mme/s6a_sm.h +++ b/src/mme/s6a_sm.h @@ -3,7 +3,7 @@ #include "core_errno.h" -#include "context.h" +#include "mme_ctx.h" #ifdef __cplusplus extern "C" { diff --git a/test/nas_sm_test.c b/test/nas_sm_test.c index 7c511c7694..46cbbc867b 100644 --- a/test/nas_sm_test.c +++ b/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" diff --git a/test/tests1ap.c b/test/tests1ap.c index ede9cdad45..675e62c459 100644 --- a/test/tests1ap.c +++ b/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" diff --git a/test/testutil.c b/test/testutil.c index f8465396d8..9be69a0087 100644 --- a/test/testutil.c +++ b/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"