update it

src/hss/Makefile.am

@@ -3,10 +3,10 @@
 noinst_LTLIBRARIES = libhss.la
 
 libhss_la_SOURCES = \
-	milenage.h hss_kdf.h hss_ctx.h
+	milenage.h hss_kdf.h hss_context.h
 
 nodist_libhss_la_SOURCES = \
-	milenage.c hss_kdf.c hss_init.c hss_ctx.c
+	milenage.c hss_kdf.c hss_init.c hss_context.c
 
 libhss_la_DEPENDENCIES = \
     $(top_srcdir)/lib/core/src/libcore.la \

src/hss/hss_context.c

@@ -4,7 +4,7 @@
 #include "core_pool.h"
 #include "core_lib.h"
 
-#include "hss_ctx.h"
+#include "hss_context.h"
 
 #define OP "5F1D289C5D354D0A140C2548F5F3E3BA"
 #define OPc "E8ED289DEBA952E4283B54E88E6183CA"

src/hss/hss_init.c

@@ -6,7 +6,7 @@
 
 #include "s6a_lib.h"
 
-#include "hss_ctx.h"
+#include "hss_context.h"
 #include "hss_kdf.h"
 #include "milenage.h"
 

src/mme/Makefile.am

@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libmme.la
 
 libmme_la_SOURCES = \
 	mme_kdf.h kasumi.h snow_3g.h zuc.h \
-    mme_event.h mme_ctx.h \
+    mme_event.h mme_context.h \
 	s1ap_build.h s1ap_handler.h s1ap_conv.h s1ap_path.h \
 	mme_s6a_handler.h \
 	nas_conv.h nas_security.h emm_handler.h esm_handler.h \
@@ -13,7 +13,7 @@ libmme_la_SOURCES = \
 
 nodist_libmme_la_SOURCES = \
 	mme_kdf.c kasumi.c snow_3g.c zuc.c \
-    mme_init.c mme_event.c mme_ctx.c \
+    mme_init.c mme_event.c mme_context.c \
 	s1ap_sm.c s1ap_build.c s1ap_handler.c s1ap_conv.c s1ap_path.c \
 	mme_s6a_handler.c \
 	nas_conv.c nas_security.c emm_sm.c emm_handler.c esm_sm.c esm_handler.c \

src/mme/emm_handler.h

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

src/mme/mme_context.c

@@ -6,7 +6,7 @@
 #include "gtp_path.h"
 #include "s1ap_message.h"
 
-#include "mme_ctx.h"
+#include "mme_context.h"
 
 #define MAX_CELL_PER_ENB            8
 #define MAX_ERAB_PER_UE             16

src/mme/mme_s11_build.c

@@ -6,7 +6,7 @@
 #include "gtp_tlv.h"
 
 #include "3gpp_common.h"
-#include "mme_ctx.h"
+#include "mme_context.h"
 
 status_t mme_s11_build_create_session_req(
         c_uint8_t *type, pkbuf_t **pkbuf, ue_ctx_t *ue)

src/mme/mme_s11_path.c

@@ -4,7 +4,7 @@
 #include "core_net.h"
 
 #include "mme_event.h"
-#include "mme_ctx.h"
+#include "mme_context.h"
 #include "mme_s11_path.h"
 
 static int _gtpv2_c_recv_cb(net_sock_t *sock, void *data)

src/mme/mme_s6a_handler.h

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

src/mme/nas_security.h

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

src/mme/s1ap_build.c

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

src/mme/s1ap_conv.h

@@ -3,8 +3,6 @@
 
 #include "s1ap_message.h"
 
-#include "mme_ctx.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */

src/mme/s1ap_handler.h

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

src/mme/s1ap_path.h

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

src/pgw/Makefile.am

@@ -3,11 +3,11 @@
 noinst_LTLIBRARIES = libpgw.la
 
 libpgw_la_SOURCES = \
-    pgw_event.h pgw_ctx.h \
+    pgw_event.h pgw_context.h \
 	pgw_path.h pgw_sm.h pgw_handler.h
 
 nodist_libpgw_la_SOURCES = \
-    pgw_init.c pgw_event.c pgw_ctx.c \
+    pgw_init.c pgw_event.c pgw_context.c \
 	pgw_path.c pgw_sm.c pgw_handler.c
 
 libpgw_la_DEPENDENCIES = \

src/pgw/pgw_context.c

@@ -6,7 +6,7 @@
 
 #include "gtp_path.h"
 
-#include "pgw_ctx.h"
+#include "pgw_context.h"
 
 static pgw_ctx_t self;
 

src/pgw/pgw_event.c

@@ -1,7 +1,7 @@
 #define TRACE_MODULE _pgw_event
 
 #include "pgw_event.h"
-#include "pgw_ctx.h"
+#include "pgw_context.h"
 
 static char EVT_NAME_TM_PGW_T3[] = "TM_PGW_PGW_T3";
 

src/pgw/pgw_init.c

@@ -3,7 +3,7 @@
 #include "core_debug.h"
 #include "core_thread.h"
 
-#include "pgw_ctx.h"
+#include "pgw_context.h"
 #include "pgw_event.h"
 
 static thread_id pgw_sm_thread;

src/pgw/pgw_path.c

@@ -6,7 +6,7 @@
 #include "3gpp_common.h"
 #include "gtp_path.h"
 
-#include "pgw_ctx.h"
+#include "pgw_context.h"
 #include "pgw_event.h"
 #include "pgw_path.h"
 

src/pgw/pgw_sm.c

@@ -2,7 +2,7 @@
 #include "core_debug.h"
 
 #include "pgw_sm.h"
-#include "pgw_ctx.h"
+#include "pgw_context.h"
 #include "pgw_event.h"
 #include "pgw_path.h"
 #include "pgw_handler.h"

src/sgw/Makefile.am

@@ -3,11 +3,11 @@
 noinst_LTLIBRARIES = libsgw.la
 
 libsgw_la_SOURCES = \
-    sgw_event.h sgw_ctx.h \
+    sgw_event.h sgw_context.h \
 	sgw_path.h sgw_sm.h sgw_handler.h
 
 nodist_libsgw_la_SOURCES = \
-    sgw_init.c sgw_event.c sgw_ctx.c \
+    sgw_init.c sgw_event.c sgw_context.c \
 	sgw_path.c sgw_sm.c sgw_handler.c
 
 libsgw_la_DEPENDENCIES = \

src/sgw/sgw_context.c

@@ -7,7 +7,7 @@
 #include "3gpp_common.h"
 #include "gtp_path.h"
 
-#include "sgw_ctx.h"
+#include "sgw_context.h"
 
 static sgw_ctx_t self;
 

src/sgw/sgw_event.c

@@ -1,7 +1,7 @@
 #define TRACE_MODULE _sgw_event
 
 #include "sgw_event.h"
-#include "sgw_ctx.h"
+#include "sgw_context.h"
 
 static char EVT_NAME_TM_SGW_T3[] = "TM_SGW_SGW_T3";
 

src/sgw/sgw_handler.c

@@ -3,7 +3,7 @@
 #include "core_debug.h"
 
 #include "sgw_event.h"
-#include "sgw_ctx.h"
+#include "sgw_context.h"
 #include "sgw_path.h"
 #include "sgw_handler.h"
 

src/sgw/sgw_init.c

@@ -3,7 +3,7 @@
 #include "core_debug.h"
 #include "core_thread.h"
 
-#include "sgw_ctx.h"
+#include "sgw_context.h"
 #include "sgw_event.h"
 
 static thread_id sgw_sm_thread;

src/sgw/sgw_path.c

@@ -6,7 +6,7 @@
 #include "3gpp_common.h"
 #include "gtp_path.h"
 
-#include "sgw_ctx.h"
+#include "sgw_context.h"
 #include "sgw_event.h"
 #include "sgw_path.h"
 

src/sgw/sgw_sm.c

@@ -1,7 +1,7 @@
 #define TRACE_MODULE _sgw_sm
 #include "core_debug.h"
 
-#include "sgw_ctx.h"
+#include "sgw_context.h"
 #include "sgw_event.h"
 #include "sgw_path.h"
 #include "sgw_handler.h"

test/gtp_message_test.c

@@ -7,7 +7,7 @@
 #include "gtp_types.h"
 #include "gtp_tlv.h"
 
-#include "sgw_ctx.h"
+#include "sgw_context.h"
 
 #include "testutil.h"
 

test/nas_sm_test.c

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

test/s1ap_message_test.c

@@ -5,6 +5,8 @@
 #include "s1ap_build.h"
 #include "s1ap_conv.h"
 
+#include "3gpp_common.h"
+
 #include "testutil.h"
 #include "tests1ap.h"
 

test/s1ap_sm_test.c

@@ -4,6 +4,8 @@
 #include "s1ap_build.h"
 #include "s1ap_conv.h"
 
+#include "3gpp_common.h"
+
 #include "testutil.h"
 #include "tests1ap.h"
 

test/tests1ap.c

@@ -4,7 +4,7 @@
 #include "core_pkbuf.h"
 #include "core_lib.h"
 
-#include "mme_ctx.h"
+#include "mme_context.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 "mme_ctx.h"
+#include "mme_context.h"
 #include "abts.h"
 #include "testutil.h"