rename project done

src/hss/Makefile.am

@@ -3,8 +3,8 @@
 noinst_LTLIBRARIES = libhss.la
 
 libhss_la_SOURCES = \
-	milenage.h hss_auc.h hss_context.h hss_fd_path.h \
-	milenage.c hss_auc.c hss_init.c hss_context.c hss_fd_path.c \
+	milenage.h hss-auc.h hss-context.h hss-fd-path.h \
+	milenage.c hss-auc.c hss-init.c hss-context.c hss-fd-path.c \
 	$(NULL)
 
 libhss_la_DEPENDENCIES = \

src/hss/hss-auc.c

@@ -1,7 +1,7 @@
 #include "ogs-crypt.h"
 #include "base/types.h"
 
-#include "hss_auc.h"
+#include "hss-auc.h"
 #include "milenage.h"
 
 #define FC_VALUE 0x10

src/hss/hss-context.c

@@ -4,7 +4,7 @@
 #include "fd/fd-lib.h"
 
 #include "app/context.h"
-#include "hss_context.h"
+#include "hss-context.h"
 
 static hss_context_t self;
 static fd_config_t g_fd_conf;

src/hss/hss-fd-path.c

@@ -4,8 +4,8 @@
 #include "fd/s6a/s6a-dict.h"
 #include "fd/s6a/s6a-message.h"
 
-#include "hss_context.h"
-#include "hss_auc.h"
+#include "hss-context.h"
+#include "hss-auc.h"
 #include "milenage.h"
 
 /* handler for fallback cb */

src/hss/hss-init.c

@@ -1,7 +1,7 @@
 #include "app/context.h"
 
-#include "hss_context.h"
-#include "hss_fd_path.h"
+#include "hss-context.h"
+#include "hss-fd-path.h"
 
 static int initialized = 0;
 

src/mme/Makefile.am

@@ -3,27 +3,27 @@
 noinst_LTLIBRARIES = libmme.la
 
 libmme_la_SOURCES = \
-	mme_kdf.h kasumi.h snow_3g.h zuc.h \
-    mme_event.h mme_context.h \
-	s1ap_build.h s1ap_handler.h s1ap_conv.h s1ap-path.h \
+	mme-kdf.h kasumi.h snow-3g.h zuc.h \
+    mme-event.h mme-context.h \
+	s1ap-build.h s1ap-handler.h s1ap-conv.h s1ap-path.h \
 	ogs-sctp.h \
-	mme_fd_path.h mme_s6a_handler.h \
-	nas_conv.h nas_security.h nas_path.h \
-	emm_handler.h emm_build.h \
-	esm_handler.h esm_build.h \
-	mme_gtp_path.h mme_s11_build.h mme_s11_handler.h \
-	mme_sm.h mme_path.h \
-	mme_kdf.c kasumi.c snow_3g.c zuc.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-fd-path.h mme-s6a-handler.h \
+	nas-conv.h nas-security.h nas-path.h \
+	emm-handler.h emm-build.h \
+	esm-handler.h esm-build.h \
+	mme-gtp-path.h mme-s11-build.h mme-s11-handler.h \
+	mme-sm.h mme-path.h \
+	mme-kdf.c kasumi.c snow-3g.c zuc.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 \
 	ogs-sctp.c \
-	mme_fd_path.c mme_s6a_handler.c \
-	nas_conv.c nas_security.c nas_path.c \
-	emm_sm.c emm_handler.c emm_build.c \
-	esm_sm.c esm_handler.c esm_build.c \
-	mme_gtp_path.c mme_s11_build.c mme_s11_handler.c \
-	mme_sm.c mme_path.c \
-	sbc_message.h sbc_handler.h sbc_handler.c \
+	mme-fd-path.c mme-s6a-handler.c \
+	nas-conv.c nas-security.c nas-path.c \
+	emm-sm.c emm-handler.c emm-build.c \
+	esm-sm.c esm-handler.c esm-build.c \
+	mme-gtp-path.c mme-s11-build.c mme-s11-handler.c \
+	mme-sm.c mme-path.c \
+	sbc-message.h sbc-handler.h sbc-handler.c \
 	$(NULL)
 
 if WITH_USRSCTP

src/mme/emm-build.c

@@ -1,8 +1,8 @@
 #include "nas/nas-message.h"
 
-#include "nas_security.h"
-#include "mme_kdf.h"
-#include "emm_build.h"
+#include "nas-security.h"
+#include "mme-kdf.h"
+#include "emm-build.h"
 
 #undef OGS_LOG_DOMAIN
 #define OGS_LOG_DOMAIN __emm_log_domain

src/mme/emm-build.h

@@ -1,7 +1,7 @@
 #ifndef __EMM_BUILD_H__
 #define __EMM_BUILD_H__
 
-#include "mme_context.h"
+#include "mme-context.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/emm-handler.c

@@ -1,17 +1,17 @@
 #include "nas/nas-message.h"
 
-#include "mme_event.h"
+#include "mme-event.h"
 
-#include "mme_kdf.h"
-#include "nas_security.h"
-#include "nas_conv.h"
+#include "mme-kdf.h"
+#include "nas-security.h"
+#include "nas-conv.h"
 
 #include "s1ap-path.h"
-#include "nas_path.h"
-#include "mme_fd_path.h"
-#include "mme_gtp_path.h"
+#include "nas-path.h"
+#include "mme-fd-path.h"
+#include "mme-gtp-path.h"
 
-#include "emm_handler.h"
+#include "emm-handler.h"
 
 #undef OGS_LOG_DOMAIN
 #define OGS_LOG_DOMAIN __emm_log_domain

src/mme/emm-handler.h

@@ -3,7 +3,7 @@
 
 #include "nas/nas-message.h"
 
-#include "mme_context.h"
+#include "mme-context.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/emm-sm.c

@@ -2,18 +2,18 @@
 #include "fd/fd-lib.h"
 #include "fd/s6a/s6a-message.h"
 
-#include "mme_event.h"
-#include "mme_kdf.h"
-#include "s1ap_handler.h"
-#include "mme_fd_path.h"
-#include "emm_handler.h"
-#include "emm_build.h"
-#include "esm_handler.h"
-#include "nas_path.h"
+#include "mme-event.h"
+#include "mme-kdf.h"
+#include "s1ap-handler.h"
+#include "mme-fd-path.h"
+#include "emm-handler.h"
+#include "emm-build.h"
+#include "esm-handler.h"
+#include "nas-path.h"
 #include "s1ap-path.h"
-#include "mme_gtp_path.h"
-#include "mme_path.h"
-#include "mme_sm.h"
+#include "mme-gtp-path.h"
+#include "mme-path.h"
+#include "mme-sm.h"
 
 #undef OGS_LOG_DOMAIN
 #define OGS_LOG_DOMAIN __emm_log_domain

src/mme/esm-build.c

@@ -1,8 +1,8 @@
 #include "nas/nas-message.h"
 
-#include "nas_security.h"
-#include "esm_build.h"
-#include "mme_sm.h"
+#include "nas-security.h"
+#include "esm-build.h"
+#include "mme-sm.h"
 
 #undef OGS_LOG_DOMAIN
 #define OGS_LOG_DOMAIN __esm_log_domain

src/mme/esm-build.h

@@ -1,7 +1,7 @@
 #ifndef __ESM_BUILD_H__
 #define __ESM_BUILD_H__
 
-#include "mme_context.h"
+#include "mme-context.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/esm-handler.c

@@ -1,10 +1,10 @@
 #include "nas/nas-message.h"
 
-#include "mme_context.h"
-#include "nas_path.h"
-#include "mme_gtp_path.h"
+#include "mme-context.h"
+#include "nas-path.h"
+#include "mme-gtp-path.h"
 
-#include "esm_build.h"
+#include "esm-build.h"
 
 #undef OGS_LOG_DOMAIN
 #define OGS_LOG_DOMAIN __esm_log_domain

src/mme/esm-handler.h

@@ -3,7 +3,7 @@
 
 #include "nas/nas-message.h"
 
-#include "mme_context.h"
+#include "mme-context.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/esm-sm.c

@@ -1,14 +1,14 @@
 #include "nas/nas-message.h"
 
-#include "mme_event.h"
-#include "mme_sm.h"
-#include "mme_fd_path.h"
-#include "emm_handler.h"
-#include "esm_build.h"
-#include "esm_handler.h"
-#include "mme_s11_handler.h"
-#include "nas_path.h"
-#include "mme_gtp_path.h"
+#include "mme-event.h"
+#include "mme-sm.h"
+#include "mme-fd-path.h"
+#include "emm-handler.h"
+#include "esm-build.h"
+#include "esm-handler.h"
+#include "mme-s11-handler.h"
+#include "nas-path.h"
+#include "mme-gtp-path.h"
 
 #undef OGS_LOG_DOMAIN
 #define OGS_LOG_DOMAIN __esm_log_domain

src/mme/mme-context.c

@@ -10,12 +10,12 @@
 #include "fd/fd-lib.h"
 
 #include "app/context.h"
-#include "nas_conv.h"
-#include "mme_context.h"
-#include "mme_event.h"
+#include "nas-conv.h"
+#include "mme-context.h"
+#include "mme-event.h"
 #include "s1ap-path.h"
-#include "s1ap_handler.h"
-#include "mme_sm.h"
+#include "s1ap-handler.h"
+#include "mme-sm.h"
 
 #define MAX_CELL_PER_ENB            8
 

src/mme/mme-event.c

@@ -1,5 +1,5 @@
-#include "mme_event.h"
-#include "mme_context.h"
+#include "mme-event.h"
+#include "mme-context.h"
 
 #include "s1ap-path.h"
 

src/mme/mme-fd-path.c

@@ -2,8 +2,8 @@
 #include "fd/s6a/s6a-dict.h"
 #include "fd/s6a/s6a-message.h"
 
-#include "mme_event.h"
-#include "mme_fd_path.h"
+#include "mme-event.h"
+#include "mme-fd-path.h"
 
 static struct session_handler *mme_s6a_reg = NULL;
 

src/mme/mme-fd-path.h

@@ -1,7 +1,7 @@
 #ifndef __MME_FD_PATH_H__
 #define __MME_FD_PATH_H__
 
-#include "mme_context.h"
+#include "mme-context.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/mme-gtp-path.c

@@ -2,10 +2,10 @@
 #include "gtp/gtp-path.h"
 #include "gtp/gtp-xact.h"
 
-#include "mme_event.h"
-#include "mme_gtp_path.h"
-#include "mme_s11_build.h"
-#include "mme_sm.h"
+#include "mme-event.h"
+#include "mme-gtp-path.h"
+#include "mme-s11-build.h"
+#include "mme-sm.h"
 
 static void _gtpv2_c_recv_cb(short when, ogs_socket_t fd, void *data)
 {

src/mme/mme-gtp-path.h

@@ -1,7 +1,7 @@
 #ifndef __MME_S11_PATH_H__
 #define __MME_S11_PATH_H__
 
-#include "mme_context.h"
+#include "mme-context.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/mme-init.c

@@ -3,11 +3,11 @@
 #include "gtp/gtp-xact.h"
 #include "app/context.h"
 
-#include "mme_context.h"
-#include "mme_sm.h"
-#include "mme_event.h"
+#include "mme-context.h"
+#include "mme-sm.h"
+#include "mme-event.h"
 
-#include "mme_fd_path.h"
+#include "mme-fd-path.h"
 #include "s1ap-path.h"
 
 static ogs_thread_t *thread;

src/mme/mme-path.c

@@ -1,7 +1,7 @@
 #include "s1ap-path.h"
-#include "nas_path.h"
-#include "mme_gtp_path.h"
-#include "mme_path.h"
+#include "nas-path.h"
+#include "mme-gtp-path.h"
+#include "mme-path.h"
 
 int mme_send_delete_session_or_detach(mme_ue_t *mme_ue)
 {

src/mme/mme-path.h

@@ -1,7 +1,7 @@
 #ifndef __MME_PATH_H__
 #define __MME_PATH_H__
 
-#include "mme_context.h"
+#include "mme-context.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/mme-s11-build.c

@@ -3,9 +3,9 @@
 #include "gtp/gtp-message.h"
 #include "gtp/gtp-node.h"
 
-#include "mme_context.h"
+#include "mme-context.h"
 
-#include "mme_s11_build.h"
+#include "mme-s11-build.h"
 
 int mme_s11_build_create_session_request(
         ogs_pkbuf_t **pkbuf, uint8_t type, mme_sess_t *sess)

src/mme/mme-s11-handler.c

@@ -2,17 +2,17 @@
 #include "gtp/gtp-conv.h"
 #include "gtp/gtp-xact.h"
 
-#include "mme_event.h"
-#include "mme_sm.h"
-#include "mme_context.h"
+#include "mme-event.h"
+#include "mme-sm.h"
+#include "mme-context.h"
 
 #include "s1ap-path.h"
-#include "mme_gtp_path.h"
-#include "nas_path.h"
-#include "mme_fd_path.h"
+#include "mme-gtp-path.h"
+#include "nas-path.h"
+#include "mme-fd-path.h"
 
-#include "mme_s11_build.h"
-#include "mme_s11_handler.h"
+#include "mme-s11-build.h"
+#include "mme-s11-handler.h"
 
 void mme_s11_handle_create_session_response(
         gtp_xact_t *xact, mme_ue_t *mme_ue, gtp_create_session_response_t *rsp)

src/mme/mme-s11-handler.h

@@ -3,7 +3,7 @@
 
 #include "gtp/gtp-message.h"
 
-#include "mme_context.h"
+#include "mme-context.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/mme-s6a-handler.c

@@ -1,9 +1,9 @@
 #include "fd/s6a/s6a-message.h"
-#include "nas_path.h"
+#include "nas-path.h"
 #include "s1ap-path.h"
 
-#include "mme_sm.h"
-#include "mme_s6a_handler.h"
+#include "mme-sm.h"
+#include "mme-s6a-handler.h"
 
 void mme_s6a_handle_aia(mme_ue_t *mme_ue, s6a_aia_message_t *aia_message)
 {

src/mme/mme-s6a-handler.h

@@ -2,7 +2,7 @@
 #define __MME_S6A_HANDLER_H__
 
 #include "fd/s6a/s6a-message.h"
-#include "mme_context.h"
+#include "mme-context.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/mme-sm.c

@@ -3,20 +3,20 @@
 #include "gtp/gtp-xact.h"
 #include "fd/fd-lib.h"
 
-#include "mme_event.h"
-#include "mme_sm.h"
+#include "mme-event.h"
+#include "mme-sm.h"
 
-#include "s1ap_handler.h"
+#include "s1ap-handler.h"
 #include "s1ap-path.h"
-#include "nas_security.h"
-#include "nas_path.h"
-#include "emm_handler.h"
-#include "esm_handler.h"
-#include "mme_gtp_path.h"
-#include "mme_s11_handler.h"
-#include "mme_fd_path.h"
-#include "mme_s6a_handler.h"
-#include "mme_path.h"
+#include "nas-security.h"
+#include "nas-path.h"
+#include "emm-handler.h"
+#include "esm-handler.h"
+#include "mme-gtp-path.h"
+#include "mme-s11-handler.h"
+#include "mme-fd-path.h"
+#include "mme-s6a-handler.h"
+#include "mme-path.h"
 
 void mme_state_initial(ogs_fsm_t *s, mme_event_t *e)
 {

src/mme/mme-sm.h

@@ -1,7 +1,7 @@
 #ifndef __MME_SM_H__
 #define __MME_SM_H__
 
-#include "mme_event.h"
+#include "mme-event.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/nas-conv.c

@@ -1,4 +1,4 @@
-#include "nas_conv.h"
+#include "nas-conv.h"
 
 void nas_imsi_to_bcd(
     nas_mobile_identity_imsi_t *imsi, uint8_t imsi_len, char *bcd)

src/mme/nas-path.c

@@ -1,10 +1,10 @@
 #include "s1ap-path.h"
-#include "s1ap_build.h"
-#include "esm_build.h"
-#include "emm_build.h"
-#include "nas_path.h"
-#include "mme_event.h"
-#include "mme_sm.h"
+#include "s1ap-build.h"
+#include "esm-build.h"
+#include "emm-build.h"
+#include "nas-path.h"
+#include "mme-event.h"
+#include "mme-sm.h"
 
 int nas_send_to_enb(mme_ue_t *mme_ue, ogs_pkbuf_t *pkbuf)
 {

src/mme/nas-path.h

@@ -1,7 +1,7 @@
 #ifndef __NAS_PATH_H__
 #define __NAS_PATH_H__
 
-#include "mme_context.h"
+#include "mme-context.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/nas-security.c

@@ -1,5 +1,5 @@
 #include "nas/nas-message.h"
-#include "nas_security.h"
+#include "nas-security.h"
 
 int nas_security_encode(
         ogs_pkbuf_t **pkbuf, mme_ue_t *mme_ue, nas_message_t *message)

src/mme/nas-security.h

@@ -3,8 +3,8 @@
 
 #include "ogs-crypt.h"
 
-#include "mme_context.h"
-#include "snow_3g.h"
+#include "mme-context.h"
+#include "snow-3g.h"
 #include "zuc.h"
 
 #define NAS_SECURITY_BEARER 0

src/mme/s1ap-build.c

@@ -1,10 +1,10 @@
 #include "fd/s6a/s6a-message.h"
 
-#include "mme_context.h"
+#include "mme-context.h"
 
-#include "mme_kdf.h"
-#include "s1ap_build.h"
-#include "s1ap_conv.h"
+#include "mme-kdf.h"
+#include "s1ap-build.h"
+#include "s1ap-conv.h"
 
 int s1ap_build_setup_rsp(ogs_pkbuf_t **pkbuf)
 {

src/mme/s1ap-build.h

@@ -2,9 +2,9 @@
 #define __S1AP_BUILD_H__
 
 #include "asn1c/s1ap-message.h"
-#include "mme_context.h"
+#include "mme-context.h"
 
-#include "sbc_message.h"
+#include "sbc-message.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/s1ap-conv.c

@@ -1,5 +1,5 @@
 #include "base/types.h"
-#include "s1ap_conv.h"
+#include "s1ap-conv.h"
 
 void s1ap_uint8_to_OCTET_STRING(uint8_t uint8, OCTET_STRING_t *octet_string)
 {

src/mme/s1ap-handler.c

@@ -1,17 +1,17 @@
-#include "mme_event.h"
+#include "mme-event.h"
 
-#include "mme_kdf.h"
-#include "s1ap_conv.h"
+#include "mme-kdf.h"
+#include "s1ap-conv.h"
 #include "s1ap-path.h"
-#include "nas_path.h"
-#include "mme_gtp_path.h"
+#include "nas-path.h"
+#include "mme-gtp-path.h"
 
-#include "mme_s11_build.h"
-#include "s1ap_build.h"
-#include "s1ap_handler.h"
+#include "mme-s11-build.h"
+#include "s1ap-build.h"
+#include "s1ap-handler.h"
 
-#include "mme_path.h"
-#include "mme_sm.h"
+#include "mme-path.h"
+#include "mme-sm.h"
 
 void s1ap_handle_s1_setup_request(mme_enb_t *enb, s1ap_message_t *message)
 {

src/mme/s1ap-handler.h

@@ -3,7 +3,7 @@
 
 #include "asn1c/s1ap-message.h"
 
-#include "mme_context.h"
+#include "mme-context.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/s1ap-lkpath.c

@@ -18,7 +18,7 @@
  */
 
 #include "ogs-sctp.h"
-#include "mme_event.h"
+#include "mme-event.h"
 #include "s1ap-path.h"
 
 static void accept_handler(short when, ogs_socket_t fd, void *data);

src/mme/s1ap-path.c

@@ -20,13 +20,13 @@
 #include "ogs-sctp.h"
 
 #include "app/context.h"
-#include "mme_event.h"
+#include "mme-event.h"
 
-#include "nas_security.h"
-#include "nas_path.h"
+#include "nas-security.h"
+#include "nas-path.h"
 
-#include "s1ap_conv.h"
-#include "s1ap_build.h"
+#include "s1ap-conv.h"
+#include "s1ap-build.h"
 #include "s1ap-path.h"
 
 int s1ap_open(void)

src/mme/s1ap-path.h

@@ -20,7 +20,7 @@
 #ifndef S1AP_PATH_H
 #define S1AP_PATH_H
 
-#include "mme_context.h"
+#include "mme-context.h"
 #include "asn1c/s1ap-message.h"
 
 #ifdef __cplusplus

src/mme/s1ap-sm.c

@@ -1,11 +1,11 @@
 #include "nas/nas-message.h"
 #include "gtp/gtp-message.h"
 
-#include "s1ap_build.h"
-#include "s1ap_handler.h"
+#include "s1ap-build.h"
+#include "s1ap-handler.h"
 
-#include "mme_event.h"
-#include "mme_sm.h"
+#include "mme-event.h"
+#include "mme-sm.h"
 
 void s1ap_state_initial(ogs_fsm_t *s, mme_event_t *e)
 {

src/mme/s1ap-usrpath.c

@@ -18,7 +18,7 @@
  */
 
 #include "ogs-sctp.h"
-#include "mme_event.h"
+#include "mme-event.h"
 #include "s1ap-path.h"
 
 int s1ap_usrsctp_recv_handler(struct socket *sock,

src/mme/sbc-handler.c

@@ -1,7 +1,7 @@
-#include "mme_context.h"
+#include "mme-context.h"
 #include "s1ap-path.h"
-#include "s1ap_build.h"
-#include "sbc_handler.h"
+#include "s1ap-build.h"
+#include "sbc-handler.h"
 
 void sbc_handle_write_replace_warning_request(sbc_pws_data_t *sbc_pws)
 {

src/mme/sbc-handler.h

@@ -1,7 +1,7 @@
 #ifndef __SBC_HANDLER_H__
 #define __SBC_HANDLER_H__
 
-#include "sbc_message.h"
+#include "sbc-message.h"
 
 /* SBc-AP handles */
 

src/mme/snow-3g.c

@@ -2,7 +2,7 @@
 * SNOW_3G.c
 *------------------------------------------------------------------------*/
 
-#include "snow_3g.h"
+#include "snow-3g.h"
 
 /* LFSR */
 

src/pcrf/Makefile.am

@@ -3,8 +3,8 @@
 noinst_LTLIBRARIES = libpcrf.la
 
 libpcrf_la_SOURCES = \
-	pcrf_context.h pcrf_fd_path.h \
-	pcrf_init.c pcrf_context.c pcrf_fd_path.c pcrf_gx_path.c pcrf_rx_path.c \
+	pcrf-context.h pcrf-fd-path.h \
+	pcrf-init.c pcrf-context.c pcrf-fd-path.c pcrf-gx-path.c pcrf-rx-path.c \
 	$(NULL)
 
 libpcrf_la_DEPENDENCIES = \

src/pcrf/pcrf-context.c

@@ -4,7 +4,7 @@
 #include "fd/fd-lib.h"
 
 #include "app/context.h"
-#include "pcrf_context.h"
+#include "pcrf-context.h"
 
 static pcrf_context_t self;
 static fd_config_t g_fd_conf;

src/pcrf/pcrf-fd-path.c

@@ -1,7 +1,7 @@
 #include "fd/fd-lib.h"
 
-#include "pcrf_context.h"
-#include "pcrf_fd_path.h"
+#include "pcrf-context.h"
+#include "pcrf-fd-path.h"
 
 int pcrf_fd_init(void)
 {

src/pcrf/pcrf-gx-path.c

@@ -4,8 +4,8 @@
 #include "fd/gx/gx-message.h"
 #include "fd/rx/rx-message.h"
 
-#include "pcrf_context.h"
-#include "pcrf_fd_path.h"
+#include "pcrf-context.h"
+#include "pcrf-fd-path.h"
 
 struct rx_sess_state {
     ogs_lnode_t node;

src/pcrf/pcrf-init.c

@@ -1,6 +1,6 @@
 #include "app/context.h"
-#include "pcrf_context.h"
-#include "pcrf_fd_path.h"
+#include "pcrf-context.h"
+#include "pcrf-fd-path.h"
 
 static int initialized = 0;
 

src/pcrf/pcrf-rx-path.c

@@ -2,8 +2,8 @@
 #include "fd/rx/rx-dict.h"
 #include "fd/rx/rx-message.h"
 
-#include "pcrf_context.h"
-#include "pcrf_fd_path.h"
+#include "pcrf-context.h"
+#include "pcrf-fd-path.h"
 
 struct sess_state {
     os0_t   rx_sid;             /* Rx Session-Id */

src/pgw/Makefile.am

@@ -4,14 +4,14 @@ noinst_LTLIBRARIES = libpgw.la
 
 libpgw_la_SOURCES = \
 	ogs-tun.h ogs-tun.c \
-	pgw_ipfw.h \
-    pgw_event.h pgw_context.h pgw_sm.h \
-	pgw_gtp_path.h pgw_s5c_build.h pgw_s5c_handler.h \
-	pgw_fd_path.h pgw_gx_handler.h \
-	pgw_ipfw.c \
-    pgw_init.c pgw_event.c pgw_context.c pgw_sm.c \
-	pgw_gtp_path.c pgw_s5c_build.c pgw_s5c_handler.c \
-	pgw_fd_path.c pgw_gx_handler.c \
+	pgw-ipfw.h \
+    pgw-event.h pgw-context.h pgw-sm.h \
+	pgw-gtp-path.h pgw-s5c-build.h pgw-s5c-handler.h \
+	pgw-fd-path.h pgw-gx-handler.h \
+	pgw-ipfw.c \
+    pgw-init.c pgw-event.c pgw-context.c pgw-sm.c \
+	pgw-gtp-path.c pgw-s5c-build.c pgw-s5c-handler.c \
+	pgw-fd-path.c pgw-gx-handler.c \
 	$(NULL)
 
 libpgw_la_DEPENDENCIES = \

src/pgw/pgw-context.c

@@ -10,7 +10,7 @@
 #include "fd/fd-lib.h"
 
 #include "app/context.h"
-#include "pgw_context.h"
+#include "pgw-context.h"
 
 static pgw_context_t self;
 static fd_config_t g_fd_conf;

src/pgw/pgw-event.c

@@ -1,5 +1,5 @@
-#include "pgw_event.h"
-#include "pgw_context.h"
+#include "pgw-event.h"
+#include "pgw-context.h"
 
 #if defined(HAVE_KQUEUE)
 /*

src/pgw/pgw-fd-path.c

@@ -4,8 +4,8 @@
 #include "fd/gx/gx-dict.h"
 #include "fd/gx/gx-message.h"
 
-#include "pgw_event.h"
-#include "pgw_fd_path.h"
+#include "pgw-event.h"
+#include "pgw-fd-path.h"
 
 static struct session_handler *pgw_gx_reg = NULL;
 static struct disp_hdl *hdl_gx_fb = NULL; 

src/pgw/pgw-fd-path.h

@@ -1,7 +1,7 @@
 #ifndef __PGW_FD_PATH_H__
 #define __PGW_FD_PATH_H__
 
-#include "pgw_context.h"
+#include "pgw-context.h"
 
 #ifdef __cplusplus
 extern "C" {

src/pgw/pgw-gtp-path.c

@@ -20,10 +20,10 @@
 #include "gtp/gtp-path.h"
 
 #include "app/context.h"
-#include "pgw_context.h"
-#include "pgw_event.h"
-#include "pgw_gtp_path.h"
-#include "pgw_ipfw.h"
+#include "pgw-context.h"
+#include "pgw-event.h"
+#include "pgw-gtp-path.h"
+#include "pgw-ipfw.h"
 
 #define PGW_GTP_HANDLED     1
 

src/pgw/pgw-gx-handler.c

@@ -1,8 +1,8 @@
-#include "pgw_context.h"
+#include "pgw-context.h"
 #include "fd/gx/gx-message.h"
-#include "pgw_gtp_path.h"
-#include "pgw_s5c_build.h"
-#include "pgw_ipfw.h"
+#include "pgw-gtp-path.h"
+#include "pgw-s5c-build.h"
+#include "pgw-ipfw.h"
 
 static int bearer_binding(pgw_sess_t *sess, gx_message_t *gx_message);
 

src/pgw/pgw-gx-handler.h

@@ -3,7 +3,7 @@
 
 #include "gtp/gtp-message.h"
 
-#include "pgw_context.h"
+#include "pgw-context.h"
 
 #ifdef __cplusplus
 extern "C" {

src/pgw/pgw-init.c

@@ -1,11 +1,11 @@
 #include "gtp/gtp-xact.h"
 
 #include "app/context.h"
-#include "pgw_context.h"
-#include "pgw_event.h"
-#include "pgw_sm.h"
+#include "pgw-context.h"
+#include "pgw-event.h"
+#include "pgw-sm.h"
 
-#include "pgw_fd_path.h"
+#include "pgw-fd-path.h"
 
 static ogs_thread_t *thread;
 static void pgw_main(void *data);

src/pgw/pgw-ipfw.c

@@ -11,7 +11,7 @@
 #include <netinet/ip6.h>
 #endif
 
-#include "pgw_context.h"
+#include "pgw-context.h"
 
 #include "ipfw/ipfw2.h"
 #include "ipfw/objs/include_e/netinet/ip_fw.h"

src/pgw/pgw-ipfw.h

@@ -1,7 +1,7 @@
 #ifndef __PGW_IPFW_H__
 #define __PGW_IPFW_H__
 
-#include "pgw_context.h"
+#include "pgw-context.h"
 
 int pgw_compile_packet_filter(pgw_rule_t *pf, char *description);
 pgw_bearer_t *pgw_bearer_find_by_packet(ogs_pkbuf_t *pkt);

src/pgw/pgw-s5c-build.c

@@ -6,7 +6,7 @@
 
 #include "ipfw/ipfw2.h"
 
-#include "pgw_context.h"
+#include "pgw-context.h"
 
 static int16_t pgw_pco_build(uint8_t *pco_buf, tlv_pco_t *tlv_pco);
 

src/pgw/pgw-s5c-handler.c

@@ -3,10 +3,10 @@
 #include "gtp/gtp-path.h"
 
 #include "app/context.h"
-#include "pgw_event.h"
-#include "pgw_context.h"
-#include "pgw_gtp_path.h"
-#include "pgw_s5c_handler.h"
+#include "pgw-event.h"
+#include "pgw-context.h"
+#include "pgw-gtp-path.h"
+#include "pgw-s5c-handler.h"
 
 void pgw_s5c_handle_create_session_request(
         pgw_sess_t *sess, gtp_xact_t *xact, gtp_create_session_request_t *req)

src/pgw/pgw-s5c-handler.h

@@ -3,7 +3,7 @@
 
 #include "gtp/gtp-message.h"
 
-#include "pgw_context.h"
+#include "pgw-context.h"
 
 #ifdef __cplusplus
 extern "C" {

src/pgw/pgw-sm.c

@@ -2,13 +2,13 @@
 #include "fd/fd-lib.h"
 #include "fd/gx/gx-message.h"
 
-#include "pgw_sm.h"
-#include "pgw_context.h"
-#include "pgw_event.h"
-#include "pgw_gtp_path.h"
-#include "pgw_s5c_handler.h"
-#include "pgw_gx_handler.h"
-#include "pgw_fd_path.h"
+#include "pgw-sm.h"
+#include "pgw-context.h"
+#include "pgw-event.h"
+#include "pgw-gtp-path.h"
+#include "pgw-s5c-handler.h"
+#include "pgw-gx-handler.h"
+#include "pgw-fd-path.h"
 
 void pgw_state_initial(ogs_fsm_t *s, pgw_event_t *e)
 {

src/pgw/pgw-sm.h

@@ -1,7 +1,7 @@
 #ifndef __PGW_SM_H__
 #define __PGW_SM_H__
 
-#include "pgw_event.h"
+#include "pgw-event.h"
 
 #ifdef __cplusplus
 extern "C" {

src/sgw/Makefile.am

@@ -5,10 +5,10 @@ noinst_LTLIBRARIES = libsgw.la
 SUBDIR = gtp
 
 libsgw_la_SOURCES = \
-    sgw_event.h sgw_context.h \
-	sgw_gtp_path.h sgw_sm.h sgw_s11_handler.h sgw_s5c_handler.h \
-    sgw_init.c sgw_event.c sgw_context.c \
-	sgw_gtp_path.c sgw_sm.c sgw_s11_handler.c sgw_s5c_handler.c \
+    sgw-event.h sgw-context.h \
+	sgw-gtp-path.h sgw-sm.h sgw-s11-handler.h sgw-s5c-handler.h \
+    sgw-init.c sgw-event.c sgw-context.c \
+	sgw-gtp-path.c sgw-sm.c sgw-s11-handler.c sgw-s5c-handler.c \
 	$(NULL)
 
 libsgw_la_DEPENDENCIES = \

src/sgw/sgw-context.c

@@ -8,7 +8,7 @@
 #include "gtp/gtp-xact.h"
 
 #include "app/context.h"
-#include "sgw_context.h"
+#include "sgw-context.h"
 
 static sgw_context_t self;
 

src/sgw/sgw-event.c

@@ -1,5 +1,5 @@
-#include "sgw_event.h"
-#include "sgw_context.h"
+#include "sgw-event.h"
+#include "sgw-context.h"
 
 static OGS_POOL(pool, sgw_event_t);
 

src/sgw/sgw-gtp-path.c

@@ -3,9 +3,9 @@
 #include "gtp/gtp-path.h"
 
 #include "app/context.h"
-#include "sgw_context.h"
-#include "sgw_event.h"
-#include "sgw_gtp_path.h"
+#include "sgw-context.h"
+#include "sgw-event.h"
+#include "sgw-gtp-path.h"
 
 static ogs_pkbuf_pool_t *packet_pool = NULL;
 

src/sgw/sgw-init.c

@@ -1,9 +1,9 @@
 #include "gtp/gtp-xact.h"
 
 #include "app/context.h"
-#include "sgw_context.h"
-#include "sgw_sm.h"
-#include "sgw_event.h"
+#include "sgw-context.h"
+#include "sgw-sm.h"
+#include "sgw-event.h"
 
 static ogs_thread_t *thread;
 static void sgw_main(void *data);

src/sgw/sgw-s11-handler.c

@@ -4,10 +4,10 @@
 #include "gtp/gtp-path.h"
 
 #include "app/context.h"
-#include "sgw_event.h"
-#include "sgw_context.h"
-#include "sgw_gtp_path.h"
-#include "sgw_s11_handler.h"
+#include "sgw-event.h"
+#include "sgw-context.h"
+#include "sgw-gtp-path.h"
+#include "sgw-s11-handler.h"
 
 void sgw_s11_handle_create_session_request(
         gtp_xact_t *s11_xact, sgw_ue_t *sgw_ue, gtp_message_t *gtp_message)

src/sgw/sgw-s11-handler.h

@@ -3,7 +3,7 @@
 
 #include "gtp/gtp-message.h"
 
-#include "sgw_context.h"
+#include "sgw-context.h"
 
 #ifdef __cplusplus
 extern "C" {