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

Change in pysim[master]: pySim-shell: catch exceptions from walk() while exporting

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28162 ) Change subject: pySim-shell: catch exceptions from walk() while exporting ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/28162/comment/750ca161_b9e8a458 PS2, Line 679: except Exception as e: Does pySim-shell support multi-line comments in a script file? If so, I would do: try: ... except e: ... import traceback print("'''") print(traceback.format_exc()) print("'''") -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3edc250ef2a84550c5b821a72e207e4d685790a5 Gerrit-Change-Number: 28162 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 20:18:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in pysim[master]: pySim-shell: match SW in apdu command

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28169 ) Change subject: pySim-shell: match SW in apdu command ...................................................................... Patch Set 1: Code-Review-1 (1 comment) File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/28169/comment/6e3f8559_23824a41 PS1, Line 249: expect_sw I would avoid mixing '-' and '_' in command options, '--expect-sw' looks more natural to me. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic5a52d7cf533c51d111850eb6d8147011a48ae6c Gerrit-Change-Number: 28169 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 20:06:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in pysim[master]: filesystem: also return the encoded FCP from probe_file

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28170 ) Change subject: filesystem: also return the encoded FCP from probe_file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia5659e106fb0d6fb8b77506a10eba309e764723e Gerrit-Change-Number: 28170 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 19:42:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in pysim[master]: ts_102_221: fix SFI generation

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28184 ) Change subject: ts_102_221: fix SFI generation ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iaa38d2be4719f12c1d7b30a8befe278f1ed78ac1 Gerrit-Change-Number: 28184 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 19:41:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in pysim[master]: ts_102_221: The BTLV IEs FILE SIZE and TOTAL FILE SIZE have a min length

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28185 ) Change subject: ts_102_221: The BTLV IEs FILE SIZE and TOTAL FILE SIZE have a min length ...................................................................... Patch Set 1: Code-Review-1 (1 comment) File pySim/construct.py: https://gerrit.osmocom.org/c/pysim/+/28185/comment/9bf39c23_9cd317b8 PS1, Line 244: length = length + (self.minlen - length) This looks weird to me, because 'length' would always be equal to 'self.minlen': test(len=0, min=10) == 0 + (10 - 0) == 10 test(len=1, min=10) == 1 + (10 - 1) == 10 test(len=5, min=10) == 5 + (10 - 5) == 10 test(len=7, min=10) == 7 + (10 - 7) == 10 test(len=9, min=10) == 9 + (10 - 9) == 10 If you want to ensure a minimum value, just do: length = min(self.__bytes_required(obj), self.minlen) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ief113ce8fe3bcae2c9fb2ff4138df9ccf98d26ff Gerrit-Change-Number: 28185 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 19:39:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: test lchan rel during LCS Loc Req

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28092 ) Change subject: bsc: test lchan rel during LCS Loc Req ...................................................................... bsc: test lchan rel during LCS Loc Req Test this scenario: Emergency call is started; Location Request is started to locate the emergency; lchan releases early for any reason; (Do not send Clear Request immediately); Location Request is completed, locating the emergency. Related: SYS#5912 Related: Ib44dd05b0adee84234f671313b156ff6625357cc (osmo-bsc) Change-Id: Idea690a4aa4aecbe4642a16e96d086cc0538564a --- M bsc/BSC_Tests.ttcn 1 file changed, 116 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index b35d316..feb8bfb 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -10301,6 +10301,120 @@ f_shutdown_helper(); } +private altstep no_bssmap_clear_req() runs on MSC_ConnHdlr { + [] BSSAP.receive(tr_BSSMAP_ClearRequest) { + setverdict(fail, "unexpected BSSMAP Clear Request"); + mtc.stop; + } +} + +private type enumerated RslRel { + RSLREL_REL_IND, + RSLREL_CONN_FAIL +}; + +private function f_emerg_call_and_lcs_loc_req_early_lchan_release(RslRel rsl_rel) runs on MSC_ConnHdlr +{ + g_pars.ra := f_rnd_ra_emerg(); + f_assignment_emerg_setup(); + + var PDU_BSSAP emerg_setup_data_ind_bssap; + timer T := 3.0; + T.start; + alt { + [] BSSAP.receive(tr_BSSAP_DTAP) -> value emerg_setup_data_ind_bssap { + var PDU_ML3_MS_NW verify_emerg_setup; + verify_emerg_setup := dec_PDU_ML3_MS_NW(emerg_setup_data_ind_bssap.pdu.dtap); + if (not ischosen(verify_emerg_setup.msgs.cc.emergencySetup)) { + setverdict(fail, "no emergency setup"); + } + } + [] BSSAP.receive { + setverdict(fail, "unexpected BSSAP message!"); + } + [] T.timeout { + setverdict(fail, "timeout waiting for EMERGENCY SETUP!"); + } + } + + /* Start a Location Request to locate the emergency */ + f_bssap_le_register_imsi(g_pars.imsi, omit); + BSSAP.send(valueof(ts_BSSMAP_Perform_Location_Request(ts_BSSMAP_Imsi(g_pars.imsi), + ts_CellId_CGI('262'H, '42'H, 23, 42)))); + BSSAP_LE.receive(tr_BSSMAP_LE_PerfLocReq(BSSMAP_LE_LOC_INFO_CURRENT_GEOGRAPHIC_LOC, ?, ?)); + + /* As long as this LCS is going on, the BSC should not send any Clear Request. Later on, it is up to the MSC to + * do a Clear Command when the Location Response arrives. */ + activate(no_bssmap_clear_req()); + + /* the lchan gets interrupted while the Location Request has no response */ + select (rsl_rel) { + case (RSLREL_REL_IND) { + RSL.send(ts_RSL_REL_IND(g_chan_nr, valueof(ts_RslLinkID_DCCH(0)))); + f_expect_lchan_rel(RSL, RSL_PROC); + } + case (RSLREL_CONN_FAIL) { + RSL.send(ts_RSL_CONN_FAIL_IND(g_chan_nr, RSL_ERR_RADIO_LINK_FAIL)); + } + case else { + setverdict(fail, "Unknown RslRel type"); + mtc.stop; + } + } + + /* Still expect the Location Response to find its way to the MSC. */ + BSSAP_LE.send(ts_BSSMAP_LE_PerfLocResp(gad_ell_point_unc_circle, omit)); + BSSAP_LE.receive(BSSAP_LE_Conn_Prim:CONN_PRIM_DISC_IND); + BSSAP.receive(tr_BSSMAP_Perform_Location_Response(tr_BSSMAP_IE_LocationEstimate(gad_ell_point_unc_circle))); + + setverdict(pass); + + select (rsl_rel) { + case (RSLREL_REL_IND) { + f_perform_clear_no_lchan(); + } + case (RSLREL_CONN_FAIL) { + f_perform_clear(); + } + } +} + +private function f_tc_emerg_call_and_lcs_loc_req_early_lchan_rel_ind(charstring id) runs on MSC_ConnHdlr +{ + f_emerg_call_and_lcs_loc_req_early_lchan_release(RSLREL_REL_IND); +} + +testcase TC_emerg_call_and_lcs_loc_req_early_lchan_rel_ind() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + f_init(1, true); + f_sleep(1.0); + f_vty_allow_emerg_msc(true); + f_vty_allow_emerg_bts(true, 0); + vc_conn := f_start_handler(refers(f_tc_emerg_call_and_lcs_loc_req_early_lchan_rel_ind), pars); + vc_conn.done; + f_shutdown_helper(); +} + +private function f_tc_emerg_call_and_lcs_loc_req_early_lchan_conn_fail(charstring id) runs on MSC_ConnHdlr +{ + f_emerg_call_and_lcs_loc_req_early_lchan_release(RSLREL_CONN_FAIL); +} + +testcase TC_emerg_call_and_lcs_loc_req_early_lchan_conn_fail() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + f_init(1, true); + f_sleep(1.0); + f_vty_allow_emerg_msc(true); + f_vty_allow_emerg_bts(true, 0); + vc_conn := f_start_handler(refers(f_tc_emerg_call_and_lcs_loc_req_early_lchan_conn_fail), pars); + vc_conn.done; + f_shutdown_helper(); +} + /* Attempt Complete Layer 3 without any MSC available (OS#4832) */ private function f_tc_no_msc(charstring id) runs on MSC_ConnHdlr { f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR); @@ -11677,6 +11791,8 @@ execute( TC_cm_service_during_lcs_loc_req() ); execute( TC_ho_during_lcs_loc_req() ); execute( TC_emerg_call_and_lcs_loc_req() ); + execute( TC_emerg_call_and_lcs_loc_req_early_lchan_rel_ind() ); + execute( TC_emerg_call_and_lcs_loc_req_early_lchan_conn_fail() ); } execute( TC_no_msc() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28092 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: Idea690a4aa4aecbe4642a16e96d086cc0538564a Gerrit-Change-Number: 28092 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_two_crcx_mdcx_and_iuup{_rtp}_rfci_unordered

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28191 ) Change subject: mgw: Introduce test TC_two_crcx_mdcx_and_iuup{_rtp}_rfci_unordered ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28191 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: I2523f18a0fdba87f4e13a2ce3c5da482c4af2e3c Gerrit-Change-Number: 28191 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 19:29:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: IuUP: Encode Initialization according to cfg

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28189 ) Change subject: IuUP: Encode Initialization according to cfg ...................................................................... IuUP: Encode Initialization according to cfg Change-Id: I1dec3a8dcc829ad2c308636b697b089e873fd824 --- M library/IuUP_Emulation.ttcn 1 file changed, 45 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/IuUP_Emulation.ttcn b/library/IuUP_Emulation.ttcn index 899ba50..1bb2bb2 100644 --- a/library/IuUP_Emulation.ttcn +++ b/library/IuUP_Emulation.ttcn @@ -35,6 +35,7 @@ template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_12_2(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {81, 103, 60}, 1); template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_SID(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {34, 0, 0}, 7); +template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_NO_DATA(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {0, 0, 0}, 1); type record IuUP_Config { /* actively send INIT (true) or only passively respond (false) */ @@ -63,7 +64,7 @@ cfg := { active_init := act_init, data_pdu_type_0 := true, - rab_flow_combs := { t_IuUP_RFC_AMR_12_2(0), t_IuUP_RFC_AMR_SID(1) } + rab_flow_combs := { t_IuUP_RFC_AMR_12_2(0), t_IuUP_RFC_AMR_SID(1), t_IuUP_RFC_AMR_NO_DATA(2) } }, state := ST_INIT, tx_next_frame_nr := 0, @@ -120,6 +121,48 @@ self.stop; } +private function f_ts_IuUP_INIT(inout IuUP_Entity st) return IuUP_PDU +{ + var IuUP_PDU pdu; + var uint4_t data_pdu_type; + var template (omit) IuUP_InitRfci rfci := omit; + var IuUP_IPTI_List IPTIs := {}; + var uint4_t num_rfci := lengthof(st.cfg.rab_flow_combs); + + if (st.cfg.data_pdu_type_0 == true) { + data_pdu_type := 0; + } else { + data_pdu_type := 1; + } + + /* Build RFCI list: */ + for (var integer remain := num_rfci; remain > 0; remain := remain - 1) { + var IuUP_RabFlowCombination comb := st.cfg.rab_flow_combs[remain - 1]; + var boolean lri := false; + if (remain == num_rfci) { + lri := true; + } + rfci := ts_IuUP_InitRfci(lri, false, comb.rfci, comb.sub_flow_bits, omit, rfci) + } + + /* Build IPTI list: */ + for (var integer i := 0; i < num_rfci; i := i + 1) { + IPTIs := IPTIs & { st.cfg.rab_flow_combs[i].ipti }; + } + + template (value) IuUP_PDU14_ProcSending_INIT tpl := ts_IuUP_PDU14_ProcSending_INIT( + ti := true, + subflows_per_rfci := num_rfci, + chain_ind := false, + rfci := rfci, + IPTIs := IPTIs, + versions_supported := '0000000000000001'B, + data_pdu_type := data_pdu_type + ); + pdu := valueof(ts_IuUP_INIT(tpl)); + return pdu; +} + function f_IuUP_Em_tx_encap(inout IuUP_Entity st, in octetstring payload) return octetstring { var IuUP_PDU pdu; select (st.state) { @@ -127,7 +170,7 @@ if (st.cfg.active_init) { if (not isvalue(st.pending_tx_pdu)) { /* send INIT */ - pdu := valueof(ts_IuUP_INIT(ts_IuUP_PDU14_ProcSending_INIT)); + pdu := f_ts_IuUP_INIT(st); st.pending_tx_pdu := pdu; } /* else: wait for INIT-ACK return ''O at the end */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28189 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: I1dec3a8dcc829ad2c308636b697b089e873fd824 Gerrit-Change-Number: 28189 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Allow Setting IuUP_Cfg from test using RTP_Emulation

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 ) Change subject: Allow Setting IuUP_Cfg from test using RTP_Emulation ...................................................................... Allow Setting IuUP_Cfg from test using RTP_Emulation Change-Id: I4e8296dae40277be51974338bc0d21c939eec149 --- M hnodeb/HNBGW_ConnectionHandler.ttcn M library/IuUP_Emulation.ttcn M library/RTP_Emulation.ttcn M mgw/MGCP_Test.ttcn 4 files changed, 43 insertions(+), 17 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnodeb/HNBGW_ConnectionHandler.ttcn b/hnodeb/HNBGW_ConnectionHandler.ttcn index 076cb82..6b06437 100644 --- a/hnodeb/HNBGW_ConnectionHandler.ttcn +++ b/hnodeb/HNBGW_ConnectionHandler.ttcn @@ -251,7 +251,7 @@ /* Initialize, connect and start the emulation component */ var RtpemConfig cfg := c_RtpemDefaultCfg; cfg.iuup_mode := true; - cfg.iuup_tx_init := false; + cfg.iuup_cfg.active_init := false; cfg.tx_payload_type := 96; vc_RTPEM := RTP_Emulation_CT.create(testcasename() & "-RTPEM") alive; diff --git a/library/IuUP_Emulation.ttcn b/library/IuUP_Emulation.ttcn index 1bb2bb2..b649e44 100644 --- a/library/IuUP_Emulation.ttcn +++ b/library/IuUP_Emulation.ttcn @@ -26,6 +26,7 @@ /* IPTI value in number of ITIs for the corresponding RFCI */ uint8_t ipti }; +type record of IuUP_RabFlowCombination IuUP_RabFlowCombinationList; template (value) IuUP_RabFlowCombination t_IuUP_RFC(IuUP_RFCI rfci, RecOfU8 subflow_bits, uint8_t ipti) := { rfci := rfci, @@ -37,21 +38,50 @@ template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_SID(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {34, 0, 0}, 7); template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_NO_DATA(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {0, 0, 0}, 1); + +const IuUP_RabFlowCombinationList c_IuUP_Config_RabFlowCombination_def := { + { + rfci := 0, + sub_flow_bits := {81, 103, 60}, + ipti := 1 + }, { + rfci := 1, + sub_flow_bits := {34, 0, 0}, + ipti := 7 + }, { + rfci := 2, + sub_flow_bits := {0, 0, 0}, + ipti := 1 + } +}; type record IuUP_Config { /* actively send INIT (true) or only passively respond (false) */ boolean active_init, boolean data_pdu_type_0, /* RAB Flow Combinations */ - record of IuUP_RabFlowCombination rab_flow_combs + IuUP_RabFlowCombinationList rab_flow_combs }; +template (value) IuUP_Config t_IuUP_Config(boolean active_init := true, + boolean data_pdu_type_0 := true, + template (value) IuUP_RabFlowCombinationList rab_flow_combs := + c_IuUP_Config_RabFlowCombination_def) := { + active_init := active_init, + data_pdu_type_0 := true, + rab_flow_combs := rab_flow_combs +} + +const IuUP_Config c_IuUP_Config_def := { + active_init := true, + data_pdu_type_0 := true, + rab_flow_combs := c_IuUP_Config_RabFlowCombination_def +} + type enumerated IuUP_Em_State { ST_INIT, ST_DATA_TRANSFER_READY }; - - type record IuUP_Entity { IuUP_Config cfg, IuUP_Em_State state, @@ -60,12 +90,8 @@ IuUP_PDU pending_tx_pdu optional }; -template (value) IuUP_Entity t_IuUP_Entity(boolean act_init) := { - cfg := { - active_init := act_init, - data_pdu_type_0 := true, - rab_flow_combs := { t_IuUP_RFC_AMR_12_2(0), t_IuUP_RFC_AMR_SID(1), t_IuUP_RFC_AMR_NO_DATA(2) } - }, +template (value) IuUP_Entity t_IuUP_Entity(template (value) IuUP_Config cfg) := { + cfg := cfg, state := ST_INIT, tx_next_frame_nr := 0, rx_last_frame_nr := omit, diff --git a/library/RTP_Emulation.ttcn b/library/RTP_Emulation.ttcn index f4d926e..eaff017 100644 --- a/library/RTP_Emulation.ttcn +++ b/library/RTP_Emulation.ttcn @@ -161,7 +161,7 @@ octetstring tx_fixed_payload optional, octetstring rx_fixed_payload optional, boolean iuup_mode, - boolean iuup_tx_init + IuUP_Config iuup_cfg }; const RtpemConfig c_RtpemDefaultCfg := { @@ -172,7 +172,7 @@ tx_fixed_payload := '01020304'O, rx_fixed_payload := '01020304'O, iuup_mode := false, - iuup_tx_init := true + iuup_cfg := c_IuUP_Config_def } signature RTPEM_bind(in HostName local_host, inout PortNumber local_port); @@ -384,7 +384,7 @@ os_error_code := 111, os_error_text := ? /* "Connection refused" */}}; - g_iuup_ent := valueof(t_IuUP_Entity(g_cfg.iuup_tx_init)); + g_iuup_ent := valueof(t_IuUP_Entity(g_cfg.iuup_cfg)); while (true) { alt { @@ -488,7 +488,7 @@ } [] CTRL.getcall(RTPEM_configure:{?}) -> param (cfg) { g_cfg := cfg; - g_iuup_ent.cfg.active_init := g_cfg.iuup_tx_init; + g_iuup_ent.cfg := g_cfg.iuup_cfg; CTRL.reply(RTPEM_configure:{cfg}); } [] CTRL.getcall(RTPEM_stats_get:{?, ?}) -> param (is_rtcp) { diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 9defea7..de00e9d 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -2482,7 +2482,7 @@ flow[0].rtp_cfg := c_RtpemDefaultCfg; flow[0].rtp_cfg.tx_payload_type := flow[0].pt; flow[0].rtp_cfg.iuup_mode := true; - flow[0].rtp_cfg.iuup_tx_init := true; + flow[0].rtp_cfg.iuup_cfg.active_init := true; f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); @@ -2493,7 +2493,7 @@ flow[1].rtp_cfg := c_RtpemDefaultCfg; flow[1].rtp_cfg.tx_payload_type := flow[1].pt; flow[1].rtp_cfg.iuup_mode := true; - flow[1].rtp_cfg.iuup_tx_init := false; + flow[1].rtp_cfg.iuup_cfg.active_init := false; f_flow_create(RTPEM[1], ep, call_id, "recvonly", flow[1], true); f_rtpem_mode(RTPEM[1], RTPEM_MODE_RXONLY); @@ -2601,7 +2601,7 @@ flow[0].rtp_cfg.tx_fixed_payload := '4f28959ffeb80181f5c4e83d176c897b4a4e333298333419a493ca63ded6e0'O; flow[0].rtp_cfg.rx_fixed_payload := '08556d944c71a1a081e7ead204244480000ecd82b81118000097c4794e7740'O; /* flow[1].rtp_cfg.tx_fixed_payload converted AMR-BE-RTP->AMR-IUUP*/ flow[0].rtp_cfg.iuup_mode := true; - flow[0].rtp_cfg.iuup_tx_init := true; + flow[0].rtp_cfg.iuup_cfg.active_init := true; f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 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: I4e8296dae40277be51974338bc0d21c939eec149 Gerrit-Change-Number: 28190 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: IuUP: Improve enc/dec of PDU Type 14

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28188 ) Change subject: IuUP: Improve enc/dec of PDU Type 14 ...................................................................... IuUP: Improve enc/dec of PDU Type 14 Related: SYS#5969 Change-Id: I33e8a82e654b5afef8bc468cf6b1fff8fa9637ce --- M library/IuUP_Emulation.ttcn M library/IuUP_Types.ttcn 2 files changed, 142 insertions(+), 47 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/IuUP_Emulation.ttcn b/library/IuUP_Emulation.ttcn index 19c2c84..899ba50 100644 --- a/library/IuUP_Emulation.ttcn +++ b/library/IuUP_Emulation.ttcn @@ -100,7 +100,7 @@ } else { /* store an INIT_ACK to be transmitted later */ st.pending_tx_pdu := valueof(ts_IuUP_INIT_ACK(pdu.type_14.frame_nr, - pdu.type_14.iuup_version)); + pdu.type_14.u.proc.hdr.iuup_version)); } } else if (match(pdu, tr_IuUP_INIT_ACK)) { if (st.cfg.active_init == true) { @@ -127,7 +127,7 @@ if (st.cfg.active_init) { if (not isvalue(st.pending_tx_pdu)) { /* send INIT */ - pdu := valueof(ts_IuUP_INIT('160051673C01270000820000001710000100'O)); + pdu := valueof(ts_IuUP_INIT(ts_IuUP_PDU14_ProcSending_INIT)); st.pending_tx_pdu := pdu; } /* else: wait for INIT-ACK return ''O at the end */ diff --git a/library/IuUP_Types.ttcn b/library/IuUP_Types.ttcn index b822ddf..e99dfef 100644 --- a/library/IuUP_Types.ttcn +++ b/library/IuUP_Types.ttcn @@ -91,6 +91,8 @@ /* See TS 25.415 6.6.3.18 */ type uint8_t IuUP_TimeAlignment; +/* See TS 25.415 6.6.3.24 */ +type uint4_t IuUP_IPTI; /* See TS 25.415 6.6.2.1 */ type record IuUP_PDU_Type_0 { @@ -119,45 +121,57 @@ IuUP_PDU_Type pdu_type, IuUP_AckNack ack_nack, uint2_t frame_nr, + IuUP_PDU14_Union u +} with { variant (u) "CROSSTAG(proc, ack_nack=IuUP_ACKNACK_CTRL; + ack, ack_nack=IuUP_ACKNACK_ACK; + nack, ack_nack=IuUP_ACKNACK_NACK)" +}; + +type record IuUP_PDU_Type_14_Common_Hdr { uint4_t iuup_version, IuUP_ProcedureIndicator procedure_ind, uint6_t header_crc, - uint10_t payload_crc, - IuUP_PDU14_Union u -} with { variant (u) "CROSSTAG( proc_sending, ack_nack=IuUP_ACKNACK_CTRL; - ack, ack_nack=IuUP_ACKNACK_ACK; - nack, ack_nack=IuUP_ACKNACK_NACK)" + uint10_t payload_crc +}; + +type union IuUP_PDU14_Union { + IuUP_PDU14_ProcSending proc, + IuUP_PDU14_ACK ack, + IuUP_PDU14_NACK nack }; /* 6.6.2.3.1 Figure 21 */ type record IuUP_PDU14_ProcSending { - octetstring payload + IuUP_PDU_Type_14_Common_Hdr hdr, + IuUP_PDU14_ProcSendingUnion u +} with { + variant (u) "CROSSTAG(init, hdr.procedure_ind=IuUP_PRI_INITIALIZATION; + rate_ctrl, hdr.procedure_ind=IuUP_PRI_RATE_CONTROL; + time_alignment, hdr.procedure_ind=IuUP_PRI_TIME_ALIGNMENT; + error_event, hdr.procedure_ind=IuUP_PRI_ERROR_EVENT; + other, OTHERWISE)" }; /* 6.6.2.3.2 Figure 22 */ type record IuUP_PDU14_ACK { + IuUP_PDU_Type_14_Common_Hdr hdr, octetstring spare_ext optional }; /* 6.6.2.3.3 Figure 23 */ type record IuUP_PDU14_NACK { + IuUP_PDU_Type_14_Common_Hdr hdr, IuUP_ErrorCause err_cause, BIT2 spare, octetstring spare_ext optional }; -type union IuUP_PDU14_Union { - IuUP_PDU14_ProcSending proc_sending, - IuUP_PDU14_ACK ack, - IuUP_PDU14_NACK nack -}; - type union IuUP_PDU14_ProcSendingUnion { IuUP_PDU14_ProcSending_INIT init, IuUP_PDU14_ProcSending_RATE_CTRL rate_ctrl, - IuUP_PDU14_ProcSending_RATE_CTRL rate_ctrl_ack, IuUP_PDU14_ProcSending_TIME_ALIGNMENT time_alignment, - IuUP_PDU14_ProcSending_ERROR_EVENT error_event + IuUP_PDU14_ProcSending_ERROR_EVENT error_event, + octetstring other }; /* 6.6.2.3.4.1 Initialisation */ @@ -166,21 +180,35 @@ boolean ti, uint3_t subflows_per_rfci, boolean chain_ind, - - /* FIXME: Further decode */ - octetstring payload + IuUP_InitRfci rfci, + IuUP_IPTI_List IPTIs optional, + BIT16 versions_supported, + uint4_t data_pdu_type, + BIT4 spare2 +} with { + variant (IPTIs) "PRESENCE(ti=true)" + variant (versions_supported) "BITORDER(lsb)" + variant (versions_supported) "BYTEORDER(last)" }; type record IuUP_InitRfci { boolean lri, boolean li, - IuUP_RFCI rfci, + IuUP_RFCI rfci_id, RecOfU8 len8 optional, - RecOfU16 len16 optional -} with { variant (len8) "PRESENCE(li=false)"; - variant (len16) "PRESENCE(li=true)" + RecOfU16 len16 optional, + IuUP_InitRfci rfci optional +} with { + variant (len8) "PRESENCE(li=false)"; + variant (len16) "PRESENCE(li=true)" + variant (rfci) "PRESENCE(lri=false)" }; -type record of uint8_t RecOfU8; -type record of uint16_t RecOfU16; +type record of IuUP_IPTI IuUP_IPTI_List with { + variant "FIELDLENGTH(3)" + variant "PADDING(yes)" + }; +type record of uint8_t RecOfU8 with { variant "FIELDLENGTH(3)" }; +type record of uint16_t RecOfU16 with { variant "FIELDLENGTH(3)" }; +type record of IuUP_InitRfci IuUP_InitRfciList; /* 6.6.2.3.4.2.1 Rate Control procedure */ type record IuUP_PDU14_ProcSending_RATE_CTRL { @@ -226,12 +254,14 @@ pdu_type := 14, ack_nack := IuUP_ACKNACK_ACK, frame_nr := frame_nr, - iuup_version := version, - procedure_ind := IuUP_PRI_INITIALIZATION, - header_crc := 0, - payload_crc := 0, u := { ack := { + hdr := { + iuup_version := version, + procedure_ind := IuUP_PRI_INITIALIZATION, + header_crc := 0, + payload_crc := 0 + }, spare_ext := omit } } @@ -243,48 +273,113 @@ pdu_type := 14, ack_nack := IuUP_ACKNACK_ACK, frame_nr := frame_nr, - iuup_version := version, - procedure_ind := IuUP_PRI_INITIALIZATION, - header_crc := ?, - payload_crc := ?, u := { ack := { + hdr := { + iuup_version := version, + procedure_ind := IuUP_PRI_INITIALIZATION, + header_crc := ?, + payload_crc := ? + }, spare_ext := omit } } } }; -template IuUP_PDU ts_IuUP_INIT(octetstring payload, uint2_t frame_nr := 0, uint4_t version := 0) := { +template (value) IuUP_InitRfci ts_IuUP_InitRfci( + template (value) boolean lri, + template (value) boolean li, + template (value) IuUP_RFCI rfci_id, + template (omit) RecOfU8 len8, + template (omit) RecOfU16 len16, + template (omit) IuUP_InitRfci rfci := omit) := { + lri := lri, + li := li, + rfci_id := rfci_id, + len8 := len8, + len16 := len16, + rfci := rfci +} + +template (value) IuUP_PDU14_ProcSending_INIT ts_IuUP_PDU14_ProcSending_INIT( + template (value) boolean ti := true, + template (value) uint3_t subflows_per_rfci := 3, + template (value) boolean chain_ind := false, + template (value) IuUP_InitRfci rfci := ts_IuUP_InitRfci(false, false, 0, {81, 103, 60}, omit, + ts_IuUP_InitRfci(false, false, 1, {39, 0, 0}, omit, + ts_IuUP_InitRfci(true, false, 2, {0, 0, 0}, omit, omit))), + template (omit) IuUP_IPTI_List IPTIs := {1, 7, 1}, + template (value) BIT16 versions_supported := '0000000000000001'B, + template (value) uint4_t data_pdu_type := 0) := { + spare := '000'B, + ti := ti, + subflows_per_rfci := subflows_per_rfci, + chain_ind := chain_ind, + rfci := rfci, + IPTIs := IPTIs, + versions_supported := versions_supported, + data_pdu_type := data_pdu_type, + spare2 := '0000'B +} + +template (present) IuUP_PDU14_ProcSending_INIT tr_IuUP_PDU14_ProcSending_INIT( + template (present) boolean ti := ?, + template (present) uint3_t subflows_per_rfci := ?, + template (present) boolean chain_ind := ?, + template (present) IuUP_InitRfci rfci := ?, + template IuUP_IPTI_List IPTIs := *, + template (present) BIT16 versions_supported := ?, + template (present) uint4_t data_pdu_type := ?) := { + spare := '000'B, + ti := ti, + subflows_per_rfci := subflows_per_rfci, + chain_ind := chain_ind, + rfci := rfci, + IPTIs := IPTIs, + versions_supported := versions_supported, + data_pdu_type := data_pdu_type, + spare2 := '0000'B +} + +template (value) IuUP_PDU ts_IuUP_INIT(template (value) IuUP_PDU14_ProcSending_INIT init, uint2_t frame_nr := 0, uint4_t version := 0) := { type_14 := { pdu_type := 14, ack_nack := IuUP_ACKNACK_CTRL, frame_nr := frame_nr, - iuup_version := version, - procedure_ind := IuUP_PRI_INITIALIZATION, - header_crc := 0, - payload_crc := 0, u := { - proc_sending := { - payload := payload + proc := { + hdr := { + iuup_version := version, + procedure_ind := IuUP_PRI_INITIALIZATION, + header_crc := 0, + payload_crc := 0 + }, + u := { + init := init + } } } } }; -template IuUP_PDU tr_IuUP_INIT(template octetstring payload := ?, template uint2_t frame_nr := ?, +template IuUP_PDU tr_IuUP_INIT(template (present) IuUP_PDU14_ProcSending_INIT init := ?, template octetstring payload := ?, template uint2_t frame_nr := ?, template uint4_t version := ?) := { type_14 := { pdu_type := 14, ack_nack := IuUP_ACKNACK_CTRL, frame_nr := frame_nr, - iuup_version := version, - procedure_ind := IuUP_PRI_INITIALIZATION, - header_crc := ?, - payload_crc := ?, u := { - proc_sending := { - payload := payload + proc := { + hdr := { + iuup_version := version, + procedure_ind := IuUP_PRI_INITIALIZATION, + header_crc := ?, + payload_crc := ? + }, + u := { + init := init + } } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28188 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: I33e8a82e654b5afef8bc468cf6b1fff8fa9637ce Gerrit-Change-Number: 28188 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> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Allow Setting IuUP_Cfg from test using RTP_Emulation

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 ) Change subject: Allow Setting IuUP_Cfg from test using RTP_Emulation ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 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: I4e8296dae40277be51974338bc0d21c939eec149 Gerrit-Change-Number: 28190 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 18:27:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: IuUP: Encode Initialization according to cfg

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28189 ) Change subject: IuUP: Encode Initialization according to cfg ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28189 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: I1dec3a8dcc829ad2c308636b697b089e873fd824 Gerrit-Change-Number: 28189 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-Comment-Date: Thu, 26 May 2022 18:27:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: IuUP: Improve enc/dec of PDU Type 14

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28188 ) Change subject: IuUP: Improve enc/dec of PDU Type 14 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28188 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: I33e8a82e654b5afef8bc468cf6b1fff8fa9637ce Gerrit-Change-Number: 28188 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 18:27:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in pysim[master]: ts_102_221: The BTLV IEs FILE SIZE and TOTAL FILE SIZE have a min length

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28185 ) Change subject: ts_102_221: The BTLV IEs FILE SIZE and TOTAL FILE SIZE have a min length ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ief113ce8fe3bcae2c9fb2ff4138df9ccf98d26ff Gerrit-Change-Number: 28185 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 17:10:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in pysim[master]: ts_102_221: fix SFI generation

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28184 ) Change subject: ts_102_221: fix SFI generation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iaa38d2be4719f12c1d7b30a8befe278f1ed78ac1 Gerrit-Change-Number: 28184 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 17:10:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ccid-firmware[master]: contrib/jenkins.sh: skip upload if nothing new

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/28186 ) Change subject: contrib/jenkins.sh: skip upload if nothing new ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/28186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3f70d6149b29ec2ff7f185dfae8bc8d4a1953dc2 Gerrit-Change-Number: 28186 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 17:09:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_two_crcx_mdcx_and_iuup{_rtp}_rfci_unordered

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28191 ) Change subject: mgw: Introduce test TC_two_crcx_mdcx_and_iuup{_rtp}_rfci_unordered ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28191 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: I2523f18a0fdba87f4e13a2ce3c5da482c4af2e3c Gerrit-Change-Number: 28191 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 17:08:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Allow Setting IuUP_Cfg from test using RTP_Emulation

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 ) Change subject: Allow Setting IuUP_Cfg from test using RTP_Emulation ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 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: I4e8296dae40277be51974338bc0d21c939eec149 Gerrit-Change-Number: 28190 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 17:08:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: IuUP: Encode Initialization according to cfg

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28189 ) Change subject: IuUP: Encode Initialization according to cfg ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28189 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: I1dec3a8dcc829ad2c308636b697b089e873fd824 Gerrit-Change-Number: 28189 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 17:07:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: IuUP: Improve enc/dec of PDU Type 14

by laforge

Attention is currently required from: osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28188 ) Change subject: IuUP: Improve enc/dec of PDU Type 14 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28188 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: I33e8a82e654b5afef8bc468cf6b1fff8fa9637ce Gerrit-Change-Number: 28188 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 17:07:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: stp: Fix sporadic failure in TC_ipa_to_m3ua_ni

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28131 ) Change subject: stp: Fix sporadic failure in TC_ipa_to_m3ua_ni ...................................................................... stp: Fix sporadic failure in TC_ipa_to_m3ua_ni It was spotted that from time to time the test set NI international instead of national. This is presumable due to a race condition between VTY and messages being received and forwarded. Let's delay resetting the VTY config after the message is recieved, to avoid the race conditions between them. Change-Id: I3ef08447d2e36b6948d3db4ec9d1459beebc9384 --- M stp/STP_Tests.ttcn 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: daniel: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/stp/STP_Tests.ttcn b/stp/STP_Tests.ttcn index ac45b1d..48214be 100644 --- a/stp/STP_Tests.ttcn +++ b/stp/STP_Tests.ttcn @@ -144,14 +144,13 @@ var octetstring sccp_enc := enc_PDU_SCCP(sccp); f_vty_config2(VTY, {"cs7 instance 0"}, "network-indicator national"); f_IPA_send(3, sccp_enc); - f_vty_config2(VTY, {"cs7 instance 0"}, "network-indicator international"); /* expect to receive it via M3UA */ var template (present) M3UA_Protocol_Data rx_pd; rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, c_M3UA_NI_NATIONAL, '00'O, '00'O, sccp_enc); f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd)); - + f_vty_config2(VTY, {"cs7 instance 0"}, "network-indicator international"); f_clear_m3ua(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28131 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: I3ef08447d2e36b6948d3db4ec9d1459beebc9384 Gerrit-Change-Number: 28131 Gerrit-PatchSet: 3 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: stp: Fix sporadic failure in TC_ipa_to_m3ua_ni

by daniel

Attention is currently required from: laforge, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28131 ) Change subject: stp: Fix sporadic failure in TC_ipa_to_m3ua_ni ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28131 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: I3ef08447d2e36b6948d3db4ec9d1459beebc9384 Gerrit-Change-Number: 28131 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 12:50:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: test Gy Volume-Quote-Threshold feature

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28179 ) Change subject: ggsn: test Gy Volume-Quote-Threshold feature ...................................................................... ggsn: test Gy Volume-Quote-Threshold feature Change-Id: If10171589e915db8e78278d2d802e38c66b37687 --- M ggsn_tests/GGSN_Tests.ttcn M library/DIAMETER_Templates.ttcn 2 files changed, 106 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 875a9d6..ddc651c 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -141,6 +141,7 @@ port DIAMETER_PT Gy_UNIT; port DIAMETEREM_PROC_PT Gy_PROC; var integer g_gy_validity_time := 0; /* In seconds. 0 => disabled, !0 => grant over CC-Time period */ + var integer g_gy_volume_threshold := 0; /* In octets. 0 => disabled, !0 => request IUT to revalidate after N octets */ var PDU_DIAMETER g_rx_gy; /* Store last received Gy message */ } @@ -667,8 +668,13 @@ avp := f_DIAMETER_get_avp(g_rx_gy, c_AVP_Code_DCC_NONE_CC_Request_Number); req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); if (g_gy_validity_time > 0) { - tx_dia := ts_DIA_Gy_CCA_ValidityTime(g_rx_gy.hop_by_hop_id, g_rx_gy.end_to_end_id, sess_id, - req_type, req_num, g_gy_validity_time); + if (g_gy_volume_threshold > 0) { + tx_dia := ts_DIA_Gy_CCA_ValidityTimeVolumeThreshold(g_rx_gy.hop_by_hop_id, g_rx_gy.end_to_end_id, sess_id, + req_type, req_num, g_gy_validity_time, g_gy_volume_threshold); + } else { + tx_dia := ts_DIA_Gy_CCA_ValidityTime(g_rx_gy.hop_by_hop_id, g_rx_gy.end_to_end_id, sess_id, + req_type, req_num, g_gy_validity_time); + } } else { tx_dia := ts_DIA_Gy_CCA(g_rx_gy.hop_by_hop_id, g_rx_gy.end_to_end_id, sess_id, req_type, req_num); @@ -812,14 +818,14 @@ const octetstring c_neigh_solicit:= '6000000000203afffe800000000000000000000000000002ff0200000000000000000001ff00000287009f9600000000fe80000000000000000000000000000201010288b51f2559'O; /* template for sending an ICMPv4 echo request */ - template PDU_ICMP ts_ICMPv4_ERQ := { + template PDU_ICMP ts_ICMPv4_ERQ(octetstring data := ''O) := { echo := { type_field := 8, code := 0, checksum := '0000'O, identifier := '0345'O, sequence_number := '0001'O, - data := ''O + data := data } } @@ -1112,8 +1118,8 @@ } /* Send an ICMPv4 echo msg through GTP given pdp ctx, and ip src and dst addr */ - function f_gen_icmpv4_echo(OCT4 saddr, OCT4 daddr) return octetstring { - var octetstring tmp := f_enc_PDU_ICMP(valueof(ts_ICMPv4_ERQ)); + function f_gen_icmpv4_echo(OCT4 saddr, OCT4 daddr, octetstring pl := ''O) return octetstring { + var octetstring tmp := f_enc_PDU_ICMP(valueof(ts_ICMPv4_ERQ(pl))); var IPv4_packet ip4 := valueof(ts_IP4(saddr, daddr, 1, 50, tmp)); var octetstring data := f_IPv4_enc(ip4); var OCT2 cksum := f_IPv4_checksum(data); @@ -2429,6 +2435,60 @@ f_shutdown_helper(); } + /* Test Volume-Quota-Thresold AVP triggers request before Validity-Time */ + testcase TC_gy_charging_volume_quota_threshold() runs on GT_CT { + var default d; + timer Tout; + g_gy_volume_threshold := 1000; /* Will make a trigger when we send bigger payload below */ + g_gy_validity_time := 8; /* Grant access for 8 seconds, needs to be re-validated afterwards */ + f_init(); + var float tout_sec := int2float(g_gy_validity_time) / 2.0; + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + f_pdp_ctx_act(ctx); + + var OCT4 dns1_addr := f_PCO_extract_proto(ctx.pco_neg, '000d'O); + + T_default.start(40.0); + d := activate(pingpong()); + + /* Send some UL traffic: */ + var octetstring payload := f_rnd_octstring(1200); + var OCT4 saddr := ctx.eua.endUserAddress.endUserAddressIPv4.ipv4_address; + f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr, dns1_addr, payload)); + f_wait_icmp4_echo_reply(ctx); + + /* ICMP Req generates one report: */ + Tout.start(tout_sec); + alt { + [] as_DIA_Gy_CCR(ctx, UPDATE_REQUEST); + [] Tout.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "TImeout waiting for Gy UPDATE triggered by Volume-Quota-Threshold"); + } + } + f_validate_gy_cc_report(g_rx_gy, THRESHOLD, (0..6), 0, (1200..1400)); + + /* ICMP Resp (echo back) generates one report: */ + as_DIA_Gy_CCR(ctx, UPDATE_REQUEST); + f_validate_gy_cc_report(g_rx_gy, THRESHOLD, (0..1), (1200..1400), 0); + + /* Second update: 0 ul/dl pkt/octet should be reported, since nothing was sent */ + as_DIA_Gy_CCR(ctx, UPDATE_REQUEST); + f_validate_gy_cc_report(g_rx_gy, VALIDITY_TIME, (8..9), 0, 0); + + /* Let the CCA reach the GGSN */ + f_sleep(0.5); + deactivate(d); + T_default.stop; + + f_pdp_ctx_del(ctx, '1'B); + f_validate_gy_cc_report(g_rx_gy, FINAL, (0..2), 0, 0); + + + f_shutdown_helper(); + } + control { execute(TC_pdp4_act_deact()); execute(TC_pdp4_act_deact_ipcp()); @@ -2479,6 +2539,7 @@ /* open5gs specific tests: */ if (m_ggsn_impl == GGSN_IMPL_OPEN5GS) { execute(TC_gy_charging_cc_time()); + execute(TC_gy_charging_volume_quota_threshold()); } } } diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index 03fec7c..2bc9e77 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -1195,6 +1195,15 @@ } } +template (value) GenericAVP ts_AVP_3GPP_VolumeQuotaThreshold(uint32_t volume_quota_thresh_val) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_DCA_3GPP_Volume_Quota_Threshold), + avp_data := { + avp_DCA_3GPP_Volume_Quota_Threshold := int2oct(volume_quota_thresh_val, 4) + } + } +} + template (present) GenericAVP tr_AVP_3GPP_CalledStationId(template (present) DNAS_NONE_Called_Station_Id id := ?) := { avp := { avp_header := tr_DIA_Hdr(c_AVP_Code_DNAS_NONE_Called_Station_Id), @@ -1541,6 +1550,36 @@ // supported features // origin }); +/* Same as ts_DIA_Gy_CCA_ValidityTime, but with extra AVP to grant access for limited amount of octets */ +template (value) PDU_DIAMETER +ts_DIA_Gy_CCA_ValidityTimeVolumeThreshold(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, + template (value) octetstring sess_id, + template (value) DCC_NONE_CC_Request_Type req_type, + template (value) AVP_Unsigned32 req_num, + uint32_t validity_time, uint32_t volume_threhsold) +:= ts_DIAMETER(flags:='01000000'B, cmd_code:=Credit_Control, + app_id:=int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4), hbh_id:=hbh_id, ete_id:=ete_id, + avps := { + ts_AVP_SessionId(sess_id), + ts_AVP_ResultCode(DIAMETER_SUCCESS), + ts_AVP_OriginHost("ocs.localdomain"), + ts_AVP_OriginRealm("localdomain"), + ts_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + ts_AVP_CcReqType(req_type), + ts_AVP_CcReqNum(req_num), + ts_AVP_Multiple_Services_Credit_Control({ + ts_AVP_Validity_Time(validity_time), + ts_AVP_Granted_Service_Unit({ + ts_AVP_CC_Total_Octets(volume_threhsold*100) + }), + ts_AVP_3GPP_VolumeQuotaThreshold(volume_threhsold) + }) + //, + // qos + // default eps bearer qos + // supported features + // origin + }); /* RFC 6733, section 5.5.1 "Device-Watchdog-Request" */ template (value) PDU_DIAMETER -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28179 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: If10171589e915db8e78278d2d802e38c66b37687 Gerrit-Change-Number: 28179 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: test Gy Volume-Quote-Threshold feature

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28179 ) Change subject: ggsn: test Gy Volume-Quote-Threshold feature ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28179 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: If10171589e915db8e78278d2d802e38c66b37687 Gerrit-Change-Number: 28179 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 12:50:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Allow Setting IuUP_Cfg from test using RTP_Emulation

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 ) Change subject: Allow Setting IuUP_Cfg from test using RTP_Emulation ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 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: I4e8296dae40277be51974338bc0d21c939eec149 Gerrit-Change-Number: 28190 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 12:34:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: IuUP: Improve enc/dec of PDU Type 14

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28188 ) Change subject: IuUP: Improve enc/dec of PDU Type 14 ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28188/comment/81976bae_ce20… PS1, Line 9: Change-Id: I33e8a82e654b5afef8bc468cf6b1fff8fa9637ce > SYS#xxxx? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28188 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: I33e8a82e654b5afef8bc468cf6b1fff8fa9637ce Gerrit-Change-Number: 28188 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 12:23:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: IuUP: Improve enc/dec of PDU Type 14

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28188 to look at the new patch set (#2). Change subject: IuUP: Improve enc/dec of PDU Type 14 ...................................................................... IuUP: Improve enc/dec of PDU Type 14 Related: SYS#5969 Change-Id: I33e8a82e654b5afef8bc468cf6b1fff8fa9637ce --- M library/IuUP_Emulation.ttcn M library/IuUP_Types.ttcn 2 files changed, 142 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/28188/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28188 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: I33e8a82e654b5afef8bc468cf6b1fff8fa9637ce Gerrit-Change-Number: 28188 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: IuUP: Encode Initialization according to cfg

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28189 to look at the new patch set (#2). Change subject: IuUP: Encode Initialization according to cfg ...................................................................... IuUP: Encode Initialization according to cfg Change-Id: I1dec3a8dcc829ad2c308636b697b089e873fd824 --- M library/IuUP_Emulation.ttcn 1 file changed, 45 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/28189/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28189 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: I1dec3a8dcc829ad2c308636b697b089e873fd824 Gerrit-Change-Number: 28189 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Allow Setting IuUP_Cfg from test using RTP_Emulation

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 to look at the new patch set (#3). Change subject: Allow Setting IuUP_Cfg from test using RTP_Emulation ...................................................................... Allow Setting IuUP_Cfg from test using RTP_Emulation Change-Id: I4e8296dae40277be51974338bc0d21c939eec149 --- M hnodeb/HNBGW_ConnectionHandler.ttcn M library/IuUP_Emulation.ttcn M library/RTP_Emulation.ttcn M mgw/MGCP_Test.ttcn 4 files changed, 43 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/28190/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 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: I4e8296dae40277be51974338bc0d21c939eec149 Gerrit-Change-Number: 28190 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: add gsm0503_detect_a[fh]s_dtx_frame2()

by pespin

Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28176 ) Change subject: coding: add gsm0503_detect_a[fh]s_dtx_frame2() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibcac395f800bb64150c97fcdaca3523ecfc5fcee Gerrit-Change-Number: 28176 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 12:02:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: cosmetic: iuup.h: Fix indentation

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28193 ) Change subject: cosmetic: iuup.h: Fix indentation ...................................................................... Patch Set 1: (1 comment) File include/osmocom/gsm/iuup.h: https://gerrit.osmocom.org/c/libosmocore/+/28193/comment/303f16ef_7f6a490b PS1, Line 45: struct osmo_iuup_rfci { > No, that's not a compacted struct used in the wire. […] Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I10a2d2a872fd6fdae8b4af94995300af3144b551 Gerrit-Change-Number: 28193 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 11:57:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-mgw[master]: iuup: Fix caps in logging message

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/28187 ) Change subject: iuup: Fix caps in logging message ...................................................................... iuup: Fix caps in logging message Change-Id: Icf836f770f22a9460378f91ef037997a73464faa --- M src/libosmo-mgcp/mgcp_iuup.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_iuup.c b/src/libosmo-mgcp/mgcp_iuup.c index 1fea392..120b330 100644 --- a/src/libosmo-mgcp/mgcp_iuup.c +++ b/src/libosmo-mgcp/mgcp_iuup.c @@ -270,7 +270,7 @@ return ft; } msgb_pull_to_l3(msg); - LOGP(DLMGCP, LOGL_DEBUG, "Convert Iuup -> AMR: ft %d, len %d\n", ft, msgb_l3len(msg)); + LOGP(DLMGCP, LOGL_DEBUG, "Convert IuUP -> AMR: ft %d, len %d\n", ft, msgb_l3len(msg)); if (mgcp_codec_amr_is_octet_aligned(conn_rtp_dst->end.codec)) { amr_hdr = (struct amr_hdr *) msgb_push(msg, sizeof(struct amr_hdr)); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/28187 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Icf836f770f22a9460378f91ef037997a73464faa Gerrit-Change-Number: 28187 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: cosmetic: iuup.h: Fix indentation

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28193 ) Change subject: cosmetic: iuup.h: Fix indentation ...................................................................... cosmetic: iuup.h: Fix indentation Change-Id: I10a2d2a872fd6fdae8b4af94995300af3144b551 --- M include/osmocom/gsm/iuup.h 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/include/osmocom/gsm/iuup.h b/include/osmocom/gsm/iuup.h index db3d5e0..ab6b8ac 100644 --- a/include/osmocom/gsm/iuup.h +++ b/include/osmocom/gsm/iuup.h @@ -44,10 +44,10 @@ }; struct osmo_iuup_rfci { uint8_t used:1, - spare1:1, - id:6; + spare1:1, + id:6; uint8_t spare2:4, - IPTI:4; /* values range 0-15, 4 bits */; + IPTI:4; /* values range 0-15, 4 bits */; uint16_t subflow_sizes[IUUP_MAX_SUBFLOWS]; }; struct osmo_iuup_rnl_config { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I10a2d2a872fd6fdae8b4af94995300af3144b551 Gerrit-Change-Number: 28193 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: cosmetic: iuup.h: Fix indentation

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28193 ) Change subject: cosmetic: iuup.h: Fix indentation ...................................................................... Patch Set 1: (1 comment) File include/osmocom/gsm/iuup.h: https://gerrit.osmocom.org/c/libosmocore/+/28193/comment/735c5bc3_8dffa31e PS1, Line 45: struct osmo_iuup_rfci { > I think we also need to handle little/big endian here? No, that's not a compacted struct used in the wire. It's just done this way to save some space since there's actually an array of them (64) for each conn. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I10a2d2a872fd6fdae8b4af94995300af3144b551 Gerrit-Change-Number: 28193 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 11:52:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: add gsm0503_detect_a[fh]s_dtx_frame2()

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28176 ) Change subject: coding: add gsm0503_detect_a[fh]s_dtx_frame2() ...................................................................... Patch Set 2: (2 comments) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/28176/comment/f828a022_8c4071cf PS2, Line 14: Converting to hard-bits is not really needed. > Initially I was planning to simplify the code to calculate a sum of all soft-bits, so that we could […] Done File src/coding/gsm0503_amr_dtx.c: https://gerrit.osmocom.org/c/libosmocore/+/28176/comment/384bd78e_cbc86630 PS2, Line 279: * \param[in] sbits input soft-bits (456 bit). > new parameter mode_id is not documented Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibcac395f800bb64150c97fcdaca3523ecfc5fcee Gerrit-Change-Number: 28176 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 09:40:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: add gsm0503_detect_a[fh]s_dtx_frame2()

by fixeria

Attention is currently required from: fixeria, pespin. Hello osmith, Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/28176 to look at the new patch set (#3). Change subject: coding: add gsm0503_detect_a[fh]s_dtx_frame2() ...................................................................... coding: add gsm0503_detect_a[fh]s_dtx_frame2() The new functions accept an additional mode_id poiner, which is currently set for the following frames: AFS_ONSET, AHS_ONSET, AHS_SID_FIRST_P2 with N * 16 - M bit pattern. Also, the new API accepts soft-bits instead of hard-bits. Converting bits from soft to hard is now performed internally. Change-Id: Ibcac395f800bb64150c97fcdaca3523ecfc5fcee Related: OS#5570 --- M include/osmocom/coding/gsm0503_amr_dtx.h M src/coding/gsm0503_amr_dtx.c M src/coding/gsm0503_coding.c M src/coding/libosmocoding.map M tests/dtx/dtx_gsm0503_test.c M tests/dtx/dtx_gsm0503_test.ok 6 files changed, 158 insertions(+), 110 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/76/28176/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibcac395f800bb64150c97fcdaca3523ecfc5fcee Gerrit-Change-Number: 28176 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

Change in osmo-ccid-firmware[master]: contrib/jenkins.sh: skip upload if nothing new

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/28186 ) Change subject: contrib/jenkins.sh: skip upload if nothing new ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/28186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3f70d6149b29ec2ff7f185dfae8bc8d4a1953dc2 Gerrit-Change-Number: 28186 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 09:35:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-mgw[master]: iuup: Fix caps in logging message

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/28187 ) Change subject: iuup: Fix caps in logging message ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/28187 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Icf836f770f22a9460378f91ef037997a73464faa Gerrit-Change-Number: 28187 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 09:21:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: cosmetic: iuup.h: Fix indentation

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28193 ) Change subject: cosmetic: iuup.h: Fix indentation ...................................................................... Patch Set 1: Code-Review+2 (1 comment) File include/osmocom/gsm/iuup.h: https://gerrit.osmocom.org/c/libosmocore/+/28193/comment/6d0642e8_0f2c2ce8 PS1, Line 45: struct osmo_iuup_rfci { I think we also need to handle little/big endian here? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I10a2d2a872fd6fdae8b4af94995300af3144b551 Gerrit-Change-Number: 28193 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 09:20:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Allow Setting IuUP_Cfg from test using RTP_Emulation

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 ) Change subject: Allow Setting IuUP_Cfg from test using RTP_Emulation ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File library/IuUP_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190/comment/afe8cbc3_f2b0… PS2, Line 29: type record of IuUP_RabFlowCombination IuUP_RabFlowCombinationList missing ';' -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 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: I4e8296dae40277be51974338bc0d21c939eec149 Gerrit-Change-Number: 28190 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 08:29:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: IuUP: Encode Initialization according to cfg

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28189 ) Change subject: IuUP: Encode Initialization according to cfg ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28189 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: I1dec3a8dcc829ad2c308636b697b089e873fd824 Gerrit-Change-Number: 28189 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 08:27:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: IuUP: Improve enc/dec of PDU Type 14

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28188 ) Change subject: IuUP: Improve enc/dec of PDU Type 14 ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28188/comment/e12d885f_e40d… PS1, Line 9: Change-Id: I33e8a82e654b5afef8bc468cf6b1fff8fa9637ce SYS#xxxx? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28188 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: I33e8a82e654b5afef8bc468cf6b1fff8fa9637ce Gerrit-Change-Number: 28188 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 08:27:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: cosmetic: iuup.h: Fix indentation

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28193 ) Change subject: cosmetic: iuup.h: Fix indentation ...................................................................... cosmetic: iuup.h: Fix indentation Change-Id: I10a2d2a872fd6fdae8b4af94995300af3144b551 --- M include/osmocom/gsm/iuup.h 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/93/28193/1 diff --git a/include/osmocom/gsm/iuup.h b/include/osmocom/gsm/iuup.h index db3d5e0..ab6b8ac 100644 --- a/include/osmocom/gsm/iuup.h +++ b/include/osmocom/gsm/iuup.h @@ -44,10 +44,10 @@ }; struct osmo_iuup_rfci { uint8_t used:1, - spare1:1, - id:6; + spare1:1, + id:6; uint8_t spare2:4, - IPTI:4; /* values range 0-15, 4 bits */; + IPTI:4; /* values range 0-15, 4 bits */; uint16_t subflow_sizes[IUUP_MAX_SUBFLOWS]; }; struct osmo_iuup_rnl_config { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I10a2d2a872fd6fdae8b4af94995300af3144b551 Gerrit-Change-Number: 28193 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

Change in osmo-hnodeb[master]: rtp: Update code to libosmogsm IuUP API changes

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/28192 ) Change subject: rtp: Update code to libosmogsm IuUP API changes ...................................................................... rtp: Update code to libosmogsm IuUP API changes NOTICE: This commit implies an API change when using libosmogsm. However, the previous API was never available in any libosmogsm release, and only available in both libosmogsm and osmo-hnodeb master, so we are only breaking compatibility between different master versions, which is acceptable. Related: SYS#5969 Change-Id: Ia26a945147d68511bb1750d51ed91909e48b4139 --- M src/osmo-hnodeb/rtp.c 1 file changed, 10 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo-hnodeb/rtp.c b/src/osmo-hnodeb/rtp.c index 0435c81..c0d96a9 100644 --- a/src/osmo-hnodeb/rtp.c +++ b/src/osmo-hnodeb/rtp.c @@ -45,13 +45,17 @@ cfg->supported_versions_mask = ce_req->supported_versions_mask; cfg->num_rfci = ce_req->num_rfci; cfg->num_subflows = ce_req->num_subflows; - OSMO_ASSERT(cfg->num_rfci <= ARRAY_SIZE(cfg->subflow_sizes)); - OSMO_ASSERT(cfg->num_subflows <= ARRAY_SIZE(cfg->subflow_sizes[0])); - for (i = 0; i < cfg->num_rfci; i++) - memcpy(&cfg->subflow_sizes[i][0], &ce_req->subflow_sizes[i][0], cfg->num_subflows*sizeof(uint16_t)); cfg->IPTIs_present = ce_req->IPTIs_present; - if (cfg->IPTIs_present) - memcpy(cfg->IPTIs, ce_req->IPTIs, cfg->num_rfci); + OSMO_ASSERT(cfg->num_rfci <= ARRAY_SIZE(cfg->rfci)); + OSMO_ASSERT(cfg->num_subflows <= ARRAY_SIZE(cfg->rfci[0].subflow_sizes)); + for (i = 0; i < cfg->num_rfci; i++) { + cfg->rfci[i].used = true; + cfg->rfci[i].id = i; /* Assume RFC ID from position, llsk_audio doesn't provide info */ + if (cfg->IPTIs_present) + cfg->rfci[i].IPTI = ce_req->IPTIs[i]; + if (cfg->num_subflows > 0) + memcpy(&cfg->rfci[i].subflow_sizes[0], &ce_req->subflow_sizes[i][0], cfg->num_subflows*sizeof(uint16_t)); + } cfg->t_init = (struct osmo_iuup_rnl_config_timer){ .t_ms = IUUP_TIMER_INIT_T_DEFAULT, .n_max = IUUP_TIMER_INIT_N_DEFAULT }; cfg->t_ta = (struct osmo_iuup_rnl_config_timer){ .t_ms = IUUP_TIMER_TA_T_DEFAULT, .n_max = IUUP_TIMER_TA_N_DEFAULT }; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/28192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ia26a945147d68511bb1750d51ed91909e48b4139 Gerrit-Change-Number: 28192 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

Change in osmo-hnodeb[master]: rtp: Update code to libosmogsm IuUP API changes

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/28192 ) Change subject: rtp: Update code to libosmogsm IuUP API changes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/28192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ia26a945147d68511bb1750d51ed91909e48b4139 Gerrit-Change-Number: 28192 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 17:39:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-hnodeb[master]: rtp: Update code to libosmogsm IuUP API changes

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/28192 ) Change subject: rtp: Update code to libosmogsm IuUP API changes ...................................................................... rtp: Update code to libosmogsm IuUP API changes NOTICE: This commit implies an API change when using libosmogsm. However, the previous API was never available in any libosmogsm release, and only available in both libosmogsm and osmo-hnodeb master, so we are only breaking compatibility between different master versions, which is acceptable. Related: SYS#5969 Change-Id: Ia26a945147d68511bb1750d51ed91909e48b4139 --- M src/osmo-hnodeb/rtp.c 1 file changed, 10 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/92/28192/1 diff --git a/src/osmo-hnodeb/rtp.c b/src/osmo-hnodeb/rtp.c index 0435c81..c0d96a9 100644 --- a/src/osmo-hnodeb/rtp.c +++ b/src/osmo-hnodeb/rtp.c @@ -45,13 +45,17 @@ cfg->supported_versions_mask = ce_req->supported_versions_mask; cfg->num_rfci = ce_req->num_rfci; cfg->num_subflows = ce_req->num_subflows; - OSMO_ASSERT(cfg->num_rfci <= ARRAY_SIZE(cfg->subflow_sizes)); - OSMO_ASSERT(cfg->num_subflows <= ARRAY_SIZE(cfg->subflow_sizes[0])); - for (i = 0; i < cfg->num_rfci; i++) - memcpy(&cfg->subflow_sizes[i][0], &ce_req->subflow_sizes[i][0], cfg->num_subflows*sizeof(uint16_t)); cfg->IPTIs_present = ce_req->IPTIs_present; - if (cfg->IPTIs_present) - memcpy(cfg->IPTIs, ce_req->IPTIs, cfg->num_rfci); + OSMO_ASSERT(cfg->num_rfci <= ARRAY_SIZE(cfg->rfci)); + OSMO_ASSERT(cfg->num_subflows <= ARRAY_SIZE(cfg->rfci[0].subflow_sizes)); + for (i = 0; i < cfg->num_rfci; i++) { + cfg->rfci[i].used = true; + cfg->rfci[i].id = i; /* Assume RFC ID from position, llsk_audio doesn't provide info */ + if (cfg->IPTIs_present) + cfg->rfci[i].IPTI = ce_req->IPTIs[i]; + if (cfg->num_subflows > 0) + memcpy(&cfg->rfci[i].subflow_sizes[0], &ce_req->subflow_sizes[i][0], cfg->num_subflows*sizeof(uint16_t)); + } cfg->t_init = (struct osmo_iuup_rnl_config_timer){ .t_ms = IUUP_TIMER_INIT_T_DEFAULT, .n_max = IUUP_TIMER_INIT_N_DEFAULT }; cfg->t_ta = (struct osmo_iuup_rnl_config_timer){ .t_ms = IUUP_TIMER_TA_T_DEFAULT, .n_max = IUUP_TIMER_TA_N_DEFAULT }; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/28192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ia26a945147d68511bb1750d51ed91909e48b4139 Gerrit-Change-Number: 28192 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Allow Setting IuUP_Cfg from test using RTP_Emulation

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 to look at the new patch set (#2). Change subject: Allow Setting IuUP_Cfg from test using RTP_Emulation ...................................................................... Allow Setting IuUP_Cfg from test using RTP_Emulation Change-Id: I4e8296dae40277be51974338bc0d21c939eec149 --- M hnodeb/HNBGW_ConnectionHandler.ttcn M library/IuUP_Emulation.ttcn M library/RTP_Emulation.ttcn M mgw/MGCP_Test.ttcn 4 files changed, 43 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/28190/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 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: I4e8296dae40277be51974338bc0d21c939eec149 Gerrit-Change-Number: 28190 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: IuUP: Encode Initialization according to cfg

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28189 ) Change subject: IuUP: Encode Initialization according to cfg ...................................................................... IuUP: Encode Initialization according to cfg Change-Id: I1dec3a8dcc829ad2c308636b697b089e873fd824 --- M library/IuUP_Emulation.ttcn 1 file changed, 45 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/28189/1 diff --git a/library/IuUP_Emulation.ttcn b/library/IuUP_Emulation.ttcn index 899ba50..1bb2bb2 100644 --- a/library/IuUP_Emulation.ttcn +++ b/library/IuUP_Emulation.ttcn @@ -35,6 +35,7 @@ template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_12_2(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {81, 103, 60}, 1); template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_SID(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {34, 0, 0}, 7); +template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_NO_DATA(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {0, 0, 0}, 1); type record IuUP_Config { /* actively send INIT (true) or only passively respond (false) */ @@ -63,7 +64,7 @@ cfg := { active_init := act_init, data_pdu_type_0 := true, - rab_flow_combs := { t_IuUP_RFC_AMR_12_2(0), t_IuUP_RFC_AMR_SID(1) } + rab_flow_combs := { t_IuUP_RFC_AMR_12_2(0), t_IuUP_RFC_AMR_SID(1), t_IuUP_RFC_AMR_NO_DATA(2) } }, state := ST_INIT, tx_next_frame_nr := 0, @@ -120,6 +121,48 @@ self.stop; } +private function f_ts_IuUP_INIT(inout IuUP_Entity st) return IuUP_PDU +{ + var IuUP_PDU pdu; + var uint4_t data_pdu_type; + var template (omit) IuUP_InitRfci rfci := omit; + var IuUP_IPTI_List IPTIs := {}; + var uint4_t num_rfci := lengthof(st.cfg.rab_flow_combs); + + if (st.cfg.data_pdu_type_0 == true) { + data_pdu_type := 0; + } else { + data_pdu_type := 1; + } + + /* Build RFCI list: */ + for (var integer remain := num_rfci; remain > 0; remain := remain - 1) { + var IuUP_RabFlowCombination comb := st.cfg.rab_flow_combs[remain - 1]; + var boolean lri := false; + if (remain == num_rfci) { + lri := true; + } + rfci := ts_IuUP_InitRfci(lri, false, comb.rfci, comb.sub_flow_bits, omit, rfci) + } + + /* Build IPTI list: */ + for (var integer i := 0; i < num_rfci; i := i + 1) { + IPTIs := IPTIs & { st.cfg.rab_flow_combs[i].ipti }; + } + + template (value) IuUP_PDU14_ProcSending_INIT tpl := ts_IuUP_PDU14_ProcSending_INIT( + ti := true, + subflows_per_rfci := num_rfci, + chain_ind := false, + rfci := rfci, + IPTIs := IPTIs, + versions_supported := '0000000000000001'B, + data_pdu_type := data_pdu_type + ); + pdu := valueof(ts_IuUP_INIT(tpl)); + return pdu; +} + function f_IuUP_Em_tx_encap(inout IuUP_Entity st, in octetstring payload) return octetstring { var IuUP_PDU pdu; select (st.state) { @@ -127,7 +170,7 @@ if (st.cfg.active_init) { if (not isvalue(st.pending_tx_pdu)) { /* send INIT */ - pdu := valueof(ts_IuUP_INIT(ts_IuUP_PDU14_ProcSending_INIT)); + pdu := f_ts_IuUP_INIT(st); st.pending_tx_pdu := pdu; } /* else: wait for INIT-ACK return ''O at the end */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28189 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: I1dec3a8dcc829ad2c308636b697b089e873fd824 Gerrit-Change-Number: 28189 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Allow Setting IuUP_Cfg from test using RTP_Emulation

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 ) Change subject: Allow Setting IuUP_Cfg from test using RTP_Emulation ...................................................................... Allow Setting IuUP_Cfg from test using RTP_Emulation Change-Id: I4e8296dae40277be51974338bc0d21c939eec149 --- M library/IuUP_Emulation.ttcn M library/RTP_Emulation.ttcn M mgw/MGCP_Test.ttcn 3 files changed, 42 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/28190/1 diff --git a/library/IuUP_Emulation.ttcn b/library/IuUP_Emulation.ttcn index 1bb2bb2..6f13a1e 100644 --- a/library/IuUP_Emulation.ttcn +++ b/library/IuUP_Emulation.ttcn @@ -26,6 +26,7 @@ /* IPTI value in number of ITIs for the corresponding RFCI */ uint8_t ipti }; +type record of IuUP_RabFlowCombination IuUP_RabFlowCombinationList template (value) IuUP_RabFlowCombination t_IuUP_RFC(IuUP_RFCI rfci, RecOfU8 subflow_bits, uint8_t ipti) := { rfci := rfci, @@ -37,21 +38,50 @@ template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_SID(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {34, 0, 0}, 7); template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_NO_DATA(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {0, 0, 0}, 1); + +const IuUP_RabFlowCombinationList c_IuUP_Config_RabFlowCombination_def := { + { + rfci := 0, + sub_flow_bits := {81, 103, 60}, + ipti := 1 + }, { + rfci := 1, + sub_flow_bits := {34, 0, 0}, + ipti := 7 + }, { + rfci := 2, + sub_flow_bits := {0, 0, 0}, + ipti := 1 + } +}; type record IuUP_Config { /* actively send INIT (true) or only passively respond (false) */ boolean active_init, boolean data_pdu_type_0, /* RAB Flow Combinations */ - record of IuUP_RabFlowCombination rab_flow_combs + IuUP_RabFlowCombinationList rab_flow_combs }; +template (value) IuUP_Config t_IuUP_Config(boolean active_init := true, + boolean data_pdu_type_0 := true, + template (value) IuUP_RabFlowCombinationList rab_flow_combs := + c_IuUP_Config_RabFlowCombination_def) := { + active_init := active_init, + data_pdu_type_0 := true, + rab_flow_combs := rab_flow_combs +} + +const IuUP_Config c_IuUP_Config_def := { + active_init := true, + data_pdu_type_0 := true, + rab_flow_combs := c_IuUP_Config_RabFlowCombination_def +} + type enumerated IuUP_Em_State { ST_INIT, ST_DATA_TRANSFER_READY }; - - type record IuUP_Entity { IuUP_Config cfg, IuUP_Em_State state, @@ -60,12 +90,8 @@ IuUP_PDU pending_tx_pdu optional }; -template (value) IuUP_Entity t_IuUP_Entity(boolean act_init) := { - cfg := { - active_init := act_init, - data_pdu_type_0 := true, - rab_flow_combs := { t_IuUP_RFC_AMR_12_2(0), t_IuUP_RFC_AMR_SID(1), t_IuUP_RFC_AMR_NO_DATA(2) } - }, +template (value) IuUP_Entity t_IuUP_Entity(template (value) IuUP_Config cfg) := { + cfg := cfg, state := ST_INIT, tx_next_frame_nr := 0, rx_last_frame_nr := omit, diff --git a/library/RTP_Emulation.ttcn b/library/RTP_Emulation.ttcn index f4d926e..eaff017 100644 --- a/library/RTP_Emulation.ttcn +++ b/library/RTP_Emulation.ttcn @@ -161,7 +161,7 @@ octetstring tx_fixed_payload optional, octetstring rx_fixed_payload optional, boolean iuup_mode, - boolean iuup_tx_init + IuUP_Config iuup_cfg }; const RtpemConfig c_RtpemDefaultCfg := { @@ -172,7 +172,7 @@ tx_fixed_payload := '01020304'O, rx_fixed_payload := '01020304'O, iuup_mode := false, - iuup_tx_init := true + iuup_cfg := c_IuUP_Config_def } signature RTPEM_bind(in HostName local_host, inout PortNumber local_port); @@ -384,7 +384,7 @@ os_error_code := 111, os_error_text := ? /* "Connection refused" */}}; - g_iuup_ent := valueof(t_IuUP_Entity(g_cfg.iuup_tx_init)); + g_iuup_ent := valueof(t_IuUP_Entity(g_cfg.iuup_cfg)); while (true) { alt { @@ -488,7 +488,7 @@ } [] CTRL.getcall(RTPEM_configure:{?}) -> param (cfg) { g_cfg := cfg; - g_iuup_ent.cfg.active_init := g_cfg.iuup_tx_init; + g_iuup_ent.cfg := g_cfg.iuup_cfg; CTRL.reply(RTPEM_configure:{cfg}); } [] CTRL.getcall(RTPEM_stats_get:{?, ?}) -> param (is_rtcp) { diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 9defea7..de00e9d 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -2482,7 +2482,7 @@ flow[0].rtp_cfg := c_RtpemDefaultCfg; flow[0].rtp_cfg.tx_payload_type := flow[0].pt; flow[0].rtp_cfg.iuup_mode := true; - flow[0].rtp_cfg.iuup_tx_init := true; + flow[0].rtp_cfg.iuup_cfg.active_init := true; f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); @@ -2493,7 +2493,7 @@ flow[1].rtp_cfg := c_RtpemDefaultCfg; flow[1].rtp_cfg.tx_payload_type := flow[1].pt; flow[1].rtp_cfg.iuup_mode := true; - flow[1].rtp_cfg.iuup_tx_init := false; + flow[1].rtp_cfg.iuup_cfg.active_init := false; f_flow_create(RTPEM[1], ep, call_id, "recvonly", flow[1], true); f_rtpem_mode(RTPEM[1], RTPEM_MODE_RXONLY); @@ -2601,7 +2601,7 @@ flow[0].rtp_cfg.tx_fixed_payload := '4f28959ffeb80181f5c4e83d176c897b4a4e333298333419a493ca63ded6e0'O; flow[0].rtp_cfg.rx_fixed_payload := '08556d944c71a1a081e7ead204244480000ecd82b81118000097c4794e7740'O; /* flow[1].rtp_cfg.tx_fixed_payload converted AMR-BE-RTP->AMR-IUUP*/ flow[0].rtp_cfg.iuup_mode := true; - flow[0].rtp_cfg.iuup_tx_init := true; + flow[0].rtp_cfg.iuup_cfg.active_init := true; f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 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: I4e8296dae40277be51974338bc0d21c939eec149 Gerrit-Change-Number: 28190 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_two_crcx_mdcx_and_iuup{_rtp}_rfci_unordered

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28191 ) Change subject: mgw: Introduce test TC_two_crcx_mdcx_and_iuup{_rtp}_rfci_unordered ...................................................................... mgw: Introduce test TC_two_crcx_mdcx_and_iuup{_rtp}_rfci_unordered Related: SYS#5969 Change-Id: I2523f18a0fdba87f4e13a2ce3c5da482c4af2e3c --- M mgw/MGCP_Test.ttcn 1 file changed, 39 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/28191/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index de00e9d..60f955f 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -19,6 +19,7 @@ import from RTP_CodecPort all; import from RTP_CodecPort_CtrlFunct all; import from RTP_Emulation all; + import from IuUP_Emulation all; import from OSMUX_Types all; import from OSMUX_CodecPort all; import from OSMUX_CodecPort_CtrlFunct all; @@ -2465,6 +2466,7 @@ /* create two local RTP+IuUP emulations and pass data in both directions */ function f_tc_two_crcx_mdcx_and_iuup(charstring local_ip_a, charstring remote_ip_a, + IuUP_RabFlowCombinationList rfcl_a, charstring local_ip_b, charstring remote_ip_b) runs on dummy_CT { var RtpFlowData flow[2]; var RtpemStats stats[2]; @@ -2483,6 +2485,7 @@ flow[0].rtp_cfg.tx_payload_type := flow[0].pt; flow[0].rtp_cfg.iuup_mode := true; flow[0].rtp_cfg.iuup_cfg.active_init := true; + flow[0].rtp_cfg.iuup_cfg.rab_flow_combs := rfcl_a; f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); @@ -2576,12 +2579,28 @@ setverdict(pass); } testcase TC_two_crcx_mdcx_and_iuup() runs on dummy_CT { - f_tc_two_crcx_mdcx_and_iuup(mp_local_ipv4, mp_remote_ipv4, + var template (value) IuUP_RabFlowCombinationList rfcl := { + t_IuUP_RFC_AMR_12_2(0), + t_IuUP_RFC_AMR_SID(1), + t_IuUP_RFC_AMR_NO_DATA(2) + }; + f_tc_two_crcx_mdcx_and_iuup(mp_local_ipv4, mp_remote_ipv4, valueof(rfcl), + mp_local_ipv4, mp_remote_ipv4); + } + /* Same as TC_two_crcx_mdcx_and_iuup, but passing unordered RFCI list (ID != position) */ + testcase TC_two_crcx_mdcx_and_iuup_rfci_unordered() runs on dummy_CT { + var template (value) IuUP_RabFlowCombinationList rfcl := { + t_IuUP_RFC_AMR_12_2(1), + t_IuUP_RFC_AMR_SID(2), + t_IuUP_RFC_AMR_NO_DATA(0) + }; + f_tc_two_crcx_mdcx_and_iuup(mp_local_ipv4, mp_remote_ipv4, valueof(rfcl), mp_local_ipv4, mp_remote_ipv4); } /* create two local emulations (1 RTP, 1 RTP+IuUP) and pass data in both directions */ function f_tc_two_crcx_mdcx_and_iuup_rtp(charstring local_ip_a, charstring remote_ip_a, + IuUP_RabFlowCombinationList rfcl_a, charstring local_ip_b, charstring remote_ip_b) runs on dummy_CT { var RtpFlowData flow[2]; var RtpemStats stats[2]; @@ -2602,6 +2621,7 @@ flow[0].rtp_cfg.rx_fixed_payload := '08556d944c71a1a081e7ead204244480000ecd82b81118000097c4794e7740'O; /* flow[1].rtp_cfg.tx_fixed_payload converted AMR-BE-RTP->AMR-IUUP*/ flow[0].rtp_cfg.iuup_mode := true; flow[0].rtp_cfg.iuup_cfg.active_init := true; + flow[0].rtp_cfg.iuup_cfg.rab_flow_combs := rfcl_a; f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); @@ -2696,7 +2716,22 @@ setverdict(pass); } testcase TC_two_crcx_mdcx_and_iuup_rtp() runs on dummy_CT { - f_tc_two_crcx_mdcx_and_iuup_rtp(mp_local_ipv4, mp_remote_ipv4, + var template (value) IuUP_RabFlowCombinationList rfcl := { + t_IuUP_RFC_AMR_12_2(0), + t_IuUP_RFC_AMR_SID(1), + t_IuUP_RFC_AMR_NO_DATA(2) + }; + f_tc_two_crcx_mdcx_and_iuup_rtp(mp_local_ipv4, mp_remote_ipv4, valueof(rfcl), + mp_local_ipv4, mp_remote_ipv4); + } + /* Same as TC_two_crcx_mdcTC_two_crcx_mdcx_and_iuup_rtpx_and_iuup, but passing unordered RFCI list (ID != position) */ + testcase TC_two_crcx_mdcx_and_iuup_rtp_rfci_unordered() runs on dummy_CT { + var template (value) IuUP_RabFlowCombinationList rfcl := { + t_IuUP_RFC_AMR_12_2(1), + t_IuUP_RFC_AMR_SID(2), + t_IuUP_RFC_AMR_NO_DATA(0) + }; + f_tc_two_crcx_mdcx_and_iuup_rtp(mp_local_ipv4, mp_remote_ipv4, valueof(rfcl), mp_local_ipv4, mp_remote_ipv4); } @@ -2775,7 +2810,9 @@ execute(TC_two_crcx_mdcx_and_rtp_osmux_ipv6_ipv4()); execute(TC_two_crcx_mdcx_and_iuup()); + execute(TC_two_crcx_mdcx_and_iuup_rfci_unordered()); execute(TC_two_crcx_mdcx_and_iuup_rtp()); + execute(TC_two_crcx_mdcx_and_iuup_rtp_rfci_unordered()); /* Note: This testcase will trigger an OSMO_ASSERT() bug in * older versions of osmo-mgw. This eventually leads into -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28191 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: I2523f18a0fdba87f4e13a2ce3c5da482c4af2e3c Gerrit-Change-Number: 28191 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

2024

2023

2022

gerrit-log May 2022