- gerrit-log - lists.osmocom.org

[L] Change in libosmo-sigtran[master]: Make osmo_ss7_route_table APIs private
by pespin 04 Nov '24

04 Nov '24

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38626?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Make osmo_ss7_route_table APIs private ...................................................................... Make osmo_ss7_route_table APIs private The routing table is actually handled internally through VTY and no user is making use of it. Make it private, to ease extension in the future (it will be extended to eg. support combined link load sharing). Change-Id: Ie7c709c9849ef3d50aef94f79751c9c4a010c92a --- M include/osmocom/sigtran/osmo_ss7.h M src/Makefile.am M src/osmo_ss7.c M src/osmo_ss7_as.c M src/osmo_ss7_hmrt.c A src/osmo_ss7_route_table.c M src/osmo_ss7_vty.c M src/sccp_user.c A src/ss7_route_table.h M src/xua_as_fsm.c M src/xua_rkm.c M tests/ss7/ss7_test.c 12 files changed, 188 insertions(+), 142 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/26/38626/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38626?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ie7c709c9849ef3d50aef94f79751c9c4a010c92a Gerrit-Change-Number: 38626 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[M] Change in libosmo-sigtran[master]: Make osmo_ss7_route_table APIs private
by pespin 04 Nov '24

04 Nov '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38626?usp=email ) Change subject: Make osmo_ss7_route_table APIs private ...................................................................... Make osmo_ss7_route_table APIs private The routing table is actually handled internally through VTY and no user is making use of it. Make it private, to ease extension in the future (it will be extended to eg. support combined link load sharing). Change-Id: Ie7c709c9849ef3d50aef94f79751c9c4a010c92a --- M include/osmocom/sigtran/osmo_ss7.h M src/Makefile.am M src/osmo_ss7.c M src/osmo_ss7_as.c M src/osmo_ss7_hmrt.c A src/osmo_ss7_route_table.c M src/osmo_ss7_vty.c A src/ss7_route_table.h M tests/ss7/ss7_test.c 9 files changed, 115 insertions(+), 74 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/26/38626/1 diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 049c7d8..1fb4cfc 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -18,6 +18,7 @@ struct osmo_sccp_instance; struct osmo_mtp_prim; struct osmo_xua_layer_manager; +struct osmo_ss7_route_table; int osmo_ss7_init(void); int osmo_ss7_find_free_rctx(struct osmo_ss7_instance *inst); @@ -38,30 +39,6 @@ } /*********************************************************************** - * SS7 Routing Tables - ***********************************************************************/ - -struct osmo_ss7_route_table { - /*! member in list of routing tables */ - struct llist_head list; - /*! \ref osmo_ss7_instance to which we belong */ - struct osmo_ss7_instance *inst; - /*! list of \ref osmo_ss7_route */ - struct llist_head routes; - - struct { - char *name; - char *description; - } cfg; -}; - -struct osmo_ss7_route_table * -osmo_ss7_route_table_find(struct osmo_ss7_instance *inst, const char *name); -struct osmo_ss7_route_table * -osmo_ss7_route_table_find_or_create(struct osmo_ss7_instance *inst, const char *name); -void osmo_ss7_route_table_destroy(struct osmo_ss7_route_table *rtbl); - -/*********************************************************************** * SS7 Instances ***********************************************************************/ diff --git a/src/Makefile.am b/src/Makefile.am index 2a257ae..5dddb05 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,6 +5,7 @@ noinst_HEADERS = \ sccp_internal.h \ ss7_internal.h \ + ss7_route_table.h \ xua_asp_fsm.h \ xua_as_fsm.h \ xua_internal.h \ @@ -37,6 +38,7 @@ osmo_ss7_hmrt.c \ osmo_ss7_vty.c \ osmo_ss7_xua_srv.c \ + osmo_ss7_route_table.c \ sccp2sua.c \ sccp_helpers.c \ sccp_lbcs.c \ diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 93bcfc2..1a19e2a 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -51,6 +51,7 @@ #include "sccp_internal.h" #include "xua_internal.h" #include "ss7_internal.h" +#include "ss7_route_table.h" #include "xua_asp_fsm.h" #include "xua_as_fsm.h" @@ -342,7 +343,7 @@ INIT_LLIST_HEAD(&inst->asp_list); INIT_LLIST_HEAD(&inst->rtable_list); INIT_LLIST_HEAD(&inst->xua_servers); - inst->rtable_system = osmo_ss7_route_table_find_or_create(inst, "system"); + inst->rtable_system = ss7_route_table_find_or_create(inst, "system"); /* default point code structure + formatting */ inst->cfg.pc_fmt.delimiter = '.'; @@ -610,49 +611,6 @@ return link; } - -/*********************************************************************** - * SS7 Route Tables - ***********************************************************************/ - -struct osmo_ss7_route_table * -osmo_ss7_route_table_find(struct osmo_ss7_instance *inst, const char *name) -{ - struct osmo_ss7_route_table *rtbl; - OSMO_ASSERT(ss7_initialized); - llist_for_each_entry(rtbl, &inst->rtable_list, list) { - if (!strcmp(rtbl->cfg.name, name)) - return rtbl; - } - return NULL; -} - -struct osmo_ss7_route_table * -osmo_ss7_route_table_find_or_create(struct osmo_ss7_instance *inst, const char *name) -{ - struct osmo_ss7_route_table *rtbl; - - OSMO_ASSERT(ss7_initialized); - rtbl = osmo_ss7_route_table_find(inst, name); - if (!rtbl) { - LOGSS7(inst, LOGL_INFO, "Creating Route Table %s\n", name); - rtbl = talloc_zero(inst, struct osmo_ss7_route_table); - rtbl->inst = inst; - rtbl->cfg.name = talloc_strdup(rtbl, name); - INIT_LLIST_HEAD(&rtbl->routes); - llist_add_tail(&rtbl->list, &inst->rtable_list); - } - return rtbl; -} - -void osmo_ss7_route_table_destroy(struct osmo_ss7_route_table *rtbl) -{ - llist_del(&rtbl->list); - /* routes are allocated as children of route table, will be - * automatically freed() */ - talloc_free(rtbl); -} - /*********************************************************************** * SS7 Routes ***********************************************************************/ diff --git a/src/osmo_ss7_as.c b/src/osmo_ss7_as.c index 9683e94..87e7e04 100644 --- a/src/osmo_ss7_as.c +++ b/src/osmo_ss7_as.c @@ -33,6 +33,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/logging.h> +#include "ss7_route_table.h" #include "ss7_internal.h" #include "xua_as_fsm.h" #include "xua_asp_fsm.h" diff --git a/src/osmo_ss7_hmrt.c b/src/osmo_ss7_hmrt.c index 3ac43b8..57d7388 100644 --- a/src/osmo_ss7_hmrt.c +++ b/src/osmo_ss7_hmrt.c @@ -35,6 +35,7 @@ #include <osmocom/sigtran/protocol/m3ua.h> #include "xua_internal.h" +#include "ss7_route_table.h" #include "ss7_internal.h" /* convert from M3UA message to MTP-TRANSFER.ind osmo_mtp_prim */ diff --git a/src/osmo_ss7_route_table.c b/src/osmo_ss7_route_table.c new file mode 100644 index 0000000..311f13f --- /dev/null +++ b/src/osmo_ss7_route_table.c @@ -0,0 +1,71 @@ +/* (C) 2015-2017 by Harald Welte <laforge(a)gnumonks.org> + * (C) 2023-2024 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 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 <http://www.gnu.org/licenses/>. + * + */ + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/logging.h> +#include <osmocom/sigtran/mtp_sap.h> +#include <osmocom/sigtran/osmo_ss7.h> + +#include "ss7_route_table.h" +#include "ss7_internal.h" + +/*********************************************************************** + * SS7 Route Tables + ***********************************************************************/ + +struct osmo_ss7_route_table * +ss7_route_table_find(struct osmo_ss7_instance *inst, const char *name) +{ + struct osmo_ss7_route_table *rtbl; + OSMO_ASSERT(ss7_initialized); + llist_for_each_entry(rtbl, &inst->rtable_list, list) { + if (!strcmp(rtbl->cfg.name, name)) + return rtbl; + } + return NULL; +} + +struct osmo_ss7_route_table * +ss7_route_table_find_or_create(struct osmo_ss7_instance *inst, const char *name) +{ + struct osmo_ss7_route_table *rtbl; + + OSMO_ASSERT(ss7_initialized); + rtbl = ss7_route_table_find(inst, name); + if (!rtbl) { + LOGSS7(inst, LOGL_INFO, "Creating Route Table %s\n", name); + rtbl = talloc_zero(inst, struct osmo_ss7_route_table); + rtbl->inst = inst; + rtbl->cfg.name = talloc_strdup(rtbl, name); + INIT_LLIST_HEAD(&rtbl->routes); + llist_add_tail(&rtbl->list, &inst->rtable_list); + } + return rtbl; +} + +void +ss7_route_table_destroy(struct osmo_ss7_route_table *rtbl) +{ + llist_del(&rtbl->list); + /* routes are allocated as children of route table, will be + * automatically freed() */ + talloc_free(rtbl); +} diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index e3142c7..7c93039 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -46,6 +46,7 @@ #include "xua_internal.h" #include <osmocom/sigtran/sccp_sap.h> #include "sccp_internal.h" +#include "ss7_route_table.h" #include "ss7_internal.h" #include <netinet/tcp.h> diff --git a/src/ss7_route_table.h b/src/ss7_route_table.h new file mode 100644 index 0000000..25f0266 --- /dev/null +++ b/src/ss7_route_table.h @@ -0,0 +1,29 @@ +#pragma once + +#include <osmocom/core/linuxlist.h> + +/*********************************************************************** + * SS7 Routing Tables + ***********************************************************************/ + +struct osmo_ss7_instance; + +struct osmo_ss7_route_table { + /*! member in list of routing tables */ + struct llist_head list; + /*! \ref osmo_ss7_instance to which we belong */ + struct osmo_ss7_instance *inst; + /*! list of \ref osmo_ss7_route */ + struct llist_head routes; + + struct { + char *name; + char *description; + } cfg; +}; + +struct osmo_ss7_route_table * +ss7_route_table_find(struct osmo_ss7_instance *inst, const char *name); +struct osmo_ss7_route_table * +ss7_route_table_find_or_create(struct osmo_ss7_instance *inst, const char *name); +void ss7_route_table_destroy(struct osmo_ss7_route_table *rtbl); diff --git a/tests/ss7/ss7_test.c b/tests/ss7/ss7_test.c index ad8dc77..54a8e62 100644 --- a/tests/ss7/ss7_test.c +++ b/tests/ss7/ss7_test.c @@ -1,3 +1,4 @@ +#include "../src/ss7_route_table.h" #include "../src/xua_internal.h" #include "../src/xua_asp_fsm.h" @@ -143,15 +144,15 @@ printf("Testing SS7 routing\n"); /* creation / destruction */ - OSMO_ASSERT(osmo_ss7_route_table_find(s7i, "foobar") == NULL); - rtbl = osmo_ss7_route_table_find_or_create(s7i, "foobar"); + OSMO_ASSERT(ss7_route_table_find(s7i, "foobar") == NULL); + rtbl = ss7_route_table_find_or_create(s7i, "foobar"); OSMO_ASSERT(rtbl); - OSMO_ASSERT(osmo_ss7_route_table_find_or_create(s7i, "foobar") == rtbl); - osmo_ss7_route_table_destroy(rtbl); - OSMO_ASSERT(osmo_ss7_route_table_find(s7i, "foobar") == NULL); + OSMO_ASSERT(ss7_route_table_find_or_create(s7i, "foobar") == rtbl); + ss7_route_table_destroy(rtbl); + OSMO_ASSERT(ss7_route_table_find(s7i, "foobar") == NULL); /* we now work with system route table */ - rtbl = osmo_ss7_route_table_find(s7i, "system"); + rtbl = ss7_route_table_find(s7i, "system"); OSMO_ASSERT(rtbl && rtbl == s7i->rtable_system); lset_a = osmo_ss7_linkset_find_or_create(s7i, "a", 100); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38626?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ie7c709c9849ef3d50aef94f79751c9c4a010c92a Gerrit-Change-Number: 38626 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: sigtran: xua_msg.h,msg_types.h: Make headers private
by pespin 04 Nov '24

04 Nov '24

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38625?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: sigtran: xua_msg.h,msg_types.h: Make headers private ...................................................................... sigtran: xua_msg.h,msg_types.h: Make headers private Those headers are only used internally in libosmo-sigtran, since those objects have no real use outside of it. Mark the headers as no-install, which implicitly makes them private. This decreases the amount of public APIs the libosmo-sigtran has. Change-Id: Icd23bf9c9364c33ea2ba709e3ef4439813a168f4 --- M include/osmocom/sigtran/Makefile.am M src/Makefile.am M src/ipa.c M src/m3ua.c M src/sccp2sua.c M src/sua.c M src/xua_as_fsm.c M src/xua_asp_fsm.c M src/xua_internal.h M src/xua_msg.c R src/xua_msg.h M src/xua_rkm.c M src/xua_shared.c R src/xua_types.h M tests/m2ua/m2ua_test.c M tests/xua/xua_test.c 16 files changed, 21 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/25/38625/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38625?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Icd23bf9c9364c33ea2ba709e3ef4439813a168f4 Gerrit-Change-Number: 38625 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: sigtran: xua_msg.h,msg_types.h: Make headers private
by pespin 04 Nov '24

04 Nov '24

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38625?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: sigtran: xua_msg.h,msg_types.h: Make headers private ...................................................................... sigtran: xua_msg.h,msg_types.h: Make headers private Those headers are only used internally in libosmo-sigtran, since those objects have no real use outside of it. Mark the headers as no-install, which implicitly makes them private. This decreases the amount of public APIs the libosmo-sigtran has. Change-Id: Icd23bf9c9364c33ea2ba709e3ef4439813a168f4 --- M include/osmocom/sigtran/Makefile.am M src/Makefile.am R src/xua_msg.h R src/xua_types.h 4 files changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/25/38625/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38625?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Icd23bf9c9364c33ea2ba709e3ef4439813a168f4 Gerrit-Change-Number: 38625 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[S] Change in libosmo-sigtran[master]: sigtran: xua_msg.h,msg_types.h: Make headers private
by pespin 04 Nov '24

04 Nov '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38625?usp=email ) Change subject: sigtran: xua_msg.h,msg_types.h: Make headers private ...................................................................... sigtran: xua_msg.h,msg_types.h: Make headers private Those headers are only used internally in libosmo-sigtran, since those objects have no real use outside of it. Mark the headers as no-install, which implicitly makes them private since they won't be accessible to be used as they are not installed. This decreases the amount of public APIs the libosmo-sigtran has. Change-Id: Icd23bf9c9364c33ea2ba709e3ef4439813a168f4 --- M include/osmocom/sigtran/Makefile.am 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/25/38625/1 diff --git a/include/osmocom/sigtran/Makefile.am b/include/osmocom/sigtran/Makefile.am index 8d90b0b..19f9dba 100644 --- a/include/osmocom/sigtran/Makefile.am +++ b/include/osmocom/sigtran/Makefile.am @@ -1,5 +1,15 @@ -sigtran_HEADERS = xua_types.h xua_msg.h sccp_sap.h \ - sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h +noinst_HEADERS = \ + xua_msg.h \ + xua_types.h \ + $(NULL) + +sigtran_HEADERS = \ + mtp_sap.h \ + osmo_ss7.h \ + sccp_helpers.h \ + sccp_sap.h \ + sigtran_sap.h \ + $(NULL) sigtrandir = $(includedir)/osmocom/sigtran -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38625?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Icd23bf9c9364c33ea2ba709e3ef4439813a168f4 Gerrit-Change-Number: 38625 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-hnbgw[master]: Add PFCP stats item group
by pespin 04 Nov '24

04 Nov '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38616?usp=email ) Change subject: Add PFCP stats item group ...................................................................... Add PFCP stats item group This will be used by TTCN3 testsuite to figure out whether it should expect a PFCP Assoc Setup from HNBGW. Depends: libosmo-pfcp.git Change-Id Ibc8047856ddcc9c71f2b4cf30f577862b6b414ca Change-Id: Ic71df8df83e97f4015077677e426c803f84d31ea --- M TODO-RELEASE M include/osmocom/hnbgw/hnbgw.h M include/osmocom/hnbgw/hnbgw_pfcp.h M src/osmo-hnbgw/hnbgw_pfcp.c M src/osmo-hnbgw/osmo_hnbgw_main.c 5 files changed, 52 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 8cc6151..7b0f29e 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,5 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmo-sigtran >2.0.0 use API osmo_sua_sccp_cause_name() \ No newline at end of file +libosmo-sigtran >2.0.0 use API osmo_sua_sccp_cause_name() +libosmo-pfcp >0.4.0 use API osmo_pfcp_cp_peer_set_associated_cb() \ No newline at end of file diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index caaff5f..afceca8 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -490,6 +490,8 @@ struct { struct osmo_pfcp_endpoint *ep; struct osmo_pfcp_cp_peer *cp_peer; + /* Running counters for the PFCP conn */ + struct osmo_stat_item_group *statg; } pfcp; struct osmo_timer_list hnb_store_rab_durations_timer; diff --git a/include/osmocom/hnbgw/hnbgw_pfcp.h b/include/osmocom/hnbgw/hnbgw_pfcp.h index 585d3f7..376d144 100644 --- a/include/osmocom/hnbgw/hnbgw_pfcp.h +++ b/include/osmocom/hnbgw/hnbgw_pfcp.h @@ -1,3 +1,9 @@ #pragma once +enum hnbgw_upf_stats { + HNBGW_UPF_STAT_ASSOCIATED, +}; +#define HNBGW_UPF_STAT_SET(stat, val) osmo_stat_item_set(osmo_stat_item_group_get_item(g_hnbgw->pfcp.statg, (stat)), (val)) + int hnbgw_pfcp_init(void); +void hnbgw_pfcp_release(void); diff --git a/src/osmo-hnbgw/hnbgw_pfcp.c b/src/osmo-hnbgw/hnbgw_pfcp.c index c7b2b08..dc82f04 100644 --- a/src/osmo-hnbgw/hnbgw_pfcp.c +++ b/src/osmo-hnbgw/hnbgw_pfcp.c @@ -20,12 +20,27 @@ */ #include <osmocom/core/sockaddr_str.h> +#include <osmocom/core/stats.h> +#include <osmocom/core/stat_item.h> #include <osmocom/pfcp/pfcp_endpoint.h> #include <osmocom/pfcp/pfcp_cp_peer.h> #include <osmocom/hnbgw/hnbgw.h> #include <osmocom/hnbgw/context_map.h> #include <osmocom/hnbgw/ps_rab_fsm.h> +#include <osmocom/hnbgw/hnbgw_pfcp.h> + +static const struct osmo_stat_item_desc hnbgw_upf_stat_item_description[] = { + [HNBGW_UPF_STAT_ASSOCIATED] = { "pfcp_associated", "Associated to UPF through PFCP", OSMO_STAT_ITEM_NO_UNIT, 16, 0}, +}; + +static const struct osmo_stat_item_group_desc hnbgw_upf_statg_desc = { + "upf", + "UPF Peer Statistics", + OSMO_STATS_CLASS_PEER, + ARRAY_SIZE(hnbgw_upf_stat_item_description), + hnbgw_upf_stat_item_description, +}; static void pfcp_set_msg_ctx(struct osmo_pfcp_endpoint *ep, struct osmo_pfcp_msg *m, struct osmo_pfcp_msg *req) { @@ -62,6 +77,12 @@ } } +static void pfcp_cp_peer_assoc_cb(struct osmo_pfcp_cp_peer *cp_peer, bool associated) +{ + LOGP(DLPFCP, LOGL_NOTICE, "PFCP Peer associated: %s\n", associated ? "true" : "false"); + HNBGW_UPF_STAT_SET(HNBGW_UPF_STAT_ASSOCIATED, associated ? 1 : 0); +} + int hnbgw_pfcp_init(void) { struct osmo_pfcp_endpoint_cfg cfg; @@ -81,6 +102,12 @@ return -1; } + g_hnbgw->pfcp.statg = osmo_stat_item_group_alloc(g_hnbgw, &hnbgw_upf_statg_desc, 0); + if (!g_hnbgw->pfcp.statg) { + LOGP(DLPFCP, LOGL_ERROR, "Failed creating UPF stats item group\n"); + return -1; + } + cfg = (struct osmo_pfcp_endpoint_cfg){ .set_msg_ctx_cb = pfcp_set_msg_ctx, .rx_msg_cb = pfcp_rx_msg, @@ -136,6 +163,11 @@ LOGP(DLPFCP, LOGL_ERROR, "Cannot allocate PFCP CP Peer FSM\n"); return -1; } + if (osmo_pfcp_cp_peer_set_associated_cb(g_hnbgw->pfcp.cp_peer, pfcp_cp_peer_assoc_cb)) { + LOGP(DLPFCP, LOGL_ERROR, "Cannot Set PFCP CP Peer associated callback\n"); + return -1; + } + if (osmo_pfcp_cp_peer_associate(g_hnbgw->pfcp.cp_peer)) { LOGP(DLPFCP, LOGL_ERROR, "Cannot start PFCP CP Peer FSM\n"); return -1; @@ -143,3 +175,10 @@ return 0; } + +void hnbgw_pfcp_release(void) +{ + if (!hnb_gw_is_gtp_mapping_enabled()) + return; + osmo_stat_item_group_free(g_hnbgw->pfcp.statg); +} diff --git a/src/osmo-hnbgw/osmo_hnbgw_main.c b/src/osmo-hnbgw/osmo_hnbgw_main.c index 3e715b0..2034490 100644 --- a/src/osmo-hnbgw/osmo_hnbgw_main.c +++ b/src/osmo-hnbgw/osmo_hnbgw_main.c @@ -369,5 +369,8 @@ } /* not reached */ +#if ENABLE_PFCP + hnbgw_pfcp_release(); +#endif exit(0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38616?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic71df8df83e97f4015077677e426c803f84d31ea Gerrit-Change-Number: 38616 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-hnbgw[master]: Add PFCP stats item group
by pespin 04 Nov '24

04 Nov '24

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38616?usp=email ) Change subject: Add PFCP stats item group ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: I actually nee to merge this one since I already merged the ttcn3 related patch, otherwise the check against nightly will be unexpected. Merging since it was already reviewed at least by fixeria. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38616?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic71df8df83e97f4015077677e426c803f84d31ea Gerrit-Change-Number: 38616 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Nov 2024 17:43:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-sigtran[master]: Move include sigtran/m2ua_types.h -> sigtran/protocol/m2ua.h
by pespin 04 Nov '24

04 Nov '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38624?usp=email ) Change subject: Move include sigtran/m2ua_types.h -> sigtran/protocol/m2ua.h ...................................................................... Move include sigtran/m2ua_types.h -> sigtran/protocol/m2ua.h That file contains only protocol (over-the-wire) related values, similar to already existing sigtran/protocol/m3ua.h. Hence, move it where it should be. This is fine since there's no user of such a header, it's only used internally by m2ua_test. Change-Id: I66d8a335bbd1c55edab8a120d85e6aee1922433c --- M include/osmocom/sigtran/Makefile.am R include/osmocom/sigtran/protocol/m2ua.h M tests/m2ua/m2ua_test.c 3 files changed, 11 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/24/38624/1 diff --git a/include/osmocom/sigtran/Makefile.am b/include/osmocom/sigtran/Makefile.am index d9cc20c..8d90b0b 100644 --- a/include/osmocom/sigtran/Makefile.am +++ b/include/osmocom/sigtran/Makefile.am @@ -1,8 +1,14 @@ -sigtran_HEADERS = xua_types.h xua_msg.h m2ua_types.h sccp_sap.h \ +sigtran_HEADERS = xua_types.h xua_msg.h sccp_sap.h \ sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h sigtrandir = $(includedir)/osmocom/sigtran -sigtran_prot_HEADERS = protocol/sua.h protocol/m3ua.h protocol/mtp.h \ - protocol/sccp_scmg.h +sigtran_prot_HEADERS = \ + protocol/sua.h \ + protocol/m2ua.h \ + protocol/m3ua.h \ + protocol/mtp.h \ + protocol/sccp_scmg.h \ + $(NULL) + sigtran_protdir = $(includedir)/osmocom/sigtran/protocol diff --git a/include/osmocom/sigtran/m2ua_types.h b/include/osmocom/sigtran/protocol/m2ua.h similarity index 98% rename from include/osmocom/sigtran/m2ua_types.h rename to include/osmocom/sigtran/protocol/m2ua.h index 7184f54..bf25086 100644 --- a/include/osmocom/sigtran/m2ua_types.h +++ b/include/osmocom/sigtran/protocol/m2ua.h @@ -1,5 +1,4 @@ -#ifndef m2ua_types_h -#define m2ua_types_h +#pragma once /** * Types found in the M2UA RFC 3331 @@ -251,5 +250,3 @@ M2UA_DEREG_ERR_PERM_DENIED, /* Error - Permission Denied */ M2UA_DEREG_ERR_NOT_REG, /* Error - Not Registered */ }; - -#endif diff --git a/tests/m2ua/m2ua_test.c b/tests/m2ua/m2ua_test.c index 12d5d7c..3469f11 100644 --- a/tests/m2ua/m2ua_test.c +++ b/tests/m2ua/m2ua_test.c @@ -16,7 +16,7 @@ */ #include <osmocom/sigtran/xua_msg.h> -#include <osmocom/sigtran/m2ua_types.h> +#include <osmocom/sigtran/protocol/m2ua.h> #include <osmocom/core/utils.h> #include <osmocom/core/msgb.h> -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38624?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I66d8a335bbd1c55edab8a120d85e6aee1922433c Gerrit-Change-Number: 38624 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-hnbgw[master]: hnbgw: Avoid using struct osmo_pfcp_cp_peer fields directly
by pespin 04 Nov '24

04 Nov '24

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38623?usp=email ) Change subject: hnbgw: Avoid using struct osmo_pfcp_cp_peer fields directly ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Requires https://gerrit.osmocom.org/c/libosmo-pfcp/+/38622 merged to have jenkins passing. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38623?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2f587cfb7fd556bcfc43bf70fc93bc79a3c211ca Gerrit-Change-Number: 38623 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 04 Nov 2024 17:11:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce test TC_ps_iu_release_req_rua_disconnect
by pespin 04 Nov '24

04 Nov '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38598?usp=email ) Change subject: hnbgw: Introduce test TC_ps_iu_release_req_rua_disconnect ...................................................................... hnbgw: Introduce test TC_ps_iu_release_req_rua_disconnect Change-Id: Id24a5aed5255af77fbbd30521be70700a9bff1c9 --- M hnbgw/HNBGW_Tests.ttcn M hnbgw/expected-results.xml 2 files changed, 44 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 05d5e6a..e15bba4 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -1433,6 +1433,47 @@ f_shutdown_helper(); } +/* Same as TC_cs_iu_release_req_rua_disconnect, but with PS RAB */ +private function f_tc_ps_iu_release_req_rua_disconnect(charstring id) runs on ConnHdlr { + var RANAP_PDU tx; + + tx := f_build_initial_ue(g_pars); + f_iuh2iu_connect(tx); + + f_create_rab_ps(); + + RUA.send(ts_RANAP_IuReleaseRequest(ts_RanapCause_radio_rab_preempted)); + BSSAP.receive(tr_RANAP_IuReleaseRequest(ts_RanapCause_radio_rab_preempted)); + + RUA.send(RUA_Disc_Req:{{misc:=unspecified}, omit}); + + /* HNBGW tears down related PFCP sessions: */ + if (g_pars.pfcp_pars.pfcp_enabled) { + var PDU_PFCP m := f_pfcp_expect(tr_PFCP_Session_Del_Req(g_pars.pfcp_pars.up_f_seid.seid)); + PFCP.send(ts_PFCP_Session_Del_Resp(m.sequence_number, g_pars.pfcp_pars.hnbgw_f_seid.seid)); + } + + /* We cannot guarantee we can send Iu-ReleaseCommand at RANAP_Emulation + * before it receives the RLSD from HNBGW, hence we don't send it. If we + * sent it, it would be ignored by HNBGW since the RUA conn is already + * disconnected: + * BSSAP.send(ts_RANAP_IuReleaseCommand(ts_RanapCause_radio_rab_preempted)); + */ + + BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND); + /* Let RAN_Emulation some time to answer RLSD with RLC: */ + f_sleep(1.0); +} +testcase TC_ps_iu_release_req_rua_disconnect() runs on test_CT { + var ConnHdlr vc_conn; + g_num_hnbs := 1; + f_init(); + vc_conn := f_start_handler_with_pars(refers(f_tc_ps_iu_release_req_rua_disconnect), f_TestHdlrParams(9, true)); + vc_conn.done; + + f_shutdown_helper(); +} + friend function f_tc_ps_rab_assignment(charstring id) runs on ConnHdlr { var RANAP_PDU tx; @@ -2344,6 +2385,7 @@ execute(TC_ranap_cs_creq_cref()); execute(TC_ranap_ps_creq_cref()); execute(TC_cs_iu_release_req_rua_disconnect()); + execute(TC_ps_iu_release_req_rua_disconnect()); execute(TC_ps_rab_assignment()); execute( TC_mscpool_L3Compl_on_1_cnlink() ); diff --git a/hnbgw/expected-results.xml b/hnbgw/expected-results.xml index 7bbcdec..70e29e6 100644 --- a/hnbgw/expected-results.xml +++ b/hnbgw/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='Titan' tests='53' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='Titan' tests='54' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='HNBGW_Tests' name='TC_hnb_register' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_hnb_register_duplicate' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_hnb_register_duplicate_reuse_sctp_assoc' time='MASKED'/> @@ -25,6 +25,7 @@ <testcase classname='HNBGW_Tests' name='TC_ranap_cs_creq_cref' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_ranap_ps_creq_cref' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_cs_iu_release_req_rua_disconnect' time='MASKED'/> + <testcase classname='HNBGW_Tests' name='TC_ps_iu_release_req_rua_disconnect' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_ps_rab_assignment' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_mscpool_L3Compl_on_1_cnlink' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_mscpool_L3Complete_by_imsi_round_robin' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38598?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id24a5aed5255af77fbbd30521be70700a9bff1c9 Gerrit-Change-Number: 38598 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log