configs/open5gs/pcrf.yaml.in

@@ -1,57 +1,4 @@
 db_uri: mongodb://localhost/open5gs
-db_json:
-  default:
-    af:
-      ambr:
-        up: 10000
-        down: 10000
-      gmbr:
-        up: 1000
-        down: 1000
-      qci: 4
-    normal:
-      ambr:
-        up: 10000
-        down: 10000
-      gmbr:
-        up: 10000
-        down: 10000
-      qci: 5
-  charging_profiles:
-    af:
-      - 1
-      - 2
-      - 3
-      - 4
-    normal:
-      - 1
-      - 2
-      - 3
-      - 4
-    dir:
-      normal: "/tmp/profiles"
-      af: "/tmp/profiles_af"
-#
-#  o Set OGS_LOG_INFO to all domain level
-#   - If `level` is omitted, the default level is OGS_LOG_INFO)
-#   - If `domain` is omitted, the all domain level is set from 'level'
-#    (Default values are used, so no configuration is required)
-#
-#  o Set OGS_LOG_ERROR to all domain level
-#   - `level` can be set with none, fatal, error, warn, info, debug, trace
-#  logger:
-#    level: error
-#
-#  o Set OGS_LOG_DEBUG to mme/emm domain level
-#  logger:
-#    level: debug
-#    domain: mme,emm
-#
-#  o Set OGS_LOG_TRACE to all domain level
-#  logger:
-#    level: trace
-#    domain: core,sbi,ausf,event,tlv,mem,sock
-#
 logger:
   file: @localstatedir@/log/open5gs/pcrf.log
 #  level: info   # fatal|error|warn|info(default)|debug|trace

debian/changelog

@@ -1,16 +1,3 @@
-open5gs (2.7.0sysmocom2) unstable; urgency=medium
-
-  * Rebase on open5gs.git main of 2024-04-09
-
- -- Oliver Smith <osmith@sysmocom.de>  Tue, 09 Apr 2024 14:05:56 +0200
-
-open5gs (2.7.0sysmocom1) unstable; urgency=medium
-
-  * Remove mongodb dependency
-  * Use default APN if none could be found
-
- -- Daniel Willmann <dwillmann@sysmocom.de>  Mon, 29 Jan 2024 20:17:10 +0100
-
 open5gs (2.7.0) unstable; urgency=medium
 
   * 5G Roaming with SEPP

debian/control

@@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 11),
                libgcrypt-dev,
                libssl-dev,
                libidn11-dev,
+               libmongoc-dev,
                libbson-dev,
                libsctp-dev,
                libyaml-dev,
@@ -120,11 +121,29 @@ Description: UPF (User Plane Function)
  .
  This package provides the UPF (User Plane Function)
 
+Package: open5gs-hss
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         mongodb-org | mongodb,
+         open5gs-common (= ${binary:Version})
+Description: HSS (Home Subscriber Server)
+ Open5GS is a C-language implementation of 5G Core and EPC
+ Packet Core, i.e. the core network of an NR/LTE network (Release-17)
+ .
+ This package provides the HSS (Home Subscriber Server) element of the
+ EPC, i.e. the central database of mobile network subscribers, with
+ their IMSI, MSISDN, cryptographic key materials, service subscription
+ information, etc.  It implements the S6a interface towards the MME
+ using the DIAMETER protocol.
+
 Package: open5gs-pcrf
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         mongodb-org | mongodb,
          open5gs-common (= ${binary:Version})
 Description: PCRF (Policy and Charging Rules Function)
  Open5GS is a C-language implementation of 5G Core and EPC
@@ -254,6 +273,7 @@ Depends: ${misc:Depends},
          open5gs-amf (= ${binary:Version}),
          open5gs-sgwu (= ${binary:Version}),
          open5gs-upf (= ${binary:Version}),
+         open5gs-hss (= ${binary:Version}),
          open5gs-pcrf (= ${binary:Version}),
          open5gs-nrf (= ${binary:Version}),
          open5gs-scp (= ${binary:Version}),

debian/open5gs-hss.install

@@ -0,0 +1,6 @@
+usr/bin/open5gs-hssd
+configs/freeDiameter/hss.* etc/freeDiameter
+configs/open5gs/hss.yaml etc/open5gs
+configs/open5gs/tls/hss.key etc/open5gs/tls
+configs/open5gs/tls/hss.crt etc/open5gs/tls
+configs/systemd/open5gs-hssd.service lib/systemd/system

lib/dbi/ims.c

@@ -19,7 +19,6 @@
 
 #include "ogs-dbi.h"
 
-#ifdef OGS_DBI_WITH_MONGODB
 int ogs_dbi_msisdn_data(
         char *imsi_or_msisdn_bcd, ogs_msisdn_data_t *msisdn_data)
 {
@@ -203,15 +202,3 @@ out:
 
     return rv;
 }
-#else /* OGS_DBI_WITH_MONGODB */
-int ogs_dbi_msisdn_data(
-        char *imsi_or_msisdn_bcd, ogs_msisdn_data_t *msisdn_data)
-{
-    return OGS_ERROR;
-}
-
-int ogs_dbi_ims_data(char *supi, ogs_ims_data_t *ims_data)
-{
-    return OGS_ERROR;
-}
-#endif

lib/dbi/meson.build

@@ -25,6 +25,9 @@ libdbi_sources = files('''
     session.c
     ims.c
 '''.split())
+
+libmongoc_dep = dependency('libmongoc-1.0')
+
 libdbi_inc = include_directories('.')
 
 libdbi = library('ogsdbi',
@@ -32,10 +35,10 @@ libdbi = library('ogsdbi',
     version : libogslib_version,
     c_args : '-DOGS_DBI_COMPILATION',
     include_directories : [libdbi_inc, libinc],
-    dependencies : [libproto_dep],
+    dependencies : [libproto_dep, libmongoc_dep],
     install : true)
 
 libdbi_dep = declare_dependency(
     link_with : libdbi,
     include_directories : [libdbi_inc, libinc],
-    dependencies : [libproto_dep])
+    dependencies : [libproto_dep, libmongoc_dep])

lib/dbi/meson_dummy.h

@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com>
- *
- * This file is part of Open5GS.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#ifndef MESON_DUMMY_H
-#define MESON_DUMMY_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct dummy_bson;
-typedef struct dummy_bson bson_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MESON_DUMMY_H */

lib/dbi/ogs-mongoc.c

@@ -17,14 +17,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <mongoc.h>
+
 #include "ogs-dbi.h"
 
 int __ogs_dbi_domain;
 
-#ifdef OGS_DBI_WITH_MONGODB
-#include <mongoc.h>
-
-
 static ogs_mongoc_t self;
 
 /*
@@ -222,28 +220,3 @@ int ogs_dbi_collection_watch_init(void)
     return OGS_ERROR;
 #endif
 }
-
-#else /* OGS_DBI_WITH_MONGODB */
-int ogs_mongoc_init(const char *db_uri)
-{
-    return OGS_ERROR;
-}
-
-void ogs_mongoc_final(void)
-{
-}
-
-ogs_mongoc_t *ogs_mongoc(void)
-{
-    return NULL;
-}
-
-int ogs_dbi_init(const char *db_uri)
-{
-    return OGS_OK;
-}
-
-void ogs_dbi_final()
-{
-}
-#endif

lib/dbi/ogs-mongoc.h

@@ -24,6 +24,8 @@
 #ifndef OGS_MONGOC_H
 #define OGS_MONGOC_H
 
+#include <mongoc.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */

lib/dbi/session.c

@@ -19,7 +19,6 @@
 
 #include "ogs-dbi.h"
 
-#ifdef OGS_DBI_WITH_MONGODB
 int ogs_dbi_session_data(char *supi, ogs_s_nssai_t *s_nssai, char *dnn,
         ogs_session_data_t *session_data)
 {
@@ -504,27 +503,3 @@ out:
 
     return rv;
 }
-
-#else /* OGS_DBI_WITH_MONGODB */
-
-int ogs_dbi_session_data(char *supi, ogs_s_nssai_t *s_nssai, char *dnn,
-        ogs_session_data_t *session_data)
-{
-	ogs_session_t *session = &session_data->session;
-	ogs_qos_t *qos = &session->qos;
-
-	session->name = ogs_strndup("staticprof", strlen("foobar"));
-	/* check if have to set type */
-	session->ambr.downlink = 300 * 1024 * 1024;
-	session->ambr.uplink = 150 * 1024 * 1024;
-
-	session->qos.index = OGS_QOS_INDEX_5;
-	session->qos.arp.priority_level = 1;
-	session->qos.mbr.downlink = 10;
-	session->qos.mbr.uplink = 10;
-	session->qos.gbr.downlink = 10;
-	session->qos.gbr.uplink = 10;
-
-    return OGS_OK;
-}
-#endif /* OGS_DBI_WITH_MONGODB */

lib/dbi/subscription.c

@@ -19,7 +19,6 @@
 
 #include "ogs-dbi.h"
 
-#ifdef OGS_DBI_WITH_MONGODB
 int ogs_dbi_auth_info(char *supi, ogs_dbi_auth_info_t *auth_info)
 {
     int rv = OGS_OK;
@@ -817,31 +816,3 @@ out:
 
     return rv;
 }
-#else
-int ogs_dbi_auth_info(char *supi, ogs_dbi_auth_info_t *auth_info)
-{
-    return OGS_ERROR;
-}
-
-int ogs_dbi_update_sqn(char *supi, uint64_t sqn)
-{
-    return OGS_ERROR;
-}
-
-int ogs_dbi_update_imeisv(char *supi, char *imeisv)
-{
-    return OGS_ERROR;
-}
-
-int ogs_dbi_increment_sqn(char *supi)
-{
-	return OGS_ERROR;
-}
-
-int ogs_dbi_subscription_data(char *supi,
-        ogs_subscription_data_t *subscription_data)
-{
-    return OGS_ERROR;
-}
-
-#endif /* OGS_DBI_WITH_MONGODB */

lib/sctp/meson.build

@@ -46,7 +46,6 @@ if host_system == 'darwin'
     libsctp_sources += files('ogs-usrsctp.c')
     libsctp_conf.set('HAVE_USRSCTP', 1)
 else
-    libsctp_conf.set('HAVE_NETINET_SCTP_H', 1)
     sctp_dep = cc.find_library('sctp', required : false)
     libsctp_sources += files('ogs-lksctp.c')
 endif

meson.build

@@ -127,7 +127,7 @@ subdir('src')
 subdir('misc')
 # Don't build the tests unless we can run them (either natively or in an exe wrapper)
 build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
-if build_tests and get_option('mongodb')
+if build_tests
     subdir('tests')
 endif
 

meson_options.txt

@@ -1,4 +1,2 @@
 option('fuzzing', type: 'boolean', value: false, description: 'Enable fuzzing tests')
 option('lib_fuzzing_engine', type : 'string', value : '', description : 'Path to the libFuzzer engine library')
-option('metrics_impl', type : 'combo', choices : ['void', 'prometheus'], value : 'void', description : 'libogsmetrics implementation')
-option('mongodb', type : 'boolean', value : 'false', description : 'build with mongo db support')

src/meson.build

@@ -34,9 +34,7 @@ version_conf.set_quoted('OPEN5GS_VERSION', package_version)
 configure_file(output : 'version.h', configuration : version_conf)
 
 subdir('mme')
-if get_option('mongodb')
-	subdir('hss')
-endif
+subdir('hss')
 subdir('sgwc')
 subdir('sgwu')
 subdir('pcrf')

src/mme/esm-handler.c

@@ -187,14 +187,8 @@ int esm_handle_information_response(mme_sess_t *sess,
 
     if (rsp->presencemask &
             OGS_NAS_EPS_ESM_INFORMATION_RESPONSE_ACCESS_POINT_NAME_PRESENT) {
-        ogs_session_t *session = mme_session_find_by_apn(
+        sess->session = mme_session_find_by_apn(
                             mme_ue, rsp->access_point_name.apn);
-        if (session) {
-            sess->session = session;
-        } else {
-            ogs_error("    APN[%s] not found, using default!", rsp->access_point_name.apn);
-            sess->session = mme_default_session(mme_ue);
-        }
     }
 
     if (rsp->presencemask &

src/sepp/meson_dummy.h

@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com>
- *
- * This file is part of Open5GS.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#ifndef MESON_DUMMY_H
-#define MESON_DUMMY_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct dummy_bson;
-typedef struct dummy_bson bson_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MESON_DUMMY_H */

src/sepp/n32c-build.h

@@ -22,8 +22,6 @@
 
 #include "context.h"
 
-#include "meson_dummy.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif