From a32465ed07e6d461d9c0a3002cd1c3c650683fc4 Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Tue, 11 Jun 2019 18:28:25 +0900 Subject: [PATCH] Rename library --- lib/asn1c/Makefile.am | 4 +- lib/asn1c/{s1ap_asn1c.h => s1ap-asn1c.h} | 0 lib/asn1c/{s1ap_decoder.c => s1ap-decoder.c} | 2 +- lib/asn1c/{s1ap_encoder.c => s1ap-encoder.c} | 2 +- lib/asn1c/{s1ap_free.c => s1ap-free.c} | 2 +- lib/asn1c/{s1ap_message.h => s1ap-message.h} | 2 +- lib/fd/Makefile.am | 16 ++--- lib/fd/{fd_config.c => fd-config.c} | 2 +- lib/fd/{fd_init.c => fd-init.c} | 5 +- lib/fd/{fd_lib.h => fd-lib.h} | 14 ++-- lib/fd/{fd_logger.c => fd-logger.c} | 2 +- lib/fd/{fd_logger.h => fd-logger.h} | 10 +-- lib/fd/{fd_message.c => fd-message.c} | 2 +- lib/fd/{fd_message.h => fd-message.h} | 10 +-- lib/fd/gx/{dict_init.c => dict-init.c} | 2 +- lib/fd/gx/{gx_dict.h => gx-dict.h} | 10 +-- lib/fd/gx/{gx_message.c => gx-message.c} | 2 +- lib/fd/gx/{gx_message.h => gx-message.h} | 10 +-- lib/fd/rx/{dict_init.c => dict-init.c} | 2 +- lib/fd/rx/{rx_dict.h => rx-dict.h} | 10 +-- lib/fd/rx/{rx_message.c => rx-message.c} | 2 +- lib/fd/rx/{rx_message.h => rx-message.h} | 10 +-- lib/fd/s6a/{dict_init.c => dict-init.c} | 2 +- lib/fd/s6a/{s6a_dict.h => s6a-dict.h} | 10 +-- lib/fd/s6a/{s6a_message.h => s6a-message.h} | 10 +-- lib/gtp/Makefile.am | 8 +-- lib/gtp/{gtp_conv.c => gtp-conv.c} | 6 +- lib/gtp/{gtp_conv.h => gtp-conv.h} | 6 +- lib/gtp/{gtp_message.c => gtp-message.c} | 6 +- lib/gtp/{gtp_node.c => gtp-node.c} | 6 +- lib/gtp/{gtp_node.h => gtp-node.h} | 12 ++-- lib/gtp/{gtp_path.c => gtp-path.c} | 8 +-- lib/gtp/{gtp_path.h => gtp-path.h} | 10 +-- lib/gtp/{gtp_tlv.c => gtp-tlv.c} | 2 +- lib/gtp/{gtp_tlv.h => gtp-tlv.h} | 6 +- lib/gtp/{gtp_types.c => gtp-types.c} | 4 +- lib/gtp/{gtp_types.h => gtp-types.h} | 12 ++-- lib/gtp/{gtp_xact.c => gtp-xact.c} | 8 +-- lib/gtp/{gtp_xact.h => gtp-xact.h} | 12 ++-- lib/gtp/support/{README => README.md} | 2 +- lib/gtp/support/{gtp_tlv.py => gtp-tlv.py} | 22 +++---- lib/nas/Makefile.am | 4 +- lib/nas/{nas_decoder.c => nas-decoder.c} | 24 +------ lib/nas/{nas_encoder.c => nas-encoder.c} | 6 +- lib/nas/{nas_ies.c => nas-ies.c} | 6 +- lib/nas/{nas_ies.h => nas-ies.h} | 16 ++--- lib/nas/{nas_message.h => nas-message.h} | 16 ++--- lib/nas/{nas_types.c => nas-types.c} | 2 +- lib/nas/{nas_types.h => nas-types.h} | 0 lib/nas/support/{README => README.md} | 2 +- .../{nas_message.py => nas-message.py} | 64 +++++++------------ .../support/{type_list.py => type-list.py} | 0 main.c | 2 +- src/{app_init.h => app-init.h} | 0 src/epc.c | 2 +- src/hss.c | 2 +- src/hss/hss_context.c | 2 +- src/hss/hss_context.h | 2 +- src/hss/hss_fd_path.c | 6 +- src/mme.c | 2 +- src/mme/emm_build.c | 2 +- src/mme/emm_handler.c | 2 +- src/mme/emm_handler.h | 2 +- src/mme/emm_sm.c | 6 +- src/mme/esm_build.c | 2 +- src/mme/esm_handler.c | 2 +- src/mme/esm_handler.h | 2 +- src/mme/esm_sm.c | 2 +- src/mme/mme_context.c | 10 +-- src/mme/mme_context.h | 8 +-- src/mme/mme_fd_path.c | 6 +- src/mme/mme_gtp_path.c | 6 +- src/mme/mme_init.c | 2 +- src/mme/mme_kdf.h | 2 +- src/mme/mme_s11_build.c | 8 +-- src/mme/mme_s11_build.h | 2 +- src/mme/mme_s11_handler.c | 6 +- src/mme/mme_s11_handler.h | 2 +- src/mme/mme_s6a_handler.c | 2 +- src/mme/mme_s6a_handler.h | 2 +- src/mme/mme_sm.c | 8 +-- src/mme/nas_conv.h | 2 +- src/mme/nas_security.c | 2 +- src/mme/s1ap-path.h | 2 +- src/mme/s1ap_build.c | 2 +- src/mme/s1ap_build.h | 2 +- src/mme/s1ap_conv.h | 2 +- src/mme/s1ap_handler.h | 2 +- src/mme/s1ap_sm.c | 4 +- src/pcrf.c | 2 +- src/pcrf/pcrf_context.c | 2 +- src/pcrf/pcrf_context.h | 2 +- src/pcrf/pcrf_fd_path.c | 2 +- src/pcrf/pcrf_gx_path.c | 10 +-- src/pcrf/pcrf_rx_path.c | 6 +- src/pgw.c | 2 +- src/pgw/pgw_context.c | 12 ++-- src/pgw/pgw_context.h | 4 +- src/pgw/pgw_fd_path.c | 8 +-- src/pgw/pgw_gtp_path.c | 4 +- src/pgw/pgw_gtp_path.h | 2 +- src/pgw/pgw_gx_handler.c | 2 +- src/pgw/pgw_gx_handler.h | 2 +- src/pgw/pgw_init.c | 2 +- src/pgw/pgw_s5c_build.c | 8 +-- src/pgw/pgw_s5c_build.h | 2 +- src/pgw/pgw_s5c_handler.c | 6 +- src/pgw/pgw_s5c_handler.h | 2 +- src/pgw/pgw_sm.c | 6 +- src/sgw.c | 2 +- src/sgw/sgw_context.c | 10 +-- src/sgw/sgw_context.h | 4 +- src/sgw/sgw_gtp_path.c | 6 +- src/sgw/sgw_gtp_path.h | 2 +- src/sgw/sgw_init.c | 2 +- src/sgw/sgw_s11_handler.c | 8 +-- src/sgw/sgw_s11_handler.h | 2 +- src/sgw/sgw_s5c_handler.c | 8 +-- src/sgw/sgw_s5c_handler.h | 2 +- src/sgw/sgw_sm.c | 2 +- tests/common/test-packet.c | 8 +-- tests/common/test-packet.h | 12 ++-- tests/complex/abts-main.c | 4 +- tests/complex/attach-test.c | 2 +- tests/complex/handover-test.c | 2 +- tests/complex/volte-test.c | 2 +- tests/simple/abts-main.c | 4 +- tests/simple/mnc3-test.c | 2 +- tests/unit/abts-main.c | 4 +- tests/unit/gtp-message-test.c | 4 +- tests/unit/nas-message-test.c | 2 +- tests/unit/security-test.c | 2 +- tests/volte/abts-main.c | 4 +- tests/volte/pcscf-fd-path.c | 8 +-- tests/volte/testapp.c | 2 +- tests/volte/volte-test.c | 2 +- 136 files changed, 348 insertions(+), 383 deletions(-) rename lib/asn1c/{s1ap_asn1c.h => s1ap-asn1c.h} (100%) rename lib/asn1c/{s1ap_decoder.c => s1ap-decoder.c} (98%) rename lib/asn1c/{s1ap_encoder.c => s1ap-encoder.c} (98%) rename lib/asn1c/{s1ap_free.c => s1ap-free.c} (97%) rename lib/asn1c/{s1ap_message.h => s1ap-message.h} (98%) rename lib/fd/{fd_config.c => fd-config.c} (99%) rename lib/fd/{fd_init.c => fd-init.c} (98%) rename lib/fd/{fd_lib.h => fd-lib.h} (93%) rename lib/fd/{fd_logger.c => fd-logger.c} (99%) rename lib/fd/{fd_logger.h => fd-logger.h} (93%) rename lib/fd/{fd_message.c => fd-message.c} (99%) rename lib/fd/{fd_message.h => fd-message.h} (95%) rename lib/fd/gx/{dict_init.c => dict-init.c} (99%) rename lib/fd/gx/{gx_dict.h => gx-dict.h} (97%) rename lib/fd/gx/{gx_message.c => gx-message.c} (97%) rename lib/fd/gx/{gx_message.h => gx-message.h} (94%) rename lib/fd/rx/{dict_init.c => dict-init.c} (99%) rename lib/fd/rx/{rx_dict.h => rx-dict.h} (97%) rename lib/fd/rx/{rx_message.c => rx-message.c} (98%) rename lib/fd/rx/{rx_message.h => rx-message.h} (96%) rename lib/fd/s6a/{dict_init.c => dict-init.c} (99%) rename lib/fd/s6a/{s6a_dict.h => s6a-dict.h} (97%) rename lib/fd/s6a/{s6a_message.h => s6a-message.h} (96%) rename lib/gtp/{gtp_conv.c => gtp-conv.c} (98%) rename lib/gtp/{gtp_conv.h => gtp-conv.h} (96%) rename lib/gtp/{gtp_message.c => gtp-message.c} (99%) rename lib/gtp/{gtp_node.c => gtp-node.c} (97%) rename lib/gtp/{gtp_node.h => gtp-node.h} (93%) rename lib/gtp/{gtp_path.c => gtp-path.c} (98%) rename lib/gtp/{gtp_path.h => gtp-path.h} (90%) rename lib/gtp/{gtp_tlv.c => gtp-tlv.c} (99%) rename lib/gtp/{gtp_tlv.h => gtp-tlv.h} (98%) rename lib/gtp/{gtp_types.c => gtp-types.c} (99%) rename lib/gtp/{gtp_types.h => gtp-types.h} (99%) rename lib/gtp/{gtp_xact.c => gtp-xact.c} (99%) rename lib/gtp/{gtp_xact.h => gtp-xact.h} (95%) rename lib/gtp/support/{README => README.md} (90%) rename lib/gtp/support/{gtp_tlv.py => gtp-tlv.py} (98%) rename lib/nas/{nas_decoder.c => nas-decoder.c} (99%) rename lib/nas/{nas_encoder.c => nas-encoder.c} (99%) rename lib/nas/{nas_ies.c => nas-ies.c} (99%) rename lib/nas/{nas_ies.h => nas-ies.h} (98%) rename lib/nas/{nas_message.h => nas-message.h} (99%) rename lib/nas/{nas_types.c => nas-types.c} (99%) rename lib/nas/{nas_types.h => nas-types.h} (100%) rename lib/nas/support/{README => README.md} (89%) rename lib/nas/support/{nas_message.py => nas-message.py} (96%) rename lib/nas/support/{type_list.py => type-list.py} (100%) rename src/{app_init.h => app-init.h} (100%) diff --git a/lib/asn1c/Makefile.am b/lib/asn1c/Makefile.am index 85bdebaa1..10d49ec5b 100644 --- a/lib/asn1c/Makefile.am +++ b/lib/asn1c/Makefile.am @@ -1127,8 +1127,8 @@ ASN_MODULE_CFLAGS= pkglib_LTLIBRARIES=libasn1c.la libasn1c_la_SOURCES= \ $(ASN_MODULE_SRCS) $(ASN_MODULE_HDRS) \ - s1ap_asn1c.h s1ap_message.h \ - s1ap_decoder.c s1ap_encoder.c s1ap_free.c \ + s1ap-asn1c.h s1ap-message.h \ + s1ap-decoder.c s1ap-encoder.c s1ap-free.c \ $(NULL) libasn1c_la_DEPENDENCIES = \ diff --git a/lib/asn1c/s1ap_asn1c.h b/lib/asn1c/s1ap-asn1c.h similarity index 100% rename from lib/asn1c/s1ap_asn1c.h rename to lib/asn1c/s1ap-asn1c.h diff --git a/lib/asn1c/s1ap_decoder.c b/lib/asn1c/s1ap-decoder.c similarity index 98% rename from lib/asn1c/s1ap_decoder.c rename to lib/asn1c/s1ap-decoder.c index d692dc829..7e0bed159 100644 --- a/lib/asn1c/s1ap_decoder.c +++ b/lib/asn1c/s1ap-decoder.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "s1ap_message.h" +#include "s1ap-message.h" #undef OGS_LOG_DOMAIN #define OGS_LOG_DOMAIN __base_s1ap_domain diff --git a/lib/asn1c/s1ap_encoder.c b/lib/asn1c/s1ap-encoder.c similarity index 98% rename from lib/asn1c/s1ap_encoder.c rename to lib/asn1c/s1ap-encoder.c index 12984724f..8d6e1a9a7 100644 --- a/lib/asn1c/s1ap_encoder.c +++ b/lib/asn1c/s1ap-encoder.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "s1ap_message.h" +#include "s1ap-message.h" #undef OGS_LOG_DOMAIN #define OGS_LOG_DOMAIN __base_s1ap_domain diff --git a/lib/asn1c/s1ap_free.c b/lib/asn1c/s1ap-free.c similarity index 97% rename from lib/asn1c/s1ap_free.c rename to lib/asn1c/s1ap-free.c index 81d841e1e..8a51ba60b 100644 --- a/lib/asn1c/s1ap_free.c +++ b/lib/asn1c/s1ap-free.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "s1ap_message.h" +#include "s1ap-message.h" #undef OGS_LOG_DOMAIN #define OGS_LOG_DOMAIN __base_s1ap_domain diff --git a/lib/asn1c/s1ap_message.h b/lib/asn1c/s1ap-message.h similarity index 98% rename from lib/asn1c/s1ap_message.h rename to lib/asn1c/s1ap-message.h index 5b82df5ee..ca05e1579 100644 --- a/lib/asn1c/s1ap_message.h +++ b/lib/asn1c/s1ap-message.h @@ -23,7 +23,7 @@ #include "ogs-core.h" #include "base/types.h" #include "base/context.h" -#include "s1ap_asn1c.h" +#include "s1ap-asn1c.h" #ifdef __cplusplus extern "C" { diff --git a/lib/fd/Makefile.am b/lib/fd/Makefile.am index 6bb4211f0..4f7bacdb1 100644 --- a/lib/fd/Makefile.am +++ b/lib/fd/Makefile.am @@ -18,17 +18,17 @@ pkglib_LTLIBRARIES = libfd.la libfd_la_SOURCES = \ - fd_message.h fd_logger.h fd_lib.h \ - libapp_sip.c fd_message.c fd_logger.c fd_config.c fd_init.c \ + fd-message.h fd-logger.h fd-lib.h \ + libapp_sip.c fd-message.c fd-logger.c fd-config.c fd-init.c \ \ - s6a/s6a_dict.h s6a/s6a_message.h \ - s6a/dict_init.c \ + s6a/s6a-dict.h s6a/s6a-message.h \ + s6a/dict-init.c \ \ - gx/gx_dict.h gx/gx_message.h \ - gx/dict_init.c gx/gx_message.c \ + gx/gx-dict.h gx/gx-message.h \ + gx/dict-init.c gx/gx-message.c \ \ - rx/rx_dict.h rx/rx_message.h \ - rx/dict_init.c rx/rx_message.c \ + rx/rx-dict.h rx/rx-message.h \ + rx/dict-init.c rx/rx-message.c \ $(NULL) libfd_la_DEPENDENCIES = \ diff --git a/lib/fd/fd_config.c b/lib/fd/fd-config.c similarity index 99% rename from lib/fd/fd_config.c rename to lib/fd/fd-config.c index f2f5ea7df..3f0aa4b6f 100644 --- a/lib/fd/fd_config.c +++ b/lib/fd/fd-config.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "fd_lib.h" +#include "fd-lib.h" #undef OGS_LOG_DOMAIN #define OGS_LOG_DOMAIN __base_fd_domain diff --git a/lib/fd/fd_init.c b/lib/fd/fd-init.c similarity index 98% rename from lib/fd/fd_init.c rename to lib/fd/fd-init.c index 60da3fcd1..b07863995 100644 --- a/lib/fd/fd_init.c +++ b/lib/fd/fd-init.c @@ -16,8 +16,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "fd_logger.h" -#include "fd_lib.h" + +#include "fd-logger.h" +#include "fd-lib.h" #undef OGS_LOG_DOMAIN #define OGS_LOG_DOMAIN __base_fd_domain diff --git a/lib/fd/fd_lib.h b/lib/fd/fd-lib.h similarity index 93% rename from lib/fd/fd_lib.h rename to lib/fd/fd-lib.h index 94dcc6151..7950bcaef 100644 --- a/lib/fd/fd_lib.h +++ b/lib/fd/fd-lib.h @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#ifndef __FD_LIB_H__ -#define __FD_LIB_H__ +#ifndef FD_LIB_H +#define FD_LIB_H #include "ogs-core.h" @@ -27,12 +27,12 @@ #include "base/context.h" -#include "fd_message.h" -#include "fd_logger.h" +#include "fd-message.h" +#include "fd-logger.h" #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif /* This is default diameter configuration if there is no config file * The Configuration : No TLS, Only TCP */ @@ -81,6 +81,6 @@ int fd_avp_search_avp ( struct avp * groupedavp, #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif -#endif /* ! __FD_LIB_H__ */ +#endif /* FD_LIB_H */ diff --git a/lib/fd/fd_logger.c b/lib/fd/fd-logger.c similarity index 99% rename from lib/fd/fd_logger.c rename to lib/fd/fd-logger.c index 9f808b70a..6d8cfae6b 100644 --- a/lib/fd/fd_logger.c +++ b/lib/fd/fd-logger.c @@ -19,7 +19,7 @@ #include "ogs-core.h" #include "base/context.h" -#include "fd_logger.h" +#include "fd-logger.h" #undef OGS_LOG_DOMAIN #define OGS_LOG_DOMAIN __base_fd_domain diff --git a/lib/fd/fd_logger.h b/lib/fd/fd-logger.h similarity index 93% rename from lib/fd/fd_logger.h rename to lib/fd/fd-logger.h index 7268e8dbd..ebc1e3516 100644 --- a/lib/fd/fd_logger.h +++ b/lib/fd/fd-logger.h @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#ifndef __FD_LOGGER_H__ -#define __FD_LOGGER_H__ +#ifndef FD_LOGGER_H +#define FD_LOGGER_H #include "ogs-core.h" @@ -27,7 +27,7 @@ #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif struct fd_logger_t { @@ -65,6 +65,6 @@ void fd_logger_unregister(); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif -#endif /* ! __FD_LOGGER_H__ */ +#endif /* FD_LOGGER_H */ diff --git a/lib/fd/fd_message.c b/lib/fd/fd-message.c similarity index 99% rename from lib/fd/fd_message.c rename to lib/fd/fd-message.c index e0b8d3c40..fa47f0eae 100644 --- a/lib/fd/fd_message.c +++ b/lib/fd/fd-message.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "fd_message.h" +#include "fd-message.h" #define CHECK_dict_search( _type, _criteria, _what, _result ) \ CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, (_type), (_criteria), (_what), (_result), ENOENT) ); diff --git a/lib/fd/fd_message.h b/lib/fd/fd-message.h similarity index 95% rename from lib/fd/fd_message.h rename to lib/fd/fd-message.h index 6bcfbb3ae..e7c44fe4a 100644 --- a/lib/fd/fd_message.h +++ b/lib/fd/fd-message.h @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -#ifndef __FD_MESSAGE_H__ -#define __FD_MESSAGE_H__ +#ifndef FD_MESSAGE_H +#define FD_MESSAGE_H #include "freeDiameter/freeDiameter-host.h" #include "freeDiameter/libfdcore.h" #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif #define FD_AVP_CODE_FRAME_IP_ADDRESS 8 #define FD_AVP_CODE_FRAME_IPV6_PREFIX 97 @@ -73,6 +73,6 @@ int fd_message_vendor_specific_appid_set(struct msg *msg, uint32_t app_id); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif -#endif /* ! __FD_MESSAGE_H__ */ +#endif /* FD_MESSAGE_H */ diff --git a/lib/fd/gx/dict_init.c b/lib/fd/gx/dict-init.c similarity index 99% rename from lib/fd/gx/dict_init.c rename to lib/fd/gx/dict-init.c index f30f26ff9..f95e4c7f2 100644 --- a/lib/fd/gx/dict_init.c +++ b/lib/fd/gx/dict-init.c @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -#include "gx_dict.h" +#include "gx-dict.h" #define CHECK_dict_search( _type, _criteria, _what, _result ) \ CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, (_type), (_criteria), (_what), (_result), ENOENT) ); diff --git a/lib/fd/gx/gx_dict.h b/lib/fd/gx/gx-dict.h similarity index 97% rename from lib/fd/gx/gx_dict.h rename to lib/fd/gx/gx-dict.h index faa42fce9..6e4edffe2 100644 --- a/lib/fd/gx/gx_dict.h +++ b/lib/fd/gx/gx-dict.h @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -#ifndef __GX_DICT_H__ -#define __GX_DICT_H__ +#ifndef GX_DICT_H +#define GX_DICT_H #include "freeDiameter/freeDiameter-host.h" #include "freeDiameter/libfdcore.h" #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif #define GX_APPLICATION_ID 16777238 @@ -130,6 +130,6 @@ int gx_dict_init(void); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif -#endif /* __GX_DICT_H__ */ +#endif /* GX_DICT_H */ diff --git a/lib/fd/gx/gx_message.c b/lib/fd/gx/gx-message.c similarity index 97% rename from lib/fd/gx/gx_message.c rename to lib/fd/gx/gx-message.c index 5284512fa..dcea45d39 100644 --- a/lib/fd/gx/gx_message.c +++ b/lib/fd/gx/gx-message.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "gx_message.h" +#include "gx-message.h" void gx_message_free(gx_message_t *gx_message) { diff --git a/lib/fd/gx/gx_message.h b/lib/fd/gx/gx-message.h similarity index 94% rename from lib/fd/gx/gx_message.h rename to lib/fd/gx/gx-message.h index 059749eb8..6ede2e63b 100644 --- a/lib/fd/gx/gx_message.h +++ b/lib/fd/gx/gx-message.h @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -#ifndef __GX_MESSAGE_H__ -#define __GX_MESSAGE_H__ +#ifndef GX_MESSAGE_H +#define GX_MESSAGE_H #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif #include "base/types.h" @@ -59,6 +59,6 @@ void gx_message_free(gx_message_t *gx_message); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif -#endif /* __GX_MESSAGE_H__ */ +#endif /* GX_MESSAGE_H */ diff --git a/lib/fd/rx/dict_init.c b/lib/fd/rx/dict-init.c similarity index 99% rename from lib/fd/rx/dict_init.c rename to lib/fd/rx/dict-init.c index 7770b3a92..97c0c836c 100644 --- a/lib/fd/rx/dict_init.c +++ b/lib/fd/rx/dict-init.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "rx_dict.h" +#include "rx-dict.h" #define CHECK_dict_search( _type, _criteria, _what, _result ) \ CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, (_type), (_criteria), (_what), (_result), ENOENT) ); diff --git a/lib/fd/rx/rx_dict.h b/lib/fd/rx/rx-dict.h similarity index 97% rename from lib/fd/rx/rx_dict.h rename to lib/fd/rx/rx-dict.h index e785944da..1d0fe11e4 100644 --- a/lib/fd/rx/rx_dict.h +++ b/lib/fd/rx/rx-dict.h @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -#ifndef __RX_DICT_H__ -#define __RX_DICT_H__ +#ifndef RX_DICT_H +#define RX_DICT_H #include "freeDiameter/freeDiameter-host.h" #include "freeDiameter/libfdcore.h" #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif #define RX_APPLICATION_ID 16777236 @@ -126,6 +126,6 @@ int rx_dict_init(void); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif -#endif /* __RX_DICT_H__ */ +#endif /* RX_DICT_H */ diff --git a/lib/fd/rx/rx_message.c b/lib/fd/rx/rx-message.c similarity index 98% rename from lib/fd/rx/rx_message.c rename to lib/fd/rx/rx-message.c index 74e6305ba..ac0de8bb0 100644 --- a/lib/fd/rx/rx_message.c +++ b/lib/fd/rx/rx-message.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "rx_message.h" +#include "rx-message.h" void rx_message_free(rx_message_t *rx_message) { diff --git a/lib/fd/rx/rx_message.h b/lib/fd/rx/rx-message.h similarity index 96% rename from lib/fd/rx/rx_message.h rename to lib/fd/rx/rx-message.h index a3a7a52f0..e4f0ed6bc 100644 --- a/lib/fd/rx/rx_message.h +++ b/lib/fd/rx/rx-message.h @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -#ifndef __RX_MESSAGE_H__ -#define __RX_MESSAGE_H__ +#ifndef RX_MESSAGE_H +#define RX_MESSAGE_H #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif #include "base/types.h" @@ -85,6 +85,6 @@ void rx_message_free(rx_message_t *rx_message); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif -#endif /* __RX_MESSAGE_H__ */ +#endif /* RX_MESSAGE_H */ diff --git a/lib/fd/s6a/dict_init.c b/lib/fd/s6a/dict-init.c similarity index 99% rename from lib/fd/s6a/dict_init.c rename to lib/fd/s6a/dict-init.c index 95804433b..5b2d6d70d 100644 --- a/lib/fd/s6a/dict_init.c +++ b/lib/fd/s6a/dict-init.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "s6a_dict.h" +#include "s6a-dict.h" #define CHECK_dict_search( _type, _criteria, _what, _result ) \ CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, (_type), (_criteria), (_what), (_result), ENOENT) ); diff --git a/lib/fd/s6a/s6a_dict.h b/lib/fd/s6a/s6a-dict.h similarity index 97% rename from lib/fd/s6a/s6a_dict.h rename to lib/fd/s6a/s6a-dict.h index 68c2675cf..35b0dfc90 100644 --- a/lib/fd/s6a/s6a_dict.h +++ b/lib/fd/s6a/s6a-dict.h @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -#ifndef __S6A_LIB_H__ -#define __S6A_LIB_H__ +#ifndef S6A_DICT_H +#define S6A_DICT_H #include "freeDiameter/freeDiameter-host.h" #include "freeDiameter/libfdcore.h" #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif #define S6A_APPLICATION_ID 16777251 @@ -107,6 +107,6 @@ int s6a_dict_init(void); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif -#endif /* ! __S6A_LIB_H__ */ +#endif /* S6A_DICT_H */ diff --git a/lib/fd/s6a/s6a_message.h b/lib/fd/s6a/s6a-message.h similarity index 96% rename from lib/fd/s6a/s6a_message.h rename to lib/fd/s6a/s6a-message.h index 6bd4ed01d..f59d35a4f 100644 --- a/lib/fd/s6a/s6a_message.h +++ b/lib/fd/s6a/s6a-message.h @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -#ifndef __S6A_MESSAGE_H__ -#define __S6A_MESSAGE_H__ +#ifndef S6A_MESSAGE_H +#define S6A_MESSAGE_H #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif #include "ogs-crypt.h" @@ -93,6 +93,6 @@ typedef struct _s6a_message_t { #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif -#endif /* __S6A_MESSAGE_H__ */ +#endif /* S6A_MESSAGE_H */ diff --git a/lib/gtp/Makefile.am b/lib/gtp/Makefile.am index 3d1b69671..b82d84ba1 100644 --- a/lib/gtp/Makefile.am +++ b/lib/gtp/Makefile.am @@ -18,10 +18,10 @@ pkglib_LTLIBRARIES = libgtp.la libgtp_la_SOURCES = \ - gtp_tlv.h gtp_message.h gtp_types.h gtp_conv.h \ - gtp_node.h gtp_path.h gtp_xact.h \ - gtp_tlv.c gtp_message.c gtp_types.c gtp_conv.c \ - gtp_node.c gtp_path.c gtp_xact.c \ + gtp-tlv.h gtp-message.h gtp-types.h gtp-conv.h \ + gtp-node.h gtp-path.h gtp-xact.h \ + gtp-tlv.c gtp-message.c gtp-types.c gtp-conv.c \ + gtp-node.c gtp-path.c gtp-xact.c \ $(NULL) libgtp_la_DEPENDENCIES = \ diff --git a/lib/gtp/gtp_conv.c b/lib/gtp/gtp-conv.c similarity index 98% rename from lib/gtp/gtp_conv.c rename to lib/gtp/gtp-conv.c index 6df810446..d6b0ae835 100644 --- a/lib/gtp/gtp_conv.c +++ b/lib/gtp/gtp-conv.c @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -#include "gtp_message.h" -#include "gtp_types.h" -#include "gtp_conv.h" +#include "gtp-message.h" +#include "gtp-types.h" +#include "gtp-conv.h" void gtp_bearers_in_create_indirect_tunnel_request( tlv_bearer_context_t *bearers[][GTP_MAX_NUM_OF_INDIRECT_TUNNEL], diff --git a/lib/gtp/gtp_conv.h b/lib/gtp/gtp-conv.h similarity index 96% rename from lib/gtp/gtp_conv.h rename to lib/gtp/gtp-conv.h index f906666ea..aadd7d4c4 100644 --- a/lib/gtp/gtp_conv.h +++ b/lib/gtp/gtp-conv.h @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#ifndef __GTP_CONV_H__ -#define __GTP_CONV_H__ +#ifndef GTP_CONV_H +#define GTP_CONV_H #include "ogs-core.h" @@ -54,5 +54,5 @@ int gtp_ip_to_f_teid(ip_t *ip, gtp_f_teid_t *f_teid, int *len); } #endif /* __cplusplus */ -#endif /* __GTP_CONV_H__ */ +#endif /* GTP_CONV_H */ diff --git a/lib/gtp/gtp_message.c b/lib/gtp/gtp-message.c similarity index 99% rename from lib/gtp/gtp_message.c rename to lib/gtp/gtp-message.c index 3792c8bff..7c979727b 100644 --- a/lib/gtp/gtp_message.c +++ b/lib/gtp/gtp-message.c @@ -18,13 +18,13 @@ */ /******************************************************************************* - * This file had been created by gtp_tlv.py script v0.1.0 + * This file had been created by gtp-tlv.py script v0.1.0 * Please do not modify this file but regenerate it via script. - * Created on: 2019-05-28 16:37:12.779763 by acetcom + * Created on: 2019-06-11 17:35:40.953361 by acetcom * from 29274-d80.docx ******************************************************************************/ -#include "gtp_message.h" +#include "gtp-message.h" tlv_desc_t tlv_desc_imsi_0 = { diff --git a/lib/gtp/gtp_node.c b/lib/gtp/gtp-node.c similarity index 97% rename from lib/gtp/gtp_node.c rename to lib/gtp/gtp-node.c index 1bbc604c3..c2b6921ce 100644 --- a/lib/gtp/gtp_node.c +++ b/lib/gtp/gtp-node.c @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -#include "gtp_conv.h" -#include "gtp_node.h" -#include "gtp_xact.h" +#include "gtp-conv.h" +#include "gtp-node.h" +#include "gtp-xact.h" static OGS_POOL(pool, gtp_node_t); diff --git a/lib/gtp/gtp_node.h b/lib/gtp/gtp-node.h similarity index 93% rename from lib/gtp/gtp_node.h rename to lib/gtp/gtp-node.h index 8446c8105..c1357af2b 100644 --- a/lib/gtp/gtp_node.h +++ b/lib/gtp/gtp-node.h @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -#ifndef __GTP_NODE_H__ -#define __GTP_NODE_H__ +#ifndef GTP_NODE_H +#define GTP_NODE_H -#include "gtp_types.h" +#include "gtp-types.h" #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif #define SETUP_GTP_NODE(__cTX, __gNODE) \ do { \ @@ -65,6 +65,6 @@ gtp_node_t *gtp_node_find(ogs_list_t *list, gtp_f_teid_t *f_teid); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif -#endif /* __GTP_NODE_H__ */ +#endif /* GTP_NODE_H */ diff --git a/lib/gtp/gtp_path.c b/lib/gtp/gtp-path.c similarity index 98% rename from lib/gtp/gtp_path.c rename to lib/gtp/gtp-path.c index 486945778..65a5c8ec7 100644 --- a/lib/gtp/gtp_path.c +++ b/lib/gtp/gtp-path.c @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -#include "gtp_message.h" -#include "gtp_conv.h" -#include "gtp_node.h" +#include "gtp-message.h" +#include "gtp-conv.h" +#include "gtp-node.h" -#include "gtp_path.h" +#include "gtp-path.h" ogs_sock_t *gtp_server(ogs_socknode_t *node) { diff --git a/lib/gtp/gtp_path.h b/lib/gtp/gtp-path.h similarity index 90% rename from lib/gtp/gtp_path.h rename to lib/gtp/gtp-path.h index b8619a5e1..5742af976 100644 --- a/lib/gtp/gtp_path.h +++ b/lib/gtp/gtp-path.h @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -#ifndef __GTP_PATH_H__ -#define __GTP_PATH_H__ +#ifndef GTP_PATH_H +#define GTP_PATH_H typedef struct gtp_node_s gtp_node_t; #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif ogs_sock_t *gtp_server(ogs_socknode_t *node); int gtp_connect(ogs_sock_t *ipv4, ogs_sock_t *ipv6, gtp_node_t *gnode); @@ -39,6 +39,6 @@ ogs_pkbuf_t *gtp_handle_echo_req(ogs_pkbuf_t *pkt); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif -#endif /* __GTP_PATH_H__ */ +#endif /* GTP_PATH_H */ diff --git a/lib/gtp/gtp_tlv.c b/lib/gtp/gtp-tlv.c similarity index 99% rename from lib/gtp/gtp_tlv.c rename to lib/gtp/gtp-tlv.c index 8bcd329e4..e8dd2a77b 100644 --- a/lib/gtp/gtp_tlv.c +++ b/lib/gtp/gtp-tlv.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "gtp_tlv.h" +#include "gtp-tlv.h" tlv_desc_t tlv_desc_more1 = { TLV_MORE, "More", 0, 1, 0, 0, { NULL } }; tlv_desc_t tlv_desc_more2 = { TLV_MORE, "More", 0, 2, 0, 0, { NULL } }; diff --git a/lib/gtp/gtp_tlv.h b/lib/gtp/gtp-tlv.h similarity index 98% rename from lib/gtp/gtp_tlv.h rename to lib/gtp/gtp-tlv.h index 9990fc377..cebcfdf36 100644 --- a/lib/gtp/gtp_tlv.h +++ b/lib/gtp/gtp-tlv.h @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#ifndef __GTP_TLV_H__ -#define __GTP_TLV_H__ +#ifndef GTP_TLV_H +#define GTP_TLV_H #include "ogs-core.h" @@ -161,4 +161,4 @@ int tlv_parse_msg(void *msg, tlv_desc_t *desc, ogs_pkbuf_t *pkbuf, int mode); } #endif /* __cplusplus */ -#endif /* __GTP_TLV_H__ */ +#endif /* GTP_TLV_H */ diff --git a/lib/gtp/gtp_types.c b/lib/gtp/gtp-types.c similarity index 99% rename from lib/gtp/gtp_types.c rename to lib/gtp/gtp-types.c index 94ae0579a..8357b9ba8 100644 --- a/lib/gtp/gtp_types.c +++ b/lib/gtp/gtp-types.c @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include "gtp_types.h" -#include "gtp_message.h" +#include "gtp-types.h" +#include "gtp-message.h" /* 8.13 Protocol Configuration Options (PCO) * 10.5.6.3 Protocol configuration options in 3GPP TS 24.008 */ diff --git a/lib/gtp/gtp_types.h b/lib/gtp/gtp-types.h similarity index 99% rename from lib/gtp/gtp_types.h rename to lib/gtp/gtp-types.h index 13f2558e5..f47287988 100644 --- a/lib/gtp/gtp_types.h +++ b/lib/gtp/gtp-types.h @@ -17,19 +17,19 @@ * along with this program. If not, see . */ -#ifndef __GTP_TYPES_H__ -#define __GTP_TYPES_H__ +#ifndef GTP_TYPES_H +#define GTP_TYPES_H #include "base/types.h" #include "base/context.h" -#include "gtp_tlv.h" +#include "gtp-tlv.h" #undef OGS_LOG_DOMAIN #define OGS_LOG_DOMAIN __base_gtp_domain #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif /* 8.4 Cause */ #define GTP_CAUSE_LOCAL_DETACH 2 @@ -434,7 +434,7 @@ ED2(uint8_t spare:6;, #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif -#endif /* __GTP_TYPES_H__ */ +#endif /* GTP_TYPES_H */ diff --git a/lib/gtp/gtp_xact.c b/lib/gtp/gtp-xact.c similarity index 99% rename from lib/gtp/gtp_xact.c rename to lib/gtp/gtp-xact.c index db86b58db..5998ca80e 100644 --- a/lib/gtp/gtp_xact.c +++ b/lib/gtp/gtp-xact.c @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -#include "gtp_message.h" -#include "gtp_node.h" -#include "gtp_path.h" +#include "gtp-message.h" +#include "gtp-node.h" +#include "gtp-path.h" -#include "gtp_xact.h" +#include "gtp-xact.h" #define GTP_MIN_XACT_ID 1 #define GTP_MAX_XACT_ID 0x800000 diff --git a/lib/gtp/gtp_xact.h b/lib/gtp/gtp-xact.h similarity index 95% rename from lib/gtp/gtp_xact.h rename to lib/gtp/gtp-xact.h index 75d1de2dc..33cbd4e72 100644 --- a/lib/gtp/gtp_xact.h +++ b/lib/gtp/gtp-xact.h @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -#ifndef __GTP_XACT_H__ -#define __GTP_XACT_H__ +#ifndef GTP_XACT_H +#define GTP_XACT_H -#include "gtp_message.h" +#include "gtp-message.h" #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif typedef struct gtp_node_s gtp_node_t; @@ -95,6 +95,6 @@ void gtp_xact_deassociate(gtp_xact_t *xact1, gtp_xact_t *xact2); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif -#endif /* __GTP_XACT_H__ */ +#endif /* GTP_XACT_H */ diff --git a/lib/gtp/support/README b/lib/gtp/support/README.md similarity index 90% rename from lib/gtp/support/README rename to lib/gtp/support/README.md index 7e2a33bc3..d161a3c71 100644 --- a/lib/gtp/support/README +++ b/lib/gtp/support/README.md @@ -13,4 +13,4 @@ user@host ~/Documents/git/nextepc/lib/gtp/support$ \ * Generate TLV support files user@host ~/Documents/git/nextepc/lib/s1ap/support$ \ - python gtp_tlv.py -f 29274-d80.docx -o .. + python gtp-tlv.py -f 29274-d80.docx -o .. diff --git a/lib/gtp/support/gtp_tlv.py b/lib/gtp/support/gtp-tlv.py similarity index 98% rename from lib/gtp/support/gtp_tlv.py rename to lib/gtp/support/gtp-tlv.py index 5b2174986..cb53f5452 100644 --- a/lib/gtp/support/gtp_tlv.py +++ b/lib/gtp/support/gtp-tlv.py @@ -74,14 +74,14 @@ def output_header_to_file(f): """) f.write("/*******************************************************************************\n") - f.write(" * This file had been created by gtp_tlv.py script v%s\n" % (version)) + f.write(" * This file had been created by gtp-tlv.py script v%s\n" % (version)) f.write(" * Please do not modify this file but regenerate it via script.\n") f.write(" * Created on: %s by %s\n * from %s\n" % (str(now), getpass.getuser(), filename)) f.write(" ******************************************************************************/\n\n") def usage(): print "Python generating TLV build/parser for GTPv2-C v%s" % (version) - print "Usage: python gtp_tlv.py [options]" + print "Usage: python gtp-tlv.py [options]" print "Available options:" print "-d Enable script debug" print "-f [file] Input file to parse" @@ -370,16 +370,16 @@ type_list["APN Restriction"]["size"] = 1 # Type : 127 type_list["Selection Mode"]["size"] = 1 # Type : 128 type_list["Node Type"]["size"] = 1 # Type : 128 -f = open(outdir + 'gtp_message.h', 'w') +f = open(outdir + 'gtp-message.h', 'w') output_header_to_file(f) -f.write("""#ifndef __GTP_MESSAGE_H__ -#define __GTP_MESSAGE_H__ +f.write("""#ifndef GTP_MESSAGE_H +#define GTP_MESSAGE_H -#include "gtp_tlv.h" +#include "gtp-tlv.h" #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif /* 5.1 General format */ #define GTPV1U_HEADER_LEN 8 @@ -523,15 +523,15 @@ int gtp_build_msg(ogs_pkbuf_t **pkbuf, gtp_message_t *gtp_message); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif -#endif /* __GTP_MESSAGE_H__ */ +#endif /* GTP_MESSAGE_H */ """) f.close() -f = open(outdir + 'gtp_message.c', 'w') +f = open(outdir + 'gtp-message.c', 'w') output_header_to_file(f) -f.write("""#include "gtp_message.h" +f.write("""#include "gtp-message.h" """) diff --git a/lib/nas/Makefile.am b/lib/nas/Makefile.am index b89b8b46c..4cfa47b6e 100644 --- a/lib/nas/Makefile.am +++ b/lib/nas/Makefile.am @@ -18,8 +18,8 @@ pkglib_LTLIBRARIES = libnas.la libnas_la_SOURCES = \ - nas_message.h nas_ies.h nas_types.h \ - nas_decoder.c nas_encoder.c nas_ies.c nas_types.c \ + nas-message.h nas-ies.h nas-types.h \ + nas-decoder.c nas-encoder.c nas-ies.c nas-types.c \ $(NULL) libnas_la_DEPENDENCIES = \ diff --git a/lib/nas/nas_decoder.c b/lib/nas/nas-decoder.c similarity index 99% rename from lib/nas/nas_decoder.c rename to lib/nas/nas-decoder.c index a2d24c9a3..5d01cdeef 100644 --- a/lib/nas/nas_decoder.c +++ b/lib/nas/nas-decoder.c @@ -18,13 +18,13 @@ */ /******************************************************************************* - * This file had been created by nas_message.py script v0.1.0 + * This file had been created by nas-message.py script v0.1.0 * Please do not modify this file but regenerate it via script. - * Created on: 2019-05-28 16:35:26.465833 by acetcom + * Created on: 2019-06-11 17:27:29.685234 by acetcom * from 24301-d80.docx ******************************************************************************/ -#include "nas_message.h" +#include "nas-message.h" #undef OGS_LOG_DOMAIN #define OGS_LOG_DOMAIN __base_nas_domain @@ -2974,21 +2974,3 @@ int nas_esm_decode(nas_message_t *message, ogs_pkbuf_t *pkbuf) return OGS_OK; } -#if 0 /* deprecated */ -int nas_plain_decode(nas_message_t *message, ogs_pkbuf_t *pkbuf) -{ - nas_security_header_t *h = NULL; - - ogs_assert(pkbuf); - h = pkbuf->data; - ogs_assert(h); - - if (h->protocol_discriminator == NAS_PROTOCOL_DISCRIMINATOR_EMM) - return nas_emm_decode(message, pkbuf); - else if (h->protocol_discriminator == NAS_PROTOCOL_DISCRIMINATOR_ESM) - return nas_esm_decode(message, pkbuf); - - ogs_assert_if_reached(); - "Invalid Protocol : %d", h->protocol_discriminator); -} -#endif diff --git a/lib/nas/nas_encoder.c b/lib/nas/nas-encoder.c similarity index 99% rename from lib/nas/nas_encoder.c rename to lib/nas/nas-encoder.c index 7b5cd95e3..be385c74b 100644 --- a/lib/nas/nas_encoder.c +++ b/lib/nas/nas-encoder.c @@ -18,13 +18,13 @@ */ /******************************************************************************* - * This file had been created by nas_message.py script v0.1.0 + * This file had been created by nas-message.py script v0.1.0 * Please do not modify this file but regenerate it via script. - * Created on: 2019-05-28 16:35:26.490638 by acetcom + * Created on: 2019-06-11 17:27:29.711227 by acetcom * from 24301-d80.docx ******************************************************************************/ -#include "nas_message.h" +#include "nas-message.h" #undef OGS_LOG_DOMAIN #define OGS_LOG_DOMAIN __base_nas_domain diff --git a/lib/nas/nas_ies.c b/lib/nas/nas-ies.c similarity index 99% rename from lib/nas/nas_ies.c rename to lib/nas/nas-ies.c index 8a2b6f823..ceaa6125b 100644 --- a/lib/nas/nas_ies.c +++ b/lib/nas/nas-ies.c @@ -18,13 +18,13 @@ */ /******************************************************************************* - * This file had been created by nas_message.py script v0.1.0 + * This file had been created by nas-message.py script v0.1.0 * Please do not modify this file but regenerate it via script. - * Created on: 2019-05-28 16:35:26.430346 by acetcom + * Created on: 2019-06-11 17:27:29.648106 by acetcom * from 24301-d80.docx ******************************************************************************/ -#include "nas_ies.h" +#include "nas-ies.h" #undef OGS_LOG_DOMAIN #define OGS_LOG_DOMAIN __base_nas_domain diff --git a/lib/nas/nas_ies.h b/lib/nas/nas-ies.h similarity index 98% rename from lib/nas/nas_ies.h rename to lib/nas/nas-ies.h index 46767d8d5..1f277633f 100644 --- a/lib/nas/nas_ies.h +++ b/lib/nas/nas-ies.h @@ -18,20 +18,20 @@ */ /******************************************************************************* - * This file had been created by nas_message.py script v0.1.0 + * This file had been created by nas-message.py script v0.1.0 * Please do not modify this file but regenerate it via script. - * Created on: 2019-05-28 16:35:26.424972 by acetcom + * Created on: 2019-06-11 17:27:29.642367 by acetcom * from 24301-d80.docx ******************************************************************************/ -#ifndef __NAS_IES_H__ -#define __NAS_IES_H__ +#ifndef NAS_IES_H +#define NAS_IES_H -#include "nas_types.h" +#include "nas-types.h" #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif int nas_encode_optional_type(ogs_pkbuf_t *pkbuf, uint8_t type); @@ -219,7 +219,7 @@ int nas_encode_pdn_address(ogs_pkbuf_t *pkbuf, nas_pdn_address_t *pdn_address); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif -#endif /* __NAS_IES_H__ */ +#endif /* NAS_IES_H */ diff --git a/lib/nas/nas_message.h b/lib/nas/nas-message.h similarity index 99% rename from lib/nas/nas_message.h rename to lib/nas/nas-message.h index 9614a1a4c..b5e3067a3 100644 --- a/lib/nas/nas_message.h +++ b/lib/nas/nas-message.h @@ -18,20 +18,20 @@ */ /******************************************************************************* - * This file had been created by nas_message.py script v0.1.0 + * This file had been created by nas-message.py script v0.1.0 * Please do not modify this file but regenerate it via script. - * Created on: 2019-05-28 16:35:26.445690 by acetcom + * Created on: 2019-06-11 17:27:29.664161 by acetcom * from 24301-d80.docx ******************************************************************************/ -#ifndef __NAS_MESSAGE_H__ -#define __NAS_MESSAGE_H__ +#ifndef NAS_MESSAGE_H +#define NAS_MESSAGE_H -#include "nas_ies.h" +#include "nas-ies.h" #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif /* The Packet Buffer(ogs_pkbuf_t) for NAS message MUST make a HEADROOM. * When calculating AES_CMAC, we need to use the headroom of the packet. */ @@ -1413,6 +1413,6 @@ int nas_plain_encode( #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif -#endif /* __NAS_MESSAGE_H__ */ +#endif /* NAS_MESSAGE_H */ diff --git a/lib/nas/nas_types.c b/lib/nas/nas-types.c similarity index 99% rename from lib/nas/nas_types.c rename to lib/nas/nas-types.c index e232a83bd..db96a460c 100644 --- a/lib/nas/nas_types.c +++ b/lib/nas/nas-types.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "nas_types.h" +#include "nas-types.h" #undef OGS_LOG_DOMAIN #define OGS_LOG_DOMAIN __base_nas_domain diff --git a/lib/nas/nas_types.h b/lib/nas/nas-types.h similarity index 100% rename from lib/nas/nas_types.h rename to lib/nas/nas-types.h diff --git a/lib/nas/support/README b/lib/nas/support/README.md similarity index 89% rename from lib/nas/support/README rename to lib/nas/support/README.md index 84abe0197..f98450008 100644 --- a/lib/nas/support/README +++ b/lib/nas/support/README.md @@ -13,4 +13,4 @@ user@host ~/Documents/git/nextepc/lib/gtp/support$ \ * Generate Message support files user@host ~/Documents/git/nextepc/lib/s1ap/support$ \ - python nas_message.py -f 24301-d80.docx -o .. + python nas-message.py -f 24301-d80.docx -o .. diff --git a/lib/nas/support/nas_message.py b/lib/nas/support/nas-message.py similarity index 96% rename from lib/nas/support/nas_message.py rename to lib/nas/support/nas-message.py index 3eb0510b6..0970ec90f 100644 --- a/lib/nas/support/nas_message.py +++ b/lib/nas/support/nas-message.py @@ -74,14 +74,14 @@ def output_header_to_file(f): """) f.write("/*******************************************************************************\n") - f.write(" * This file had been created by nas_message.py script v%s\n" % (version)) + f.write(" * This file had been created by nas-message.py script v%s\n" % (version)) f.write(" * Please do not modify this file but regenerate it via script.\n") f.write(" * Created on: %s by %s\n * from %s\n" % (str(now), getpass.getuser(), filename)) f.write(" ******************************************************************************/\n\n") def usage(): print "Python generating NAS Message encoder/decoder v%s" % (version) - print "Usage: python nas_message.py [options]" + print "Usage: python nas-message.py [options]" print "Available options:" print "-d Enable script debug" print "-f [file] Input file to parse" @@ -320,7 +320,7 @@ for (k, v) in sorted_msg_list: type_list[key] = { "reference" : ie["reference"], "presence" : ie["presence"], "format" : ie["format"], "length" : ie["length"], "message" : k, "value" : ie["value"] } d_info("[Type List]") -typefile = currentdir + "type_list.py" +typefile = currentdir + "type-list.py" if os.path.isfile(typefile) and os.access(typefile, os.R_OK): execfile(typefile) print "Read from " + typefile @@ -328,16 +328,16 @@ if os.path.isfile(typefile) and os.access(typefile, os.R_OK): tmp = [(k, v["reference"]) for k, v in type_list.items()] sorted_type_list = sorted(tmp, key=lambda tup: tup[1]) -f = open(outdir + 'nas_ies.h', 'w') +f = open(outdir + 'nas-ies.h', 'w') output_header_to_file(f) -f.write("""#ifndef __NAS_IES_H__ -#define __NAS_IES_H__ +f.write("""#ifndef NAS_IES_H +#define NAS_IES_H -#include "nas_types.h" +#include "nas-types.h" #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif int nas_encode_optional_type(ogs_pkbuf_t *pkbuf, uint8_t type); @@ -354,16 +354,16 @@ f.write("\n") f.write("""#ifdef __cplusplus } -#endif /* __cplusplus */ +#endif -#endif /* __NAS_IES_H__ */ +#endif /* NAS_IES_H */ """) f.close() -f = open(outdir + 'nas_ies.c', 'w') +f = open(outdir + 'nas-ies.c', 'w') output_header_to_file(f) -f.write("""#include "nas_ies.h" +f.write("""#include "nas-ies.h" #undef OGS_LOG_DOMAIN #define OGS_LOG_DOMAIN __base_nas_domain @@ -491,16 +491,16 @@ for (k, v) in sorted_type_list: f.write("}\n\n"); f.close() -f = open(outdir + 'nas_message.h', 'w') +f = open(outdir + 'nas-message.h', 'w') output_header_to_file(f) -f.write("""#ifndef __NAS_MESSAGE_H__ -#define __NAS_MESSAGE_H__ +f.write("""#ifndef NAS_MESSAGE_H +#define NAS_MESSAGE_H -#include "nas_ies.h" +#include "nas-ies.h" #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif /* The Packet Buffer(ogs_pkbuf_t) for NAS message MUST make a HEADROOM. * When calculating AES_CMAC, we need to use the headroom of the packet. */ @@ -628,18 +628,18 @@ int nas_plain_encode( #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif -#endif /* __NAS_MESSAGE_H__ */ +#endif /* NAS_MESSAGE_H */ """) f.close() -f = open(outdir + 'nas_decoder.c', 'w') +f = open(outdir + 'nas-decoder.c', 'w') output_header_to_file(f) -f.write("""#include "nas_message.h" +f.write("""#include "nas-message.h" #undef OGS_LOG_DOMAIN #define OGS_LOG_DOMAIN __base_nas_domain @@ -799,31 +799,13 @@ f.write(""" default: return OGS_OK; } -#if 0 /* deprecated */ -int nas_plain_decode(nas_message_t *message, ogs_pkbuf_t *pkbuf) -{ - nas_security_header_t *h = NULL; - - ogs_assert(pkbuf); - h = pkbuf->data; - ogs_assert(h); - - if (h->protocol_discriminator == NAS_PROTOCOL_DISCRIMINATOR_EMM) - return nas_emm_decode(message, pkbuf); - else if (h->protocol_discriminator == NAS_PROTOCOL_DISCRIMINATOR_ESM) - return nas_esm_decode(message, pkbuf); - - ogs_assert_if_reached(); - "Invalid Protocol : %d", h->protocol_discriminator); -} -#endif """) f.close() -f = open(outdir + 'nas_encoder.c', 'w') +f = open(outdir + 'nas-encoder.c', 'w') output_header_to_file(f) -f.write("""#include "nas_message.h" +f.write("""#include "nas-message.h" #undef OGS_LOG_DOMAIN #define OGS_LOG_DOMAIN __base_nas_domain diff --git a/lib/nas/support/type_list.py b/lib/nas/support/type-list.py similarity index 100% rename from lib/nas/support/type_list.py rename to lib/nas/support/type-list.py diff --git a/main.c b/main.c index 7c20fdecf..ab291c969 100644 --- a/main.c +++ b/main.c @@ -7,7 +7,7 @@ /* Server */ #include "app/application.h" -#include "app_init.h" +#include "app-init.h" static char *version = "NextEPC daemon v" PACKAGE_VERSION; diff --git a/src/app_init.h b/src/app-init.h similarity index 100% rename from src/app_init.h rename to src/app-init.h diff --git a/src/epc.c b/src/epc.c index 39bf23376..2070ad998 100644 --- a/src/epc.c +++ b/src/epc.c @@ -1,7 +1,7 @@ #include "app/context.h" #include "app/application.h" -#include "app_init.h" +#include "app-init.h" static ogs_proc_mutex_t *pcrf_sem1 = NULL; static ogs_proc_mutex_t *pcrf_sem2 = NULL; diff --git a/src/hss.c b/src/hss.c index dfb5a66f2..cbd348e2f 100644 --- a/src/hss.c +++ b/src/hss.c @@ -1,7 +1,7 @@ #include "app/context.h" #include "app/application.h" -#include "app_init.h" +#include "app-init.h" extern int __hss_log_domain; diff --git a/src/hss/hss_context.c b/src/hss/hss_context.c index 0e719c176..732fb47b0 100644 --- a/src/hss/hss_context.c +++ b/src/hss/hss_context.c @@ -1,7 +1,7 @@ #include #include -#include "fd/fd_lib.h" +#include "fd/fd-lib.h" #include "app/context.h" #include "hss_context.h" diff --git a/src/hss/hss_context.h b/src/hss/hss_context.h index 59ed2e172..f7b63c07e 100644 --- a/src/hss/hss_context.h +++ b/src/hss/hss_context.h @@ -1,7 +1,7 @@ #ifndef __HSS_CONTEXT_H__ #define __HSS_CONTEXT_H__ -#include "fd/s6a/s6a_message.h" +#include "fd/s6a/s6a-message.h" #ifdef __cplusplus extern "C" { diff --git a/src/hss/hss_fd_path.c b/src/hss/hss_fd_path.c index 79d25705e..cba6f8315 100644 --- a/src/hss/hss_fd_path.c +++ b/src/hss/hss_fd_path.c @@ -1,8 +1,8 @@ #include "ogs-crypt.h" -#include "fd/fd_lib.h" -#include "fd/s6a/s6a_dict.h" -#include "fd/s6a/s6a_message.h" +#include "fd/fd-lib.h" +#include "fd/s6a/s6a-dict.h" +#include "fd/s6a/s6a-message.h" #include "hss_context.h" #include "hss_auc.h" diff --git a/src/mme.c b/src/mme.c index 1e5dc6b82..e52bc796d 100644 --- a/src/mme.c +++ b/src/mme.c @@ -1,7 +1,7 @@ #include "app/context.h" #include "app/application.h" -#include "app_init.h" +#include "app-init.h" extern int __mme_log_domain; diff --git a/src/mme/emm_build.c b/src/mme/emm_build.c index 8e34512db..025c27a51 100644 --- a/src/mme/emm_build.c +++ b/src/mme/emm_build.c @@ -1,4 +1,4 @@ -#include "nas/nas_message.h" +#include "nas/nas-message.h" #include "nas_security.h" #include "mme_kdf.h" diff --git a/src/mme/emm_handler.c b/src/mme/emm_handler.c index d513fbd26..58e508c48 100644 --- a/src/mme/emm_handler.c +++ b/src/mme/emm_handler.c @@ -1,4 +1,4 @@ -#include "nas/nas_message.h" +#include "nas/nas-message.h" #include "mme_event.h" diff --git a/src/mme/emm_handler.h b/src/mme/emm_handler.h index c0fa36cfc..b908a1b30 100644 --- a/src/mme/emm_handler.h +++ b/src/mme/emm_handler.h @@ -1,7 +1,7 @@ #ifndef __EMM_HANDLER_H__ #define __EMM_HANDLER_H__ -#include "nas/nas_message.h" +#include "nas/nas-message.h" #include "mme_context.h" diff --git a/src/mme/emm_sm.c b/src/mme/emm_sm.c index 72a650020..3f4b51b13 100644 --- a/src/mme/emm_sm.c +++ b/src/mme/emm_sm.c @@ -1,6 +1,6 @@ -#include "nas/nas_message.h" -#include "fd/fd_lib.h" -#include "fd/s6a/s6a_message.h" +#include "nas/nas-message.h" +#include "fd/fd-lib.h" +#include "fd/s6a/s6a-message.h" #include "mme_event.h" #include "mme_kdf.h" diff --git a/src/mme/esm_build.c b/src/mme/esm_build.c index 4e55b2596..8e9244fc3 100644 --- a/src/mme/esm_build.c +++ b/src/mme/esm_build.c @@ -1,4 +1,4 @@ -#include "nas/nas_message.h" +#include "nas/nas-message.h" #include "nas_security.h" #include "esm_build.h" diff --git a/src/mme/esm_handler.c b/src/mme/esm_handler.c index 681a06581..acdff5d54 100644 --- a/src/mme/esm_handler.c +++ b/src/mme/esm_handler.c @@ -1,4 +1,4 @@ -#include "nas/nas_message.h" +#include "nas/nas-message.h" #include "mme_context.h" #include "nas_path.h" diff --git a/src/mme/esm_handler.h b/src/mme/esm_handler.h index d3f8de066..41545b061 100644 --- a/src/mme/esm_handler.h +++ b/src/mme/esm_handler.h @@ -1,7 +1,7 @@ #ifndef __ESM_HANDLER_H__ #define __ESM_HANDLER_H__ -#include "nas/nas_message.h" +#include "nas/nas-message.h" #include "mme_context.h" diff --git a/src/mme/esm_sm.c b/src/mme/esm_sm.c index fb0ddfbc4..e5c378e9e 100644 --- a/src/mme/esm_sm.c +++ b/src/mme/esm_sm.c @@ -1,4 +1,4 @@ -#include "nas/nas_message.h" +#include "nas/nas-message.h" #include "mme_event.h" #include "mme_sm.h" diff --git a/src/mme/mme_context.c b/src/mme/mme_context.c index 521fc27d0..d403bb838 100644 --- a/src/mme/mme_context.c +++ b/src/mme/mme_context.c @@ -3,11 +3,11 @@ #include "ogs-sctp.h" -#include "asn1c/s1ap_message.h" -#include "gtp/gtp_xact.h" -#include "gtp/gtp_node.h" -#include "gtp/gtp_path.h" -#include "fd/fd_lib.h" +#include "asn1c/s1ap-message.h" +#include "gtp/gtp-xact.h" +#include "gtp/gtp-node.h" +#include "gtp/gtp-path.h" +#include "fd/fd-lib.h" #include "app/context.h" #include "nas_conv.h" diff --git a/src/mme/mme_context.h b/src/mme/mme_context.h index e6da1925d..544d53106 100644 --- a/src/mme/mme_context.h +++ b/src/mme/mme_context.h @@ -4,10 +4,10 @@ #include "ogs-crypt.h" #include "base/types.h" -#include "asn1c/s1ap_message.h" -#include "nas/nas_message.h" -#include "fd/s6a/s6a_message.h" -#include "gtp/gtp_tlv.h" +#include "asn1c/s1ap-message.h" +#include "nas/nas-message.h" +#include "fd/s6a/s6a-message.h" +#include "gtp/gtp-tlv.h" /* S1AP */ #include "S1AP_Cause.h" diff --git a/src/mme/mme_fd_path.c b/src/mme/mme_fd_path.c index e318620e2..fb3165109 100644 --- a/src/mme/mme_fd_path.c +++ b/src/mme/mme_fd_path.c @@ -1,6 +1,6 @@ -#include "fd/fd_lib.h" -#include "fd/s6a/s6a_dict.h" -#include "fd/s6a/s6a_message.h" +#include "fd/fd-lib.h" +#include "fd/s6a/s6a-dict.h" +#include "fd/s6a/s6a-message.h" #include "mme_event.h" #include "mme_fd_path.h" diff --git a/src/mme/mme_gtp_path.c b/src/mme/mme_gtp_path.c index f86b857d8..68993eed3 100644 --- a/src/mme/mme_gtp_path.c +++ b/src/mme/mme_gtp_path.c @@ -1,6 +1,6 @@ -#include "gtp/gtp_node.h" -#include "gtp/gtp_path.h" -#include "gtp/gtp_xact.h" +#include "gtp/gtp-node.h" +#include "gtp/gtp-path.h" +#include "gtp/gtp-xact.h" #include "mme_event.h" #include "mme_gtp_path.h" diff --git a/src/mme/mme_init.c b/src/mme/mme_init.c index bc227423c..660bb3063 100644 --- a/src/mme/mme_init.c +++ b/src/mme/mme_init.c @@ -1,6 +1,6 @@ #include "ogs-sctp.h" -#include "gtp/gtp_xact.h" +#include "gtp/gtp-xact.h" #include "app/context.h" #include "mme_context.h" diff --git a/src/mme/mme_kdf.h b/src/mme/mme_kdf.h index 463f2486f..a3b3446b7 100644 --- a/src/mme/mme_kdf.h +++ b/src/mme/mme_kdf.h @@ -1,7 +1,7 @@ #ifndef __MME_KDF_H__ #define __MME_KDF_H__ -#include "nas/nas_ies.h" +#include "nas/nas-ies.h" /* Algorithm Type Distinguishers */ #define MME_KDF_NAS_ENC_ALG 0x01 diff --git a/src/mme/mme_s11_build.c b/src/mme/mme_s11_build.c index 7da2260e8..74e9e650a 100644 --- a/src/mme/mme_s11_build.c +++ b/src/mme/mme_s11_build.c @@ -1,7 +1,7 @@ -#include "gtp/gtp_types.h" -#include "gtp/gtp_conv.h" -#include "gtp/gtp_message.h" -#include "gtp/gtp_node.h" +#include "gtp/gtp-types.h" +#include "gtp/gtp-conv.h" +#include "gtp/gtp-message.h" +#include "gtp/gtp-node.h" #include "mme_context.h" diff --git a/src/mme/mme_s11_build.h b/src/mme/mme_s11_build.h index e3058f73a..cc8a27d6b 100644 --- a/src/mme/mme_s11_build.h +++ b/src/mme/mme_s11_build.h @@ -1,7 +1,7 @@ #ifndef __MME_S11_BUILD_H__ #define __MME_S11_BUILD_H__ -#include "gtp/gtp_message.h" +#include "gtp/gtp-message.h" #ifdef __cplusplus extern "C" { diff --git a/src/mme/mme_s11_handler.c b/src/mme/mme_s11_handler.c index e1df72ff3..b2e43fc3c 100644 --- a/src/mme/mme_s11_handler.c +++ b/src/mme/mme_s11_handler.c @@ -1,6 +1,6 @@ -#include "gtp/gtp_types.h" -#include "gtp/gtp_conv.h" -#include "gtp/gtp_xact.h" +#include "gtp/gtp-types.h" +#include "gtp/gtp-conv.h" +#include "gtp/gtp-xact.h" #include "mme_event.h" #include "mme_sm.h" diff --git a/src/mme/mme_s11_handler.h b/src/mme/mme_s11_handler.h index 646041f02..fdb78ccc8 100644 --- a/src/mme/mme_s11_handler.h +++ b/src/mme/mme_s11_handler.h @@ -1,7 +1,7 @@ #ifndef __MME_S11_HANDLER_H__ #define __MME_S11_HANDLER_H__ -#include "gtp/gtp_message.h" +#include "gtp/gtp-message.h" #include "mme_context.h" diff --git a/src/mme/mme_s6a_handler.c b/src/mme/mme_s6a_handler.c index edf51e9ab..5f7f0c59d 100644 --- a/src/mme/mme_s6a_handler.c +++ b/src/mme/mme_s6a_handler.c @@ -1,4 +1,4 @@ -#include "fd/s6a/s6a_message.h" +#include "fd/s6a/s6a-message.h" #include "nas_path.h" #include "s1ap-path.h" diff --git a/src/mme/mme_s6a_handler.h b/src/mme/mme_s6a_handler.h index 254efaf8a..1860e5008 100644 --- a/src/mme/mme_s6a_handler.h +++ b/src/mme/mme_s6a_handler.h @@ -1,7 +1,7 @@ #ifndef __MME_S6A_HANDLER_H__ #define __MME_S6A_HANDLER_H__ -#include "fd/s6a/s6a_message.h" +#include "fd/s6a/s6a-message.h" #include "mme_context.h" #ifdef __cplusplus diff --git a/src/mme/mme_sm.c b/src/mme/mme_sm.c index 1e622562e..06458b0b3 100644 --- a/src/mme/mme_sm.c +++ b/src/mme/mme_sm.c @@ -1,7 +1,7 @@ -#include "asn1c/s1ap_message.h" -#include "nas/nas_message.h" -#include "gtp/gtp_xact.h" -#include "fd/fd_lib.h" +#include "asn1c/s1ap-message.h" +#include "nas/nas-message.h" +#include "gtp/gtp-xact.h" +#include "fd/fd-lib.h" #include "mme_event.h" #include "mme_sm.h" diff --git a/src/mme/nas_conv.h b/src/mme/nas_conv.h index 9e6281b11..c044b857a 100644 --- a/src/mme/nas_conv.h +++ b/src/mme/nas_conv.h @@ -1,7 +1,7 @@ #ifndef __NAS_CONV_H__ #define __NAS_CONV_H__ -#include "nas/nas_message.h" +#include "nas/nas-message.h" #ifdef __cplusplus extern "C" { diff --git a/src/mme/nas_security.c b/src/mme/nas_security.c index 3095aa6fe..fcbd3bc0e 100644 --- a/src/mme/nas_security.c +++ b/src/mme/nas_security.c @@ -1,4 +1,4 @@ -#include "nas/nas_message.h" +#include "nas/nas-message.h" #include "nas_security.h" int nas_security_encode( diff --git a/src/mme/s1ap-path.h b/src/mme/s1ap-path.h index 99d33cd22..f4d0cf7b9 100644 --- a/src/mme/s1ap-path.h +++ b/src/mme/s1ap-path.h @@ -21,7 +21,7 @@ #define S1AP_PATH_H #include "mme_context.h" -#include "asn1c/s1ap_message.h" +#include "asn1c/s1ap-message.h" #ifdef __cplusplus extern "C" { diff --git a/src/mme/s1ap_build.c b/src/mme/s1ap_build.c index 796b8ae94..236564c23 100644 --- a/src/mme/s1ap_build.c +++ b/src/mme/s1ap_build.c @@ -1,4 +1,4 @@ -#include "fd/s6a/s6a_message.h" +#include "fd/s6a/s6a-message.h" #include "mme_context.h" diff --git a/src/mme/s1ap_build.h b/src/mme/s1ap_build.h index 64b5ed2dd..a3aec21ec 100644 --- a/src/mme/s1ap_build.h +++ b/src/mme/s1ap_build.h @@ -1,7 +1,7 @@ #ifndef __S1AP_BUILD_H__ #define __S1AP_BUILD_H__ -#include "asn1c/s1ap_message.h" +#include "asn1c/s1ap-message.h" #include "mme_context.h" #include "sbc_message.h" diff --git a/src/mme/s1ap_conv.h b/src/mme/s1ap_conv.h index 617d40d99..baa2744a5 100644 --- a/src/mme/s1ap_conv.h +++ b/src/mme/s1ap_conv.h @@ -1,7 +1,7 @@ #ifndef __S1AP_CONV_H__ #define __S1AP_CONV_H__ -#include "asn1c/s1ap_message.h" +#include "asn1c/s1ap-message.h" #ifdef __cplusplus extern "C" { diff --git a/src/mme/s1ap_handler.h b/src/mme/s1ap_handler.h index b2805b695..81201ceec 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 "asn1c/s1ap_message.h" +#include "asn1c/s1ap-message.h" #include "mme_context.h" diff --git a/src/mme/s1ap_sm.c b/src/mme/s1ap_sm.c index d21858eb0..2297e4419 100644 --- a/src/mme/s1ap_sm.c +++ b/src/mme/s1ap_sm.c @@ -1,5 +1,5 @@ -#include "nas/nas_message.h" -#include "gtp/gtp_message.h" +#include "nas/nas-message.h" +#include "gtp/gtp-message.h" #include "s1ap_build.h" #include "s1ap_handler.h" diff --git a/src/pcrf.c b/src/pcrf.c index 3246e127f..2c9ff6739 100644 --- a/src/pcrf.c +++ b/src/pcrf.c @@ -1,7 +1,7 @@ #include "app/context.h" #include "app/application.h" -#include "app_init.h" +#include "app-init.h" extern int __pcrf_log_domain; diff --git a/src/pcrf/pcrf_context.c b/src/pcrf/pcrf_context.c index 4833e3564..476222ada 100644 --- a/src/pcrf/pcrf_context.c +++ b/src/pcrf/pcrf_context.c @@ -1,7 +1,7 @@ #include #include -#include "fd/fd_lib.h" +#include "fd/fd-lib.h" #include "app/context.h" #include "pcrf_context.h" diff --git a/src/pcrf/pcrf_context.h b/src/pcrf/pcrf_context.h index 2b1066d2f..847c9bbfd 100644 --- a/src/pcrf/pcrf_context.h +++ b/src/pcrf/pcrf_context.h @@ -1,7 +1,7 @@ #ifndef __PCRF_CONTEXT_H__ #define __PCRF_CONTEXT_H__ -#include "fd/gx/gx_message.h" +#include "fd/gx/gx-message.h" #ifdef __cplusplus extern "C" { diff --git a/src/pcrf/pcrf_fd_path.c b/src/pcrf/pcrf_fd_path.c index bb4a5bef3..f9bb4dbac 100644 --- a/src/pcrf/pcrf_fd_path.c +++ b/src/pcrf/pcrf_fd_path.c @@ -1,4 +1,4 @@ -#include "fd/fd_lib.h" +#include "fd/fd-lib.h" #include "pcrf_context.h" #include "pcrf_fd_path.h" diff --git a/src/pcrf/pcrf_gx_path.c b/src/pcrf/pcrf_gx_path.c index bfa203bd1..b9f6d99f7 100644 --- a/src/pcrf/pcrf_gx_path.c +++ b/src/pcrf/pcrf_gx_path.c @@ -1,8 +1,8 @@ -#include "fd/fd_lib.h" -#include "fd/gx/gx_dict.h" -#include "fd/rx/rx_dict.h" -#include "fd/gx/gx_message.h" -#include "fd/rx/rx_message.h" +#include "fd/fd-lib.h" +#include "fd/gx/gx-dict.h" +#include "fd/rx/rx-dict.h" +#include "fd/gx/gx-message.h" +#include "fd/rx/rx-message.h" #include "pcrf_context.h" #include "pcrf_fd_path.h" diff --git a/src/pcrf/pcrf_rx_path.c b/src/pcrf/pcrf_rx_path.c index 09bc35f35..6cb45733c 100644 --- a/src/pcrf/pcrf_rx_path.c +++ b/src/pcrf/pcrf_rx_path.c @@ -1,6 +1,6 @@ -#include "fd/fd_lib.h" -#include "fd/rx/rx_dict.h" -#include "fd/rx/rx_message.h" +#include "fd/fd-lib.h" +#include "fd/rx/rx-dict.h" +#include "fd/rx/rx-message.h" #include "pcrf_context.h" #include "pcrf_fd_path.h" diff --git a/src/pgw.c b/src/pgw.c index b1b2665b9..9e75b1117 100644 --- a/src/pgw.c +++ b/src/pgw.c @@ -1,7 +1,7 @@ #include "app/context.h" #include "app/application.h" -#include "app_init.h" +#include "app-init.h" extern int __pgw_log_domain; diff --git a/src/pgw/pgw_context.c b/src/pgw/pgw_context.c index 676786c06..fdcf20a3b 100644 --- a/src/pgw/pgw_context.c +++ b/src/pgw/pgw_context.c @@ -1,13 +1,13 @@ #include #include -#include "gtp/gtp_types.h" -#include "gtp/gtp_conv.h" -#include "gtp/gtp_node.h" -#include "gtp/gtp_path.h" -#include "gtp/gtp_xact.h" +#include "gtp/gtp-types.h" +#include "gtp/gtp-conv.h" +#include "gtp/gtp-node.h" +#include "gtp/gtp-path.h" +#include "gtp/gtp-xact.h" -#include "fd/fd_lib.h" +#include "fd/fd-lib.h" #include "app/context.h" #include "pgw_context.h" diff --git a/src/pgw/pgw_context.h b/src/pgw/pgw_context.h index 008dc2a1d..55997146d 100644 --- a/src/pgw/pgw_context.h +++ b/src/pgw/pgw_context.h @@ -1,8 +1,8 @@ #ifndef __PGW_CONTEXT_H__ #define __PGW_CONTEXT_H__ -#include "gtp/gtp_types.h" -#include "gtp/gtp_message.h" +#include "gtp/gtp-types.h" +#include "gtp/gtp-message.h" #ifdef __cplusplus extern "C" { diff --git a/src/pgw/pgw_fd_path.c b/src/pgw/pgw_fd_path.c index 58c6bb9d8..16958fdf1 100644 --- a/src/pgw/pgw_fd_path.c +++ b/src/pgw/pgw_fd_path.c @@ -1,8 +1,8 @@ -#include "gtp/gtp_xact.h" +#include "gtp/gtp-xact.h" -#include "fd/fd_lib.h" -#include "fd/gx/gx_dict.h" -#include "fd/gx/gx_message.h" +#include "fd/fd-lib.h" +#include "fd/gx/gx-dict.h" +#include "fd/gx/gx-message.h" #include "pgw_event.h" #include "pgw_fd_path.h" diff --git a/src/pgw/pgw_gtp_path.c b/src/pgw/pgw_gtp_path.c index 849cc34b1..8a901c73d 100644 --- a/src/pgw/pgw_gtp_path.c +++ b/src/pgw/pgw_gtp_path.c @@ -16,8 +16,8 @@ #include #endif -#include "gtp/gtp_node.h" -#include "gtp/gtp_path.h" +#include "gtp/gtp-node.h" +#include "gtp/gtp-path.h" #include "app/context.h" #include "pgw_context.h" diff --git a/src/pgw/pgw_gtp_path.h b/src/pgw/pgw_gtp_path.h index ac1bcb84d..8793e468a 100644 --- a/src/pgw/pgw_gtp_path.h +++ b/src/pgw/pgw_gtp_path.h @@ -2,7 +2,7 @@ #define __PGW_PATH_H__ #include "ogs-tun.h" -#include "gtp/gtp_xact.h" +#include "gtp/gtp-xact.h" #ifdef __cplusplus extern "C" { diff --git a/src/pgw/pgw_gx_handler.c b/src/pgw/pgw_gx_handler.c index 434076e73..0934fbbf3 100644 --- a/src/pgw/pgw_gx_handler.c +++ b/src/pgw/pgw_gx_handler.c @@ -1,5 +1,5 @@ #include "pgw_context.h" -#include "fd/gx/gx_message.h" +#include "fd/gx/gx-message.h" #include "pgw_gtp_path.h" #include "pgw_s5c_build.h" #include "pgw_ipfw.h" diff --git a/src/pgw/pgw_gx_handler.h b/src/pgw/pgw_gx_handler.h index e77a1cc1c..447352c84 100644 --- a/src/pgw/pgw_gx_handler.h +++ b/src/pgw/pgw_gx_handler.h @@ -1,7 +1,7 @@ #ifndef __PGW_GX_HANDLER_H__ #define __PGW_GX_HANDLER_H__ -#include "gtp/gtp_message.h" +#include "gtp/gtp-message.h" #include "pgw_context.h" diff --git a/src/pgw/pgw_init.c b/src/pgw/pgw_init.c index a563f6f41..3396d66c2 100644 --- a/src/pgw/pgw_init.c +++ b/src/pgw/pgw_init.c @@ -1,4 +1,4 @@ -#include "gtp/gtp_xact.h" +#include "gtp/gtp-xact.h" #include "app/context.h" #include "pgw_context.h" diff --git a/src/pgw/pgw_s5c_build.c b/src/pgw/pgw_s5c_build.c index db3861355..03554a2d8 100644 --- a/src/pgw/pgw_s5c_build.c +++ b/src/pgw/pgw_s5c_build.c @@ -1,8 +1,8 @@ #include "base/types.h" -#include "gtp/gtp_types.h" -#include "gtp/gtp_conv.h" -#include "gtp/gtp_message.h" -#include "fd/gx/gx_message.h" +#include "gtp/gtp-types.h" +#include "gtp/gtp-conv.h" +#include "gtp/gtp-message.h" +#include "fd/gx/gx-message.h" #include "ipfw/ipfw2.h" diff --git a/src/pgw/pgw_s5c_build.h b/src/pgw/pgw_s5c_build.h index 7a5b215b4..5d51f59a8 100644 --- a/src/pgw/pgw_s5c_build.h +++ b/src/pgw/pgw_s5c_build.h @@ -1,7 +1,7 @@ #ifndef __PGW_S5C_BUILD_H__ #define __PGW_S5C_BUILD_H__ -#include "gtp/gtp_message.h" +#include "gtp/gtp-message.h" #ifdef __cplusplus extern "C" { diff --git a/src/pgw/pgw_s5c_handler.c b/src/pgw/pgw_s5c_handler.c index 37b66e0cc..86fbf826e 100644 --- a/src/pgw/pgw_s5c_handler.c +++ b/src/pgw/pgw_s5c_handler.c @@ -1,6 +1,6 @@ -#include "gtp/gtp_types.h" -#include "gtp/gtp_node.h" -#include "gtp/gtp_path.h" +#include "gtp/gtp-types.h" +#include "gtp/gtp-node.h" +#include "gtp/gtp-path.h" #include "app/context.h" #include "pgw_event.h" diff --git a/src/pgw/pgw_s5c_handler.h b/src/pgw/pgw_s5c_handler.h index 7f1234c19..b6a72c892 100644 --- a/src/pgw/pgw_s5c_handler.h +++ b/src/pgw/pgw_s5c_handler.h @@ -1,7 +1,7 @@ #ifndef __PGW_S5C_HANDLER_H__ #define __PGW_S5C_HANDLER_H__ -#include "gtp/gtp_message.h" +#include "gtp/gtp-message.h" #include "pgw_context.h" diff --git a/src/pgw/pgw_sm.c b/src/pgw/pgw_sm.c index daf301ccd..8a897d4ec 100644 --- a/src/pgw/pgw_sm.c +++ b/src/pgw/pgw_sm.c @@ -1,6 +1,6 @@ -#include "gtp/gtp_node.h" -#include "fd/fd_lib.h" -#include "fd/gx/gx_message.h" +#include "gtp/gtp-node.h" +#include "fd/fd-lib.h" +#include "fd/gx/gx-message.h" #include "pgw_sm.h" #include "pgw_context.h" diff --git a/src/sgw.c b/src/sgw.c index b598ce7fa..2997297f5 100644 --- a/src/sgw.c +++ b/src/sgw.c @@ -1,7 +1,7 @@ #include "app/context.h" #include "app/application.h" -#include "app_init.h" +#include "app-init.h" extern int __sgw_log_domain; diff --git a/src/sgw/sgw_context.c b/src/sgw/sgw_context.c index 7133782fc..320c45777 100644 --- a/src/sgw/sgw_context.c +++ b/src/sgw/sgw_context.c @@ -1,11 +1,11 @@ #include #include -#include "gtp/gtp_types.h" -#include "gtp/gtp_conv.h" -#include "gtp/gtp_node.h" -#include "gtp/gtp_path.h" -#include "gtp/gtp_xact.h" +#include "gtp/gtp-types.h" +#include "gtp/gtp-conv.h" +#include "gtp/gtp-node.h" +#include "gtp/gtp-path.h" +#include "gtp/gtp-xact.h" #include "app/context.h" #include "sgw_context.h" diff --git a/src/sgw/sgw_context.h b/src/sgw/sgw_context.h index ad96f04c7..151c28c19 100644 --- a/src/sgw/sgw_context.h +++ b/src/sgw/sgw_context.h @@ -4,8 +4,8 @@ #include "ogs-core.h" #include "base/types.h" -#include "gtp/gtp_types.h" -#include "gtp/gtp_message.h" +#include "gtp/gtp-types.h" +#include "gtp/gtp-message.h" #ifdef __cplusplus extern "C" { diff --git a/src/sgw/sgw_gtp_path.c b/src/sgw/sgw_gtp_path.c index 88464d7fe..4030e288c 100644 --- a/src/sgw/sgw_gtp_path.c +++ b/src/sgw/sgw_gtp_path.c @@ -1,6 +1,6 @@ -#include "gtp/gtp_types.h" -#include "gtp/gtp_node.h" -#include "gtp/gtp_path.h" +#include "gtp/gtp-types.h" +#include "gtp/gtp-node.h" +#include "gtp/gtp-path.h" #include "app/context.h" #include "sgw_context.h" diff --git a/src/sgw/sgw_gtp_path.h b/src/sgw/sgw_gtp_path.h index 1b9498830..66adb6ef0 100644 --- a/src/sgw/sgw_gtp_path.h +++ b/src/sgw/sgw_gtp_path.h @@ -1,7 +1,7 @@ #ifndef __SGW_PATH_H__ #define __SGW_PATH_H__ -#include "gtp/gtp_xact.h" +#include "gtp/gtp-xact.h" #ifdef __cplusplus extern "C" { diff --git a/src/sgw/sgw_init.c b/src/sgw/sgw_init.c index ca042e36d..a82f80d53 100644 --- a/src/sgw/sgw_init.c +++ b/src/sgw/sgw_init.c @@ -1,4 +1,4 @@ -#include "gtp/gtp_xact.h" +#include "gtp/gtp-xact.h" #include "app/context.h" #include "sgw_context.h" diff --git a/src/sgw/sgw_s11_handler.c b/src/sgw/sgw_s11_handler.c index c4cc9cf25..8f7627aca 100644 --- a/src/sgw/sgw_s11_handler.c +++ b/src/sgw/sgw_s11_handler.c @@ -1,7 +1,7 @@ -#include "gtp/gtp_types.h" -#include "gtp/gtp_conv.h" -#include "gtp/gtp_node.h" -#include "gtp/gtp_path.h" +#include "gtp/gtp-types.h" +#include "gtp/gtp-conv.h" +#include "gtp/gtp-node.h" +#include "gtp/gtp-path.h" #include "app/context.h" #include "sgw_event.h" diff --git a/src/sgw/sgw_s11_handler.h b/src/sgw/sgw_s11_handler.h index d5c93eee0..ca47cc126 100644 --- a/src/sgw/sgw_s11_handler.h +++ b/src/sgw/sgw_s11_handler.h @@ -1,7 +1,7 @@ #ifndef __SGW_S11_HANDLER_H__ #define __SGW_S11_HANDLER_H__ -#include "gtp/gtp_message.h" +#include "gtp/gtp-message.h" #include "sgw_context.h" diff --git a/src/sgw/sgw_s5c_handler.c b/src/sgw/sgw_s5c_handler.c index 20b9313f8..53db260d9 100644 --- a/src/sgw/sgw_s5c_handler.c +++ b/src/sgw/sgw_s5c_handler.c @@ -1,7 +1,7 @@ -#include "gtp/gtp_conv.h" -#include "gtp/gtp_types.h" -#include "gtp/gtp_node.h" -#include "gtp/gtp_path.h" +#include "gtp/gtp-conv.h" +#include "gtp/gtp-types.h" +#include "gtp/gtp-node.h" +#include "gtp/gtp-path.h" #include "app/context.h" #include "sgw_event.h" diff --git a/src/sgw/sgw_s5c_handler.h b/src/sgw/sgw_s5c_handler.h index 4fbc28466..684cfac3a 100644 --- a/src/sgw/sgw_s5c_handler.h +++ b/src/sgw/sgw_s5c_handler.h @@ -1,7 +1,7 @@ #ifndef __SGW_S5C_HANDLER_H__ #define __SGW_S5C_HANDLER_H__ -#include "gtp/gtp_message.h" +#include "gtp/gtp-message.h" #include "sgw_context.h" diff --git a/src/sgw/sgw_sm.c b/src/sgw/sgw_sm.c index f757da16a..9a9506aa0 100644 --- a/src/sgw/sgw_sm.c +++ b/src/sgw/sgw_sm.c @@ -1,4 +1,4 @@ -#include "gtp/gtp_node.h" +#include "gtp/gtp-node.h" #include "sgw_context.h" #include "sgw_event.h" diff --git a/tests/common/test-packet.c b/tests/common/test-packet.c index 6e75d98b5..add709aaf 100644 --- a/tests/common/test-packet.c +++ b/tests/common/test-packet.c @@ -21,10 +21,10 @@ #include "mme/s1ap-path.h" #include "mme/snow_3g.h" -#include "gtp/gtp_message.h" -#include "gtp/gtp_conv.h" -#include "gtp/gtp_node.h" -#include "gtp/gtp_path.h" +#include "gtp/gtp-message.h" +#include "gtp/gtp-conv.h" +#include "gtp/gtp-node.h" +#include "gtp/gtp-path.h" #include "mme/ogs-sctp.h" #include "app/context.h" diff --git a/tests/common/test-packet.h b/tests/common/test-packet.h index c45fd40d8..bd05c55e1 100644 --- a/tests/common/test-packet.h +++ b/tests/common/test-packet.h @@ -1,11 +1,11 @@ -#ifndef __TESTS1AP_H__ -#define __TESTS1AP_H__ +#ifndef TEST_PACKET_H +#define TEST_PACKET_H -#include "asn1c/s1ap_message.h" +#include "asn1c/s1ap-message.h" #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif int testpacket_init(); int testpacket_final(); @@ -103,6 +103,6 @@ int testgtpu_build_slacc_rs(ogs_pkbuf_t **sendbuf, int i); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif -#endif /* __TESTS1AP_H__ */ +#endif /* TEST_PACKET_H */ diff --git a/tests/complex/abts-main.c b/tests/complex/abts-main.c index 57d0ed569..ff09b534b 100644 --- a/tests/complex/abts-main.c +++ b/tests/complex/abts-main.c @@ -20,12 +20,12 @@ #include "ogs-core.h" #include "core/abts.h" -#include "fd/fd_lib.h" +#include "fd/fd-lib.h" #include "app/application.h" #include "app/context.h" -#include "app_init.h" +#include "app-init.h" #include "test-packet.h" abts_suite *test_s1setup(abts_suite *suite); diff --git a/tests/complex/attach-test.c b/tests/complex/attach-test.c index 4f2875af8..33e04e8d1 100644 --- a/tests/complex/attach-test.c +++ b/tests/complex/attach-test.c @@ -6,7 +6,7 @@ #include "app/context.h" #include "mme/mme_context.h" #include "mme/s1ap_build.h" -#include "asn1c/s1ap_message.h" +#include "asn1c/s1ap-message.h" #include "test-packet.h" diff --git a/tests/complex/handover-test.c b/tests/complex/handover-test.c index c55ad2da4..d7facaa31 100644 --- a/tests/complex/handover-test.c +++ b/tests/complex/handover-test.c @@ -5,7 +5,7 @@ #include "app/context.h" #include "mme/mme_context.h" -#include "asn1c/s1ap_message.h" +#include "asn1c/s1ap-message.h" #include "test-packet.h" diff --git a/tests/complex/volte-test.c b/tests/complex/volte-test.c index 89bfe7d23..79d867978 100644 --- a/tests/complex/volte-test.c +++ b/tests/complex/volte-test.c @@ -5,7 +5,7 @@ #include "app/context.h" #include "mme/mme_context.h" -#include "asn1c/s1ap_message.h" +#include "asn1c/s1ap-message.h" #include "test-packet.h" diff --git a/tests/simple/abts-main.c b/tests/simple/abts-main.c index ae434e0f0..ff8929099 100644 --- a/tests/simple/abts-main.c +++ b/tests/simple/abts-main.c @@ -20,12 +20,12 @@ #include "ogs-core.h" #include "core/abts.h" -#include "fd/fd_lib.h" +#include "fd/fd-lib.h" #include "app/application.h" #include "app/context.h" -#include "app_init.h" +#include "app-init.h" #include "test-packet.h" abts_suite *test_mnc3(abts_suite *suite); diff --git a/tests/simple/mnc3-test.c b/tests/simple/mnc3-test.c index cef85933e..fb60b71df 100644 --- a/tests/simple/mnc3-test.c +++ b/tests/simple/mnc3-test.c @@ -6,7 +6,7 @@ #include "app/context.h" #include "mme/mme_context.h" #include "mme/s1ap_build.h" -#include "asn1c/s1ap_message.h" +#include "asn1c/s1ap-message.h" #include "test-packet.h" diff --git a/tests/unit/abts-main.c b/tests/unit/abts-main.c index 71af7cf8e..d0c19e3a9 100644 --- a/tests/unit/abts-main.c +++ b/tests/unit/abts-main.c @@ -22,12 +22,12 @@ #include "mme/ogs-sctp.h" -#include "fd/fd_lib.h" +#include "fd/fd-lib.h" #include "app/application.h" #include "app/context.h" -#include "app_init.h" +#include "app-init.h" #include "mme/mme_context.h" abts_suite *test_s1ap_message(abts_suite *suite); diff --git a/tests/unit/gtp-message-test.c b/tests/unit/gtp-message-test.c index 22827034d..17545f8b5 100644 --- a/tests/unit/gtp-message-test.c +++ b/tests/unit/gtp-message-test.c @@ -1,7 +1,7 @@ #include "core/abts.h" -#include "gtp/gtp_types.h" -#include "gtp/gtp_message.h" +#include "gtp/gtp-types.h" +#include "gtp/gtp-message.h" static void gtp_message_test1(abts_case *tc, void *data) { diff --git a/tests/unit/nas-message-test.c b/tests/unit/nas-message-test.c index b2902225b..6f9c55579 100644 --- a/tests/unit/nas-message-test.c +++ b/tests/unit/nas-message-test.c @@ -1,6 +1,6 @@ #include "core/abts.h" -#include "nas/nas_message.h" +#include "nas/nas-message.h" #include "mme/nas_security.h" static void nas_message_test1(abts_case *tc, void *data) diff --git a/tests/unit/security-test.c b/tests/unit/security-test.c index 6b5091220..1a63ba697 100644 --- a/tests/unit/security-test.c +++ b/tests/unit/security-test.c @@ -1,5 +1,5 @@ #include "ogs-crypt.h" -#include "nas/nas_message.h" +#include "nas/nas-message.h" #include "hss/milenage.h" #include "hss/hss_auc.h" diff --git a/tests/volte/abts-main.c b/tests/volte/abts-main.c index 5d24be34f..42ee9a68b 100644 --- a/tests/volte/abts-main.c +++ b/tests/volte/abts-main.c @@ -22,12 +22,12 @@ #include "mme/ogs-sctp.h" -#include "fd/fd_lib.h" +#include "fd/fd-lib.h" #include "app/application.h" #include "app/context.h" -#include "app_init.h" +#include "app-init.h" #include "test-packet.h" #include "test-app.h" diff --git a/tests/volte/pcscf-fd-path.c b/tests/volte/pcscf-fd-path.c index 1962cd8b7..9c8191b8b 100644 --- a/tests/volte/pcscf-fd-path.c +++ b/tests/volte/pcscf-fd-path.c @@ -1,8 +1,8 @@ -#include "gtp/gtp_xact.h" +#include "gtp/gtp-xact.h" -#include "fd/fd_lib.h" -#include "fd/rx/rx_dict.h" -#include "fd/rx/rx_message.h" +#include "fd/fd-lib.h" +#include "fd/rx/rx-dict.h" +#include "fd/rx/rx-message.h" #include "pcscf-fd-path.h" diff --git a/tests/volte/testapp.c b/tests/volte/testapp.c index acbb043bf..5529905dc 100644 --- a/tests/volte/testapp.c +++ b/tests/volte/testapp.c @@ -1,7 +1,7 @@ #include "app/context.h" #include "app/application.h" -#include "app_init.h" +#include "app-init.h" static ogs_proc_mutex_t *pcrf_sem1 = NULL; static ogs_proc_mutex_t *pcrf_sem2 = NULL; diff --git a/tests/volte/volte-test.c b/tests/volte/volte-test.c index c70554cd1..d2cdf4633 100644 --- a/tests/volte/volte-test.c +++ b/tests/volte/volte-test.c @@ -2,7 +2,7 @@ #include #include "core/abts.h" #include "base/types.h" -#include "asn1c/s1ap_message.h" +#include "asn1c/s1ap-message.h" #include "app/context.h" #include "test-packet.h" #include "pcscf-fd-path.h"