From 262cc871daa9366fee92d2c662fcbd949600d096 Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Sat, 5 Aug 2017 14:37:53 +0900 Subject: [PATCH] conf name changes.. TRACE_LEVEL.S6A -> TRACE_LEVEL.FD --- lib/base/context.c | 4 ++-- lib/base/context.h | 2 +- src/hss/hss_context.c | 28 ++++++++++++++-------------- src/hss/hss_context.h | 2 +- src/hss/hss_s6a_handler.c | 4 ++-- src/mme/mme_context.c | 28 ++++++++++++++-------------- src/mme/mme_context.h | 2 +- src/mme/mme_s6a_handler.c | 4 ++-- support/nextepc.conf.in | 6 +++--- 9 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lib/base/context.c b/lib/base/context.c index 4278fc0e6..dbc68c955 100644 --- a/lib/base/context.c +++ b/lib/base/context.c @@ -147,9 +147,9 @@ status_t context_parse_config() { if (v) self.trace_level.nas = atoi(v); } - else if (jsmntok_equal(json, t+m, "S6A") == 0) + else if (jsmntok_equal(json, t+m, "FD") == 0) { - if (v) self.trace_level.s6a = atoi(v); + if (v) self.trace_level.fd = atoi(v); } else if (jsmntok_equal(json, t+m, "GTP") == 0) { diff --git a/lib/base/context.h b/lib/base/context.h index c716628e1..dd85ce27e 100644 --- a/lib/base/context.h +++ b/lib/base/context.h @@ -34,7 +34,7 @@ typedef struct _context_t { int s1ap; int nas; int gtp; - int s6a; + int fd; int others; } trace_level; diff --git a/src/hss/hss_context.c b/src/hss/hss_context.c index 3ec224ad0..e7dacd50b 100644 --- a/src/hss/hss_context.c +++ b/src/hss/hss_context.c @@ -61,17 +61,17 @@ static status_t hss_context_prepare() static status_t hss_context_validation() { - if (self.s6a_config_path == NULL) + if (self.fd_conf_path == NULL) { if (self.hss_s6a_addr == NULL) { - d_error("No HSS.S6A_CONFIG_PATH or HSS.NETWORK.S6A_ADDR in '%s'", + d_error("No HSS.FD_CONF_PATH or HSS.NETWORK.S6A_ADDR in '%s'", context_self()->config.path); return CORE_ERROR; } if (self.mme_s6a_addr == NULL) { - d_error("No HSS.S6A_CONFIG_PATH or MME.NETWORK.S6A_ADDR in '%s'", + d_error("No HSS.FD_CONF_PATH or MME.NETWORK.S6A_ADDR in '%s'", context_self()->config.path); return CORE_ERROR; } @@ -153,9 +153,9 @@ status_t hss_context_parse_config() } case HSS_ROOT: { - if (jsmntok_equal(json, t, "S6A_CONFIG_PATH") == 0) + if (jsmntok_equal(json, t, "FD_CONF_PATH") == 0) { - self.s6a_config_path = jsmntok_to_string(json, t+1); + self.fd_conf_path = jsmntok_to_string(json, t+1); } else if (jsmntok_equal(json, t, "NETWORK") == 0) { @@ -282,24 +282,24 @@ status_t hss_context_parse_config() status_t hss_context_setup_trace_module() { - int s6a = context_self()->trace_level.s6a; + int fd = context_self()->trace_level.fd; int others = context_self()->trace_level.others; - if (s6a) + if (fd) { - if (s6a <= 1) fd_g_debug_lvl = FD_LOG_ERROR; - else if (s6a <= 3) fd_g_debug_lvl = FD_LOG_NOTICE; - else if (s6a <= 5) fd_g_debug_lvl = FD_LOG_DEBUG; + if (fd <= 1) fd_g_debug_lvl = FD_LOG_ERROR; + else if (fd <= 3) fd_g_debug_lvl = FD_LOG_NOTICE; + else if (fd <= 5) fd_g_debug_lvl = FD_LOG_DEBUG; else fd_g_debug_lvl = FD_LOG_ANNOYING; extern int _hss_s6a_handler; - d_trace_level(&_hss_s6a_handler, s6a); + d_trace_level(&_hss_s6a_handler, fd); extern int _fd_init; - d_trace_level(&_fd_init, s6a); + d_trace_level(&_fd_init, fd); extern int _fd_context; - d_trace_level(&_fd_context, s6a); + d_trace_level(&_fd_context, fd); extern int _fd_logger; - d_trace_level(&_fd_logger, s6a); + d_trace_level(&_fd_logger, fd); } if (others) diff --git a/src/hss/hss_context.h b/src/hss/hss_context.h index 47cc31634..1de056176 100644 --- a/src/hss/hss_context.h +++ b/src/hss/hss_context.h @@ -47,7 +47,7 @@ typedef struct _hss_db_subscription_data_t { } hss_db_subscription_data_t; typedef struct _hss_context_t { - char* s6a_config_path; /* HSS S6A Configuration File Path */ + char* fd_conf_path; /* HSS freeDiameter conf path */ char* hss_s6a_addr; /* HSS S6A local address (STIRNG)*/ c_uint16_t hss_s6a_port; /* HSS S6A local port */ c_uint16_t hss_s6a_tls_port; /* HSS S6A local TLS port */ diff --git a/src/hss/hss_s6a_handler.c b/src/hss/hss_s6a_handler.c index 3a326d79b..a5e76fe99 100644 --- a/src/hss/hss_s6a_handler.c +++ b/src/hss/hss_s6a_handler.c @@ -491,7 +491,7 @@ status_t hss_s6a_init(void) fd_context_init(FD_MODE_SERVER); - if (hss_self()->s6a_config_path == NULL) + if (hss_self()->fd_conf_path == NULL) { /* This is default diameter configuration if there is no config file * The Configuration : No TLS, Only TCP */ @@ -507,7 +507,7 @@ status_t hss_s6a_init(void) fd_self()->pic_port = hss_self()->mme_s6a_port; } - ret = fd_init(hss_self()->s6a_config_path); + ret = fd_init(hss_self()->fd_conf_path); if (ret != 0) return CORE_ERROR; /* Install objects definitions for this application */ diff --git a/src/mme/mme_context.c b/src/mme/mme_context.c index 8a6c8f397..09a670125 100644 --- a/src/mme/mme_context.c +++ b/src/mme/mme_context.c @@ -116,17 +116,17 @@ static status_t mme_context_prepare() static status_t mme_context_validation() { - if (self.s6a_config_path == NULL) + if (self.fd_conf_path == NULL) { if (self.mme_s6a_addr == NULL) { - d_error("No MME.S6A_CONFIG_PATH or MME.NETWORK.S6A_ADDR in '%s'", + d_error("No MME.FD_CONF_PATH or MME.NETWORK.S6A_ADDR in '%s'", context_self()->config.path); return CORE_ERROR; } if (self.hss_s6a_addr == NULL) { - d_error("No MME.S6A_CONFIG_PATH or HSS.NETWORK.S6A_ADDR in '%s'", + d_error("No MME.FD_CONF_PATH or HSS.NETWORK.S6A_ADDR in '%s'", context_self()->config.path); return CORE_ERROR; } @@ -350,9 +350,9 @@ status_t mme_context_parse_config() char *v = jsmntok_to_string(json, t+1); if (v) self.relative_capacity = atoi(v); } - else if (jsmntok_equal(json, t, "S6A_CONFIG_PATH") == 0) + else if (jsmntok_equal(json, t, "FD_CONF_PATH") == 0) { - self.s6a_config_path = jsmntok_to_string(json, t+1); + self.fd_conf_path = jsmntok_to_string(json, t+1); } else if (jsmntok_equal(json, t, "NETWORK") == 0) { @@ -782,7 +782,7 @@ status_t mme_context_setup_trace_module() { int s1ap = context_self()->trace_level.s1ap; int nas = context_self()->trace_level.nas; - int s6a = context_self()->trace_level.s6a; + int fd = context_self()->trace_level.fd; int gtp = context_self()->trace_level.gtp; int others = context_self()->trace_level.others; @@ -824,21 +824,21 @@ status_t mme_context_setup_trace_module() d_trace_level(&_nas_ies, nas); } - if (s6a) + if (fd) { - if (s6a <= 1) fd_g_debug_lvl = FD_LOG_ERROR; - else if (s6a <= 3) fd_g_debug_lvl = FD_LOG_NOTICE; - else if (s6a <= 5) fd_g_debug_lvl = FD_LOG_DEBUG; + if (fd <= 1) fd_g_debug_lvl = FD_LOG_ERROR; + else if (fd <= 3) fd_g_debug_lvl = FD_LOG_NOTICE; + else if (fd <= 5) fd_g_debug_lvl = FD_LOG_DEBUG; else fd_g_debug_lvl = FD_LOG_ANNOYING; extern int _mme_s6a_handler; - d_trace_level(&_mme_s6a_handler, s6a); + d_trace_level(&_mme_s6a_handler, fd); extern int _fd_init; - d_trace_level(&_fd_init, s6a); + d_trace_level(&_fd_init, fd); extern int _fd_context; - d_trace_level(&_fd_context, s6a); + d_trace_level(&_fd_context, fd); extern int _fd_logger; - d_trace_level(&_fd_logger, s6a); + d_trace_level(&_fd_logger, fd); } if (gtp) diff --git a/src/mme/mme_context.h b/src/mme/mme_context.h index 9a03a947d..31156b44c 100644 --- a/src/mme/mme_context.h +++ b/src/mme/mme_context.h @@ -43,7 +43,7 @@ typedef struct _served_gummei { } served_gummei_t; typedef struct _mme_context_t { - char* s6a_config_path; /* MME S6A Configuration File Path */ + char* fd_conf_path; /* MME freeDiameter conf path */ char* mme_s6a_addr; /* MME S6A local address (STIRNG)*/ c_uint16_t mme_s6a_port; /* MME S6A local port */ c_uint16_t mme_s6a_tls_port; /* MME S6A local TLS port */ diff --git a/src/mme/mme_s6a_handler.c b/src/mme/mme_s6a_handler.c index 3730be9ee..ed2d49019 100644 --- a/src/mme/mme_s6a_handler.c +++ b/src/mme/mme_s6a_handler.c @@ -576,7 +576,7 @@ status_t mme_s6a_init(void) fd_context_init(FD_MODE_CLIENT); - if (mme_self()->s6a_config_path == NULL) + if (mme_self()->fd_conf_path == NULL) { /* This is default diameter configuration if there is no config file * The Configuration : No TLS, Only TCP */ @@ -592,7 +592,7 @@ status_t mme_s6a_init(void) fd_self()->pic_port = mme_self()->hss_s6a_port; } - rv = fd_init(mme_self()->s6a_config_path); + rv = fd_init(mme_self()->fd_conf_path); if (rv != CORE_OK) return rv; /* Install objects definitions for this application */ diff --git a/support/nextepc.conf.in b/support/nextepc.conf.in index 75c9c547c..64ea69997 100644 --- a/support/nextepc.conf.in +++ b/support/nextepc.conf.in @@ -5,14 +5,14 @@ { S1AP: 1, NAS: 1, - S6A: 1, + FD: 1, GTP: 1, OTHERS: 1, } HSS : { -#S6A_CONFIG_PATH : "@prefix@/etc/freeDiameter/hss.conf", +#FD_CONF_PATH : "@prefix@/etc/freeDiameter/hss.conf", NETWORK : { S6A_ADDR : "10.1.35.214" @@ -21,7 +21,7 @@ MME : { -#S6A_CONFIG_PATH : "@prefix@/etc/freeDiameter/mme.conf", +#FD_CONF_PATH : "@prefix@/etc/freeDiameter/mme.conf", DEFAULT_PAGING_DRX : "v64", #RELATIVE_CAPACITY : 255,