sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add S6A_TLS_PORT

This commit is contained in:
Sukchan Lee 2017-08-02 02:16:30 +09:00
parent 91f1d9adc5
commit 67003aef5a
7 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hss/hss_context.c
View File

@ -52,7 +52,9 @@ status_t hss_context_final(void)
static status_t hss_context_prepare()
{
self.mme_s6a_port = DIAMETER_PORT;
self.mme_s6a_tls_port = DIAMETER_SECURE_PORT;
self.hss_s6a_port = DIAMETER_PORT;
self.hss_s6a_tls_port = DIAMETER_SECURE_PORT;
return CORE_OK;
}
@ -181,6 +183,11 @@ status_t hss_context_parse_config()
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.hss_s6a_port = atoi(v);
}
else if (jsmntok_equal(json, t+m, "S6A_TLS_PORT") == 0)
{
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.hss_s6a_tls_port = atoi(v);
}
}
}
}
@ -228,6 +235,11 @@ status_t hss_context_parse_config()
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.mme_s6a_port = atoi(v);
}
else if (jsmntok_equal(json, t+m, "S6A_TLS_PORT") == 0)
{
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.mme_s6a_tls_port = atoi(v);
}
}
}
}

6
src/hss/hss_context.h
View File

@ -50,8 +50,10 @@ typedef struct _hss_context_t {
char* s6a_config_path; /* HSS S6A Configuration File Path */
char* hss_s6a_addr; /* HSS S6A local address (STIRNG)*/
c_uint16_t hss_s6a_port; /* HSS S6A local port */
char* mme_s6a_addr; /* HSS S6A local address (STIRNG)*/
c_uint16_t mme_s6a_port; /* HSS S6A local port */
c_uint16_t hss_s6a_tls_port; /* HSS S6A local TLS port */
char* mme_s6a_addr; /* MME S6A address (STIRNG)*/
c_uint16_t mme_s6a_port; /* MME S6A port */
c_uint16_t mme_s6a_tls_port; /* MME S6A TLS port */
void *subscriberCollection;
mutex_id db_lock;

1
src/hss/hss_s6a_handler.c
View File

@ -498,6 +498,7 @@ status_t hss_s6a_init(void)
s6a_config->cnf_diamrlm = S6A_REALM;
s6a_config->cnf_addr = hss_self()->hss_s6a_addr;
s6a_config->cnf_port = hss_self()->hss_s6a_port;
s6a_config->cnf_port_tls = hss_self()->hss_s6a_tls_port;
s6a_config->pi_diamid = MME_IDENTITY;
s6a_config->pi_addr = hss_self()->mme_s6a_addr;

13
src/mme/mme_context.c
View File

@ -105,7 +105,9 @@ static status_t mme_context_prepare()
self.relative_capacity = 0xff;
self.mme_s6a_port = DIAMETER_PORT;
self.mme_s6a_tls_port = DIAMETER_SECURE_PORT;
self.hss_s6a_port = DIAMETER_PORT;
self.hss_s6a_tls_port = DIAMETER_SECURE_PORT;
self.s1ap_port = S1AP_SCTP_PORT;
self.s11_port = GTPV2_C_UDP_PORT;
@ -316,6 +318,12 @@ status_t mme_context_parse_config()
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.hss_s6a_port = atoi(v);
}
else if (jsmntok_equal(json, t+m, "S6A_TLS_PORT")
== 0)
{
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.hss_s6a_tls_port = atoi(v);
}
}
}
}
@ -372,6 +380,11 @@ status_t mme_context_parse_config()
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.mme_s6a_port = atoi(v);
}
else if (jsmntok_equal(json, t+m, "S6A_TLS_PORT") == 0)
{
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.mme_s6a_tls_port = atoi(v);
}
else if (jsmntok_equal(json, t+m, "S1AP_ADDR") == 0)
{
char *v = jsmntok_to_string(json, t+m+1);

6
src/mme/mme_context.h
View File

@ -43,8 +43,10 @@ typedef struct _mme_context_t {
char* s6a_config_path; /* MME S6A Configuration File Path */
char* mme_s6a_addr; /* MME S6A local address (STIRNG)*/
c_uint16_t mme_s6a_port; /* MME S6A local port */
char* hss_s6a_addr; /* HSS S6A local address (STIRNG)*/
c_uint16_t hss_s6a_port; /* HSS S6A local port */
c_uint16_t mme_s6a_tls_port; /* MME S6A local TLS port */
char* hss_s6a_addr; /* HSS S6A address (STIRNG)*/
c_uint16_t hss_s6a_port; /* HSS S6A port */
c_uint16_t hss_s6a_tls_port; /* HSS S6A TLS port */
c_uint32_t s1ap_addr; /* MME S1AP local address */
c_uint16_t s1ap_port; /* MME S1AP local port */

1
src/mme/mme_s6a_handler.c
View File

@ -583,6 +583,7 @@ status_t mme_s6a_init(void)
s6a_config->cnf_diamrlm = S6A_REALM;
s6a_config->cnf_addr = mme_self()->mme_s6a_addr;
s6a_config->cnf_port = mme_self()->mme_s6a_port;
s6a_config->cnf_port_tls = mme_self()->mme_s6a_tls_port;
s6a_config->pi_diamid = HSS_IDENTITY;
s6a_config->pi_addr = mme_self()->hss_s6a_addr;

2
support/nextepc.conf.in
View File

@ -17,6 +17,8 @@
NETWORK :
{
S6A_ADDR : "10.1.35.214"
S6A_PORT : 30868,
S6A_TLS_PORT : 30869
}
}