May 2025 - gerrit-log - lists.osmocom.org

[S] Change in libosmo-sigtran[master]: sccp: Implement dpc_accessible()

by fixeria

Attention is currently required from: daniel, laforge, neels, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250?usp=email ) Change subject: sccp: Implement dpc_accessible() ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/sccp_scrc.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250/comment/5d41ab5c_29c2d… : PS2, Line 87: LOGL_INFO Do we really want to log @ `INFO` here? How often is this expected to happen? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I16b0aa71db5be2daf7a8c52da829a38ad564eb7b Gerrit-Change-Number: 40250 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 08 May 2025 17:46:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: combined_linkset: Improve logging

by fixeria

Attention is currently required from: daniel, osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40249?usp=email ) Change subject: combined_linkset: Improve logging ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40249?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ide1e72b9737a236561c7b6e86f381d929969346e Gerrit-Change-Number: 40249 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 08 May 2025 17:42:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce tests TC_ps_rab_release(_abnormal)

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40272?usp=email ) Change subject: hnbgw: Introduce tests TC_ps_rab_release(_abnormal) ...................................................................... hnbgw: Introduce tests TC_ps_rab_release(_abnormal) Same as their existing CS counterparts TC_rab_release(_abnormal). Related: SYS#7451 Change-Id: Ia25efc2d6bf01d4a13e7fd1ce0563d20dd2e321e --- M hnbgw/HNBGW_Tests.ttcn M hnbgw/expected-results.xml 2 files changed, 80 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/40272/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 2ce36d5..e968e63 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -1660,6 +1660,81 @@ f_shutdown_helper(); } +/* PS RAB release with Cause NAS/Normal (successful/orderly release). + * This can happen when MS sent a "SM Deactivate PDP Context Request", then CN answers with + * "SM Deactivate PDP Context Accept" followed by a "RAB Assign Req (ReleaseList)" */ +friend function f_ps_tc_rab_release(charstring id) runs on ConnHdlr { + var charstring hnb0_ctr_prefix := f_hnb_ctr_prefix(g_pars.hnb); + var MgcpCommand mgcp_cmd; + var RANAP_PDU tx; + timer T := 15.0; + + f_statsd_reset(); + + tx := f_build_initial_ue(g_pars); + f_iuh2iu_connect(tx); + + f_create_rab_ps(); + + var charstring ctr_name; + if (g_pars.rab_rel_cause == valueof(ts_RanapCause_nas_normal)) { + ctr_name := "ranap.ps.rab_rel.req.normal"; + } else { + ctr_name := "ranap.ps.rab_rel.req.abnormal"; + } + + /* Expect stats to be 0 */ + var StatsDExpects expect := { + {name := hnb0_ctr_prefix & ctr_name, mtype := "c", min := 0, max := 0} + }; + f_statsd_expect(expect); + + /* Send RAB Release */ + tx := valueof(ts_RANAP_RabAssReq(rab_rl := ts_RAB_RL(t_RAB_id(23), g_pars.rab_rel_cause))); + BSSAP.send(tx); + + if (g_pars.pfcp_pars.pfcp_enabled) { + T.start; + alt { + [] as_pfcp_handle_del_req() {} + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Timeout waiting for PFCP Sess Del Req"); + } + } + T.stop; + } + + f_rua_expect(tx); + + expect := { + {name := hnb0_ctr_prefix & ctr_name, mtype := "c", min := 1, max := 1} + }; + f_statsd_expect(expect); +} +testcase TC_ps_rab_release() runs on test_CT { + var ConnHdlr vc_conn; + g_num_hnbs := 1; + f_init(); + + vc_conn := f_start_handler_with_pars(refers(f_ps_tc_rab_release), f_TestHdlrParams(5, true)); + vc_conn.done; + + f_shutdown_helper(); +} +/* PS RAB release with Cause abnormal */ +testcase TC_ps_rab_release_abnormal() runs on test_CT { + var ConnHdlr vc_conn; + g_num_hnbs := 1; + f_init(); + + vc_conn := f_start_handler_with_pars(refers(f_ps_tc_rab_release), + f_TestHdlrParams(8, true, rab_rel_cause := ts_RanapCause_radio_conn_lost)); + vc_conn.done; + + f_shutdown_helper(); +} + /* Default list of counters for a 'cn' entity to test the cnpool feature. */ const CounterNameVals counternames_cnpool := { { "cnpool:subscr:new", 0 }, @@ -2655,6 +2730,8 @@ execute(TC_ps_rua_dt_during_sccp_wait_cc()); execute(TC_ps_rab_assignment()); execute(TC_ps_rab_assignment_concurrent()); + execute(TC_ps_rab_release()); + execute(TC_ps_rab_release_abnormal()); execute( TC_mscpool_L3Compl_on_1_cnlink() ); execute( TC_mscpool_L3Complete_by_imsi_round_robin() ); diff --git a/hnbgw/expected-results.xml b/hnbgw/expected-results.xml index 3777715..c04876d 100644 --- a/hnbgw/expected-results.xml +++ b/hnbgw/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='Titan' tests='60' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='Titan' tests='62' 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'/> @@ -33,6 +33,8 @@ <testcase classname='HNBGW_Tests' name='TC_ps_rua_dt_during_sccp_wait_cc' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_ps_rab_assignment' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_ps_rab_assignment_concurrent' time='MASKED'/> + <testcase classname='HNBGW_Tests' name='TC_ps_rab_release' time='MASKED'/> + <testcase classname='HNBGW_Tests' name='TC_ps_rab_release_abnormal' 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'/> <testcase classname='HNBGW_Tests' name='TC_mscpool_LU_by_tmsi_null_nri_0_round_robin' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40272?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia25efc2d6bf01d4a13e7fd1ce0563d20dd2e321e Gerrit-Change-Number: 40272 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce altstep as_pfcp_handle_del_req()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40271?usp=email ) Change subject: hnbgw: Introduce altstep as_pfcp_handle_del_req() ...................................................................... hnbgw: Introduce altstep as_pfcp_handle_del_req() Change-Id: I94101b5f0ad8634db68f0a9d5230c00926b02061 --- M hnbgw/ConnHdlr.ttcn M hnbgw/HNBGW_Tests.ttcn 2 files changed, 25 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/71/40271/1 diff --git a/hnbgw/ConnHdlr.ttcn b/hnbgw/ConnHdlr.ttcn index d722b60..093677d 100644 --- a/hnbgw/ConnHdlr.ttcn +++ b/hnbgw/ConnHdlr.ttcn @@ -573,11 +573,14 @@ T.stop; } if (pfcp_teardown) { - var PDU_PFCP m; - m := f_pfcp_expect(tr_PFCP_Session_Del_Req(g_pars.pfcp_pars.upf_f_seid.seid)); - PFCP.send(ts_PFCP_Session_Del_Resp(m.sequence_number, g_pars.pfcp_pars.hnbgw_f_seid.seid)); - /* ask PFCPEM to *not* route PDUs with this specific SEID to us */ - f_PFCPEM_unsubscribe_seid(g_pars.pfcp_pars.upf_f_seid.seid); + T.start(5.0); + alt { + [] as_pfcp_handle_del_req() {} + [] T.timeout { + setverdict(fail, "Timeout waiting for PFCP Del Sess Req"); + } + } + T.stop; } tx := valueof(ts_RANAP_IuReleaseComplete()); @@ -982,6 +985,22 @@ } } +altstep as_pfcp_handle_del_req() runs on ConnHdlr +{ + var template (present) PDU_PFCP exp_rx := tr_PFCP_Session_Del_Req(g_pars.pfcp_pars.upf_f_seid.seid); + var PDU_PFCP m; + + [] PFCP.receive(exp_rx) -> value m { + PFCP.send(ts_PFCP_Session_Del_Resp(m.sequence_number, g_pars.pfcp_pars.hnbgw_f_seid.seid)); + /* ask PFCPEM to *not* route PDUs with this specific SEID to us */ + f_PFCPEM_unsubscribe_seid(g_pars.pfcp_pars.upf_f_seid.seid); + } + [] PFCP.receive(PDU_PFCP:?) -> value m { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Got an unexpected PFCP message: ", m, " vs exp ", exp_rx)); + } +} + function f_perform_compl_l3(octetstring nas, boolean do_clear := true, boolean expect_success := true) runs on ConnHdlr { timer T := 10.0; diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index a123dda..2ce36d5 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -1542,8 +1542,7 @@ /* 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.upf_f_seid.seid)); - PFCP.send(ts_PFCP_Session_Del_Resp(m.sequence_number, g_pars.pfcp_pars.hnbgw_f_seid.seid)); + as_pfcp_handle_del_req(); } /* We cannot guarantee we can send Iu-ReleaseCommand at RANAP_Emulation -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40271?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I94101b5f0ad8634db68f0a9d5230c00926b02061 Gerrit-Change-Number: 40271 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: vty: Allow setting cnlink msc/sgsn name

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40270?usp=email ) Change subject: vty: Allow setting cnlink msc/sgsn name ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40270?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: Ic557f20f40fec49ce2c83a73f6e5c8b027d57ef5 Gerrit-Change-Number: 40270 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 08 May 2025 12:48:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: cnlink: Introduce stats group with connected state

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40269?usp=email ) Change subject: cnlink: Introduce stats group with connected state ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40269?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: I9c78c6b78b4ee8d6836df8d90c5c57103aa4d762 Gerrit-Change-Number: 40269 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 08 May 2025 12:47:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: cnlink: Introduce stats group with connected state

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40269?usp=email ) Change subject: cnlink: Introduce stats group with connected state ...................................................................... cnlink: Introduce stats group with connected state Change-Id: I9c78c6b78b4ee8d6836df8d90c5c57103aa4d762 --- M include/osmocom/hnbgw/cnlink.h M src/osmo-hnbgw/cnlink.c M src/osmo-hnbgw/cnlink_fsm.c 3 files changed, 37 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/69/40269/1 diff --git a/include/osmocom/hnbgw/cnlink.h b/include/osmocom/hnbgw/cnlink.h index fd1b7de..ee1a8dd 100644 --- a/include/osmocom/hnbgw/cnlink.h +++ b/include/osmocom/hnbgw/cnlink.h @@ -3,6 +3,7 @@ #include <stdbool.h> #include <osmocom/core/rate_ctr.h> +#include <osmocom/core/stat_item.h> #include <osmocom/gsm/gsm48.h> #include <osmocom/sigtran/sccp_sap.h> @@ -48,6 +49,13 @@ CNLINK_CTR_CNPOOL_SUBSCR_ATTACH_LOST, CNLINK_CTR_CNPOOL_EMERG_FORWARDED, }; +#define CNLINK_CTR_INC(cnlink, x) rate_ctr_inc2((cnlink)->ctrs, x) + +enum cnlink_stat { + CNLINK_STAT_CONNECTED, +}; +#define CNLINK_STAT(cnlink, x) osmo_stat_item_group_get_item((cnlink)->statg, x) +#define CNLINK_STAT_SET(cnlink, x, val) osmo_stat_item_set(CNLINK_STAT(cnlink, x), val) /* User provided configuration for struct hnbgw_cnlink. */ struct hnbgw_cnlink_cfg { @@ -90,6 +98,7 @@ struct llist_head paging; struct rate_ctr_group *ctrs; + struct osmo_stat_item_group *statg; }; struct hnbgw_cnlink *hnbgw_cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr); @@ -125,5 +134,3 @@ #define LOG_CNLINK(CNLINK, SUBSYS, LEVEL, FMT, ARGS...) \ LOGP(SUBSYS, LEVEL, "(%s) " FMT, (CNLINK) ? (CNLINK)->name : "null", ##ARGS) - -#define CNLINK_CTR_INC(cnlink, x) rate_ctr_inc2((cnlink)->ctrs, x) diff --git a/src/osmo-hnbgw/cnlink.c b/src/osmo-hnbgw/cnlink.c index 19f1d3d..8d312c6 100644 --- a/src/osmo-hnbgw/cnlink.c +++ b/src/osmo-hnbgw/cnlink.c @@ -21,6 +21,7 @@ #include <osmocom/core/fsm.h> #include <osmocom/core/tdef.h> #include <osmocom/core/stats.h> +#include <osmocom/core/stat_item.h> #include <osmocom/gsm/gsm23236.h> @@ -161,19 +162,42 @@ cnlink_ctr_description, }; +static const struct osmo_stat_item_desc cnlink_stat_desc[] = { + [CNLINK_STAT_CONNECTED] = { "connected", "Connected (1) or disconnected (0)", NULL, 60, 0 }, +}; + +const struct osmo_stat_item_group_desc msc_statg_desc = { + .group_name_prefix = "msc", + .group_description = "MSC", + .class_id = OSMO_STATS_CLASS_GLOBAL, + .num_items = ARRAY_SIZE(cnlink_stat_desc), + .item_desc = cnlink_stat_desc, +}; + +const struct osmo_stat_item_group_desc sgsn_statg_desc = { + .group_name_prefix = "sgsn", + .group_description = "SGSN", + .class_id = OSMO_STATS_CLASS_GLOBAL, + .num_items = ARRAY_SIZE(cnlink_stat_desc), + .item_desc = cnlink_stat_desc, +}; + struct hnbgw_cnlink *hnbgw_cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr) { struct hnbgw_cnlink *cnlink; const struct rate_ctr_group_desc *ctrg_desc; + const struct osmo_stat_item_group_desc *statg_desc; OSMO_ASSERT(cnpool); switch (cnpool->domain) { case DOMAIN_CS: ctrg_desc = &msc_ctrg_desc; + statg_desc = &msc_statg_desc; break; case DOMAIN_PS: ctrg_desc = &sgsn_ctrg_desc; + statg_desc = &sgsn_statg_desc; break; default: OSMO_ASSERT(0); @@ -190,6 +214,7 @@ }, .allow_attach = true, .ctrs = rate_ctr_group_alloc(cnlink, ctrg_desc, nr), + .statg = osmo_stat_item_group_alloc(cnlink, statg_desc, nr), }; cnlink->name = talloc_asprintf(cnlink, "%s-%d", cnpool->peer_name, nr); INIT_LLIST_HEAD(&cnlink->map_list); @@ -230,6 +255,7 @@ osmo_fsm_inst_term(cnlink->fi, OSMO_FSM_TERM_REQUEST, NULL); cnlink->fi = NULL; + osmo_stat_item_group_free(cnlink->statg); rate_ctr_group_free(cnlink->ctrs); llist_del(&cnlink->entry); talloc_free(cnlink); diff --git a/src/osmo-hnbgw/cnlink_fsm.c b/src/osmo-hnbgw/cnlink_fsm.c index acfbae4..9402198 100644 --- a/src/osmo-hnbgw/cnlink_fsm.c +++ b/src/osmo-hnbgw/cnlink_fsm.c @@ -63,6 +63,7 @@ static void link_up(struct hnbgw_cnlink *cnlink) { LOGPFSML(cnlink->fi, LOGL_NOTICE, "link up\n"); + CNLINK_STAT_SET(cnlink, CNLINK_STAT_CONNECTED, 1); } static void link_lost(struct hnbgw_cnlink *cnlink) @@ -70,6 +71,7 @@ struct hnbgw_context_map *map, *map2; LOGPFSML(cnlink->fi, LOGL_NOTICE, "link lost\n"); + CNLINK_STAT_SET(cnlink, CNLINK_STAT_CONNECTED, 0); llist_for_each_entry_safe(map, map2, &cnlink->map_list, hnbgw_cnlink_entry) context_map_cnlink_lost(map); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40269?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I9c78c6b78b4ee8d6836df8d90c5c57103aa4d762 Gerrit-Change-Number: 40269 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: vty: Allow setting cnlink msc/sgsn name

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40270?usp=email ) Change subject: vty: Allow setting cnlink msc/sgsn name ...................................................................... vty: Allow setting cnlink msc/sgsn name This is useful to identify each individual CN link towards a specific MSC/SGSN, be it checking VTY config, looking at logs, reporting over statsd, etc. Change-Id: Ic557f20f40fec49ce2c83a73f6e5c8b027d57ef5 --- M include/osmocom/hnbgw/cnlink.h M src/osmo-hnbgw/cnlink.c M src/osmo-hnbgw/hnbgw_vty.c M tests/cnpool.vty 4 files changed, 58 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/70/40270/1 diff --git a/include/osmocom/hnbgw/cnlink.h b/include/osmocom/hnbgw/cnlink.h index ee1a8dd..1d413a9 100644 --- a/include/osmocom/hnbgw/cnlink.h +++ b/include/osmocom/hnbgw/cnlink.h @@ -104,6 +104,7 @@ struct hnbgw_cnlink *hnbgw_cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr); void hnbgw_cnlink_term_and_free(struct hnbgw_cnlink *cnlink); void hnbgw_cnlink_drop_sccp(struct hnbgw_cnlink *cnlink); +int hnbgw_cnlink_set_name(struct hnbgw_cnlink *cnlink, const char *name); int hnbgw_cnlink_tx_ranap_reset(struct hnbgw_cnlink *cnlink); int hnbgw_cnlink_tx_ranap_reset_ack(struct hnbgw_cnlink *cnlink); diff --git a/src/osmo-hnbgw/cnlink.c b/src/osmo-hnbgw/cnlink.c index 8d312c6..0bd2b3d 100644 --- a/src/osmo-hnbgw/cnlink.c +++ b/src/osmo-hnbgw/cnlink.c @@ -230,6 +230,17 @@ return cnlink; } +int hnbgw_cnlink_set_name(struct hnbgw_cnlink *cnlink, const char *name) +{ + talloc_free(cnlink->name); + cnlink->name = talloc_strdup(cnlink, name); + osmo_fsm_inst_update_id_f_sanitize(cnlink->fi, '-', cnlink->name); + /* Update rate_ctr/stats to report by name instead of index: */ + rate_ctr_group_set_name(cnlink->ctrs, cnlink->name); + osmo_stat_item_group_set_name(cnlink->statg, cnlink->name); + return 0; +} + void hnbgw_cnlink_drop_sccp(struct hnbgw_cnlink *cnlink) { struct hnbgw_context_map *map, *map2; diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index 52c5ba6..7d78909 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -149,7 +149,8 @@ return; } - vty_out(vty, "%s <->", + vty_out(vty, "%s: %s <->", + cnlink->name, osmo_sccp_user_name(cnlink->hnbgw_sccp_user->sccp_user)); vty_out(vty, " %s%s%s%s", cnlink->use.remote_addr_name ? : "", @@ -526,6 +527,18 @@ /* 'msc 0' / 'remote-addr my-msc' and * 'sgsn 0' / 'remote-addr my-sgsn' */ +DEFUN(cfg_cnlink_name, + cfg_cnlink_name_cmd, + "name NAME", + "Set user defined name for this msc/sgsn\n" + "The user defined name to be set for this msc/sgsn\n") +{ + struct hnbgw_cnlink *cnlink = vty->index; + if (hnbgw_cnlink_set_name(cnlink, argv[0]) < 0) + return CMD_WARNING; + return CMD_SUCCESS; +} + DEFUN(cfg_cnlink_remote_addr, cfg_cnlink_remote_addr_cmd, "remote-addr NAME", @@ -1057,6 +1070,7 @@ llist_for_each_entry(cnlink, &cnpool->cnlinks, entry) { vty_out(vty, "%s %d%s", cnpool->peer_name, cnlink->nr, VTY_NEWLINE); + vty_out(vty, " name %s%s", cnlink->name, VTY_NEWLINE); if (cnlink->vty.remote_addr_name) vty_out(vty, " remote-addr %s%s", cnlink->vty.remote_addr_name, VTY_NEWLINE); cnlink_write_nri(vty, cnlink, false); @@ -1098,6 +1112,7 @@ static void install_cnlink_elements(int node) { + install_element(node, &cfg_cnlink_name_cmd); install_element(node, &cfg_cnlink_remote_addr_cmd); install_element(node, &cfg_cnlink_nri_add_cmd); install_element(node, &cfg_cnlink_nri_del_cmd); diff --git a/tests/cnpool.vty b/tests/cnpool.vty index 2de56a7..78f660f 100644 --- a/tests/cnpool.vty +++ b/tests/cnpool.vty @@ -135,7 +135,9 @@ OsmoHNBGW(config)# show running-config ... msc 0 + name msc-0 sgsn 0 + name sgsn-0 ... OsmoHNBGW(config)# msc 1 @@ -224,9 +226,13 @@ OsmoHNBGW(config)# show running-config ... msc 0 + name msc-0 msc 1 + name msc-1 sgsn 0 + name sgsn-0 sgsn 1 + name sgsn-1 ... OsmoHNBGW(config)# ### Add {msc,sgsn}x{2,3} @@ -252,18 +258,26 @@ OsmoHNBGW(config)# show running-config ... msc 0 + name msc-0 msc 1 + name msc-1 msc 2 + name msc-2 remote-addr addr-msc2 no allow-attach msc 3 + name msc-3 remote-addr addr-msc3 allow-emergency sgsn 0 + name sgsn-0 sgsn 1 + name sgsn-1 sgsn 2 + name sgsn-2 remote-addr addr-sgsn2 sgsn 3 + name sgsn-3 remote-addr addr-sgsn3 ... @@ -282,16 +296,24 @@ OsmoHNBGW(config)# show running-config ... msc 0 + name msc-0 msc 1 + name msc-1 msc 2 + name msc-2 remote-addr addr-msc2 msc 3 + name msc-3 remote-addr addr-msc4 sgsn 0 + name sgsn-0 sgsn 1 + name sgsn-1 sgsn 2 + name sgsn-2 remote-addr addr-sgsn4 sgsn 3 + name sgsn-3 remote-addr addr-sgsn3 ... @@ -321,18 +343,26 @@ hnbgw ... msc 0 + name msc-0 remote-addr addr-msc0 msc 1 + name msc-1 msc 2 + name msc-2 remote-addr addr-msc2 msc 3 + name msc-3 remote-addr addr-msc4 sgsn 0 + name sgsn-0 remote-addr addr-sgsn0 sgsn 1 + name sgsn-1 sgsn 2 + name sgsn-2 remote-addr addr-sgsn4 sgsn 3 + name sgsn-3 remote-addr addr-sgsn3 ... -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40270?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic557f20f40fec49ce2c83a73f6e5c8b027d57ef5 Gerrit-Change-Number: 40270 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[L] Change in osmo-hnbgw[master]: Move cnlink funcs from hnbgw_cn.c to cnlink.c

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40266?usp=email ) Change subject: Move cnlink funcs from hnbgw_cn.c to cnlink.c ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40266?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: Ic9a962877ea000aa1bca6c2c282baac6e53f6489 Gerrit-Change-Number: 40266 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 08 May 2025 11:32:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: cnlink: Fix several funcs missing prefix

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263?usp=email ) Change subject: cnlink: Fix several funcs missing prefix ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/osmo-hnbgw/hnbgw_cn.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263/comment/673fe057_6539df7a?u… : PS1, Line 114: static bool hnbgw_hnbgw_cnlink_sccp_cfg_changed(struct hnbgw_cnlink *cnlink) > ```suggestion […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263?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: If20890bb99885e8c18732588376f8fdaa326d639 Gerrit-Change-Number: 40263 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 08 May 2025 11:31:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025