Osmocom Open Build Service

commit_2434f1e4f1f26c700760f0ed341da34a38257a03.txt Added

commit_fd897f35a3994e775edf81bf2263732e52aff205.txt Deleted

open5gs_2.7.6.4777.fd89.tar.xz/lib/metrics/prometheus/pager.h Deleted

@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2025 by Juraj Elias <juraj.elias@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 OGS_METRICS_PROM_PAGER_H
-#define OGS_METRICS_PROM_PAGER_H
-
-#include <stddef.h>
-
-/* NF-specific optional pager setter signatures.
- * NFs may assign these at init time. If left NULL, paging is ignored for that NF.
- */
-
-typedef void (*ogs_metrics_pager_fn)(size_t page, size_t page_size);
-
-/* Connected PDUs (SMF) */
-extern ogs_metrics_pager_fn ogs_metrics_pdu_info_set_pager;
-extern ogs_metrics_pager_fn ogs_metrics_ue_info_set_pager;
-extern ogs_metrics_pager_fn ogs_metrics_gnb_info_set_pager;
-extern ogs_metrics_pager_fn ogs_metrics_enb_info_set_pager;
-
-#endif /* OGS_METRICS_PROM_PAGER_H */
-

open5gs_2.7.6.4777.fd89.dsc -> open5gs_2.7.6.4780.2434.dsc Changed

@@ -2,7 +2,7 @@
 Source: open5gs
 Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-scp, open5gs-sepp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
 Architecture: any
-Version: 2.7.6.4777.fd89
+Version: 2.7.6.4780.2434
 Maintainer: Harald Welte <laforge@gnumonks.org>
 Uploaders: Sukchan Lee <acetcom@gmail.com>
 Homepage: https://open5gs.org
@@ -32,8 +32,8 @@
  open5gs-udr deb net optional arch=any
  open5gs-upf deb net optional arch=any
 Checksums-Sha1:
- 98e899a7d5fb600ea467c7986fa7f762c44fd545 15090308 open5gs_2.7.6.4777.fd89.tar.xz
+ d038aa37b48bfeb8c0f4524b7ef794f6abe04b03 15084636 open5gs_2.7.6.4780.2434.tar.xz
 Checksums-Sha256:
- 5c276268a5c6185a73092ef00480baa4c0dfa739dc18cdb38253f2f962f7f294 15090308 open5gs_2.7.6.4777.fd89.tar.xz
+ 5607038f4a2f02544d2de98f689dc380e4d64eccbc0a010adba0e08e6192ac4f 15084636 open5gs_2.7.6.4780.2434.tar.xz
 Files:
- 0e6e366f742bf0cf6c9df826b44b7cc9 15090308 open5gs_2.7.6.4777.fd89.tar.xz
+ bc90ab7676fc162aa25d11cba993b870 15084636 open5gs_2.7.6.4780.2434.tar.xz

open5gs_2.7.6.4777.fd89.tar.xz/.tarball-version -> open5gs_2.7.6.4780.2434.tar.xz/.tarball-version Changed

open5gs_2.7.6.4777.fd89.tar.xz/debian/changelog -> open5gs_2.7.6.4780.2434.tar.xz/debian/changelog Changed

open5gs_2.7.6.4777.fd89.tar.xz/lib/metrics/context.c -> open5gs_2.7.6.4780.2434.tar.xz/lib/metrics/context.c Changed

@@ -25,30 +25,6 @@
 
 #define DEFAULT_PROMETHEUS_HTTP_PORT       9090
 
-size_t (*ogs_metrics_pdu_info_dumper)(char *buf, size_t buflen) = NULL;
-size_t (*ogs_metrics_ue_info_dumper)(char *buf, size_t buflen) = NULL;
-size_t (*ogs_metrics_gnb_info_dumper)(char *buf, size_t buflen) = NULL;
-size_t (*ogs_metrics_enb_info_dumper)(char *buf, size_t buflen) = NULL;
-
-void ogs_metrics_register_ue_info(size_t (*fn)(char *buf, size_t buflen))
-{
-    ogs_metrics_ue_info_dumper = fn;
-}
-
-void ogs_metrics_register_pdu_info(size_t (*fn)(char *buf, size_t buflen))
-{
-    ogs_metrics_pdu_info_dumper = fn;
-}
-
-void ogs_metrics_register_gnb_info(size_t (*fn)(char *buf, size_t buflen))
-{
-    ogs_metrics_gnb_info_dumper = fn;
-}
-
-void ogs_metrics_register_enb_info(size_t (*fn)(char *buf, size_t buflen))
-{
-    ogs_metrics_enb_info_dumper = fn;
-}
 int __ogs_metrics_domain;
 static ogs_metrics_context_t self;
 static int context_initialized = 0;
@@ -65,6 +41,8 @@
     ogs_metrics_spec_init(ogs_metrics_self());
     ogs_metrics_server_init(ogs_metrics_self());
 
+    ogs_list_init(&self.custom_eps);
+
     context_initialized = 1;
 }
 
@@ -74,7 +52,15 @@
 }
 void ogs_metrics_context_close(ogs_metrics_context_t *ctx)
 {
+    ogs_metrics_custom_ep_t *node = NULL, *node_next = NULL;
+
     ogs_metrics_server_close(ctx);
+
+    ogs_list_for_each_safe(&self.custom_eps, node_next, node) {
+        if (node->endpoint) ogs_free(node->endpoint);
+        ogs_list_remove(&self.custom_eps, node);
+        ogs_free(node);
+    }
 }
 
 void ogs_metrics_context_final(void)
@@ -290,3 +276,18 @@
 
     return OGS_OK;
 }
+
+
+void ogs_metrics_register_custom_ep(ogs_metrics_custom_ep_hdlr_t handler,
+        const char *endpoint)
+{
+    ogs_metrics_custom_ep_t *ep;
+
+    ep = ogs_calloc(1, sizeof(*ep));
+    ogs_assert(ep);
+
+    ep->endpoint = ogs_strdup(endpoint);
+    ep->handler = handler;
+
+    ogs_list_add(&self.custom_eps, ep);
+}

open5gs_2.7.6.4777.fd89.tar.xz/lib/metrics/context.h -> open5gs_2.7.6.4780.2434.tar.xz/lib/metrics/context.h Changed

open5gs_2.7.6.4777.fd89.tar.xz/lib/metrics/ogs-metrics.h -> open5gs_2.7.6.4780.2434.tar.xz/lib/metrics/ogs-metrics.h Changed

open5gs_2.7.6.4777.fd89.tar.xz/lib/metrics/prometheus/context.c -> open5gs_2.7.6.4780.2434.tar.xz/lib/metrics/prometheus/context.c Changed

@@ -36,12 +36,7 @@
 #include "prom.h"
 #include "microhttpd.h"
 #include <string.h>
-#include "prometheus/pager.h"
 
-ogs_metrics_pager_fn ogs_metrics_pdu_info_set_pager  = NULL;
-ogs_metrics_pager_fn ogs_metrics_gnb_info_set_pager = NULL;
-ogs_metrics_pager_fn ogs_metrics_enb_info_set_pager = NULL;
-ogs_metrics_pager_fn ogs_metrics_ue_info_set_pager  = NULL;
 
 extern int __ogs_metrics_domain;
 #define MAX_LABELS 8
@@ -199,17 +194,11 @@
 
 /* Small helper to serve JSON from a registered dumper */
 static _MHD_Result serve_json_from_dumper(struct MHD_Connection *connection,
-                                          size_t (*dumper)(char*, size_t),
-                                          const char *missing_msg)
+                                          ogs_metrics_custom_ep_hdlr_t handler,
+                                          size_t page, size_t page_size)
 {
-    if (!dumper) {
-        struct MHD_Response *rsp = MHD_create_response_from_buffer(strlen(missing_msg),
-                                (void*)missing_msg, MHD_RESPMEM_PERSISTENT);
-        if (!rsp) return (_MHD_Result)MHD_NO;
-        int ret = MHD_queue_response(connection, MHD_HTTP_NOT_FOUND, rsp);
-        MHD_destroy_response(rsp);
-        return (_MHD_Result)ret;
-    }
+    ogs_assert(connection);
+    ogs_assert(handler);
 
     size_t cap = 512 * 1024;
     char *bufjson = (char *)ogs_malloc(cap);
@@ -223,7 +212,7 @@
         return (_MHD_Result)ret;
     }
 
-    size_t n = dumper(bufjson, cap);
+    size_t n = handler(bufjson, cap, page, page_size);
     if (n >= cap - 1) {
         /* grow once */
         size_t newcap = cap * 2;
@@ -239,7 +228,7 @@
             return (_MHD_Result)ret;
         }
         bufjson = tmp; cap = newcap;
-        n = dumper(bufjson, cap);
+        n = handler(bufjson, cap, page, page_size);
         if (n >= cap - 1) {
             /* graceful fallback */
             n = ogs_snprintf(bufjson, cap, "");
@@ -308,46 +297,17 @@
         MHD_destroy_response(rsp);
         return (_MHD_Result)ret;
     }
- 
-    /* JSON: connected PDUs (SMF) */
-    if (strcmp(url, "/pdu-info") == 0) {
-        size_t page = get_query_size_t(connection, "page", 0);
-        size_t page_size = get_query_size_t(connection, "page_size", 100);
-        if (ogs_metrics_pdu_info_set_pager)
-            ogs_metrics_pdu_info_set_pager(page, page_size);
-        return serve_json_from_dumper(connection, ogs_metrics_pdu_info_dumper,
-                                      "pdu-info endpoint not available on this NF\n");
-    }
 
-    /* JSON: connected gNBs (AMF) */
-    if (strcmp(url, "/gnb-info") == 0) {
-        size_t page = get_query_size_t(connection, "page", 0);
-        size_t page_size = get_query_size_t(connection, "page_size", 100);
-        if (ogs_metrics_gnb_info_set_pager)
-            ogs_metrics_gnb_info_set_pager(page, page_size);
-        return serve_json_from_dumper(connection, ogs_metrics_gnb_info_dumper,
-                                      "gnb-info endpoint not available on this NF\n");
-    }
-
-    /* JSON: connected eNBs (MME) */
-    if (strcmp(url, "/enb-info") == 0) {
-        size_t page = get_query_size_t(connection, "page", 0);
-        size_t page_size = get_query_size_t(connection, "page_size", 100);
-        if (ogs_metrics_enb_info_set_pager)
-            ogs_metrics_enb_info_set_pager(page, page_size);
-        return serve_json_from_dumper(connection, ogs_metrics_enb_info_dumper,
-                                      "enb-info endpoint not available on this NF\n");
-    }
-
-    /* JSON: connected UEs (AMF/MME) */
-    if (strcmp(url, "/ue-info") == 0) {
-        size_t page = get_query_size_t(connection, "page", 0);
-        size_t page_size = get_query_size_t(connection, "page_size", 100);
-        if (ogs_metrics_ue_info_set_pager)
-            ogs_metrics_ue_info_set_pager(page, page_size);
-        return serve_json_from_dumper(connection, ogs_metrics_ue_info_dumper,
-                                      "ue-info endpoint not available on this NF\n");
+    size_t page = get_query_size_t(connection, "page", 0);
+    size_t page_size = get_query_size_t(connection, "page_size", 100);
 
+    ogs_metrics_custom_ep_t *node = NULL;
+    ogs_list_for_each(&ogs_metrics_self()->custom_eps, node) {
+        if (!strcmp(node->endpoint, url)) {
+            return serve_json_from_dumper(connection,
+                    node->handler,
+                    page, page_size);
+        }
     }
 
     /* No matching route */

open5gs_2.7.6.4777.fd89.tar.xz/src/amf/gnb-info.c -> open5gs_2.7.6.4780.2434.tar.xz/src/amf/gnb-info.c Changed

@@ -94,18 +94,9 @@
 #define GNB_INFO_PAGE_SIZE_DEFAULT 100U
 #endif
 
-static size_t g_page = SIZE_MAX;      /* SIZE_MAX => no paging */
-static size_t g_page_size = 0;        /* 0 => use default in dumper */
-
-void amf_metrics_gnb_info_set_pager(size_t page, size_t page_size)
-{
-    g_page = page;
-    g_page_size = page_size;
-}
-
-size_t amf_dump_gnb_info(char *buf, size_t buflen)
+size_t amf_dump_gnb_info(char *buf, size_t buflen, size_t page, size_t page_size)
 {
-    return amf_dump_gnb_info_paged(buf, buflen, g_page, g_page_size);
+    return amf_dump_gnb_info_paged(buf, buflen, page, page_size);
 }
 
 static inline uint32_t u24_to_u32(ogs_uint24_t v)
@@ -208,8 +199,9 @@
             if (!tas) { cJSON_Delete(g); oom = true; break; }
 
             bool inner_oom = false;
+            int t;
 
-            for (int t = 0; t < gnb->num_of_supported_ta_list; t++) {
+            for (t = 0; t < gnb->num_of_supported_ta_list; t++) {
                 const ogs_uint24_t tac = gnb->supported_ta_listt.tac;
                 const int nbp = gnb->supported_ta_listt.num_of_bplmn_list;
 
@@ -223,8 +215,9 @@
                 if (!bplmns) { cJSON_Delete(ta); inner_oom = true; break; }
 
                 bool inner2_oom = false;
+                int p;
 
-                for (int p = 0; p < nbp; p++) {
+                for (p = 0; p < nbp; p++) {
                     const ogs_plmn_id_t *bp_plmn = &gnb->supported_ta_listt.bplmn_listp.plmn_id;
                     const int ns = gnb->supported_ta_listt.bplmn_listp.num_of_s_nssai;
                     const ogs_s_nssai_t *sn = gnb->supported_ta_listt.bplmn_listp.s_nssai;
@@ -238,8 +231,9 @@
                     if (!sns) { cJSON_Delete(bp); inner2_oom = true; break; }
 
                     bool inner3_oom = false;
+                    int i;
 
-                    for (int i = 0; i < ns; i++) {
+                    for (i = 0; i < ns; i++) {
                         cJSON *o = cJSON_CreateObject();
                         if (!o) { inner3_oom = true; break; }

open5gs_2.7.6.4777.fd89.tar.xz/src/amf/gnb-info.h -> open5gs_2.7.6.4780.2434.tar.xz/src/amf/gnb-info.h Changed

open5gs_2.7.6.4777.fd89.tar.xz/src/amf/init.c -> open5gs_2.7.6.4780.2434.tar.xz/src/amf/init.c Changed

open5gs_2.7.6.4777.fd89.tar.xz/src/amf/ue-info.c -> open5gs_2.7.6.4780.2434.tar.xz/src/amf/ue-info.c Changed

@@ -115,20 +115,12 @@
 #include "sbi/openapi/external/cJSON.h"
 #include "metrics/prometheus/json_pager.h"
 
-static size_t g_ue_page = 0;
-static size_t g_ue_page_size = 0;
 
-void amf_metrics_ue_info_set_pager(size_t page, size_t page_size)
+size_t amf_dump_ue_info(char *buf, size_t buflen, size_t page, size_t page_size)
 {
-    g_ue_page = page;
-    g_ue_page_size = page_size;
-}
-
-size_t amf_dump_ue_info(char *buf, size_t buflen)
-{
-    size_t page = g_ue_page;
-    size_t page_size = g_ue_page_size ? g_ue_page_size : 100;
+    page_size = page_size ? page_size : 100;
     if (page_size > 100) page_size = 100;
+
     return amf_dump_ue_info_paged(buf, buflen, page, page_size);
 }
 
@@ -343,9 +335,11 @@
 static int add_msisdn_array(cJSON *parent, const amf_ue_t *ue)
 {
     cJSON *arr = cJSON_CreateArray();
+    int i;
+
     if (!arr) return -1;
 
-    for (int i = 0; i < ue->num_of_msisdn; i++) {
+    for (i = 0; i < ue->num_of_msisdn; i++) {
         if (!ue->msisdni || !ue->msisdni0) continue;
         cJSON *s = cJSON_CreateString(ue->msisdni);
         if (!s) { cJSON_Delete(arr); return -1; }
@@ -478,10 +472,12 @@
 {
     cJSON *req = cJSON_CreateArray();
     cJSON *allow = cJSON_CreateArray();
+    int i;
+
     if (!req || !allow) { if (req) cJSON_Delete(req); if (allow) cJSON_Delete(allow); return -1; }
 
     /* requested */
-    for (int i = 0; i < ue->requested_nssai.num_of_s_nssai; i++) {
+    for (i = 0; i < ue->requested_nssai.num_of_s_nssai; i++) {
         const ogs_nas_s_nssai_ie_t *ie = &ue->requested_nssai.s_nssaii;
         cJSON *sn = cJSON_CreateObject();
         if (!sn) { cJSON_Delete(req); cJSON_Delete(allow); return -1; }
@@ -493,7 +489,7 @@
     }
 
     /* allowed */
-    for (int i = 0; i < ue->allowed_nssai.num_of_s_nssai; i++) {
+    for (i = 0; i < ue->allowed_nssai.num_of_s_nssai; i++) {
         const ogs_nas_s_nssai_ie_t *ie = &ue->allowed_nssai.s_nssaii;
         cJSON *sn = cJSON_CreateObject();
         if (!sn) { cJSON_Delete(req); cJSON_Delete(allow); return -1; }
@@ -537,7 +533,8 @@
     cJSON *labels = cJSON_CreateArray();
     if (!bits || !labels) { if (bits) cJSON_Delete(bits); if (labels) cJSON_Delete(labels); cJSON_Delete(feat); return -1; }
 
-    for (int i = 0; i < 64; i++) {
+    int i;
+    for (i = 0; i < 64; i++) {
         if ((f >> i) & 1ULL) {
             cJSON *bi = cJSON_CreateNumber((double)i);
             if (!bi) { cJSON_Delete(bits); cJSON_Delete(labels); cJSON_Delete(feat); return -1; }

open5gs_2.7.6.4777.fd89.tar.xz/src/amf/ue-info.h -> open5gs_2.7.6.4780.2434.tar.xz/src/amf/ue-info.h Changed

open5gs_2.7.6.4777.fd89.tar.xz/src/mme/enb-info.c -> open5gs_2.7.6.4780.2434.tar.xz/src/mme/enb-info.c Changed

@@ -73,20 +73,12 @@
 #define ENB_INFO_PAGE_SIZE_DEFAULT 100U
 #endif
 
-static size_t g_enb_page = 0;
-static size_t g_enb_page_size = 0;
 
-void mme_metrics_enb_info_set_pager(size_t page, size_t page_size)
+size_t mme_dump_enb_info(char *buf, size_t buflen, size_t page, size_t page_size)
 {
-    g_enb_page = page;
-    g_enb_page_size = page_size;
-}
-
-size_t mme_dump_enb_info(char *buf, size_t buflen)
-{
-    size_t page = g_enb_page;
-    size_t page_size = g_enb_page_size ? g_enb_page_size : ENB_INFO_PAGE_SIZE_DEFAULT;
+    page_size = page_size ? page_size : ENB_INFO_PAGE_SIZE_DEFAULT;
     if (page_size > ENB_INFO_PAGE_SIZE_DEFAULT) page_size = ENB_INFO_PAGE_SIZE_DEFAULT;
+
     return mme_dump_enb_info_paged(buf, buflen, page, page_size);
 }
 
@@ -206,8 +198,9 @@
             if (!tas) { cJSON_Delete(e); oom = true; break; }
 
             bool inner_oom = false;
+            int t;
 
-            for (int t = 0; t < enb->num_of_supported_ta_list; t++) {
+            for (t = 0; t < enb->num_of_supported_ta_list; t++) {
                 cJSON *ta = cJSON_CreateObject();
                 if (!ta) { inner_oom = true; break; }

open5gs_2.7.6.4777.fd89.tar.xz/src/mme/enb-info.h -> open5gs_2.7.6.4780.2434.tar.xz/src/mme/enb-info.h Changed

open5gs_2.7.6.4777.fd89.tar.xz/src/mme/mme-init.c -> open5gs_2.7.6.4780.2434.tar.xz/src/mme/mme-init.c Changed

open5gs_2.7.6.4777.fd89.tar.xz/src/mme/ue-info.c -> open5gs_2.7.6.4780.2434.tar.xz/src/mme/ue-info.c Changed

open5gs_2.7.6.4777.fd89.tar.xz/src/mme/ue-info.h -> open5gs_2.7.6.4780.2434.tar.xz/src/mme/ue-info.h Changed

open5gs_2.7.6.4777.fd89.tar.xz/src/smf/init.c -> open5gs_2.7.6.4780.2434.tar.xz/src/smf/init.c Changed

open5gs_2.7.6.4777.fd89.tar.xz/src/smf/pdu-info.c -> open5gs_2.7.6.4780.2434.tar.xz/src/smf/pdu-info.c Changed

open5gs_2.7.6.4777.fd89.tar.xz/src/smf/pdu-info.h -> open5gs_2.7.6.4780.2434.tar.xz/src/smf/pdu-info.h Changed

Changes of Revision 696