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

[NRF] Fixed library load error

This commit is contained in:
Sukchan Lee 2022-08-26 10:57:11 +09:00
parent 83a20b82c7
commit 9b10d70c77
52 changed files with 59 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/open5gs/nrf.yaml.in
View File

@ -1,5 +1,3 @@
db_uri: mongodb://localhost/open5gs
#
# logger:
#

4
lib/app/meson.build
View File

@ -38,11 +38,11 @@ libapp = library('ogsapp',
version : libogslib_version,
c_args : '-DOGS_APP_COMPILATION',
include_directories : [libapp_inc, libinc],
dependencies : [libproto_dep, yaml_dep],
dependencies : [libcore_dep, yaml_dep],
install : true)
libapp_dep = declare_dependency(
link_with : libapp,
include_directories : [libapp_inc, libinc],
dependencies : [libproto_dep, yaml_dep],
dependencies : [libcore_dep, yaml_dep],
)

2
lib/app/ogs-app.h
View File

@ -20,7 +20,7 @@
#ifndef OGS_APP_H
#define OGS_APP_H
#include "ogs-proto.h"
#include "proto/ogs-proto.h"
#define OGS_APP_INSIDE

2
lib/asn1c/common/asn_internal.h
View File

@ -40,7 +40,7 @@ int get_asn1c_environment_version(void); /* Run-time version */
#define REALLOC(oldptr, size) realloc(oldptr, size)
#define FREEMEM(ptr) free(ptr)
#else
#include "ogs-proto.h"
#include "proto/ogs-proto.h"
static ogs_inline void *ogs_asn_malloc(size_t size, const char *file_line)
{

4
lib/asn1c/common/meson.build
View File

@ -171,10 +171,10 @@ libasn1c_common = library('ogsasn1c-common',
version : libogslib_version,
c_args : libasn1c_common_cc_flags,
include_directories : libasn1c_common_inc,
dependencies : libproto_dep,
dependencies : libcore_dep,
install : true)
libasn1c_common_dep = declare_dependency(
link_with : libasn1c_common,
include_directories : libasn1c_common_inc,
dependencies : libproto_dep)
dependencies : libcore_dep)

2
lib/crypt/ogs-crypt.h
View File

@ -20,7 +20,7 @@
#ifndef OGS_CRYPT_H
#define OGS_CRYPT_H
#include "ogs-proto.h"
#include "proto/ogs-proto.h"
#define OGS_CRYPT_INSIDE

3
lib/dbi/ogs-dbi.h
View File

@ -20,8 +20,7 @@
#ifndef OGS_DBI_H
#define OGS_DBI_H
#include "ogs-core.h"
#include "ogs-crypt.h"
#include "crypt/ogs-crypt.h"
#define OGS_DBI_INSIDE

4
lib/diameter/common/meson.build
View File

@ -51,10 +51,10 @@ libdiameter_common = library('ogsdiameter-common',
version : libogslib_version,
c_args : libdiameter_common_cc_flags,
include_directories : [libdiameter_common_inc, libinc],
dependencies : [libproto_dep, libfdcore_dep],
dependencies : [libcore_dep, libfdcore_dep],
install : true)
libdiameter_common_dep = declare_dependency(
link_with : libdiameter_common,
include_directories : [libdiameter_common_inc, libinc],
dependencies : [libproto_dep, libfdcore_dep])
dependencies : [libcore_dep, libfdcore_dep])

2
lib/diameter/common/ogs-diameter-common.h
View File

@ -37,7 +37,7 @@
#pragma GCC diagnostic pop
#endif
#include "ogs-proto.h"
#include "proto/ogs-proto.h"
#define OGS_DIAMETER_INSIDE

4
lib/gtp/meson.build
View File

@ -56,10 +56,10 @@ libgtp = library('ogsgtp',
version : libogslib_version,
c_args : '-DOGS_GTP_COMPILATION',
include_directories : [libgtp_inc, libinc],
dependencies : [libcore_dep, libapp_dep, libnas_common_dep],
dependencies : [libproto_dep, libipfw_dep, libapp_dep],
install : true)
libgtp_dep = declare_dependency(
link_with : libgtp,
include_directories : [libgtp_inc, libinc],
dependencies : [libcore_dep, libapp_dep, libnas_common_dep])
dependencies : [libproto_dep, libipfw_dep, libapp_dep])

5
lib/gtp/ogs-gtp.h
View File

@ -20,10 +20,9 @@
#ifndef OGS_GTP_H
#define OGS_GTP_H
#include "ogs-core.h"
#include "ipfw/ogs-ipfw.h"
#include "ogs-app.h"
#include "ogs-nas-common.h"
#include "proto/ogs-proto.h"
#include "app/ogs-app.h"
#define OGS_GTPV1_U_UDP_PORT 2152
#define OGS_GTPV2_C_UDP_PORT 2123

4
lib/ipfw/meson.build
View File

@ -80,10 +80,10 @@ libipfw = library('ogsipfw',
version : libogslib_version,
c_args : ['-include', 'glue.h', ipfw_cc_flags],
include_directories : libipfw_inc,
dependencies : libproto_dep,
dependencies : libcore_dep,
install : true)
libipfw_dep = declare_dependency(
link_with : libipfw,
include_directories : libinc,
dependencies : libproto_dep)
dependencies : libcore_dep)

2
lib/ipfw/ogs-ipfw.h
View File

@ -24,7 +24,7 @@
extern "C" {
#endif
#include "ogs-proto.h"
#include "proto/ogs-proto.h"
typedef struct ogs_ipfw_rule_s {
uint8_t proto;

2
lib/metrics/meson.build
View File

@ -20,7 +20,7 @@ libmetrics_file_list = '''
context.h
context.c
'''
libmetrics_dependencies = [libcore_dep, libapp_dep]
libmetrics_dependencies = [libapp_dep]
metrics_impl_optval = get_option('metrics_impl')

3
lib/metrics/ogs-metrics.h
View File

@ -20,8 +20,7 @@
#ifndef OGS_METRICS_H
#define OGS_METRICS_H
#include "ogs-core.h"
#include "ogs-app.h"
#include "app/ogs-app.h"
#define OGS_METRICS_INSIDE

4
lib/nas/common/meson.build
View File

@ -28,10 +28,10 @@ libnas_common = library('ogsnas-common',
version : libogslib_version,
c_args : '-DOGS_NAS_COMPILATION',
include_directories : [libnas_common_inc, libcrypt_inc, libinc],
dependencies : [libcore_dep, libcrypt_dep],
dependencies : libcrypt_dep,
install : true)
libnas_common_dep = declare_dependency(
link_with : libnas_common,
include_directories : [libnas_common_inc, libcrypt_inc, libinc],
dependencies : [libcore_dep, libcrypt_dep])
dependencies : libcrypt_dep)

3
lib/nas/common/ogs-nas-common.h
View File

@ -20,8 +20,7 @@
#ifndef OGS_NAS_COMMON_H
#define OGS_NAS_COMMON_H
#include "ogs-core.h"
#include "ogs-crypt.h"
#include "crypt/ogs-crypt.h"
#define OGS_NAS_INSIDE

2
lib/ngap/ogs-ngap.h
View File

@ -20,7 +20,7 @@
#ifndef OGS_NGAP_H
#define OGS_NGAP_H
#include "ogs-core.h"
#include "core/ogs-core.h"
#include "NGAP_AdditionalDLUPTNLInformationForHOItem.h"
#include "NGAP_AdditionalDLUPTNLInformationForHOList.h"

4
lib/pfcp/meson.build
View File

@ -64,11 +64,11 @@ libpfcp = library('ogspfcp',
version : libogslib_version,
c_args : '-DOGS_PFCP_COMPILATION',
include_directories : [libpfcp_inc, libinc],
dependencies : [libcore_dep, libipfw_dep, libapp_dep, libgtp_dep],
dependencies : libgtp_dep,
install_rpath : libdir,
install : true)
libpfcp_dep = declare_dependency(
link_with : libpfcp,
include_directories : [libpfcp_inc, libinc],
dependencies : [libcore_dep, libipfw_dep, libapp_dep, libgtp_dep])
dependencies : libgtp_dep)

6
lib/pfcp/ogs-pfcp.h
View File

@ -20,13 +20,9 @@
#ifndef OGS_PFCP_H
#define OGS_PFCP_H
#include "ogs-core.h"
#include "pfcp/pfcp-config.h"
#include "ipfw/ogs-ipfw.h"
#include "ogs-app.h"
#include "ogs-gtp.h"
#include "gtp/ogs-gtp.h"
#define OGS_PFCP_UDP_PORT 8805

2
lib/proto/ogs-proto.h
View File

@ -20,7 +20,7 @@
#ifndef OGS_PROTO_H
#define OGS_PROTO_H
#include "ogs-core.h"
#include "core/ogs-core.h"
#define OGS_PROTO_INSIDE

2
lib/s1ap/ogs-s1ap.h
View File

@ -20,7 +20,7 @@
#ifndef OGS_S1AP_H
#define OGS_S1AP_H
#include "ogs-core.h"
#include "core/ogs-core.h"
#include "S1AP_Additional-GUTI.h"
#include "S1AP_AdditionalCSFallbackIndicator.h"

1
lib/sbi/client.c
View File

@ -17,7 +17,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "ogs-app.h"
#include "ogs-sbi.h"
#include "curl/curl.h"

1
lib/sbi/context.c
View File

@ -17,7 +17,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "ogs-app.h"
#include "ogs-sbi.h"
int __ogs_sbi_domain;

1
lib/sbi/message.c
View File

@ -18,7 +18,6 @@
*/
#include "ogs-sbi.h"
#include "ogs-crypt.h"
#include "yuarel.h"
#include "contrib/multipart_parser.h"

1
lib/sbi/mhd-server.c
View File

@ -17,7 +17,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "ogs-app.h"
#include "ogs-sbi.h"
#include "microhttpd.h"

1
lib/sbi/nf-sm.c
View File

@ -17,7 +17,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "ogs-app.h"
#include "ogs-sbi.h"
void ogs_sbi_nf_fsm_init(ogs_sbi_nf_instance_t *nf_instance)

1
lib/sbi/nghttp2-server.c
View File

@ -17,7 +17,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "ogs-app.h"
#include "ogs-sbi.h"
#include "yuarel.h"

1
lib/sbi/nnrf-build.c
View File

@ -18,7 +18,6 @@
*/
#include "ogs-sbi.h"
#include "ogs-app.h"
OpenAPI_nf_profile_t *ogs_nnrf_nfm_build_nf_profile(void)
{

1
lib/sbi/nnrf-handler.c
View File

@ -18,7 +18,6 @@
*/
#include "ogs-sbi.h"
#include "ogs-app.h"
static void handle_smf_info(
ogs_sbi_nf_instance_t *nf_instance, OpenAPI_smf_info_t *SmfInfo);

3
lib/sbi/ogs-sbi.h
View File

@ -20,7 +20,8 @@
#ifndef OGS_SBI_H
#define OGS_SBI_H
#include "ogs-proto.h"
#include "crypt/ogs-crypt.h"
#include "app/ogs-app.h"
#if defined(__GNUC__)
#pragma GCC diagnostic push

1
lib/sbi/path.c
View File

@ -18,7 +18,6 @@
*/
#include "ogs-sbi.h"
#include "ogs-app.h"
bool ogs_sbi_send_request(ogs_sbi_nf_instance_t *nf_instance,
ogs_sbi_client_cb_f client_cb, ogs_sbi_xact_t *xact)

1
lib/sbi/server.c
View File

@ -17,7 +17,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "ogs-app.h"
#include "ogs-sbi.h"
extern const ogs_sbi_server_actions_t ogs_mhd_server_actions;

1
lib/sbi/timer.c
View File

@ -18,7 +18,6 @@
*/
#include "ogs-sbi.h"
#include "ogs-app.h"
static void timer_send_event(int timer_id, void *data)
{

2
lib/sctp/ogs-sctp.h
View File

@ -20,7 +20,7 @@
#ifndef OGS_SCTP_H
#define OGS_SCTP_H
#include "ogs-app.h"
#include "app/ogs-app.h"
#include "sctp/sctp-config.h"

2
lib/tun/ogs-tun.h
View File

@ -20,7 +20,7 @@
#ifndef OGS_TUN_H
#define OGS_TUN_H
#include "ogs-proto.h"
#include "proto/ogs-proto.h"
#ifdef __cplusplus
extern "C" {

6
src/amf/meson.build
View File

@ -64,8 +64,7 @@ libamf_sources = files('''
libamf = static_library('amf',
sources : libamf_sources,
dependencies : [libapp_dep,
libmetrics_dep,
dependencies : [libmetrics_dep,
libsctp_dep,
libngap_dep,
libnas_5gs_dep,
@ -74,8 +73,7 @@ libamf = static_library('amf',
libamf_dep = declare_dependency(
link_with : libamf,
dependencies : [libapp_dep,
libmetrics_dep,
dependencies : [libmetrics_dep,
libsctp_dep,
libngap_dep,
libnas_5gs_dep,

6
src/ausf/meson.build
View File

@ -34,15 +34,13 @@ libausf_sources = files('''
libausf = static_library('ausf',
sources : libausf_sources,
dependencies : [libapp_dep,
libcrypt_dep,
dependencies : [libcrypt_dep,
libsbi_dep],
install : false)
libausf_dep = declare_dependency(
link_with : libausf,
dependencies : [libapp_dep,
libcrypt_dep,
dependencies : [libcrypt_dep,
libsbi_dep])
ausf_sources = files('''

6
src/bsf/meson.build
View File

@ -30,15 +30,13 @@ libbsf_sources = files('''
libbsf = static_library('bsf',
sources : libbsf_sources,
dependencies : [libapp_dep,
libcrypt_dep,
dependencies : [libcrypt_dep,
libsbi_dep],
install : false)
libbsf_dep = declare_dependency(
link_with : libbsf,
dependencies : [libapp_dep,
libcrypt_dep,
dependencies : [libcrypt_dep,
libsbi_dep])
bsf_sources = files('''

2
src/hss/meson.build
View File

@ -32,7 +32,6 @@ libhss_sources = files('''
libhss = static_library('hss',
sources : libhss_sources,
dependencies : [libapp_dep,
libcrypt_dep,
libdbi_dep,
libdiameter_s6a_dep,
libdiameter_cx_dep,
@ -42,7 +41,6 @@ libhss = static_library('hss',
libhss_dep = declare_dependency(
link_with : libhss,
dependencies : [libapp_dep,
libcrypt_dep,
libdbi_dep,
libdiameter_s6a_dep,
libdiameter_cx_dep,

6
src/mme/meson.build
View File

@ -79,8 +79,7 @@ libmme_sources = files('''
libmme = static_library('mme',
sources : libmme_sources,
dependencies : [libapp_dep,
libmetrics_dep,
dependencies : [libmetrics_dep,
libsctp_dep,
libs1ap_dep,
libnas_eps_dep,
@ -90,8 +89,7 @@ libmme = static_library('mme',
libmme_dep = declare_dependency(
link_with : libmme,
dependencies : [libapp_dep,
libmetrics_dep,
dependencies : [libmetrics_dep,
libsctp_dep,
libs1ap_dep,
libnas_eps_dep,

2
src/nrf/context.c
View File

@ -17,7 +17,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "ogs-dbi.h"
#include "context.h"
static nrf_context_t self;
@ -33,7 +32,6 @@ void nrf_context_init(void)
/* Initialize NRF context */
memset(&self, 0, sizeof(nrf_context_t));
ogs_log_install_domain(&__ogs_dbi_domain, "dbi", ogs_core()->log.level);
ogs_log_install_domain(&__nrf_log_domain, "nrf", ogs_core()->log.level);
context_initialized = 1;

8
src/nrf/meson.build
View File

@ -32,16 +32,12 @@ libnrf_sources = files('''
libnrf = static_library('nrf',
sources : libnrf_sources,
dependencies : [libapp_dep,
libdbi_dep,
libsbi_dep],
dependencies : libsbi_dep,
install : false)
libnrf_dep = declare_dependency(
link_with : libnrf,
dependencies : [libapp_dep,
libdbi_dep,
libsbi_dep])
dependencies : libsbi_dep)
nrf_sources = files('''
app.c

6
src/nssf/meson.build
View File

@ -29,14 +29,12 @@ libnssf_sources = files('''
libnssf = static_library('nssf',
sources : libnssf_sources,
dependencies : [libapp_dep,
libsbi_dep],
dependencies : libsbi_dep,
install : false)
libnssf_dep = declare_dependency(
link_with : libnssf,
dependencies : [libapp_dep,
libsbi_dep])
dependencies : libsbi_dep)
nssf_sources = files('''
app.c

8
src/pcf/meson.build
View File

@ -43,17 +43,13 @@ libpcf_sources = files('''
libpcf = static_library('pcf',
sources : libpcf_sources,
dependencies : [libcrypt_dep,
libapp_dep,
libdbi_dep,
dependencies : [libdbi_dep,
libsbi_dep],
install : false)
libpcf_dep = declare_dependency(
link_with : libpcf,
dependencies : [libcrypt_dep,
libapp_dep,
libdbi_dep,
dependencies : [libdbi_dep,
libsbi_dep])
pcf_sources = files('''

6
src/scp/meson.build
View File

@ -30,15 +30,13 @@ libscp_sources = files('''
libscp = static_library('scp',
sources : libscp_sources,
dependencies : [libapp_dep,
libcrypt_dep,
dependencies : [libcrypt_dep,
libsbi_dep],
install : false)
libscp_dep = declare_dependency(
link_with : libscp,
dependencies : [libapp_dep,
libcrypt_dep,
dependencies : [libcrypt_dep,
libsbi_dep])
scp_sources = files('''

8
src/sgwc/meson.build
View File

@ -45,16 +45,12 @@ libsgwc_sources = files('''
libsgwc = static_library('sgwc',
sources : libsgwc_sources,
dependencies : [libapp_dep,
libgtp_dep,
libpfcp_dep],
dependencies : libpfcp_dep,
install : false)
libsgwc_dep = declare_dependency(
link_with : libsgwc,
dependencies : [libapp_dep,
libgtp_dep,
libpfcp_dep])
dependencies : libpfcp_dep)
sgwc_sources = files('''
app.c

8
src/sgwu/meson.build
View File

@ -39,16 +39,12 @@ libsgwu_sources = files('''
libsgwu = static_library('sgwu',
sources : libsgwu_sources,
dependencies : [libapp_dep,
libgtp_dep,
libpfcp_dep],
dependencies : libpfcp_dep,
install : false)
libsgwu_dep = declare_dependency(
link_with : libsgwu,
dependencies : [libapp_dep,
libgtp_dep,
libpfcp_dep])
dependencies : libpfcp_dep)
sgwu_sources = files('''
app.c

8
src/smf/meson.build
View File

@ -110,29 +110,25 @@ libsmf_sources = files('''
libsmf = static_library('smf',
sources : libsmf_sources,
dependencies : [libapp_dep,
libmetrics_dep,
dependencies : [libmetrics_dep,
libsbi_dep,
libngap_dep,
libnas_5gs_dep,
libdiameter_gx_dep,
libdiameter_gy_dep,
libdiameter_s6b_dep,
libgtp_dep,
libpfcp_dep],
install : false)
libsmf_dep = declare_dependency(
link_with : libsmf,
dependencies : [libapp_dep,
libmetrics_dep,
dependencies : [libmetrics_dep,
libsbi_dep,
libngap_dep,
libnas_5gs_dep,
libdiameter_gx_dep,
libdiameter_gy_dep,
libdiameter_s6b_dep,
libgtp_dep,
libpfcp_dep])
smf_sources = files('''

8
src/udm/meson.build
View File

@ -34,16 +34,12 @@ libudm_sources = files('''
libudm = static_library('udm',
sources : libudm_sources,
dependencies : [libapp_dep,
libcrypt_dep,
libsbi_dep],
dependencies : libsbi_dep,
install : false)
libudm_dep = declare_dependency(
link_with : libudm,
dependencies : [libapp_dep,
libcrypt_dep,
libsbi_dep])
dependencies : libsbi_dep)
udm_sources = files('''
app.c

6
src/udr/meson.build
View File

@ -29,15 +29,13 @@ libudr_sources = files('''
libudr = static_library('udr',
sources : libudr_sources,
dependencies : [libapp_dep,
libdbi_dep,
dependencies : [libdbi_dep,
libsbi_dep],
install : false)
libudr_dep = declare_dependency(
link_with : libudr,
dependencies : [libapp_dep,
libdbi_dep,
dependencies : [libdbi_dep,
libsbi_dep])
udr_sources = files('''

4
src/upf/meson.build
View File

@ -86,8 +86,6 @@ libarp_nd_dep = declare_dependency(
libupf = static_library('upf',
sources : libupf_sources,
dependencies : [
libapp_dep,
libgtp_dep,
libpfcp_dep,
libtun_dep,
libarp_nd_dep,
@ -97,8 +95,6 @@ libupf = static_library('upf',
libupf_dep = declare_dependency(
link_with : libupf,
dependencies : [
libapp_dep,
libgtp_dep,
libpfcp_dep,
libtun_dep,
libarp_nd_dep,