- gerrit-log - lists.osmocom.org

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

by pespin

Attention is currently required from: daniel, fixeria, laforge, neels, osmith. Hello Jenkins Builder, daniel, fixeria, laforge, neels, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: sccp: Implement dpc_accessible() ...................................................................... sccp: Implement dpc_accessible() Change-Id: I16b0aa71db5be2daf7a8c52da829a38ad564eb7b --- M src/sccp_scrc.c 1 file changed, 30 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/50/40250/4 -- 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: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I16b0aa71db5be2daf7a8c52da829a38ad564eb7b Gerrit-Change-Number: 40250 Gerrit-PatchSet: 4 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp: Introduce LOGPSCC() log macro

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40284?usp=email ) Change subject: sccp: Introduce LOGPSCC() log macro ...................................................................... sccp: Introduce LOGPSCC() log macro Change-Id: I8b79987153ba16b3fe940a5cad2f43f3780d89f0 --- M src/sccp_scoc.c 1 file changed, 24 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/84/40284/1 diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 204fd19..4e390af 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -127,6 +127,10 @@ struct osmo_timer_list t_int; struct osmo_timer_list t_rep_rel; }; +#define _LOGPSCC(scc, subsys, level, fmt, args ...) \ + _LOGPSCU((scc)->user, subsys, level, "CONN(%d) " fmt, (conn)->conn_id, ## args) +#define LOGPSCC(scc, level, fmt, args ...) \ + _LOGPSCC(scc, DLSCCP, level, fmt, ## args) /*********************************************************************** * various helper functions @@ -642,8 +646,9 @@ * Compare this information with source of Optional Data recorded while caching * to make sure we're on the same page. */ - LOGP(DLSCCP, LOGL_ERROR, "unexpected message type %s != cache source %s\n", - xua_class_msg_name(xmc, exp_type), xua_class_msg_name(xmc, conn->opt_data_cache->cb[0])); + LOGPSCC(conn, LOGL_ERROR, "unexpected message type %s != cache source %s\n", + xua_class_msg_name(xmc, exp_type), + xua_class_msg_name(xmc, conn->opt_data_cache->cb[0])); } else { osmo_sccp_tx_data(conn->user, conn->conn_id, msgb_data(conn->opt_data_cache), msgb_length(conn->opt_data_cache)); } @@ -676,8 +681,8 @@ if (msgb_l2len(prim->oph.msg) > max_optional_data) { if (conn->opt_data_cache) { /* Caching optional data, but there already is optional data occupying the cache: */ - LOGP(DLSCCP, LOGL_ERROR, "replacing unsent %u bytes of optional data cache with %s optional data\n", - msgb_length(conn->opt_data_cache), osmo_scu_prim_name(&prim->oph)); + LOGPSCC(conn, LOGL_ERROR, "replacing unsent %u bytes of optional data cache with %s optional data\n", + msgb_length(conn->opt_data_cache), osmo_scu_prim_name(&prim->oph)); msgb_trim(conn->opt_data_cache, 0); } else { conn->opt_data_cache = msgb_alloc_c(conn, SCCP_MAX_DATA, "SCCP optional data cache for CR/CC/RLSD"); @@ -844,7 +849,7 @@ break; /* FIXME */ default: - LOGP(DLSCCP, LOGL_ERROR, "Don't know how to encode msg_type %u\n", msg_type); + LOGPSCC(conn, LOGL_ERROR, "Don't know how to encode msg_type %u\n", msg_type); xua_msg_free(xua); return NULL; } @@ -852,8 +857,8 @@ prim_needed: xua_msg_free(xua); - LOGP(DLSCCP, LOGL_ERROR, "%s must be called with valid 'prim' " - "pointer for msg_type=%u\n", __func__, msg_type); + LOGPSCC(conn, LOGL_ERROR, "%s must be called with valid 'prim' pointer for msg_type=%u\n", + __func__, msg_type); return NULL; } @@ -1748,9 +1753,9 @@ struct xua_msg *xua, uint32_t inval_src_ref) { - LOGP(DLSCCP, LOGL_NOTICE, - "Received message for source ref %u on conn with mismatching remote ref %u\n", - inval_src_ref, conn->remote_ref); + LOGPSCC(conn, LOGL_NOTICE, + "Received message for source ref %u on conn with mismatching remote ref %u\n", + inval_src_ref, conn->remote_ref); /* we have received a message with invalid source local * reference and thus apply the action indicated in Table @@ -1770,8 +1775,7 @@ /* DISCARD */ break; default: - LOGP(DLSCCP, LOGL_NOTICE, "Unhandled %s\n", - xua_hdr_dump(xua, &xua_dialect_sua)); + LOGPSCC(conn, LOGL_NOTICE, "Unhandled %s\n", xua_hdr_dump(xua, &xua_dialect_sua)); break; } } @@ -1780,11 +1784,11 @@ static void sccp_scoc_rx_inval_opc(struct sccp_connection *conn, struct xua_msg *xua) { - LOGP(DLSCCP, LOGL_NOTICE, - "Received message %s for opc=%u=%s on conn with mismatching remote pc=%u=%s\n", - xua_hdr_dump(xua, &xua_dialect_sua), - xua->mtp.opc, osmo_ss7_pointcode_print(conn->inst->ss7, xua->mtp.opc), - conn->remote_pc, osmo_ss7_pointcode_print2(conn->inst->ss7, conn->remote_pc)); + LOGPSCC(conn, LOGL_NOTICE, + "Received message %s for opc=%u=%s on conn with mismatching remote pc=%u=%s\n", + xua_hdr_dump(xua, &xua_dialect_sua), + xua->mtp.opc, osmo_ss7_pointcode_print(conn->inst->ss7, xua->mtp.opc), + conn->remote_pc, osmo_ss7_pointcode_print2(conn->inst->ss7, conn->remote_pc)); /* we have received a message with invalid origin PC and thus * apply the action indicated in Table B.2/Q.714 */ switch (xua->hdr.msg_type) { @@ -1801,7 +1805,7 @@ /* DISCARD */ break; default: - LOGP(DLSCCP, LOGL_NOTICE, "Unhandled %s\n", + LOGPSCC(conn, LOGL_NOTICE, "Unhandled %s\n", xua_hdr_dump(xua, &xua_dialect_sua)); break; } @@ -1850,8 +1854,7 @@ OSMO_ASSERT(conn); OSMO_ASSERT(conn->fi); - DEBUGP(DLSCCP, "Received %s for local reference %u\n", - xua_hdr_dump(xua, &xua_dialect_sua), conn->conn_id); + LOGPSCC(conn, LOGL_DEBUG, "Received %s\n", xua_hdr_dump(xua, &xua_dialect_sua)); if (xua->hdr.msg_type != SUA_CO_CORE && xua->hdr.msg_type != SUA_CO_COAK && @@ -1876,7 +1879,7 @@ /* Map from XUA message to event */ event = xua_msg_event_map(xua, sua_scoc_event_map, ARRAY_SIZE(sua_scoc_event_map)); if (event < 0) { - LOGP(DLSCCP, LOGL_ERROR, "Cannot map SCRC msg %s to event\n", + LOGPSCC(conn, LOGL_ERROR, "Cannot map SCRC msg %s to event\n", xua_hdr_dump(xua, &xua_dialect_sua)); /* Table B.1/Q714 states DISCARD for any message with * unknown type */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40284?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: I8b79987153ba16b3fe940a5cad2f43f3780d89f0 Gerrit-Change-Number: 40284 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

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

by pespin

pespin has submitted this change. ( 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(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve 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: merged 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> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

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

by pespin

pespin has submitted this change. ( 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 M library/ranap/RANAP_Templates.ttcn 3 files changed, 152 insertions(+), 3 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 2ce36d5..ef70948 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -1660,6 +1660,85 @@ 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); + f_rua_expect(tx); + + tx := valueof(ts_RANAP_RabAssResp(rab_rl := ts_RAB_RLD(t_RAB_id(23)))); + RUA.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_bssap_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 +2734,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'/> diff --git a/library/ranap/RANAP_Templates.ttcn b/library/ranap/RANAP_Templates.ttcn index c328171..2ea443e 100644 --- a/library/ranap/RANAP_Templates.ttcn +++ b/library/ranap/RANAP_Templates.ttcn @@ -1745,6 +1745,38 @@ } } } +template (value) RAB_ReleasedList ts_RAB_RLD(template (value) RAB_ID rab_id) := { { + { + id := id_RAB_ReleasedItem, + criticality := ignore, + value_ := { + rAB_ReleasedItem := { + rAB_ID := rab_id, + dl_dataVolumes := omit, + dL_GTP_PDU_SequenceNumber := omit, + uL_GTP_PDU_SequenceNumber := omit, + iE_Extensions := omit + } + } + } +} } + +template RAB_ReleasedList tr_RAB_RLD(template (present) RAB_ID rab_id) := { { + { + id := id_RAB_ReleasedItem, + criticality := ignore, + value_ := { + rAB_ReleasedItem := { + rAB_ID := rab_id, + dl_dataVolumes := *, + dL_GTP_PDU_SequenceNumber := *, + uL_GTP_PDU_SequenceNumber := *, + iE_Extensions := * + } + } + } +} } + function ts_RANAP_RabAssReq(template (omit) RAB_SetupOrModifyList rab_sml := omit, @@ -1860,6 +1892,7 @@ function ts_RANAP_RabAssResp(template (omit) RAB_SetupOrModifiedList rab_sml := omit, + template (omit) RAB_ReleasedList rab_rl := omit, template (omit) RAB_FailedList rab_fl := omit, template (omit) RAB_AssignmentResponse.protocolExtensions exts := omit) return template RANAP_PDU { var template RANAP_PDU ret; @@ -1867,6 +1900,7 @@ var integer ie_pos := 0; var template RAB_AssignmentResponse.protocolIEs protocolIEs_rab_sml; + var template RAB_AssignmentResponse.protocolIEs protocolIEs_rab_rl; var template RAB_AssignmentResponse.protocolIEs protocolIEs_rab_fl; /* RAB-SetupOrModifiedList */ @@ -1885,7 +1919,22 @@ ie_pos := ie_pos + 1; } - /* TODO: RAB-ReleasedList */ + /* RAB-ReleasedList */ + if (istemplatekind(rab_rl, "value")) { + protocolIEs_rab_rl := { + { + id := id_RAB_ReleasedList, + criticality := ignore, + value_ := { + rAB_ReleasedList := rab_rl + } + } + } + + protocolIEs[ie_pos] := protocolIEs_rab_rl[0]; + ie_pos := ie_pos + 1; + } + /* TODO: RAB-QueuedList */ /* RAB-FailedList */ @@ -1922,6 +1971,7 @@ function tr_RANAP_RabAssResp(template RAB_SetupOrModifiedList rab_sml := omit, + template RAB_ReleasedList rab_rl := omit, template RAB_FailedList rab_fl := omit, template RAB_AssignmentResponse.protocolExtensions exts := *) return template RANAP_PDU { var template RANAP_PDU ret; @@ -1929,6 +1979,7 @@ var integer ie_pos := 0; var template RAB_AssignmentResponse.protocolIEs protocolIEs_rab_sml; + var template RAB_AssignmentResponse.protocolIEs protocolIEs_rab_rl; var template RAB_AssignmentResponse.protocolIEs protocolIEs_rab_fl; /* RAB-SetupOrModifiedList */ @@ -1947,7 +1998,22 @@ ie_pos := ie_pos + 1; } - /* TODO: RAB-ReleasedList */ + /* RAB-ReleasedList */ + if (not istemplatekind(rab_rl, "omit")) { + protocolIEs_rab_rl := { + { + id := id_RAB_ReleasedList, + criticality := ignore, + value_ := { + rAB_ReleasedList := rab_rl + } + } + } + + protocolIEs[ie_pos] := protocolIEs_rab_rl[0]; + ie_pos := ie_pos + 1; + } + /* TODO: RAB-QueuedList */ /* RAB-FailedList */ -- 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: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia25efc2d6bf01d4a13e7fd1ce0563d20dd2e321e Gerrit-Change-Number: 40272 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

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

by pespin

Attention is currently required from: fixeria, neels. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40272?usp=email ) Change subject: hnbgw: Introduce tests TC_ps_rab_release(_abnormal) ...................................................................... Patch Set 2: Code-Review+2 -- 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: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia25efc2d6bf01d4a13e7fd1ce0563d20dd2e321e Gerrit-Change-Number: 40272 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 15:08:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

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

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40271?usp=email ) Change subject: hnbgw: Introduce altstep as_pfcp_handle_del_req() ...................................................................... Patch Set 1: Code-Review+2 -- 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: comment 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> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 15:08:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[XS] Change in osmo-hnbgw[master]: kpi: Fix wrong counters incremented in RAB Release Failed List

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40279?usp=email ) Change subject: kpi: Fix wrong counters incremented in RAB Release Failed List ...................................................................... kpi: Fix wrong counters incremented in RAB Release Failed List Thouse counters are already incremented somewhere else, when Setup-or-modify is answered with a failure. This list is for RABs which failed to release, and the correct counter is already being incremented above. Change-Id: I0bcb70ca18078bb9201ce6cbf4ea81c05ae4ea68 --- M src/osmo-hnbgw/kpi_ranap.c 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-hnbgw/kpi_ranap.c b/src/osmo-hnbgw/kpi_ranap.c index 640f838..cbaa61d 100644 --- a/src/osmo-hnbgw/kpi_ranap.c +++ b/src/osmo-hnbgw/kpi_ranap.c @@ -382,11 +382,9 @@ /* differentiate modify / activate */ switch (map->rab_state[rab_id]) { case RAB_STATE_ACT_REQ: - HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_FAIL : HNB_CTR_RANAP_CS_RAB_ACT_FAIL); map->rab_state[rab_id] = RAB_STATE_INACTIVE; break; case RAB_STATE_ACTIVE: - HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_MOD_FAIL : HNB_CTR_RANAP_CS_RAB_MOD_FAIL); // FIXME: does it remain active after modification failure? break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40279?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: I0bcb70ca18078bb9201ce6cbf4ea81c05ae4ea68 Gerrit-Change-Number: 40279 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: kpi: count RAB actions received in unexpected state

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40280?usp=email ) Change subject: kpi: count RAB actions received in unexpected state ...................................................................... kpi: count RAB actions received in unexpected state This allows figuring out that something may be wrong in the network, with both sides (HNB vs CN) going out of sync, or HNBGW ending up in a bad state due to eg. a bug where a RAB is lost. While at it, fix some formatting issues on related counters. Related: SYS#7455 Change-Id: If3521ba601b9d7448226f2303ed2ef402d861bef --- M include/osmocom/hnbgw/hnb_persistent.h M src/osmo-hnbgw/hnb_persistent.c M src/osmo-hnbgw/kpi_ranap.c 3 files changed, 66 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/hnbgw/hnb_persistent.h b/include/osmocom/hnbgw/hnb_persistent.h index c4379de..07c017b 100644 --- a/include/osmocom/hnbgw/hnb_persistent.h +++ b/include/osmocom/hnbgw/hnb_persistent.h @@ -39,12 +39,18 @@ HNB_CTR_RANAP_PS_RAB_ACT_REQ, HNB_CTR_RANAP_CS_RAB_ACT_REQ, + HNB_CTR_RANAP_PS_RAB_ACT_REQ_UNEXP, + HNB_CTR_RANAP_CS_RAB_ACT_REQ_UNEXP, HNB_CTR_RANAP_PS_RAB_ACT_CNF, HNB_CTR_RANAP_CS_RAB_ACT_CNF, + HNB_CTR_RANAP_PS_RAB_ACT_CNF_UNEXP, + HNB_CTR_RANAP_CS_RAB_ACT_CNF_UNEXP, HNB_CTR_RANAP_PS_RAB_ACT_FAIL, HNB_CTR_RANAP_CS_RAB_ACT_FAIL, + HNB_CTR_RANAP_PS_RAB_ACT_FAIL_UNEXP, + HNB_CTR_RANAP_CS_RAB_ACT_FAIL_UNEXP, HNB_CTR_RANAP_PS_RAB_MOD_REQ, HNB_CTR_RANAP_CS_RAB_MOD_REQ, @@ -59,12 +65,18 @@ HNB_CTR_RANAP_CS_RAB_REL_REQ, HNB_CTR_RANAP_PS_RAB_REL_REQ_ABNORMAL, HNB_CTR_RANAP_CS_RAB_REL_REQ_ABNORMAL, + HNB_CTR_RANAP_PS_RAB_REL_REQ_UNEXP, + HNB_CTR_RANAP_CS_RAB_REL_REQ_UNEXP, HNB_CTR_RANAP_PS_RAB_REL_CNF, HNB_CTR_RANAP_CS_RAB_REL_CNF, + HNB_CTR_RANAP_PS_RAB_REL_CNF_UNEXP, + HNB_CTR_RANAP_CS_RAB_REL_CNF_UNEXP, HNB_CTR_RANAP_PS_RAB_REL_FAIL, HNB_CTR_RANAP_CS_RAB_REL_FAIL, + HNB_CTR_RANAP_PS_RAB_REL_FAIL_UNEXP, + HNB_CTR_RANAP_CS_RAB_REL_FAIL_UNEXP, HNB_CTR_RANAP_PS_RAB_REL_IMPLICIT, HNB_CTR_RANAP_CS_RAB_REL_IMPLICIT, diff --git a/src/osmo-hnbgw/hnb_persistent.c b/src/osmo-hnbgw/hnb_persistent.c index bcd6c4b..015e7c6 100644 --- a/src/osmo-hnbgw/hnb_persistent.c +++ b/src/osmo-hnbgw/hnb_persistent.c @@ -63,16 +63,28 @@ "ranap:ps:rab_act:req", "PS RAB Activations requested" }, [HNB_CTR_RANAP_CS_RAB_ACT_REQ] = { "ranap:cs:rab_act:req", "CS RAB Activations requested" }, + [HNB_CTR_RANAP_PS_RAB_ACT_REQ_UNEXP] = { + "ranap:ps:rab_act:req_unexp", "PS RAB Activations requested in unexpected state" }, + [HNB_CTR_RANAP_CS_RAB_ACT_REQ_UNEXP] = { + "ranap:cs:rab_act:req_unexp", "CS RAB Activations requested in unexpected state" }, [HNB_CTR_RANAP_PS_RAB_ACT_CNF] = { "ranap:ps:rab_act:cnf", "PS RAB Activations confirmed" }, [HNB_CTR_RANAP_CS_RAB_ACT_CNF] = { "ranap:cs:rab_act:cnf", "CS RAB Activations confirmed" }, + [HNB_CTR_RANAP_PS_RAB_ACT_CNF_UNEXP] = { + "ranap:ps:rab_act:cnf_unexp", "PS RAB Activations confirmed in unexpected state" }, + [HNB_CTR_RANAP_CS_RAB_ACT_CNF_UNEXP] = { + "ranap:cs:rab_act:cnf_unexp", "CS RAB Activations confirmed in unexpected state" }, [HNB_CTR_RANAP_PS_RAB_ACT_FAIL] = { "ranap:ps:rab_act:fail", "PS RAB Activations failed" }, [HNB_CTR_RANAP_CS_RAB_ACT_FAIL] = { "ranap:cs:rab_act:fail", "CS RAB Activations failed" }, + [HNB_CTR_RANAP_PS_RAB_ACT_FAIL_UNEXP] = { + "ranap:ps:rab_act:fail_unexp", "PS RAB Activations failed in unexpected state" }, + [HNB_CTR_RANAP_CS_RAB_ACT_FAIL_UNEXP] = { + "ranap:cs:rab_act:fail_unexp", "CS RAB Activations failed in unexpected state" }, [HNB_CTR_RANAP_PS_RAB_MOD_REQ] = { @@ -98,16 +110,28 @@ "ranap:ps:rab_rel:req:abnormal", "PS RAB Release requested (by CN), abnormal" }, [HNB_CTR_RANAP_CS_RAB_REL_REQ_ABNORMAL] = { "ranap:cs:rab_rel:req:abnormal", "CS RAB Release requested (by CN), abnormal" }, + [HNB_CTR_RANAP_PS_RAB_REL_REQ_UNEXP] = { + "ranap:ps:rab_rel:req:unexp", "PS RAB Release requested (by CN) in unexpected state" }, + [HNB_CTR_RANAP_CS_RAB_REL_REQ_UNEXP] = { + "ranap:cs:rab_rel:req:unexp", "CS RAB Release requested (by CN) in unexpected state" }, [HNB_CTR_RANAP_PS_RAB_REL_CNF] = { "ranap:ps:rab_rel:cnf", "PS RAB Release confirmed" }, [HNB_CTR_RANAP_CS_RAB_REL_CNF] = { "ranap:cs:rab_rel:cnf", "CS RAB Release confirmed" }, + [HNB_CTR_RANAP_PS_RAB_REL_CNF_UNEXP] = { + "ranap:ps:rab_rel:cnf_unexp", "PS RAB Release confirmed in unexpected state" }, + [HNB_CTR_RANAP_CS_RAB_REL_CNF_UNEXP] = { + "ranap:cs:rab_rel:cnf_unexp", "CS RAB Release confirmed in unexpected state" }, [HNB_CTR_RANAP_PS_RAB_REL_FAIL] = { "ranap:ps:rab_rel:fail", "PS RAB Release failed" }, [HNB_CTR_RANAP_CS_RAB_REL_FAIL] = { "ranap:cs:rab_rel:fail", "CS RAB Release failed" }, + [HNB_CTR_RANAP_PS_RAB_REL_FAIL_UNEXP] = { + "ranap:ps:rab_rel:fail_unexp", "PS RAB Release failed in unexpected state" }, + [HNB_CTR_RANAP_CS_RAB_REL_FAIL_UNEXP] = { + "ranap:cs:rab_rel:fail_unexp", "CS RAB Release failed in unexpected state" }, [HNB_CTR_RANAP_PS_RAB_REL_IMPLICIT] = { "ranap:ps:rab_rel:implicit:normal", "PS RAB Release implicit (during Iu Release), normal" }, diff --git a/src/osmo-hnbgw/kpi_ranap.c b/src/osmo-hnbgw/kpi_ranap.c index cbaa61d..865e2b4 100644 --- a/src/osmo-hnbgw/kpi_ranap.c +++ b/src/osmo-hnbgw/kpi_ranap.c @@ -106,13 +106,17 @@ * new, it is a setup */ switch (map->rab_state[rab_id]) { case RAB_STATE_ACTIVE: - HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_MOD_REQ : HNB_CTR_RANAP_CS_RAB_MOD_REQ); + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_MOD_REQ : + HNB_CTR_RANAP_CS_RAB_MOD_REQ); break; case RAB_STATE_INACTIVE: - HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_REQ : HNB_CTR_RANAP_CS_RAB_ACT_REQ); + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_REQ : + HNB_CTR_RANAP_CS_RAB_ACT_REQ); map->rab_state[rab_id] = RAB_STATE_ACT_REQ; break; default: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_REQ_UNEXP : + HNB_CTR_RANAP_CS_RAB_ACT_REQ_UNEXP); LOG_MAP(map, DRANAP, LOGL_NOTICE, "Unexpected RAB Activation/Modification Req for RAB in state %s\n", hnbgw_rab_state_name(map->rab_state[rab_id])); @@ -158,6 +162,8 @@ } break; default: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_REQ_UNEXP : + HNB_CTR_RANAP_CS_RAB_REL_REQ_UNEXP); LOG_MAP(map, DRANAP, LOGL_NOTICE, "Unexpected RAB Release Req in state %s\n", hnbgw_rab_state_name(map->rab_state[rab_id])); @@ -247,13 +253,17 @@ /* differentiate modify / activate */ switch (map->rab_state[rab_id]) { case RAB_STATE_ACT_REQ: - HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_CNF : HNB_CTR_RANAP_CS_RAB_ACT_CNF); + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_CNF : + HNB_CTR_RANAP_CS_RAB_ACT_CNF); map->rab_state[rab_id] = RAB_STATE_ACTIVE; break; case RAB_STATE_ACTIVE: - HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_MOD_CNF : HNB_CTR_RANAP_CS_RAB_MOD_CNF); + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_MOD_CNF : + HNB_CTR_RANAP_CS_RAB_MOD_CNF); break; default: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_CNF_UNEXP : + HNB_CTR_RANAP_CS_RAB_ACT_CNF_UNEXP); LOG_MAP(map, DRANAP, LOGL_NOTICE, "Unexpected RAB Activation/Modification Conf for RAB in state %s\n", hnbgw_rab_state_name(map->rab_state[rab_id])); @@ -267,8 +277,6 @@ if (ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_RELEASEDLIST_PRESENT) { RANAP_RAB_ReleasedList_t *r_list = &ies->raB_ReleasedList; /* increment number of released RABs, we don't need to do that individually during iteration */ - HNBP_CTR_ADD(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_CNF : HNB_CTR_RANAP_CS_RAB_REL_CNF, - r_list->raB_ReleasedList_ies.list.count); for (unsigned int i = 0; i < r_list->raB_ReleasedList_ies.list.count; i++) { RANAP_IE_t *released_list_ie = r_list->raB_ReleasedList_ies.list.array[i]; RANAP_RAB_ReleasedItemIEs_t _rab_rel_item_ies = {}; @@ -292,8 +300,12 @@ switch (map->rab_state[rab_id]) { case RAB_STATE_REL_REQ: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_CNF : + HNB_CTR_RANAP_CS_RAB_REL_CNF); break; default: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_CNF_UNEXP : + HNB_CTR_RANAP_CS_RAB_REL_CNF_UNEXP); LOG_MAP(map, DRANAP, LOGL_NOTICE, "Unexpected RAB Release Conf for RAB in state %s\n", hnbgw_rab_state_name(map->rab_state[rab_id])); @@ -335,14 +347,18 @@ /* differentiate modify / activate */ switch (map->rab_state[rab_id]) { case RAB_STATE_ACT_REQ: - HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_FAIL : HNB_CTR_RANAP_CS_RAB_ACT_FAIL); + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_FAIL : + HNB_CTR_RANAP_CS_RAB_ACT_FAIL); map->rab_state[rab_id] = RAB_STATE_INACTIVE; break; case RAB_STATE_ACTIVE: - HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_MOD_FAIL : HNB_CTR_RANAP_CS_RAB_MOD_FAIL); + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_MOD_FAIL : + HNB_CTR_RANAP_CS_RAB_MOD_FAIL); // FIXME: does it remain active after modification failure? break; default: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_FAIL_UNEXP : + HNB_CTR_RANAP_CS_RAB_ACT_FAIL_UNEXP); LOG_MAP(map, DRANAP, LOGL_NOTICE, "Unexpected RAB Activation/Modification Failed for RAB in state %s\n", hnbgw_rab_state_name(map->rab_state[rab_id])); @@ -356,8 +372,6 @@ if (ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_RELEASEFAILEDLIST_PRESENT) { RANAP_RAB_ReleaseFailedList_t *rf_list = &ies->raB_ReleaseFailedList; /* increment number of released RABs, we don't need to do that individually during iteration */ - HNBP_CTR_ADD(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_FAIL : HNB_CTR_RANAP_CS_RAB_REL_FAIL, - rf_list->raB_FailedList_ies.list.count); for (unsigned int i = 0; i < rf_list->raB_FailedList_ies.list.count; i++) { RANAP_IE_t *failed_list_ie = rf_list->raB_FailedList_ies.list.array[i]; RANAP_RAB_FailedItemIEs_t _rab_failed_item_ies = {}; @@ -382,12 +396,18 @@ /* differentiate modify / activate */ switch (map->rab_state[rab_id]) { case RAB_STATE_ACT_REQ: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_FAIL : + HNB_CTR_RANAP_CS_RAB_REL_FAIL); map->rab_state[rab_id] = RAB_STATE_INACTIVE; break; case RAB_STATE_ACTIVE: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_FAIL : + HNB_CTR_RANAP_CS_RAB_REL_FAIL); // FIXME: does it remain active after modification failure? break; default: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_FAIL_UNEXP : + HNB_CTR_RANAP_CS_RAB_REL_FAIL_UNEXP); LOG_MAP(map, DRANAP, LOGL_NOTICE, "Unexpected RAB Release Failed for RAB in state %s\n", hnbgw_rab_state_name(map->rab_state[rab_id])); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40280?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: If3521ba601b9d7448226f2303ed2ef402d861bef Gerrit-Change-Number: 40280 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: Clean up calls to ps_rab_ass_fsm_state_chg()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40274?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Clean up calls to ps_rab_ass_fsm_state_chg() ...................................................................... Clean up calls to ps_rab_ass_fsm_state_chg() Change-Id: I7c9a67ebe192ba30fa474f84eaee1db2a718fa35 --- M src/osmo-hnbgw/ps_rab_ass_fsm.c 1 file changed, 3 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/src/osmo-hnbgw/ps_rab_ass_fsm.c b/src/osmo-hnbgw/ps_rab_ass_fsm.c index f76b1cf..68bf58a 100644 --- a/src/osmo-hnbgw/ps_rab_ass_fsm.c +++ b/src/osmo-hnbgw/ps_rab_ass_fsm.c @@ -118,7 +118,7 @@ /* PS_RAB_ASS_ST_WAIT_RABS_ESTABLISHED is terminated by PFCP timeouts via ps_rab_fsm */ }; -#define ps_rab_ass_fsm_state_chg(state) \ +#define ps_rab_ass_fsm_state_chg(fi, state) \ osmo_tdef_fsm_inst_state_chg(fi, state, ps_rab_ass_fsm_timeouts, hnbgw_T_defs, -1) static struct osmo_fsm ps_rab_ass_fsm; @@ -219,12 +219,9 @@ { RANAP_RAB_AssignmentRequestIEs_t *ies = &message->msg.raB_AssignmentRequestIEs; int i; - struct ps_rab_ass *rab_ass; - struct osmo_fsm_inst *fi; rab_ass = ps_rab_ass_alloc(map); - talloc_steal(rab_ass, message); rab_ass->ranap_rab_ass_req_message = message; /* Now rab_ass owns message and will clean it up */ @@ -258,8 +255,7 @@ /* Got all RABs' state and their Core side GTP info in map->ps_rab_list. For each, a ps_rab_fsm has been started and * each will call back with PS_RAB_ASS_EV_LOCAL_F_TEIDS_RX or PS_RAB_ASS_EV_RAB_FAIL. */ - fi = rab_ass->fi; - return ps_rab_ass_fsm_state_chg(PS_RAB_ASS_ST_WAIT_LOCAL_F_TEIDS); + return ps_rab_ass_fsm_state_chg(rab_ass->fi, PS_RAB_ASS_ST_WAIT_LOCAL_F_TEIDS); no_rab: ps_rab_ass_failure(rab_ass); @@ -416,7 +412,6 @@ int rc; int i; struct ps_rab_ass *rab_ass; - struct osmo_fsm_inst *fi; RANAP_RAB_AssignmentResponseIEs_t *ies; /* Make sure we indeed deal with a setup-or-modify list */ @@ -472,8 +467,7 @@ /* Got all RABs' state and updated their Access side GTP info in map->ps_rab_list. For each RAB ID, the matching * ps_rab_fsm has been instructed to tell the UPF about the Access Remote GTP F-TEID. Each will call back with * PS_RAB_ASS_EV_RAB_ESTABLISHED or PS_RAB_ASS_EV_RAB_FAIL. */ - fi = rab_ass->fi; - return ps_rab_ass_fsm_state_chg(PS_RAB_ASS_ST_WAIT_RABS_ESTABLISHED); + return ps_rab_ass_fsm_state_chg(rab_ass->fi, PS_RAB_ASS_ST_WAIT_RABS_ESTABLISHED); } static void ps_rab_ass_resp_send_if_ready(struct ps_rab_ass *rab_ass); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40274?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: I7c9a67ebe192ba30fa474f84eaee1db2a718fa35 Gerrit-Change-Number: 40274 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

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

by pespin

pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved 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: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic557f20f40fec49ce2c83a73f6e5c8b027d57ef5 Gerrit-Change-Number: 40270 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log