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

configuration is updated

This commit is contained in:
Sukchan Lee 2017-11-24 16:08:26 +00:00
parent 61432a3070
commit b34d8b931e
5 changed files with 39 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/mme/s1ap_path.c
View File

@ -12,6 +12,43 @@
#include "s1ap_build.h"
#include "s1ap_path.h"
status_t s1ap_open(void)
{
status_t rv;
#if USE_USRSCTP != 1
int type = SOCK_STREAM;
#else
int type = SOCK_SEQPACKET;
#endif
mme_s1ap_t *s1ap = NULL;
for (s1ap = mme_s1ap_first(); s1ap; s1ap = mme_s1ap_next(s1ap))
{
rv = s1ap_server(&s1ap->sock, s1ap->domain, type,
s1ap->hostname, s1ap->port);
if (rv != CORE_OK)
{
d_error("s1ap_server(%d:%d:[%s]:%d) failed",
s1ap->domain, type, s1ap->hostname, s1ap->port);
return CORE_ERROR;
}
}
return CORE_OK;
}
status_t s1ap_close()
{
mme_s1ap_t *s1ap = NULL;
for (s1ap = mme_s1ap_first(); s1ap; s1ap = mme_s1ap_next(s1ap))
{
s1ap_delete(s1ap->sock);
}
return CORE_OK;
}
status_t s1ap_send_to_enb(mme_enb_t *enb, pkbuf_t *pkbuf)
{
status_t rv = CORE_ERROR;

26
src/mme/s1ap_sctp.c
View File

@ -19,30 +19,6 @@ status_t s1ap_final()
return CORE_OK;
}
status_t s1ap_open(void)
{
status_t rv;
int family = AF_INET;
int type = SOCK_STREAM;
const char *hostname = NULL;
c_uint16_t port = S1AP_SCTP_PORT;
rv = s1ap_server(&mme_self()->s1ap_sock, family, type, hostname, port);
if (rv != CORE_OK)
{
d_error("s1ap_server %d:%d:[%s]:%d failed",
family, type, hostname, port);
return CORE_ERROR;
}
return CORE_OK;
}
status_t s1ap_close()
{
return s1ap_delete(mme_self()->s1ap_sock);
}
status_t s1ap_server(sock_id *new,
int family, int type, const char *hostname, c_uint16_t port)
{
@ -53,7 +29,7 @@ status_t s1ap_server(sock_id *new,
rv = sctp_server(new, family, type, hostname, port);
d_assert(rv == CORE_OK, return CORE_ERROR,);
rv = sock_register(mme_self()->s1ap_sock, s1ap_accept_handler, NULL);
rv = sock_register(*new, s1ap_accept_handler, NULL);
d_assert(rv == CORE_OK, return CORE_ERROR,);
addr = sock_local_addr_get(*new);

33
src/mme/s1ap_usrsctp.c
View File

@ -59,39 +59,6 @@ status_t s1ap_final()
return CORE_OK;
}
status_t s1ap_open(void)
{
status_t rv;
int type = SOCK_SEQPACKET;
mme_s1ap_t *s1ap = NULL;
for (s1ap = mme_s1ap_first(); s1ap; s1ap = mme_s1ap_next(s1ap))
{
rv = s1ap_server(&s1ap->sock, s1ap->domain, type,
s1ap->hostname, s1ap->port);
if (rv != CORE_OK)
{
d_error("s1ap_server(%d:%d:[%s]:%d) failed",
s1ap->domain, type, s1ap->hostname, s1ap->port);
return CORE_ERROR;
}
}
return CORE_OK;
}
status_t s1ap_close()
{
mme_s1ap_t *s1ap = NULL;
for (s1ap = mme_s1ap_first(); s1ap; s1ap = mme_s1ap_next(s1ap))
{
s1ap_delete(s1ap->sock);
}
return CORE_OK;
}
status_t s1ap_delete(sock_id sock)
{
d_assert(sock, return CORE_ERROR,);

3
support/config/mme.conf.in
View File

@ -25,9 +25,6 @@
[
{
"DOMAIN" : "AF_INET"
},
{
"DOMAIN" : "AF_INET6"
}
],
"NETWORK" :

5
support/config/nextepc.conf.in
View File

@ -32,10 +32,7 @@
"S1AP" :
[
{
"HOSTNAME" : "127.0.0.1"
},
{
"HOSTNAME" : "::1"
"DOMAIN" : "AF_INET"
}
],
"NETWORK" :