acouzens
/
open5gs
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

first diameter integration is done

This commit is contained in:
Sukchan Lee 2017-02-25 15:32:30 +09:00
parent 2eac5462f6
commit 7005969056
4 changed files with 50 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/s6a/s6a_app.h
View File

@ -87,9 +87,9 @@ typedef struct _s6a_config_t {
c_uint8_t *realm;
} s6a_config_t;
CORE_DECLARE(status_t) s6a_config_init(s6a_config_t *config);
CORE_DECLARE(status_t) s6a_config_init(int hss);
CORE_DECLARE(status_t) s6a_thread_start();
CORE_DECLARE(status_t) s6a_thread_start(int hss);
CORE_DECLARE(void) s6a_thread_stop();
int s6a_app_init(void);

28
lib/s6a/s6a_config.c
View File

@ -23,7 +23,7 @@ static int aw_validate(struct peer_info * info, int * auth, int (**cb2)(struct p
}
#endif
int s6a_conf_parse()
int s6a_conf_parse(int hss)
{
struct peer_info fddpi;
struct addrinfo hints, *ai;
@ -35,7 +35,16 @@ int s6a_conf_parse()
#endif
/* Resolve hostname if not provided */
fd_g_config->cnf_diamid = "peer1.localdomain";
if (hss)
{
fd_g_config->cnf_diamid = "peer2.localdomain";
fd_g_config->cnf_port = 30868;
fd_g_config->cnf_port_tls = 30869;
}
else
{
fd_g_config->cnf_diamid = "peer1.localdomain";
}
fd_os_validate_DiameterIdentity(&fd_g_config->cnf_diamid, &fd_g_config->cnf_diamid_len, 1);
/* Handle the realm part */
@ -48,7 +57,11 @@ int s6a_conf_parse()
fddpi.config.pic_flags.pro4 = PI_P4_TCP;
fddpi.config.pic_flags.alg = PI_ALGPREF_TCP;
fddpi.config.pic_flags.sec |= PI_SEC_NONE;
fddpi.config.pic_port = (uint16_t)30868;
if (hss)
fddpi.config.pic_port = (uint16_t)3868;
else
fddpi.config.pic_port = (uint16_t)30868;
memset(&hints, 0, sizeof(hints));
hints.ai_flags = AI_ADDRCONFIG | AI_NUMERICHOST;
@ -57,7 +70,10 @@ int s6a_conf_parse()
fd_list_init( &fddpi.pi_endpoints, NULL );
fddpi.pi_diamid = "peer2.localdomain";
if (hss)
fddpi.pi_diamid = "peer1.localdomain";
else
fddpi.pi_diamid = "peer2.localdomain";
fd_ep_add_merge( &fddpi.pi_endpoints, ai->ai_addr, ai->ai_addrlen, EP_FL_CONF | (disc ?: EP_ACCEPTALL) );
fd_peer_add ( &fddpi, NULL, NULL, NULL );
@ -66,12 +82,12 @@ int s6a_conf_parse()
return 0;
}
status_t s6a_config_init(s6a_config_t *config)
status_t s6a_config_init(int hss)
{
char * buf = NULL, *b;
size_t len = 0;
CHECK_FCT( s6a_conf_parse() );
CHECK_FCT( s6a_conf_parse(hss) );
/* The following module use data from the configuration */
int fd_rtdisp_init(void);

4
lib/s6a/s6a_init.c
View File

@ -12,7 +12,7 @@
static void s6a_gnutls_log_func(int level, const char *str);
static void s6a_fd_logger(int printlevel, const char *format, va_list ap);
status_t s6a_thread_start()
status_t s6a_thread_start(int hss)
{
int ret;
@ -35,7 +35,7 @@ status_t s6a_thread_start()
return CORE_ERROR;
}
ret = s6a_config_init(NULL);
ret = s6a_config_init(hss);
if (ret != 0)
{
d_error("s6a_config_init() failed");

27
src/init.c
View File

@ -111,9 +111,30 @@ void threads_start()
d_assert(rv == CORE_OK, return,
"MME Network socket recv thread creation failed");
rv = s6a_thread_start();
d_assert(rv == CORE_OK, return,
"HSS thread creation failed");
{
status_t rv;
pid_t pid;
pid = fork();
d_assert(pid != -1, return, "fork() failed");
if (pid == 0)
{
/* Child */
setsid();
umask(027);
rv = s6a_thread_start(1);
d_assert(rv == CORE_OK, return,
"HSS thread creation failed");
return;
}
/* Parent */
rv = s6a_thread_start(0);
d_assert(rv == CORE_OK, return,
"HSS thread creation failed");
}
}
void threads_stop()