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

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: add decoder for PCUIF_pch_dt
by dexter 18 Jul '23

18 Jul '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33793 ) Change subject: PCUIF_Types: add decoder for PCUIF_pch_dt ...................................................................... PCUIF_Types: add decoder for PCUIF_pch_dt An encoder function enc_PCUIF_pch_dt exists but we do not have an encoder yet. Related: OS#5927 Change-Id: I535aa45a676b87a8912e99bdb802bf29a23f1c89 --- M library/PCUIF_Types.ttcn 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/33793/1 diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 65d0c41..94056b9 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -326,6 +326,8 @@ external function enc_PCUIF_pch_dt(in PCUIF_pch_dt pdu) return octetstring with { extension "prototype(convert) encode(RAW)" }; +external function dec_PCUIF_pch_dt(in octetstring stream) return PCUIF_pch_dt + with { extension "prototype(convert) decode(RAW)" }; type union PCUIF_MsgUnion { PCUIF_data data_req, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33793 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: I535aa45a676b87a8912e99bdb802bf29a23f1c89 Gerrit-Change-Number: 33793 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: PCU_Tests: use PCUIF v.11 exclusively
by dexter 18 Jul '23

18 Jul '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33796 ) Change subject: PCU_Tests: use PCUIF v.11 exclusively ...................................................................... PCU_Tests: use PCUIF v.11 exclusively OsmoPCU has support for PCUIF v.11 for quite some time now. Let's upgrade the testsuite as well. Related: OS#5927 Change-Id: I6c4042f2224cd48aecc1b1499226f7d23caddd4f --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.default 2 files changed, 35 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/33796/1 diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 64a39dd..9d3aeec 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -628,7 +628,7 @@ ms.ul_tbf := f_ultbf_new_from_rr_imm_ass(rr_imm_ass); } -function f_ms_exp_dl_tbf_ass_ccch(inout GprsMS ms, template PCUIF_Sapi sapi := PCU_IF_SAPI_PCH, +function f_ms_exp_dl_tbf_ass_ccch(inout GprsMS ms, template PCUIF_Sapi sapi := PCU_IF_SAPI_PCH_DT, template GsmRrMessage t_imm_ass := tr_IMM_TBF_ASS(true, ?, ?), template (present) TsTrxBtsNum nr := tr_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { @@ -862,24 +862,31 @@ /* This function can be used to send DATA.cnf in response to the IUT originated DATA.req. */ function f_pcuif_tx_data_cnf(in BTS_CCCH_Block data_msg) runs on MS_BTS_IFACE_CT { - var PCUIF_Message pcu_msg_cnf := { - msg_type := PCU_IF_MSG_DATA_CNF, - bts_nr := data_msg.bts_nr, - spare := '0000'O, - u := { data_cnf := data_msg.raw } + var PCUIF_data_cnf_dt cnf_dt := { + sapi := data_msg.raw.sapi, + tlli := data_msg.tlli, + fn := data_msg.raw.fn, + /* TODO: The following fields are unused, remove them (in pcuif_proto.h and in PCUIF_Types.ttcn) */ + arfcn := 0, + trx_nr := 0, + ts_nr := 0, + block_nr := 0, + rssi := 0, + ber10k := 0, + ta_offs_qbits := 0, + lqual_cb := 0 }; - /* PCU wants DATA.cnf containing basically everything that was in DATA.req, - * but PCU_IF_SAPI_PCH is a special case - paging group shall be excluded. */ - if (data_msg.raw.sapi == PCU_IF_SAPI_PCH) { - pcu_msg_cnf.u.data_cnf.data := substr(data_msg.raw.data, 3, - data_msg.raw.len - 3); - } + var PCUIF_Message pcu_msg_cnf := { + msg_type := PCU_IF_MSG_DATA_CNF_DT, + bts_nr := data_msg.bts_nr, + spare := '0000'O, + u := { data_cnf_dt := cnf_dt} + }; BTS.send(pcu_msg_cnf); } - private function f_ms_gtfi_tmpl(inout GprsMS ms) runs on MS_BTS_IFACE_CT return template (present) GlobalTfi { var template (present) GlobalTfi gtfi; @@ -1054,7 +1061,7 @@ rr_imm_ass := data_msg.rr_msg; log("Rx Immediate Assignment: ", rr_imm_ass); /* Send DATA.cnf back to the IUT (only needed for PCH) */ - if (data_msg.raw.sapi == PCU_IF_SAPI_PCH) { + if (data_msg.raw.sapi == PCU_IF_SAPI_PCH_DT) { f_pcuif_tx_data_cnf(data_msg); } setverdict(pass); diff --git a/pcu/PCU_Tests.default b/pcu/PCU_Tests.default index 6f633d2..07d1ffc 100644 --- a/pcu/PCU_Tests.default +++ b/pcu/PCU_Tests.default @@ -29,7 +29,7 @@ } }; Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU"; -PCUIF_Types.mp_pcuif_version := 10; +PCUIF_Types.mp_pcuif_version := 11; [TESTPORT_PARAMETERS] *.PCU.socket_type := "SEQPACKET" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33796 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: I6c4042f2224cd48aecc1b1499226f7d23caddd4f Gerrit-Change-Number: 33796 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: hnbgw: Skip asn1 talloc mem checks in osmo-hnbgw-latest
by pespin 18 Jul '23

18 Jul '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33781 ) Change subject: hnbgw: Skip asn1 talloc mem checks in osmo-hnbgw-latest ...................................................................... hnbgw: Skip asn1 talloc mem checks in osmo-hnbgw-latest Depends: osmo-ttcn3-hacks.git Change-Id I5c18cf2d6797bcf0bef13d71ab0b69f1403b474f Change-Id: I1a933795ffef3cea97fcf34b1c513e71f3256c83 --- M ttcn3-hnbgw-test/HNBGW_Tests.cfg M ttcn3-hnbgw-test/jenkins.sh 2 files changed, 15 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-hnbgw-test/HNBGW_Tests.cfg b/ttcn3-hnbgw-test/HNBGW_Tests.cfg index 5d07cb1..a76d5fd 100644 --- a/ttcn3-hnbgw-test/HNBGW_Tests.cfg +++ b/ttcn3-hnbgw-test/HNBGW_Tests.cfg @@ -108,7 +108,7 @@ rctx := 8 } }; - +HNBGW_Tests.mp_validate_talloc_asn1 := true; [MAIN_CONTROLLER] diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh index e93c8af..51dd825 100755 --- a/ttcn3-hnbgw-test/jenkins.sh +++ b/ttcn3-hnbgw-test/jenkins.sh @@ -31,6 +31,10 @@ mkdir $base_dir/hnbgw-tester/unix cp "$tests_cfg" $base_dir/hnbgw-tester/ write_mp_osmo_repo "$base_dir/hnbgw-tester/HNBGW_Tests.cfg" + # Can be removed once a new release osmo-hnbgw > 1.4.0 is avilable: + if ! image_suffix_is_master; then + sed -i 's/HNBGW_Tests.mp_validate_talloc_asn1 := true/HNBGW_Tests.mp_validate_talloc_asn1 := false/g' "$base_dir/hnbgw-tester/HNBGW_Tests.cfg" + fi mkdir $base_dir/stp cp "$stp_cfg" $base_dir/stp/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1a933795ffef3cea97fcf34b1c513e71f3256c83 Gerrit-Change-Number: 33781 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce module parameter mp_validate_talloc_asn1
by pespin 18 Jul '23

18 Jul '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33780 ) Change subject: hnbgw: Introduce module parameter mp_validate_talloc_asn1 ...................................................................... hnbgw: Introduce module parameter mp_validate_talloc_asn1 This allows selectively disabling ASN.1 memory checks, which still fail in current osmo-hnbgw-latest. Change-Id: I5c18cf2d6797bcf0bef13d71ab0b69f1403b474f --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 17 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index f38fc0c..a89837a 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -185,6 +185,8 @@ /* IP address from which the SUT (osmo-hnbgw) sends PFCP requests, and to which the ttcn3 UPF emulation sends * PFCP responses. */ charstring mp_pfcp_ip_remote := "127.0.0.2"; + + boolean mp_validate_talloc_asn1 := true; } function MSC_UnitdataCallback(RANAP_PDU ranap) runs on RAN_Emulation_CT return template RANAP_PDU { @@ -460,7 +462,9 @@ } friend function f_shutdown_helper() runs on test_CT { - f_verify_talloc_bytes(HNBGWVTY, {"asn1_context"}, 1); + if (mp_validate_talloc_asn1) { + f_verify_talloc_bytes(HNBGWVTY, {"asn1_context"}, 1); + } all component.stop; setverdict(pass); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33780 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: I5c18cf2d6797bcf0bef13d71ab0b69f1403b474f Gerrit-Change-Number: 33780 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in simtrace2[master]: Fix unchecked return value of osmo_libusb_init()
by pespin 18 Jul '23

18 Jul '23

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/33792 ) Change subject: Fix unchecked return value of osmo_libusb_init() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/33792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic1f600dfd44d15da165a17d84f0faab6f6fd69c3 Gerrit-Change-Number: 33792 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 18 Jul 2023 13:27:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-remsim[master]: user_simtrace2: Fix uninitialized ifm->path
by pespin 18 Jul '23

18 Jul '23

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/33790 ) Change subject: user_simtrace2: Fix uninitialized ifm->path ...................................................................... Patch Set 1: Code-Review-1 (1 comment) File src/client/user_simtrace2.c: https://gerrit.osmocom.org/c/osmo-remsim/+/33790/comment/f2902e61_f9259545 PS1, Line 414: memset(&ifm, 0, sizeof(ifm)); this looks wrong, ifm is already a pointer? -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/33790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I2bd0dac76b6d028d10f12f3f58a2aee123ca8562 Gerrit-Change-Number: 33790 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 18 Jul 2023 13:27:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-e1-recorder[master]: e1_recorder: Fix potential null-dereference
by pespin 18 Jul '23

18 Jul '23

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/33789 ) Change subject: e1_recorder: Fix potential null-dereference ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/33789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I481f0695f971f5cd2e77b8c9c62d423a70e0840d Gerrit-Change-Number: 33789 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 18 Jul 2023 13:26:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce module parameter mp_validate_talloc_asn1
by osmith 18 Jul '23

18 Jul '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33780 ) Change subject: hnbgw: Introduce module parameter mp_validate_talloc_asn1 ...................................................................... Patch Set 1: Code-Review+2 (1 comment) File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33780/comment/74f4afeb_a872… PS1, Line 465: if (mp_validate_talloc_asn1) { > I think it's better to keep it the way I submitted so that the checks can be enabled or not based on […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33780 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: I5c18cf2d6797bcf0bef13d71ab0b69f1403b474f Gerrit-Change-Number: 33780 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 13:23:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: hnbgw: Skip asn1 talloc mem checks in osmo-hnbgw-latest
by osmith 18 Jul '23

18 Jul '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33781 ) Change subject: hnbgw: Skip asn1 talloc mem checks in osmo-hnbgw-latest ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: > I preferred keeping it this way so that it can also be disabled whatever the condition, which may be […] Okay, fine with me. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1a933795ffef3cea97fcf34b1c513e71f3256c83 Gerrit-Change-Number: 33781 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 13:23:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-uecups[master]: gtp_tunnel: Avoid double-unlock in error path of gtp_tunnel_alloc
by pespin 18 Jul '23

18 Jul '23

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/33791 ) Change subject: gtp_tunnel: Avoid double-unlock in error path of gtp_tunnel_alloc ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/33791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ie6e4c08d2c235fbe90516c3dfe2c82963fd70a6f Gerrit-Change-Number: 33791 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 18 Jul 2023 13:22:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0