April 2023 - gerrit-log - lists.osmocom.org

[S] Change in libosmo-sccp[master]: comment: fix typo 'OSMO_ASCU_'
by fixeria 05 Apr '23

05 Apr '23

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/32215 ) Change subject: comment: fix typo 'OSMO_ASCU_' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/32215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I1c0f501a7f828499c6112cab8aece20f7c34c118 Gerrit-Change-Number: 32215 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 05 Apr 2023 07:25:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-sccp[master]: add two value_string[]s related to N-PCSTATE
by fixeria 05 Apr '23

05 Apr '23

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/32214 ) Change subject: add two value_string[]s related to N-PCSTATE ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/32214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I873ea30e8f64280487769668c748c67ce4ff4023 Gerrit-Change-Number: 32214 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 05 Apr 2023 07:23:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: SCCP N-PCSTATE: trigger MSC status on PC availability
by neels 05 Apr '23

05 Apr '23

Attention is currently required from: laforge. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32151 ) Change subject: SCCP N-PCSTATE: trigger MSC status on PC availability ...................................................................... Patch Set 2: (1 comment) File src/osmo-bsc/osmo_bsc_sigtran.c: https://gerrit.osmocom.org/c/osmo-bsc/+/32151/comment/0b010da3_39222232 PS1, Line 112: static struct bsc_msc_data *get_msc_by_pc(uint32_t pc) : { : struct bsc_msc_data *msc; : llist_for_each_entry(msc, msc_list, entry) { : if ((msc->a.msc_addr.presence & OSMO_SCCP_ADDR_T_PC) == 0) : continue; : if (msc->a.msc_addr.pc == pc) : return msc; : } : return NULL; : } > don't we somehow need to involve the sccp_instance in this? AFAICT we can have multiple MSCs within […] gotcha, of course. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3a0869598b8395601a16d78dbc46eec400c0ea84 Gerrit-Change-Number: 32151 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 05 Apr 2023 05:41:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: SCCP N-PCSTATE: trigger MSC status on PC availability
by neels 05 Apr '23

05 Apr '23

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32151 ) Change subject: SCCP N-PCSTATE: trigger MSC status on PC availability ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3a0869598b8395601a16d78dbc46eec400c0ea84 Gerrit-Change-Number: 32151 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 05 Apr 2023 05:40:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: log: N-PCSTATE: use new value_strings
by neels 05 Apr '23

05 Apr '23

Attention is currently required from: neels. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/32152 to look at the new patch set (#2). Change subject: log: N-PCSTATE: use new value_strings ...................................................................... log: N-PCSTATE: use new value_strings Related: SYS#6319 Depends: I873ea30e8f64280487769668c748c67ce4ff4023 (libosmo-sccp) Change-Id: I7a13fcf2bfee232c6cebc3c1180b956a73abc24e --- M src/osmo-bsc/osmo_bsc_sigtran.c 1 file changed, 22 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/52/32152/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7a13fcf2bfee232c6cebc3c1180b956a73abc24e Gerrit-Change-Number: 32152 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-ttcn3-hacks[master]: bsc: add TC_mscpool_sccp_n_pcstate_detaches_msc
by neels 05 Apr '23

05 Apr '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32216 ) Change subject: bsc: add TC_mscpool_sccp_n_pcstate_detaches_msc ...................................................................... bsc: add TC_mscpool_sccp_n_pcstate_detaches_msc Related: SYS#6319 OS#5917 Related: I3a0869598b8395601a16d78dbc46eec400c0ea84 (osmo-bsc) Change-Id: Ia1aea4e33230d6a685b72ea5ba20dd9c7d265d44 --- M bsc/BSC_Tests.ttcn 1 file changed, 57 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/32216/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index bfab0fa..39c82ab 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -9161,6 +9161,50 @@ f_shutdown_helper(); } +/* When an MSC point-code gets an SCCP N-PCSTATE saying it is unreachable, immediately mark the MSC as unusable. */ +testcase TC_mscpool_sccp_n_pcstate_detaches_msc() runs on test_CT { + + f_init(nr_bts := 3, handler_mode := true, nr_msc := 2); + f_sleep(1.0); + + /* Control which MSC gets chosen next by the round-robin, otherwise + * would be randomly affected by which other tests ran before this. */ + f_vty_transceive(BSCVTY, "mscpool roundrobin next 0"); + + f_ctrs_msc_init(); + + var MSC_ConnHdlr vc_conn1; + var TestHdlrParams pars1 := f_gen_test_hdlr_pars(bssap_idx := 0); + pars1.mscpool.rsl_idx := 0; + pars1.mscpool.l3_info := valueof(ts_LU_REQ(LU_Type_IMSI_Attach, valueof(ts_MI_IMSI_LV('001010000000001'H)), '00F110'O)); + vc_conn1 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars1); + vc_conn1.done; + f_ctrs_msc_expect(0, "mscpool:subscr:new"); + + var MSC_ConnHdlr vc_conn2; + var TestHdlrParams pars2 := f_gen_test_hdlr_pars(bssap_idx := 1); + pars2.mscpool.rsl_idx := 1; + pars2.mscpool.l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_MO_CALL, valueof(ts_MI_IMSI_LV('001010000000002'H)))); + vc_conn2 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars2); + vc_conn2.done; + f_ctrs_msc_expect(1, "mscpool:subscr:new"); + + f_logp(BSCVTY, "disconnecting msc0"); + /* Disconnect the first MSC */ + f_ran_adapter_cleanup(g_bssap[0]); + + /* Now round-robin would wrap to the first MSC, but since the first MSC is disconnected, it wraps around to msc + * 2 again. */ + var MSC_ConnHdlr vc_conn3; + var TestHdlrParams pars3 := f_gen_test_hdlr_pars(bssap_idx := 1); + pars3.mscpool.rsl_idx := 2; + pars3.mscpool.l3_info := valueof(ts_PAG_RESP(valueof(ts_MI_IMSI_LV('001010000000003'H)))); + vc_conn3 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars3); + vc_conn3.done; + f_ctrs_msc_expect(1, "mscpool:subscr:new"); + f_shutdown_helper(); +} + /* Allow/Deny emergency calls globally via VTY */ private function f_vty_allow_emerg_msc(boolean allow) runs on test_CT { f_vty_enter_cfg_msc(BSCVTY, 0); @@ -12463,6 +12507,8 @@ execute( TC_mscpool_paging_and_response_tmsi() ); execute( TC_mscpool_no_allow_attach_round_robin() ); execute( TC_mscpool_no_allow_attach_valid_nri() ); + + execute( TC_mscpool_sccp_n_pcstate_detaches_msc() ); } execute( TC_early_conn_fail() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia1aea4e33230d6a685b72ea5ba20dd9c7d265d44 Gerrit-Change-Number: 32216 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: bsc: add TC_mscpool_sccp_n_pcstate_attaches_msc
by neels 05 Apr '23

05 Apr '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32217 ) Change subject: bsc: add TC_mscpool_sccp_n_pcstate_attaches_msc ...................................................................... bsc: add TC_mscpool_sccp_n_pcstate_attaches_msc Related: I3a0869598b8395601a16d78dbc46eec400c0ea84 (osmo-bsc) Change-Id: Ib4a5330df30a73e744c316898817b2fa3271d75e --- M bsc/BSC_Tests.ttcn 1 file changed, 103 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/32217/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 39c82ab..74f7889 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -646,6 +646,8 @@ /* are we initialized yet */ var boolean g_initialized := false; + var boolean g_handler_mode := false; + /* Osmux is enabled through VTY */ var boolean g_osmux_enabled_cn := false; var boolean g_osmux_enabled_bts := false; @@ -1210,6 +1212,27 @@ } } +private function f_bssap_idx_init(integer bssap_idx) runs on test_CT { + /* Call a function of our 'parent component' RAN_Adapter_CT to start the + * MSC-side BSSAP emulation */ + if (g_handler_mode) { + var RanOps ranops := MSC_RanOps; + ranops.use_osmux := g_osmux_enabled_cn; + f_ran_adapter_init(g_bssap[bssap_idx], mp_bssap_cfg[bssap_idx], "VirtMSC", ranops); + connect(self:SCCPLITE_IPA_CTRL, g_bssap[bssap_idx].vc_RAN:CTRL_CLIENT); + f_ran_adapter_start(g_bssap[bssap_idx]); + } else { + f_ran_adapter_init(g_bssap[bssap_idx], mp_bssap_cfg[bssap_idx], "VirtMSC", omit); + connect(self:BSSAP, g_bssap[bssap_idx].vc_SCCP:SCCP_SP_PORT); + f_ran_adapter_start(g_bssap[bssap_idx]); + f_legacy_bssap_reset(); + } +} + +private function f_bssap_idx_disconnect(integer bssap_idx) runs on test_CT { + f_ran_adapter_cleanup(g_bssap[bssap_idx]); +} + /* global initialization function * \param nr_bts Number of BTSs we should start/bring up * \param handler_mode Start an RSL_Emulation_CT component (true) or not (false). @@ -1238,22 +1261,10 @@ f_vty_transceive(BSCVTY, "msc " & int2str(bssap_idx) & " bssmap reset", strict := false); } + g_handler_mode := handler_mode; for (bssap_idx := 0; bssap_idx < nr_msc; bssap_idx := bssap_idx+1) { allow_attach[bssap_idx] := true; - /* Call a function of our 'parent component' RAN_Adapter_CT to start the - * MSC-side BSSAP emulation */ - if (handler_mode) { - var RanOps ranops := MSC_RanOps; - ranops.use_osmux := g_osmux_enabled_cn; - f_ran_adapter_init(g_bssap[bssap_idx], mp_bssap_cfg[bssap_idx], "VirtMSC", ranops); - connect(self:SCCPLITE_IPA_CTRL, g_bssap[bssap_idx].vc_RAN:CTRL_CLIENT); - f_ran_adapter_start(g_bssap[bssap_idx]); - } else { - f_ran_adapter_init(g_bssap[bssap_idx], mp_bssap_cfg[bssap_idx], "VirtMSC", omit); - connect(self:BSSAP, g_bssap[bssap_idx].vc_SCCP:SCCP_SP_PORT); - f_ran_adapter_start(g_bssap[bssap_idx]); - f_legacy_bssap_reset(); - } + f_bssap_idx_init(bssap_idx); } if (mp_enable_lcs_tests) { @@ -9176,7 +9187,7 @@ var MSC_ConnHdlr vc_conn1; var TestHdlrParams pars1 := f_gen_test_hdlr_pars(bssap_idx := 0); pars1.mscpool.rsl_idx := 0; - pars1.mscpool.l3_info := valueof(ts_LU_REQ(LU_Type_IMSI_Attach, valueof(ts_MI_IMSI_LV('001010000000001'H)), '00F110'O)); + pars1.mscpool.l3_info := valueof(ts_LU_REQ(LU_Type_IMSI_Attach, valueof(ts_MI_IMSI_LV('001010420000001'H)), '00F110'O)); vc_conn1 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars1); vc_conn1.done; f_ctrs_msc_expect(0, "mscpool:subscr:new"); @@ -9184,25 +9195,87 @@ var MSC_ConnHdlr vc_conn2; var TestHdlrParams pars2 := f_gen_test_hdlr_pars(bssap_idx := 1); pars2.mscpool.rsl_idx := 1; - pars2.mscpool.l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_MO_CALL, valueof(ts_MI_IMSI_LV('001010000000002'H)))); + pars2.mscpool.l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_MO_CALL, valueof(ts_MI_IMSI_LV('001010420000002'H)))); vc_conn2 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars2); vc_conn2.done; f_ctrs_msc_expect(1, "mscpool:subscr:new"); f_logp(BSCVTY, "disconnecting msc0"); - /* Disconnect the first MSC */ - f_ran_adapter_cleanup(g_bssap[0]); + f_bssap_idx_disconnect(0); /* Now round-robin would wrap to the first MSC, but since the first MSC is disconnected, it wraps around to msc * 2 again. */ var MSC_ConnHdlr vc_conn3; var TestHdlrParams pars3 := f_gen_test_hdlr_pars(bssap_idx := 1); pars3.mscpool.rsl_idx := 2; - pars3.mscpool.l3_info := valueof(ts_PAG_RESP(valueof(ts_MI_IMSI_LV('001010000000003'H)))); + pars3.mscpool.l3_info := valueof(ts_PAG_RESP(valueof(ts_MI_IMSI_LV('001010420000003'H)))); vc_conn3 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars3); vc_conn3.done; f_ctrs_msc_expect(1, "mscpool:subscr:new"); + + f_logp(BSCVTY, "reconnecting msc0"); + f_bssap_idx_init(0); + f_sleep(1.0); + + /* This time round-robin wraps to the first MSC, because it is back online. */ + var MSC_ConnHdlr vc_conn4; + var TestHdlrParams pars4 := f_gen_test_hdlr_pars(bssap_idx := 0); + pars4.mscpool.rsl_idx := 0; + pars4.mscpool.l3_info := valueof(ts_PAG_RESP(valueof(ts_MI_IMSI_LV('001010420000004'H)))); + vc_conn4 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars4); + vc_conn4.done; + f_ctrs_msc_expect(0, "mscpool:subscr:new"); + f_shutdown_helper(); + +} + +/* When an MSC point-code gets an SCCP N-PCSTATE saying it is now reachable, immediately trigger RESET and bring up the + * MSC. */ +testcase TC_mscpool_sccp_n_pcstate_attaches_msc() runs on test_CT { + + f_init(nr_bts := 3, handler_mode := true, nr_msc := 1); + f_sleep(1.0); + + /* Control which MSC gets chosen next by the round-robin, otherwise + * would be randomly affected by which other tests ran before this. */ + f_vty_transceive(BSCVTY, "mscpool roundrobin next 0"); + + f_ctrs_msc_init(); + + /* There is only one MSC, round robin stays on msc0 */ + var MSC_ConnHdlr vc_conn1; + var TestHdlrParams pars1 := f_gen_test_hdlr_pars(bssap_idx := 0); + pars1.mscpool.rsl_idx := 0; + pars1.mscpool.l3_info := valueof(ts_LU_REQ(LU_Type_IMSI_Attach, valueof(ts_MI_IMSI_LV('0010100230000001'H)), '00F110'O)); + vc_conn1 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars1); + vc_conn1.done; + f_ctrs_msc_expect(0, "mscpool:subscr:new"); + + var MSC_ConnHdlr vc_conn2; + var TestHdlrParams pars2 := f_gen_test_hdlr_pars(bssap_idx := 0); + pars2.mscpool.rsl_idx := 1; + pars2.mscpool.l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_MO_CALL, valueof(ts_MI_IMSI_LV('001010023000002'H)))); + vc_conn2 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars2); + vc_conn2.done; + f_ctrs_msc_expect(0, "mscpool:subscr:new"); + + f_logp(BSCVTY, "connecting msc1"); + f_vty_msc_allow_attach(BSCVTY, { true, true }); + f_bssap_idx_init(1); + f_sleep(1.0); + + /* This time round-robin wraps to the second MSC, because it is now online. */ + var MSC_ConnHdlr vc_conn4; + var TestHdlrParams pars4 := f_gen_test_hdlr_pars(bssap_idx := 1); + pars4.mscpool.rsl_idx := 2; + pars4.mscpool.l3_info := valueof(ts_PAG_RESP(valueof(ts_MI_IMSI_LV('001010023000003'H)))); + vc_conn4 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars4); + vc_conn4.done; + f_ctrs_msc_expect(1, "mscpool:subscr:new"); + + f_shutdown_helper(); + } /* Allow/Deny emergency calls globally via VTY */ @@ -12509,6 +12582,7 @@ execute( TC_mscpool_no_allow_attach_valid_nri() ); execute( TC_mscpool_sccp_n_pcstate_detaches_msc() ); + execute( TC_mscpool_sccp_n_pcstate_attaches_msc() ); } execute( TC_early_conn_fail() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib4a5330df30a73e744c316898817b2fa3271d75e Gerrit-Change-Number: 32217 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-sccp[master]: comment: fix typo 'OSMO_ASCU_'
by neels 05 Apr '23

05 Apr '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/32215 ) Change subject: comment: fix typo 'OSMO_ASCU_' ...................................................................... comment: fix typo 'OSMO_ASCU_' Change-Id: I1c0f501a7f828499c6112cab8aece20f7c34c118 --- M include/osmocom/sigtran/sccp_sap.h 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/15/32215/1 diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h index ca47036..24d8832 100644 --- a/include/osmocom/sigtran/sccp_sap.h +++ b/include/osmocom/sigtran/sccp_sap.h @@ -262,7 +262,7 @@ uint32_t ssn_multiplicity_ind; }; -/* OSMO_ASCU_PRIM_N_PCSTATE */ +/* OSMO_SCU_PRIM_N_PCSTATE */ struct osmo_scu_pcstate_param { uint32_t affected_pc; uint32_t restricted_importance_level; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/32215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I1c0f501a7f828499c6112cab8aece20f7c34c118 Gerrit-Change-Number: 32215 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-sccp[master]: add two value_string[]s related to N-PCSTATE
by neels 05 Apr '23

05 Apr '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/32214 ) Change subject: add two value_string[]s related to N-PCSTATE ...................................................................... add two value_string[]s related to N-PCSTATE Related: SYS#6319 Change-Id: I873ea30e8f64280487769668c748c67ce4ff4023 --- M include/osmocom/sigtran/sccp_sap.h M src/sccp_sap.c 2 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/14/32214/1 diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h index 4bcdd38..ca47036 100644 --- a/include/osmocom/sigtran/sccp_sap.h +++ b/include/osmocom/sigtran/sccp_sap.h @@ -143,6 +143,13 @@ OSMO_SCCP_SP_S_CONGESTED = 2, OSMO_SCCP_SP_S_ACCESSIBLE = 3, }; + +extern const struct value_string osmo_sccp_sp_status_names[]; +static inline const char *osmo_sccp_sp_status_name(enum osmo_sccp_sp_status val) +{ + return get_value_string(osmo_sccp_sp_status_names, val); +} + /* Q.711 6.3.2.2.6 Remote SCCP status */ enum osmo_sccp_rem_sccp_status { OSMO_SCCP_REM_SCCP_S_AVAILABLE = 1, @@ -152,6 +159,12 @@ OSMO_SCCP_REM_SCCP_S_CONGESTED = 5, }; +extern const struct value_string osmo_sccp_rem_sccp_status_names[]; +static inline const char *osmo_sccp_rem_sccp_status_name(enum osmo_sccp_rem_sccp_status val) +{ + return get_value_string(osmo_sccp_rem_sccp_status_names, val); +} + /* legacy shim for name change */ #define OSMO_SCCP_SSN_SMLC_BSSAP OSMO_SCCP_SSN_SMLC_BSSAP_LE diff --git a/src/sccp_sap.c b/src/sccp_sap.c index 51237ad..b3bc3e8 100644 --- a/src/sccp_sap.c +++ b/src/sccp_sap.c @@ -120,6 +120,22 @@ { 0, NULL } }; +const struct value_string osmo_sccp_sp_status_names[] = { + { OSMO_SCCP_SP_S_INACCESSIBLE, "INACCESSIBLE" }, + { OSMO_SCCP_SP_S_CONGESTED, "CONGESTED" }, + { OSMO_SCCP_SP_S_ACCESSIBLE, "ACCESSIBLE" }, + {} +}; + +const struct value_string osmo_sccp_rem_sccp_status_names[] = { + { OSMO_SCCP_REM_SCCP_S_AVAILABLE, "AVAILABLE" }, + { OSMO_SCCP_REM_SCCP_S_UNAVAILABLE_UNKNOWN, "UNAVAILABLE_UNKNOWN" }, + { OSMO_SCCP_REM_SCCP_S_UNEQUIPPED, "UNEQUIPPED" }, + { OSMO_SCCP_REM_SCCP_S_INACCESSIBLE, "INACCESSIBLE" }, + { OSMO_SCCP_REM_SCCP_S_CONGESTED, "CONGESTED" }, + {} +}; + const struct value_string osmo_sccp_ssn_names[] = { { OSMO_SCCP_SSN_MGMT, "MGMT" }, { OSMO_SCCP_SSN_ISUP, "ISUP" }, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/32214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I873ea30e8f64280487769668c748c67ce4ff4023 Gerrit-Change-Number: 32214 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: include/osmocom/gsm/protocol: add gsm_06_31.h
by falconia 04 Apr '23

04 Apr '23

Attention is currently required from: pespin. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32197 ) Change subject: include/osmocom/gsm/protocol: add gsm_06_31.h ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Let's see if we can all get on the same page here: my end objective in this patch series is to add some new functions to libosmocodec, and these functions happen to have this 06.31-defined ternary enum as their return value. Harald just said that naming ETSI-defined or 3GPP-defined things without osmo_ prefix is fine in <osmocom/gsm/protocol/xxx.h> headers - but if the present patch were to be accepted, then the very next patch in the series will have <osmocom/codec/codec.h> including the new <osmocom/gsm/protocol/gsm_06_31.h> header, in order to get that enum for the return value of osmo_{fr,efr}_sid_classify() functions. Thus if namespace pollution is a concern, then it does not stay confined to programs that explicitly include <osmocom/gsm/protocol/gsm_06_31.h>, instead everyone who includes <osmocom/codec/codec.h> will get it too. So what should we do? Continue with the approach of creating this new <osmocom/gsm/protocol/gsm_06_31.h> header to hold the GSM 06.31 SID class enum, or go back to my original approach of putting this enum directly into <osmocom/codec/codec.h>? And as for the enum itself and its items, should I just bite the bullet and prefix them all with osmo_ even though they aren't Osmo-defined? If we decide the latter, I suggest this naming: enum osmo_gsm631_sid_class OSMO_GSM631_SID_CLASS_SPEECH OSMO_GSM631_SID_CLASS_INVALID OSMO_GSM631_SID_CLASS_VALID Disadvantage: long. Advantage: achieves namespace containment while also making it clear that the definitions come from the spec and are not Osmocom-invented. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If004b668778d3d9cf6cd998b3af2dbfa83691529 Gerrit-Change-Number: 32197 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 20:43:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0