- gerrit-log - lists.osmocom.org

Change in osmo-msc[master]: vlr_loc_update(): drop bogus check
by neels 11 Oct '22

11 Oct '22

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/29693 ) Change subject: vlr_loc_update(): drop bogus check ...................................................................... vlr_loc_update(): drop bogus check All callers pass authentication_required = true when is_utran = true. The failure this error message would highlight is not possible. Change-Id: Ia1b5d5d308746651a41612f46a988f41acd0a269 --- M src/libvlr/vlr_lu_fsm.c 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/93/29693/1 diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 4f603b3..f673316 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -1520,10 +1520,6 @@ (ciphering_required? "+Ciph" : " (no Ciph)") : ""); - if (is_utran && !authentication_required) - LOGPFSML(fi, LOGL_ERROR, - "Authentication off on UTRAN network. Good luck.\n"); - osmo_fsm_inst_dispatch(fi, VLR_ULA_E_UPDATE_LA, NULL); return fi; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia1b5d5d308746651a41612f46a988f41acd0a269 Gerrit-Change-Number: 29693 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: msc: test auth options, and fall-back to no-auth
by neels 11 Oct '22

11 Oct '22

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29692 ) Change subject: msc: test auth options, and fall-back to no-auth ...................................................................... msc: test auth options, and fall-back to no-auth Test 12 permutations of (auth optional,required) x (a5 '0', '0 3', '3') x (hlr has auth info) In TC_auth_options_2(), expect behavior after implementing OS#4830: if the HLR fails to return auth info and auth + ciph are configured optional, fall back to no authentication. This test will start succeeding starting with commit I5feda196fa481dd8a46b0e4721c64b7c6600f0d1 in osmo-msc.git. All other tests yield the current behavior of osmo-msc. Related: I5feda196fa481dd8a46b0e4721c64b7c6600f0d1 (osmo-msc) Related: OS#4830 Change-Id: I8e3b02ca83e56ef5349d85f08407509e19fa353c --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 409 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/29692/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 4e736b8..fe9187c 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -78,8 +78,24 @@ } type record BSC_ConnHdlrNetworkPars { + /* Bitmask of expected A5 levels; in Ciphering, will expect use of the highest A5 remaining after masking this + * with A5 supported by the MS */ OCT1 kc_support, + /* osmo-msc VTY cfg under 'network': If a test wants to temporarily modify auth and encr config, this is the + * original config to return to for this test (is *not* sent to vty before the test, but maybe it should). + * For example: { "authentication optional", "encryption a5 0 3" } */ + rof_charstring net_config, + /* expect_attach_success == true: expect Location Updating / CM Service Request to succeed. + * expect_attach_success == false: expect the MSC to reject LU / CM Service. */ + boolean expect_attach_success, + /* expect_tmsi == true: expect MSC to allocate a new TMSI. + * expect_tmsi == false: expect no TMSI to be assigned, operate with IMSI Mobile Identity. */ boolean expect_tmsi, + /* expect_auth == true overrides expect_auth_attempt == false */ + boolean expect_auth_attempt, + /* hlr_has_auth_info has an effect only when (expect_auth_attempt or expect_auth) == true. + * hlr_has_auth_info == false means the HLR responds to Send Auth Info Request with a NACK. */ + boolean hlr_has_auth_info, boolean expect_auth, boolean expect_ciph, boolean expect_imei, @@ -404,7 +420,11 @@ } else { if (etype != EST_TYPE_PAG_RESP) { /* explicit CM SERVICE ACCEPT */ - BSSAP.receive(tr_PDU_DTAP_MT(tr_CM_SERV_ACC)); + if (g_pars.net.expect_attach_success) { + BSSAP.receive(tr_PDU_DTAP_MT(tr_CM_SERV_ACC)); + } else { + BSSAP.receive(tr_PDU_DTAP_MT(tr_CM_SERV_REJ)); + } } } } @@ -436,34 +456,43 @@ altstep as_GSUP_SAI() runs on BSC_ConnHdlr { var GSUP_IE auth_tuple; [] GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)) { - if (g_pars.use_umts_aka) { - if (not g_pars.vec_keep) { - g_pars.vec := f_gen_auth_vec_3g(); + if (g_pars.net.hlr_has_auth_info) { + if (g_pars.use_umts_aka) { + if (not g_pars.vec_keep) { + g_pars.vec := f_gen_auth_vec_3g(); + } + auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G3G(g_pars.vec.rand, + g_pars.vec.sres, + g_pars.vec.kc, + g_pars.vec.ik, + g_pars.vec.ck, + g_pars.vec.autn, + g_pars.vec.res)); + GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple)); + } else { + if (not g_pars.vec_keep) { + g_pars.vec := f_gen_auth_vec_2g(); + } + auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G(g_pars.vec.rand, + g_pars.vec.sres, + g_pars.vec.kc)); + GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple)); } - auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G3G(g_pars.vec.rand, - g_pars.vec.sres, - g_pars.vec.kc, - g_pars.vec.ik, - g_pars.vec.ck, - g_pars.vec.autn, - g_pars.vec.res)); - GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple)); } else { - if (not g_pars.vec_keep) { - g_pars.vec := f_gen_auth_vec_2g(); - } - auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G(g_pars.vec.rand, - g_pars.vec.sres, - g_pars.vec.kc)); - GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple)); + log("XXX ts_GSUP_SAI_ERR"); + /* HLR knows the IMSI but has no authentication info; osmo-hlr responds with GMM_CAUSE_IMSI_UNKNOWN=2 in + * this case, for SAI this merely means there is no auth entry for this IMSI. */ + GSUP.send(ts_GSUP_SAI_ERR(g_pars.imsi, 2)); } } } function f_mm_auth() runs on BSC_ConnHdlr { - if (g_pars.net.expect_auth) { + if (g_pars.net.expect_auth or g_pars.net.expect_auth_attempt) { as_GSUP_SAI(); + } + if (g_pars.net.expect_auth) { if (g_pars.use_umts_aka) { BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_MM_AUTH_REQ_3G(g_pars.vec.rand, g_pars.vec.autn))); var OCT4 res := substr(g_pars.vec.res, 0, 4); @@ -685,6 +714,9 @@ f_mm_ciph_utran(); } + if (not g_pars.net.expect_attach_success) { + return; + } f_expect_common_id(); } @@ -810,15 +842,18 @@ f_mm_common(); f_msc_lu_hlr(); f_mm_imei(); - f_accept_reject_lu(); + as_accept_reject_lu(g_pars.net.expect_attach_success); /* FIXME: there could be pending SMS or other common procedures by the MSC, let's ignore them */ - f_expect_clear(); + f_expect_clear(verify_vlr_cell_id := g_pars.net.expect_attach_success); setverdict(pass); } function f_msc_lu_hlr() runs on BSC_ConnHdlr { + if (not g_pars.net.expect_attach_success) { + return; + } /* Expect MSC to perform LU with HLR */ GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)); GSUP.send(ts_GSUP_ISD_REQ(g_pars.imsi, g_pars.msisdn)); @@ -826,11 +861,10 @@ GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); } -function f_accept_reject_lu() runs on BSC_ConnHdlr { +altstep as_accept_reject_lu(boolean expect_accept := true) runs on BSC_ConnHdlr { var PDU_DTAP_MT dtap_mt; - alt { - [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Acc)) -> value dtap_mt { + [expect_accept] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Acc)) -> value dtap_mt { var PDU_ML3_LocationUpdateAccept lu_acc := dtap_mt.dtap.msgs.mm.locationUpdateAccept; if (g_pars.net.expect_tmsi) { if (not ispresent(lu_acc.mobileIdentityTLV) or @@ -848,16 +882,23 @@ mtc.stop; } } - } - [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { + + /* Wait for MM-Information (if enabled) */ + f_expect_mm_info(); + setverdict(pass); + } + [expect_accept] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { setverdict(fail, "Expected LU ACK, but received LU REJ"); mtc.stop; - } } - /* Wait for MM-Information (if enabled) */ - f_expect_mm_info(); - setverdict(pass); + [not expect_accept] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { + setverdict(pass); + } + [not expect_accept] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Acc)) -> value dtap_mt { + setverdict(fail, "Expected LU REJ, but received LU ACK"); + mtc.stop; + } } function f_expect_lu_reject(template OCT1 cause := ?) runs on BSC_ConnHdlr { diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index e6d270d..13133de 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -371,7 +371,11 @@ runs on MTC_CT return BSC_ConnHdlrPars { var BSC_ConnHdlrNetworkPars net_pars := { kc_support := '0A'O, /* A5/1 and A5/3 enabled */ + net_config := { "authentication optional", "encryption a5 0" }, + expect_attach_success := true, expect_tmsi := true, + expect_auth_attempt := false, + hlr_has_auth_info := true, expect_auth := false, expect_ciph := false, expect_imei := false, @@ -4474,7 +4478,7 @@ /* TODO: Verify MSC is using the best cipher available! How? */ f_msc_lu_hlr(); - f_accept_reject_lu(); + as_accept_reject_lu(); f_expect_clear(); setverdict(pass); } @@ -6848,6 +6852,325 @@ vc_conn.done; } +/* a5 0 a5 0 a5 0 3 a5 0 3 a5 3 a5 3 + * HLR has auth info no yes no yes no yes + * + * test case index [0] [1] [2] [3] [4] [5] + * authentication optional No auth No auth attempt auth, auth reject auth + * (%) fall back to +ciph +ciph + * no-auth + * + * [6] [7] [8] [9] [10] [11] + * authentication mandatory reject auth reject auth reject auth + * only +ciph +ciph + * + * (%): Arguably, when HLR has auth info, the MSC should use it. Current behavior of osmo-msc is to not attempt auth at + * all. Related: OS#4830. + */ +type record of BSC_ConnHdlrNetworkPars rof_netpars; + +const rof_netpars auth_options_testcases := { + { + /* [0] auth optional, encr a5 0: no-auth" */ + kc_support := '01'O, + net_config := { "authentication optional", + "encryption a5 0" }, + expect_attach_success := true, + expect_tmsi := true, + expect_auth_attempt := false, + hlr_has_auth_info := false, + expect_auth := false, + expect_ciph := false, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [1] auth optional, encr a5 0, HLR HAS auth info: no-auth */ + kc_support := '01'O, + net_config := { "authentication optional", + "encryption a5 0" }, + expect_attach_success := true, + expect_tmsi := true, + expect_auth_attempt := false, + hlr_has_auth_info := true, + expect_auth := false, + expect_ciph := false, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [2] auth optional, encr a5 0 3, HLR has NO Auth Info: Fall back to no-auth" */ + kc_support := '09'O, + net_config := { "authentication optional", + "encryption a5 0 3" }, + expect_attach_success := true, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := false, + expect_auth := false, + expect_ciph := false, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [3] auth optional, encr a5 0 3, HLR HAS Auth Info: Use A5/3 */ + kc_support := '09'O, + net_config := { "authentication optional", + "encryption a5 0 3" }, + expect_attach_success := true, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := true, + expect_auth := true, + expect_ciph := true, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [4] auth optional, encr a5 3, HLR has NO Auth Info: reject. + * Auth is required implicitly because ciph is required. */ + kc_support := '08'O, + net_config := { "authentication optional", + "encryption a5 3" }, + expect_attach_success := false, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := false, + expect_auth := false, + expect_ciph := false, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [5] auth optional, encr a5 3, HLR HAS Auth Info: auth + ciph. + * Auth is required implicitly because ciph is required. */ + kc_support := '08'O, + net_config := { "authentication optional", + "encryption a5 3" }, + expect_attach_success := true, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := true, + expect_auth := true, + expect_ciph := true, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + + /* Same as above, but with 'authentication required' */ + + { + /* [6] auth required, encr a5 0, HLR has NO auth info: reject */ + kc_support := '01'O, + net_config := { "authentication required", + "encryption a5 0" }, + expect_attach_success := false, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := false, + expect_auth := false, + expect_ciph := false, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [7] auth required, encr a5 0, HLR HAS auth info: do auth, no ciph" */ + kc_support := '01'O, + net_config := { "authentication required", + "encryption a5 0" }, + expect_attach_success := true, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := true, + expect_auth := true, + expect_ciph := false, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [8] auth required, encr a5 0 3, HLR has NO Auth Info: reject */ + kc_support := '09'O, + net_config := { "authentication required", + "encryption a5 0 3" }, + expect_attach_success := false, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := false, + expect_auth := false, + expect_ciph := false, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [9] auth required, encr a5 0 3, HLR HAS Auth Info: Use A5/3 */ + kc_support := '09'O, + net_config := { "authentication required", + "encryption a5 0 3" }, + expect_attach_success := true, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := true, + expect_auth := true, + expect_ciph := true, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [10] auth required, encr a5 3, HLR has NO Auth Info: reject. */ + kc_support := '08'O, + net_config := { "authentication required", + "encryption a5 3" }, + expect_attach_success := false, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := false, + expect_auth := false, + expect_ciph := false, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [11] auth required, encr a5 3, HLR HAS Auth Info: auth + ciph. */ + kc_support := '08'O, + net_config := { "authentication required", + "encryption a5 3" }, + expect_attach_success := true, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := true, + expect_auth := true, + expect_ciph := true, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + } +}; + +private function f_tc_auth_options(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars); + + /* Location Updating */ + f_logp(MSCVTY, "f_perform_lu() starting"); + f_perform_lu(); + f_logp(MSCVTY, "f_perform_lu() done"); + + f_sleep(1.0); + + if (not pars.net.expect_attach_success) { + /* Expected above LU to fail. In order to test CM Service Request below, a LU has to succeed first. So + * run another LU that will be successful. Careful not to load auth tokens into the VLR that may taint + * the test for CM Service Request below. */ + + f_logp(MSCVTY, "Running a successful LU so that CM Service Request can be tested"); + var BSC_ConnHdlrNetworkPars saved_net := g_pars.net; + g_pars.net.kc_support := '01'O; + g_pars.net.expect_attach_success := true; + g_pars.net.expect_auth_attempt := false; + g_pars.net.expect_auth := false; + g_pars.net.expect_ciph := false; + f_vty_config3(MSCVTY, {"network"}, {"authentication optional", "encryption a5 0"}); + f_perform_lu(); + + /* Reconfigure like it was before */ + g_pars.net := saved_net; + f_vty_config3(MSCVTY, {"network"}, g_pars.net.net_config); + f_logp(MSCVTY, "Running a successful LU done"); + } + + /* CM Service Request */ + f_logp(MSCVTY, "f_establish_fully() starting"); + f_establish_fully(); + f_logp(MSCVTY, "f_establish_fully() done"); + BSSAP.send(ts_BSSMAP_ClearRequest(0)); + f_expect_clear(); +} + +function f_TC_auth_options(integer tc_i) runs on MTC_CT { + f_init(); + + var BSC_ConnHdlrNetworkPars tc := auth_options_testcases[tc_i]; + + f_vty_config3(MSCVTY, {"network"}, tc.net_config); + + var BSC_ConnHdlrPars pars := f_init_pars(42300 + tc_i); + pars.net := tc; + + var BSC_ConnHdlr vc_conn; + vc_conn := f_start_handler_with_pars(refers(f_tc_auth_options), pars); + vc_conn.done; +} + +testcase TC_auth_options_0() runs on MTC_CT { + f_TC_auth_options(0); +} + +testcase TC_auth_options_1() runs on MTC_CT { + f_TC_auth_options(1); +} + +testcase TC_auth_options_2() runs on MTC_CT { + f_TC_auth_options(2); +} + +testcase TC_auth_options_3() runs on MTC_CT { + f_TC_auth_options(3); +} + +testcase TC_auth_options_4() runs on MTC_CT { + f_TC_auth_options(4); +} + +testcase TC_auth_options_5() runs on MTC_CT { + f_TC_auth_options(5); +} + +testcase TC_auth_options_6() runs on MTC_CT { + f_TC_auth_options(6); +} + +testcase TC_auth_options_7() runs on MTC_CT { + f_TC_auth_options(7); +} + +testcase TC_auth_options_8() runs on MTC_CT { + f_TC_auth_options(8); +} + +testcase TC_auth_options_9() runs on MTC_CT { + f_TC_auth_options(9); +} + +testcase TC_auth_options_10() runs on MTC_CT { + f_TC_auth_options(10); +} + +testcase TC_auth_options_11() runs on MTC_CT { + f_TC_auth_options(11); +} + control { execute( TC_cr_before_reset() ); execute( TC_lu_imsi_noauth_tmsi() ); @@ -7012,6 +7335,19 @@ execute( TC_call_re_establishment_ciph() ); execute( TC_cm_serv_wrong_mi() ); + + execute( TC_auth_options_0() ); + execute( TC_auth_options_1() ); + execute( TC_auth_options_2() ); + execute( TC_auth_options_3() ); + execute( TC_auth_options_4() ); + execute( TC_auth_options_5() ); + execute( TC_auth_options_6() ); + execute( TC_auth_options_7() ); + execute( TC_auth_options_8() ); + execute( TC_auth_options_9() ); + execute( TC_auth_options_10() ); + execute( TC_auth_options_11() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29692 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: I8e3b02ca83e56ef5349d85f08407509e19fa353c Gerrit-Change-Number: 29692 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-mgw[master]: osmux: Introduce osmux peer-behind-nat (on|off) and rework conn activ...
by Jenkins Builder 11 Oct '22

11 Oct '22

Attention is currently required from: pespin. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29659 ) Change subject: osmux: Introduce osmux peer-behind-nat (on|off) and rework conn activation ...................................................................... Patch Set 2: Verified+1 4 passed: [build] https://jenkins.osmocom.org/jenkins/job/gerrit-osmo-mgw-build/a1=default,a2… [lint] https://jenkins.osmocom.org/jenkins/job/gerrit-lint/38/consoleFull [deb] https://jenkins.osmocom.org/jenkins/job/gerrit-binpkgs-deb/22/consoleFull [rpm] https://jenkins.osmocom.org/jenkins/job/gerrit-binpkgs-rpm/24/consoleFull Build Successful -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I7654ddf51d197a4107e55f4e406053b2e4a02f83 Gerrit-Change-Number: 29659 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: Tue, 11 Oct 2022 19:28:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-mgw[master]: osmux: Introduce osmux peer-behind-nat (on|off) and rework conn activ...
by pespin 11 Oct '22

11 Oct '22

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/29659 to look at the new patch set (#2). Change subject: osmux: Introduce osmux peer-behind-nat (on|off) and rework conn activation ...................................................................... osmux: Introduce osmux peer-behind-nat (on|off) and rework conn activation Change-Id: I7654ddf51d197a4107e55f4e406053b2e4a02f83 --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/osmux.h M src/libosmo-mgcp/mgcp_osmux.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 5 files changed, 131 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/59/29659/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I7654ddf51d197a4107e55f4e406053b2e4a02f83 Gerrit-Change-Number: 29659 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-MessageType: newpatchset

1 0

Change in docker-playground[master]: ttcn3-mgw: jenkins.sh Fix centos tests
by pespin 11 Oct '22

11 Oct '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29665 ) Change subject: ttcn3-mgw: jenkins.sh Fix centos tests ...................................................................... ttcn3-mgw: jenkins.sh Fix centos tests The sed lines dropping the new configs must be applied to any non-master run. Fixes: e077fec68419d13c2dbe347b6799f407dd927ffd Change-Id: I369bb61f3979bd9118fad17c3d202253411ba14b --- M ttcn3-mgw-test/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index 48cd1d1..2dee534 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -16,7 +16,7 @@ mkdir $VOL_BASE_DIR/mgw cp osmo-mgw.cfg $VOL_BASE_DIR/mgw/ # Can be dropped once released osmo-mgw is >1.10.0: -if image_suffix_is_latest; then +if ! image_suffix_is_master; then sed -i "/^ osmux bind-ip-v6 fd02:db8:4::180/d" $VOL_BASE_DIR/mgw/osmo-mgw.cfg fi -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I369bb61f3979bd9118fad17c3d202253411ba14b Gerrit-Change-Number: 29665 Gerrit-PatchSet: 1 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> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_crcx_osmux_257
by pespin 11 Oct '22

11 Oct '22

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29661 to look at the new patch set (#4). Change subject: mgw: Introduce test TC_crcx_osmux_257 ...................................................................... mgw: Introduce test TC_crcx_osmux_257 Related: SYS#5987 Change-Id: I74e6c760e076fe2547b6297a54524255fb8b --- M mgw/MGCP_Test.ttcn M mgw/expected-results.xml M mgw/osmo-mgw.cfg 3 files changed, 49 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/29661/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29661 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: I74e6c760e076fe2547b6297a54524255fb8bc41b Gerrit-Change-Number: 29661 Gerrit-PatchSet: 4 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-ttcn3-hacks[master]: mgw: Remove hack in f_two_crcx_mdcx_and_rtp_osmux() no longer needed
by pespin 11 Oct '22

11 Oct '22

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29664 ) Change subject: mgw: Remove hack in f_two_crcx_mdcx_and_rtp_osmux() no longer needed ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > should we add a code path for latest release here, so it doesn't start failing? Latest release is wrong, so it's fine having them fail. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29664 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: I531631d716581f68c11d3c0b07fc6755a822a0d3 Gerrit-Change-Number: 29664 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-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Oct 2022 19:22:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: mgw: Rename osmux RtpFlowData fields to clarify them
by pespin 11 Oct '22

11 Oct '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29662 ) Change subject: mgw: Rename osmux RtpFlowData fields to clarify them ...................................................................... mgw: Rename osmux RtpFlowData fields to clarify them Change-Id: I64b4060706a321bc1f5e46d791035e6d85fa8e1e --- M mgw/MGCP_Test.ttcn 1 file changed, 45 insertions(+), 37 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index cbc22a6..5665981 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -333,6 +333,12 @@ charstring hostname, integer portnr optional } + type record RtpOsmuxFlowData { + boolean local_cid_sent, /* whther non wildcarded CID was already sent to MGW */ + MgcpOsmuxCID local_cid optional, + MgcpOsmuxCID remote_cid optional, + OsmuxemConfig cfg optional + } type record RtpFlowData { HostPort em, /* emulation side */ HostPort mgw, /* mgw side */ @@ -340,10 +346,7 @@ charstring codec, MgcpConnectionId mgcp_conn_id optional, RtpemConfig rtp_cfg optional, - boolean osmux_cid_sent, /* whther non wildcarded CID was already sent to MGW */ - MgcpOsmuxCID osmux_cid optional, - MgcpOsmuxCID osmux_cid_response optional, - OsmuxemConfig osmux_cfg optional, + RtpOsmuxFlowData osmux, charstring fmtp optional } @@ -426,12 +429,12 @@ f_osmuxem_bind(pt, flow.em.hostname, flow.em.portnr); /* configure osmux-emulation */ - if (ispresent(flow.osmux_cfg)) { - f_osmuxem_configure(pt, flow.osmux_cfg); + if (ispresent(flow.osmux.cfg)) { + f_osmuxem_configure(pt, flow.osmux.cfg); } else { var OsmuxemConfig osmux_cfg := c_OsmuxemDefaultCfg; f_osmuxem_configure(pt, osmux_cfg); - flow.osmux_cfg := osmux_cfg + flow.osmux.cfg := osmux_cfg } if (one_phase) { @@ -439,14 +442,14 @@ * part that tells the MGW where we are listening for Osmux streams * that come from the MGW. We get a fully working connection in * one go. */ - if (flow.osmux_cid != -1) { + if (flow.osmux.local_cid != -1) { /* We may still want to negotiate osmux CID later at MDCX */ rx_hdl := c_OsmuxemDefaultRxHandle; - rx_hdl.cid := flow.osmux_cid; + rx_hdl.cid := flow.osmux.local_cid; f_osmuxem_register_rxhandle(pt, rx_hdl); - flow.osmux_cid_sent := true; + flow.osmux.local_cid_sent := true; } - cmd := ts_CRCX_osmux(get_next_trans_id(), ep, mode, call_id, flow.osmux_cid); + cmd := ts_CRCX_osmux(get_next_trans_id(), ep, mode, call_id, flow.osmux.local_cid); cmd.sdp := ts_SDP(flow.em.hostname, flow.em.hostname, "23", "42", flow.em.portnr, { int2str(flow.pt) }, attributes); resp := mgcp_transceive_mgw(cmd, tr_CRCX_ACK_osmux); @@ -461,7 +464,7 @@ * data back to us. In order to turn the connection in a fully * bi-directional one, a separate MDCX is needed. */ - cmd := ts_CRCX_osmux(get_next_trans_id(), ep, mode, call_id, flow.osmux_cid); + cmd := ts_CRCX_osmux(get_next_trans_id(), ep, mode, call_id, flow.osmux.local_cid); resp := mgcp_transceive_mgw(cmd, tr_CRCX_ACK_osmux); flow.mgcp_conn_id := extract_conn_id(resp); @@ -481,12 +484,12 @@ } /* Make sure response is no wildcard */ - flow.osmux_cid_response := f_mgcp_osmux_cid_decode(cid_response); - if (flow.osmux_cid_response == -1) { + flow.osmux.remote_cid := f_mgcp_osmux_cid_decode(cid_response); + if (flow.osmux.remote_cid == -1) { setverdict(fail, "Osmux CID in MGCP response contains unexpected wildcard"); mtc.stop; } - tx_hdl := valueof(t_TxHandleAMR590(flow.osmux_cid_response)); + tx_hdl := valueof(t_TxHandleAMR590(flow.osmux.remote_cid)); f_osmuxem_register_txhandle(pt, tx_hdl); /* finally, connect the emulation-side RTP socket to the MGW */ @@ -551,23 +554,23 @@ f_osmuxem_bind(pt, flow.em.hostname, flow.em.portnr); /* configure osmux-emulation */ - if (ispresent(flow.osmux_cfg)) { - f_osmuxem_configure(pt, flow.osmux_cfg); + if (ispresent(flow.osmux.cfg)) { + f_osmuxem_configure(pt, flow.osmux.cfg); } else { var OsmuxemConfig osmux_cfg := c_OsmuxemDefaultCfg; f_osmuxem_configure(pt, osmux_cfg); } /* We didn't send a non-wildcarded Osmux CID yet. If caller wants to submit it, register handler */ - if (flow.osmux_cid_sent == false and flow.osmux_cid != -1) { + if (flow.osmux.local_cid_sent == false and flow.osmux.local_cid != -1) { rx_hdl := c_OsmuxemDefaultRxHandle; - rx_hdl.cid := flow.osmux_cid; + rx_hdl.cid := flow.osmux.local_cid; f_osmuxem_register_rxhandle(pt, rx_hdl); - flow.osmux_cid_sent := true; + flow.osmux.local_cid_sent := true; } /* connect MGW side Osmux socket to the emulation-side Osmux socket using SDP */ - cmd := ts_MDCX_osmux(get_next_trans_id(), ep, mode, call_id, flow.mgcp_conn_id, flow.osmux_cid); + cmd := ts_MDCX_osmux(get_next_trans_id(), ep, mode, call_id, flow.mgcp_conn_id, flow.osmux.local_cid); cmd.sdp := ts_SDP(flow.em.hostname, flow.em.hostname, "23", "42", flow.em.portnr, { int2str(flow.pt) }, attributes); resp := mgcp_transceive_mgw(cmd, tr_MDCX_ACK); @@ -593,7 +596,7 @@ setverdict(fail, "Osmux CID in MGCP response contains unexpected wildcard"); mtc.stop; } - if (cid_resp_parsed != flow.osmux_cid_response) { + if (cid_resp_parsed != flow.osmux.remote_cid) { setverdict(fail, "Osmux CID in MGCP MDCX response changed from prev value"); mtc.stop; } @@ -1183,7 +1186,7 @@ f_init(ep, true); flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000/1")); flow.em.portnr := mp_local_osmux_port; - flow.osmux_cid := -1; + flow.osmux.local_cid := -1; f_flow_create_osmux(OsmuxEM, ep, call_id, "recvonly", flow, false); /* create a transmitter not yet known by MGW */ @@ -1196,10 +1199,10 @@ stats := f_osmuxem_stats_get(OsmuxEM); - if (stats.num_pkts_tx < 40 / flow.osmux_cfg.batch_size) { + if (stats.num_pkts_tx < 40 / flow.osmux.cfg.batch_size) { setverdict(fail); } - if (stats.bytes_payload_tx < stats.num_pkts_tx * f_amrft_payload_len(tx_hdl.amr_ft) * flow.osmux_cfg.batch_size) { + if (stats.bytes_payload_tx < stats.num_pkts_tx * f_amrft_payload_len(tx_hdl.amr_ft) * flow.osmux.cfg.batch_size) { setverdict(fail); } @@ -1220,7 +1223,7 @@ f_init(ep, true); flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000/1")); flow.em.portnr := mp_local_osmux_port; - flow.osmux_cid := 2; + flow.osmux.local_cid := 2; f_flow_create_osmux(OsmuxEM, ep, call_id, "loopback", flow); f_osmuxem_mode(OsmuxEM, OSMUXEM_MODE_BIDIR); @@ -1314,8 +1317,8 @@ /* from MGW back to us */ flow[1] := valueof(t_RtpFlow(local_ip_osmux, remote_ip_osmux, 110, "AMR/8000")); flow[1].em.portnr := mp_local_osmux_port; - flow[1].osmux_cid := 2; - flow[1].osmux_cfg := c_OsmuxemDefaultCfg; + flow[1].osmux.local_cid := 2; + flow[1].osmux.cfg := c_OsmuxemDefaultCfg; f_flow_create_osmux(OsmuxEM, ep, call_id, "sendrecv", flow[1]); if (bidir) { @@ -1344,7 +1347,7 @@ stats_rtp := f_rtpem_stats_get(RTPEM[0]); stats_osmux := f_osmuxem_stats_get(OsmuxEM); - if (not f_rtp_osmux_stats_compare(stats_rtp, stats_osmux, flow[1].osmux_cfg.batch_size, tolerance)) { + if (not f_rtp_osmux_stats_compare(stats_rtp, stats_osmux, flow[1].osmux.cfg.batch_size, tolerance)) { setverdict(fail, "RTP and Osmux endpoint statistics don't match"); mtc.stop; } @@ -1416,11 +1419,11 @@ flow[1] := valueof(t_RtpFlow(local_ip_osmux, remote_ip_osmux, 110, "AMR/8000")); flow[1].em.portnr := mp_local_osmux_port; if (crcx_osmux_wildcard) { - flow[1].osmux_cid := -1; + flow[1].osmux.local_cid := -1; } else { - flow[1].osmux_cid := 2; + flow[1].osmux.local_cid := 2; } - flow[1].osmux_cfg := c_OsmuxemDefaultCfg; + flow[1].osmux.cfg := c_OsmuxemDefaultCfg; f_flow_create_osmux(OsmuxEM, ep, call_id, "recvonly", flow[1], true); @@ -1480,7 +1483,7 @@ if (crcx_osmux_wildcard) { /* For now we must set same CID as the MGW recvCID, * having sendCID!=recvCID is not yet supported. */ - flow[1].osmux_cid := flow[1].osmux_cid_response; + flow[1].osmux.local_cid := flow[1].osmux.remote_cid; } f_flow_modify_osmux(OsmuxEM, ep, call_id, "sendrecv", flow[1]); f_sleep(2.0); @@ -1488,8 +1491,8 @@ stats_rtp := f_rtpem_stats_get(RTPEM[0]); stats_osmux := f_osmuxem_stats_get(OsmuxEM); - temp := stats_rtp.num_pkts_tx - num_pkts_tx[0] - stats_osmux.num_pkts_rx * flow[1].osmux_cfg.batch_size; - if (temp > 3 * flow[1].osmux_cfg.batch_size or temp < -3 * flow[1].osmux_cfg.batch_size) { + temp := stats_rtp.num_pkts_tx - num_pkts_tx[0] - stats_osmux.num_pkts_rx * flow[1].osmux.cfg.batch_size; + if (temp > 3 * flow[1].osmux.cfg.batch_size or temp < -3 * flow[1].osmux.cfg.batch_size) { log("stats_rtp: ", stats_rtp); log("stats_osmux: ", stats_osmux); log("old_rtp_tx: ", num_pkts_tx[0]); @@ -1497,7 +1500,7 @@ mtc.stop; } - temp := stats_osmux.num_pkts_tx - num_pkts_tx[1] - stats_rtp.num_pkts_rx / flow[1].osmux_cfg.batch_size; + temp := stats_osmux.num_pkts_tx - num_pkts_tx[1] - stats_rtp.num_pkts_rx / flow[1].osmux.cfg.batch_size; if (temp > 3 or temp < -3) { setverdict(fail, "number of packets not within normal parameters (" & int2str(temp) & ")"); mtc.stop; @@ -1684,7 +1687,12 @@ }, pt := pt, codec := codec, - osmux_cid_sent := false + osmux:= { + local_cid_sent := false, + local_cid := omit, + remote_cid := omit, + cfg := omit + } } /* transmit RTP streams between two RTP Emulations back-to-back; expect no loss */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29662 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: I64b4060706a321bc1f5e46d791035e6d85fa8e1e Gerrit-Change-Number: 29662 Gerrit-PatchSet: 1 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> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: mgw: Log osmux stats in f_two_crcx_mdcx_and_rtp_osmux()
by pespin 11 Oct '22

11 Oct '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29657 ) Change subject: mgw: Log osmux stats in f_two_crcx_mdcx_and_rtp_osmux() ...................................................................... mgw: Log osmux stats in f_two_crcx_mdcx_and_rtp_osmux() Change-Id: I2122e086f828a44ddf1c285e11a1eb79759ae989 --- M mgw/MGCP_Test.ttcn 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 5665981..859a677 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -1502,6 +1502,9 @@ temp := stats_osmux.num_pkts_tx - num_pkts_tx[1] - stats_rtp.num_pkts_rx / flow[1].osmux.cfg.batch_size; if (temp > 3 or temp < -3) { + log("stats_rtp: ", stats_rtp); + log("stats_osmux: ", stats_osmux); + log("old_osmux_tx: ", num_pkts_tx[1]); setverdict(fail, "number of packets not within normal parameters (" & int2str(temp) & ")"); mtc.stop; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29657 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: I2122e086f828a44ddf1c285e11a1eb79759ae989 Gerrit-Change-Number: 29657 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: mgw: Avoid hardcoding in test the amount of endpoints configured in o...
by pespin 11 Oct '22

11 Oct '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29663 ) Change subject: mgw: Avoid hardcoding in test the amount of endpoints configured in osmo-mgw ...................................................................... mgw: Avoid hardcoding in test the amount of endpoints configured in osmo-mgw Some tests require to match what's configured in osmo-mgw. Let's make it possible to change it through a module parameter. This will be needed for a follow-up patch to test >256 concurrent osmux conns, which will require increasing the number of configured endpoints above that value. Change-Id: Ia1e5a0b59ba7c49e97c2cf7ee7a009f3827cf36d --- M mgw/MGCP_Test.ttcn 1 file changed, 15 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 859a677..c54fdb4 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -84,6 +84,8 @@ PortNumber mp_local_osmux_port := 1985; PortNumber mp_mgw_statsd_port := 8125; PortNumber mp_mgw_ctrl_port := 4267; + /* Maximum number of available endpoints in osmo-mgw.cfg ("number endpoints"): */ + integer mp_num_endpoints := 31; } private function f_vty_enable_osmux(boolean osmux_on) runs on dummy_CT { @@ -941,18 +943,19 @@ } /* test valid wildcarded CRCX */ + type record of MgcpEndpoint MgcpEndpointList; testcase TC_crcx_wildcarded_exhaust() runs on dummy_CT { - const integer n_endpoints := 31; var integer i; var template MgcpCommand cmd; var MgcpResponse resp; var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "*@" & c_mgw_domain; var MgcpCallId call_id := '1234'H; - var MgcpEndpoint ep_assigned[n_endpoints]; + var MgcpEndpoint ep_assigned; + var MgcpEndpointList ep_assigned_li := {}; f_init(); /* Exhaust all endpoint resources on the virtual trunk */ - for (i := 0; i < n_endpoints; i := i+1) { + for (i := 0; i < mp_num_endpoints; i := i+1) { cmd := ts_CRCX(get_next_trans_id(), ep, "recvonly", call_id); resp := mgcp_transceive_mgw(cmd, tr_CRCX_ACK); @@ -962,10 +965,11 @@ var MgcpMessage resp_msg := { response := resp } - if (f_mgcp_find_param(resp_msg, "Z", ep_assigned[i]) == false) { + if (f_mgcp_find_param(resp_msg, "Z", ep_assigned) == false) { setverdict(fail, "No SpecificEndpointName in MGCP response", resp); mtc.stop; } + ep_assigned_li := ep_assigned_li & {ep_assigned} } /* Try to allocate one more endpoint, which should fail */ @@ -975,8 +979,8 @@ setverdict(pass); /* clean-up */ - for (i := 0; i < n_endpoints; i := i+1) { - f_dlcx_ok(ep_assigned[i], call_id); + for (i := 0; i < mp_num_endpoints; i := i+1) { + f_dlcx_ok(ep_assigned_li[i], call_id); } setverdict(pass); } @@ -1040,7 +1044,8 @@ testcase TC_dlcx_non_existant_ep() runs on dummy_CT { var template MgcpCommand cmd; var MgcpResponse resp; - var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "AA@" & c_mgw_domain; + var charstring non_existant_ep := hex2str(int2hex(mp_num_endpoints + 1, 4)) + var MgcpEndpoint ep := c_mgw_ep_rtpbridge & non_existant_ep & "@" & c_mgw_domain; var template MgcpResponse rtmpl := { line := { code := ("500"), @@ -1090,14 +1095,13 @@ var template MgcpCommand cmd; var MgcpResponse resp; var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "*@" & c_mgw_domain; - const integer n_endpoints := 31; var integer i; var MgcpCallId call_id := '1234'H; var StatsDExpects expect; f_init(ep); /* Allocate a few endpoints */ - for (i := 0; i < n_endpoints; i := i+1) { + for (i := 0; i < mp_num_endpoints; i := i+1) { cmd := ts_CRCX(get_next_trans_id(), ep, "recvonly", call_id); resp := mgcp_transceive_mgw(cmd, tr_CRCX_ACK); } @@ -1106,7 +1110,7 @@ * occupied endpoints */ f_sleep(1.0) expect := { - { name := "TTCN3.trunk.virtual-0.common.endpoints.used", mtype := "g", min := n_endpoints, max := n_endpoints} + { name := "TTCN3.trunk.virtual-0.common.endpoints.used", mtype := "g", min := mp_num_endpoints, max := mp_num_endpoints} }; f_statsd_expect(expect); @@ -1125,7 +1129,7 @@ /* Query a the statsd once to ensure that intermediate results are pulled from the * pipeline. The second query (below) will return the actual result. */ expect := { - { name := "TTCN3.trunk.virtual-0.common.endpoints.used", mtype := "g", min := 0, max := n_endpoints} + { name := "TTCN3.trunk.virtual-0.common.endpoints.used", mtype := "g", min := 0, max := mp_num_endpoints} }; f_statsd_expect(expect); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29663 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: Ia1e5a0b59ba7c49e97c2cf7ee7a009f3827cf36d Gerrit-Change-Number: 29663 Gerrit-PatchSet: 1 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> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log