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

Finished on version

This commit is contained in:
Sukchan Lee 2020-07-13 21:53:41 -04:00
parent 347e0d7b2f
commit c22ef51e01
21 changed files with 72 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debian/changelog vendored
View File

@ -1,3 +1,9 @@
open5gs (1.3.0) unstable; urgency=medium
* Release-16
-- Sukchan Lee <acetcom@gmail.com> Fri, 10 Jul 2020 17:29:33 -0400
open5gs (1.3.0~eoan1) eoan; urgency=medium
* Release-16
@ -16,12 +22,6 @@ open5gs (1.3.0~bionic1) bionic; urgency=medium
-- Sukchan Lee <acetcom@gmail.com> Fri, 10 Jul 2020 17:30:57 -0400
open5gs (1.3.0) unstable; urgency=medium
* Release-16
-- Sukchan Lee <acetcom@gmail.com> Fri, 10 Jul 2020 17:29:33 -0400
open5gs (1.2.4~eoan) eoan; urgency=medium
* Bug Fixed

1
meson.build
View File

@ -35,6 +35,7 @@ localstatedir = join_paths(prefix, get_option('localstatedir'))
cc = meson.get_compiler('c')
host_system = host_machine.system()
git = find_program('git', required: false)
#python = import('python')
#python3 = python.find_installation('python3')
python3 = find_program('python3', 'python')

2
src/amf/meson.build
View File

@ -80,6 +80,6 @@ executable('open5gs-amfd',
sources : amf_sources,
c_args : '-DDEFAULT_CONFIG_FILENAME="@0@/amf.yaml"'.format(open5gs_sysconfdir),
include_directories : srcinc,
dependencies : [versiondep, libamf_dep],
dependencies : libamf_dep,
install_rpath : libdir,
install : true)

2
src/ausf/meson.build
View File

@ -58,6 +58,6 @@ executable('open5gs-ausfd',
sources : ausf_sources,
c_args : '-DDEFAULT_CONFIG_FILENAME="@0@/ausf.yaml"'.format(open5gs_sysconfdir),
include_directories : srcinc,
dependencies : [versiondep, libausf_dep],
dependencies : libausf_dep,
install_rpath : libdir,
install : true)

2
src/hss/meson.build
View File

@ -43,6 +43,6 @@ executable('open5gs-hssd',
sources : hss_sources,
c_args : '-DDEFAULT_CONFIG_FILENAME="@0@/hss.yaml"'.format(open5gs_sysconfdir),
include_directories : srcinc,
dependencies : [versiondep, libhss_dep],
dependencies : libhss_dep,
install_rpath : libdir,
install : true)

2
src/main.c
View File

@ -24,7 +24,7 @@
#include "ogs-app.h"
#include "version.h"
static const char *version = "Open5GS daemon v" OPEN5GS_VERSION;
static const char *version = "Open5GS daemon " OPEN5GS_VERSION;
static void show_version(void)
{

23
src/meson.build
View File

@ -17,20 +17,17 @@
srcinc = include_directories('.')
#version_conf = configuration_data()
#version_conf.set_quoted('OPEN5GS_VERSION', meson.project_version())
#configure_file(output : 'version.h', configuration : version_conf)
package_version = 'v' + meson.project_version()
if git.found()
git_version = run_command('git', ['describe', '--abbrev=7', '--dirty=+'])
if git_version.returncode() == 0
package_version = git_version.stdout().strip()
endif
endif
version_data = configuration_data()
version_data.set_quoted('OPEN5GS_VERSION', '@VCS_TAG@')
version_h = vcs_tag(
input : configure_file(
output : 'version.h.in',
configuration : version_data),
output : 'version.h')
versiondep = declare_dependency(sources: version_h)
version_conf = configuration_data()
version_conf.set_quoted('OPEN5GS_VERSION', package_version)
configure_file(output : 'version.h', configuration : version_conf)
subdir('mme')
subdir('hss')

2
src/mme/meson.build
View File

@ -103,6 +103,6 @@ executable('open5gs-mmed',
sources : mme_sources,
c_args : '-DDEFAULT_CONFIG_FILENAME="@0@/mme.yaml"'.format(open5gs_sysconfdir),
include_directories : srcinc,
dependencies : [versiondep, libmme_dep],
dependencies : libmme_dep,
install_rpath : libdir,
install : true)

31
src/mme/mme-init.c
View File

@ -92,30 +92,19 @@ static void mme_main(void *data)
ogs_pollset_poll(mme_self()->pollset,
ogs_timer_mgr_next(mme_self()->timer_mgr));
/* Process the MESSAGE FIRST.
/*
* After ogs_pollset_poll(), ogs_timer_mgr_expire() must be called.
*
* For example, if UE Context Release Complete is received,
* the MME_TIMER_UE_CONTEXT_RELEASE is first stopped */
for ( ;; ) {
mme_event_t *e = NULL;
rv = ogs_queue_trypop(mme_self()->queue, (void**)&e);
ogs_assert(rv != OGS_ERROR);
if (rv == OGS_DONE)
goto done;
if (rv == OGS_RETRY)
break;
ogs_assert(e);
ogs_fsm_dispatch(&mme_sm, e);
mme_event_free(e);
}
* The reason is why ogs_timer_mgr_next() can get the corrent value
* when ogs_timer_stop() is called internally in ogs_timer_mgr_expire().
*
* You should not use event-queue before ogs_timer_mgr_expire().
* In this case, ogs_timer_mgr_expire() does not work
* because 'if rv == OGS_DONE' statement is exiting and
* not calling ogs_timer_mgr_expire().
*/
ogs_timer_mgr_expire(mme_self()->timer_mgr);
/* AND THEN, process the TIMER. */
for ( ;; ) {
mme_event_t *e = NULL;

2
src/nrf/meson.build
View File

@ -53,6 +53,6 @@ executable('open5gs-nrfd',
sources : nrf_sources,
c_args : '-DDEFAULT_CONFIG_FILENAME="@0@/nrf.yaml"'.format(open5gs_sysconfdir),
include_directories : srcinc,
dependencies : [versiondep, libnrf_dep],
dependencies : libnrf_dep,
install_rpath : libdir,
install : true)

2
src/pcrf/meson.build
View File

@ -50,6 +50,6 @@ executable('open5gs-pcrfd',
sources : pcrf_sources,
c_args : '-DDEFAULT_CONFIG_FILENAME="@0@/pcrf.yaml"'.format(open5gs_sysconfdir),
include_directories : srcinc,
dependencies : [versiondep, libpcrf_dep],
dependencies : libpcrf_dep,
install_rpath : libdir,
install : true)

2
src/pgw/meson.build
View File

@ -80,6 +80,6 @@ executable('open5gs-pgwd',
sources : pgw_sources,
c_args : '-DDEFAULT_CONFIG_FILENAME="@0@/pgw.yaml"'.format(open5gs_sysconfdir),
include_directories : srcinc,
dependencies : [versiondep, libpgw_dep],
dependencies : libpgw_dep,
install_rpath : libdir,
install : true)

31
src/pgw/pgw-init.c
View File

@ -88,30 +88,19 @@ static void pgw_main(void *data)
ogs_pollset_poll(pgw_self()->pollset,
ogs_timer_mgr_next(pgw_self()->timer_mgr));
/* Process the MESSAGE FIRST.
/*
* After ogs_pollset_poll(), ogs_timer_mgr_expire() must be called.
*
* For example, if UE Context Release Complete is received,
* the MME_TIMER_UE_CONTEXT_RELEASE is first stopped */
for ( ;; ) {
pgw_event_t *e = NULL;
rv = ogs_queue_trypop(pgw_self()->queue, (void**)&e);
ogs_assert(rv != OGS_ERROR);
if (rv == OGS_DONE)
goto done;
if (rv == OGS_RETRY)
break;
ogs_assert(e);
ogs_fsm_dispatch(&pgw_sm, e);
pgw_event_free(e);
}
* The reason is why ogs_timer_mgr_next() can get the corrent value
* when ogs_timer_stop() is called internally in ogs_timer_mgr_expire().
*
* You should not use event-queue before ogs_timer_mgr_expire().
* In this case, ogs_timer_mgr_expire() does not work
* because 'if rv == OGS_DONE' statement is exiting and
* not calling ogs_timer_mgr_expire().
*/
ogs_timer_mgr_expire(pgw_self()->timer_mgr);
/* AND THEN, process the TIMER. */
for ( ;; ) {
pgw_event_t *e = NULL;

2
src/sgw/meson.build
View File

@ -50,6 +50,6 @@ executable('open5gs-sgwd',
sources : sgw_sources,
c_args : '-DDEFAULT_CONFIG_FILENAME="@0@/sgw.yaml"'.format(open5gs_sysconfdir),
include_directories : srcinc,
dependencies : [versiondep, libsgw_dep],
dependencies : libsgw_dep,
install_rpath : libdir,
install : true)

31
src/sgw/sgw-init.c
View File

@ -78,30 +78,19 @@ static void sgw_main(void *data)
ogs_pollset_poll(sgw_self()->pollset,
ogs_timer_mgr_next(sgw_self()->timer_mgr));
/* Process the MESSAGE FIRST.
/*
* After ogs_pollset_poll(), ogs_timer_mgr_expire() must be called.
*
* For example, if UE Context Release Complete is received,
* the MME_TIMER_UE_CONTEXT_RELEASE is first stopped */
for ( ;; ) {
sgw_event_t *e = NULL;
rv = ogs_queue_trypop(sgw_self()->queue, (void**)&e);
ogs_assert(rv != OGS_ERROR);
if (rv == OGS_DONE)
goto done;
if (rv == OGS_RETRY)
break;
ogs_assert(e);
ogs_fsm_dispatch(&sgw_sm, e);
sgw_event_free(e);
}
* The reason is why ogs_timer_mgr_next() can get the corrent value
* when ogs_timer_stop() is called internally in ogs_timer_mgr_expire().
*
* You should not use event-queue before ogs_timer_mgr_expire().
* In this case, ogs_timer_mgr_expire() does not work
* because 'if rv == OGS_DONE' statement is exiting and
* not calling ogs_timer_mgr_expire().
*/
ogs_timer_mgr_expire(sgw_self()->timer_mgr);
/* AND THEN, process the TIMER. */
for ( ;; ) {
sgw_event_t *e = NULL;

2
src/smf/meson.build
View File

@ -123,6 +123,6 @@ executable('open5gs-smfd',
sources : smf_sources,
c_args : '-DDEFAULT_CONFIG_FILENAME="@0@/smf.yaml"'.format(open5gs_sysconfdir),
include_directories : srcinc,
dependencies : [versiondep, libsmf_dep],
dependencies : libsmf_dep,
install_rpath : libdir,
install : true)

2
src/udm/meson.build
View File

@ -58,6 +58,6 @@ executable('open5gs-udmd',
sources : udm_sources,
c_args : '-DDEFAULT_CONFIG_FILENAME="@0@/udm.yaml"'.format(open5gs_sysconfdir),
include_directories : srcinc,
dependencies : [versiondep, libudm_dep],
dependencies : libudm_dep,
install_rpath : libdir,
install : true)

2
src/udr/meson.build
View File

@ -54,6 +54,6 @@ executable('open5gs-udrd',
sources : udr_sources,
c_args : '-DDEFAULT_CONFIG_FILENAME="@0@/udr.yaml"'.format(open5gs_sysconfdir),
include_directories : srcinc,
dependencies : [versiondep, libudr_dep],
dependencies : libudr_dep,
install_rpath : libdir,
install : true)

31
src/upf/init.c
View File

@ -86,30 +86,19 @@ static void upf_main(void *data)
ogs_pollset_poll(upf_self()->pollset,
ogs_timer_mgr_next(upf_self()->timer_mgr));
/* Process the MESSAGE FIRST.
/*
* After ogs_pollset_poll(), ogs_timer_mgr_expire() must be called.
*
* For example, if UE Context Release Complete is received,
* the MME_TIMER_UE_CONTEXT_RELEASE is first stopped */
for ( ;; ) {
upf_event_t *e = NULL;
rv = ogs_queue_trypop(upf_self()->queue, (void**)&e);
ogs_assert(rv != OGS_ERROR);
if (rv == OGS_DONE)
goto done;
if (rv == OGS_RETRY)
break;
ogs_assert(e);
ogs_fsm_dispatch(&upf_sm, e);
upf_event_free(e);
}
* The reason is why ogs_timer_mgr_next() can get the corrent value
* when ogs_timer_stop() is called internally in ogs_timer_mgr_expire().
*
* You should not use event-queue before ogs_timer_mgr_expire().
* In this case, ogs_timer_mgr_expire() does not work
* because 'if rv == OGS_DONE' statement is exiting and
* not calling ogs_timer_mgr_expire().
*/
ogs_timer_mgr_expire(upf_self()->timer_mgr);
/* AND THEN, process the TIMER. */
for ( ;; ) {
upf_event_t *e = NULL;

2
src/upf/meson.build
View File

@ -85,6 +85,6 @@ executable('open5gs-upfd',
sources : upf_sources,
c_args : '-DDEFAULT_CONFIG_FILENAME="@0@/upf.yaml"'.format(open5gs_sysconfdir),
include_directories : srcinc,
dependencies : [versiondep, libupf_dep],
dependencies : libupf_dep,
install_rpath : libdir,
install : true)

4
tests/app/meson.build
View File

@ -56,7 +56,7 @@ executable('epc',
sources : [testepc_sources],
c_args : libtestepc_cc_args,
include_directories : srcinc,
dependencies : [versiondep, libtestepc_dep])
dependencies : libtestepc_dep)
libtest5gc_cc_args = '-DDEFAULT_CONFIG_FILENAME="@0@/configs/5gc.yaml"'.format(meson.build_root())
@ -85,4 +85,4 @@ executable('5gc',
sources : [test5gc_sources],
c_args : libtest5gc_cc_args,
include_directories : srcinc,
dependencies : [versiondep, libtest5gc_dep])
dependencies : libtest5gc_dep)