[M] Change in osmo-ttcn3-hacks[master]: pcuif_proto: get rid of _DT, _dt (Direct TLLI)

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34138 ) Change subject: pcuif_proto: get rid of _DT, _dt (Direct TLLI) ...................................................................... pcuif_proto: get rid of _DT, _dt (Direct TLLI) Since we now no longer refer to TLLI when we mean "message ID" (msg_id), we should also remove the "_DT" / "_dt" suffix from structs and define constants and replace it with "_2" if required. Depends: osmo-pcu.git If641b507dcb6b176109c99dce7cff2a7561364b0 Related: OS#5927 Change-Id: I15e754ce3ceed92a517586a073d3e3ed008b5eef --- M bts/BTS_Tests.ttcn M library/PCUIF_CodecPort.ttcn M library/PCUIF_Types.ttcn M pcu/PCUIF_Components.ttcn 4 files changed, 53 insertions(+), 38 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/34138/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index ad6ae5a..63a9a05 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5819,11 +5819,11 @@ /* three characters prefix: last 3 digits of IMSI as ASCII */ f_pcu_data_req(0, 0, 0, 0, 0, PCU_IF_SAPI_PCH, '313233'O & c_PCU_DATA); } else { - var PCUIF_pch_dt pch_dt; - pch_dt.msg_id := '01020304'O; - pch_dt.imsi := "00101000000000123"; - pch_dt.data := c_PCU_DATA; - f_pcu_data_req(0, 0, 0, 0, 0, PCU_IF_SAPI_PCH_DT, enc_PCUIF_pch_dt(pch_dt)); + var PCUIF_pch pch; + pch.msg_id := '01020304'O; + pch.imsi := "00101000000000123"; + pch.data := c_PCU_DATA; + f_pcu_data_req(0, 0, 0, 0, 0, PCU_IF_SAPI_PCH_2, enc_PCUIF_pch(pch)); } T.start; diff --git a/library/PCUIF_CodecPort.ttcn b/library/PCUIF_CodecPort.ttcn index ad6eac4..30f19b4 100644 --- a/library/PCUIF_CodecPort.ttcn +++ b/library/PCUIF_CodecPort.ttcn @@ -155,11 +155,11 @@ pt.send(t_SD_PCUIF(conn_id, ts_PCUIF_DATA_REQ(bts_nr, 0, 0, 0, 0, PCU_IF_SAPI_PCH, prefix & imm_ass))); } else { - var PCUIF_pch_dt pch_dt; - pch_dt.msg_id := msg_id; - pch_dt.imsi := hex2str(imsi); - pch_dt.data := imm_ass; - pt.send(t_SD_PCUIF(conn_id, ts_PCUIF_DATA_REQ(bts_nr, 0, 0, 0, 0, PCU_IF_SAPI_PCH_DT, enc_PCUIF_pch_dt(pch_dt)))); + var PCUIF_pch pch; + pch.msg_id := msg_id; + pch.imsi := hex2str(imsi); + pch.data := imm_ass; + pt.send(t_SD_PCUIF(conn_id, ts_PCUIF_DATA_REQ(bts_nr, 0, 0, 0, 0, PCU_IF_SAPI_PCH_2, enc_PCUIF_pch(pch)))); } /* Exit early when the caller is not interested in the confirmation message */ @@ -171,14 +171,14 @@ alt { [] pt.receive(t_SD_PCUIF(conn_id, tr_PCUIF_DATA_CNF(bts_nr, 0, 0, PCU_IF_SAPI_PCH))) -> value sd { if (mp_pcuif_version >= 11) { - setverdict(fail, "expecting tr_PCUIF_DATA_CNF_DT in PCUIF v.11 or later"); + setverdict(fail, "expecting tr_PCUIF_DATA_CNF_2 in PCUIF v.11 or later"); mtc.stop; } else { log("IMM.ASS was sent on PCH at fn ", sd.data.u.data_cnf.fn); return sd.data.u.data_cnf.fn; } } - [] pt.receive(t_SD_PCUIF(conn_id, tr_PCUIF_DATA_CNF_DT(bts_nr, PCU_IF_SAPI_PCH_DT))) -> value sd { + [] pt.receive(t_SD_PCUIF(conn_id, tr_PCUIF_DATA_CNF_2(bts_nr, PCU_IF_SAPI_PCH_2))) -> value sd { if (mp_pcuif_version < 11) { setverdict(fail, "expecting tr_PCUIF_DATA_CNF in PCUIF v.10 or earlier"); mtc.stop; diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 2a86b54..8583504 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -30,7 +30,7 @@ PCU_IF_MSG_SUSP_REQ ('03'O), PCU_IF_MSG_APP_INFO_REQ ('04'O), PCU_IF_MSG_RTS_REQ ('10'O), - PCU_IF_MSG_DATA_CNF_DT ('11'O), + PCU_IF_MSG_DATA_CNF_2 ('11'O), PCU_IF_MSG_RACH_IND ('22'O), PCU_IF_MSG_INFO_IND ('32'O), PCU_IF_MSG_E1_CCU_IND ('33'O), @@ -54,7 +54,7 @@ PCU_IF_SAPI_PDTCH ('05'O), PCU_IF_SAPI_PRACH ('06'O), PCU_IF_SAPI_PTCCH ('07'O), - PCU_IF_SAPI_PCH_DT ('08'O) + PCU_IF_SAPI_PCH_2 ('08'O) } with { variant "FIELDLENGTH(8)" }; type record PCUIF_Flags { @@ -104,7 +104,7 @@ int16_t lqual_cb } with { variant (data) "FIELDLENGTH(162), ALIGN(left)" }; -type record PCUIF_data_cnf_dt { +type record PCUIF_data_cnf { PCUIF_Sapi sapi, OCT4 msg_id } with { variant "" }; @@ -304,8 +304,8 @@ }; /* Record to send a (confirmed) IMMEDIATE ASSIGNMENT message via PCH. The record is sent by the PCU to the BTS as a - * data request (data_req) under SAPI PCU_IF_SAPI_PCH_DT. */ -type record PCUIF_pch_dt { + * data request (data_req) under SAPI PCU_IF_SAPI_PCH_2. */ +type record PCUIF_pch { OCT4 msg_id, charstring imsi length(17), octetstring data length(23) @@ -315,15 +315,15 @@ variant (data) "FIELDLENGTH(23)" }; -external function enc_PCUIF_pch_dt(in PCUIF_pch_dt pdu) return octetstring +external function enc_PCUIF_pch(in PCUIF_pch pdu) return octetstring with { extension "prototype(convert) encode(RAW)" }; -external function dec_PCUIF_pch_dt(in octetstring stream) return PCUIF_pch_dt +external function dec_PCUIF_pch(in octetstring stream) return PCUIF_pch with { extension "prototype(convert) decode(RAW)" }; type union PCUIF_MsgUnion { PCUIF_data data_req, PCUIF_data data_cnf, - PCUIF_data_cnf_dt data_cnf_dt, + PCUIF_data_cnf data_cnf2, PCUIF_data data_ind, PCUIF_susp_req susp_req, PCUIF_rts_req rts_req, @@ -347,7 +347,7 @@ } with { variant (u) "CROSSTAG( data_req, msg_type = PCU_IF_MSG_DATA_REQ; data_cnf, msg_type = PCU_IF_MSG_DATA_CNF; - data_cnf_dt, msg_type = PCU_IF_MSG_DATA_CNF_DT; + data_cnf2, msg_type = PCU_IF_MSG_DATA_CNF_2; data_ind, msg_type = PCU_IF_MSG_DATA_IND; susp_req, msg_type = PCU_IF_MSG_SUSP_REQ; rts_req, msg_type = PCU_IF_MSG_RTS_REQ; @@ -682,27 +682,27 @@ } } -template (value) PCUIF_Message ts_PCUIF_DATA_CNF_DT(template (value) uint8_t bts_nr, - template (value) PCUIF_Sapi sapi, - template (value) OCT4 msg_id) := { - msg_type := PCU_IF_MSG_DATA_CNF_DT, +template (value) PCUIF_Message ts_PCUIF_DATA_CNF_2(template (value) uint8_t bts_nr, + template (value) PCUIF_Sapi sapi, + template (value) OCT4 msg_id) := { + msg_type := PCU_IF_MSG_DATA_CNF_2, bts_nr := bts_nr, spare := '0000'O, u := { - data_cnf_dt := { + data_cnf2 := { sapi := sapi, msg_id := msg_id } } } -template PCUIF_Message tr_PCUIF_DATA_CNF_DT(template uint8_t bts_nr, - template PCUIF_Sapi sapi := ?, - template OCT4 msg_id := ?) := { - msg_type := PCU_IF_MSG_DATA_CNF_DT, +template PCUIF_Message tr_PCUIF_DATA_CNF_2(template uint8_t bts_nr, + template PCUIF_Sapi sapi := ?, + template OCT4 msg_id := ?) := { + msg_type := PCU_IF_MSG_DATA_CNF_2, bts_nr := bts_nr, spare := ?, u := { - data_cnf_dt := { + data_cnf2 := { sapi := sapi, msg_id := msg_id } diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn index a6c5bae..d7e2ed5 100644 --- a/pcu/PCUIF_Components.ttcn +++ b/pcu/PCUIF_Components.ttcn @@ -499,7 +499,7 @@ /* Wait until the PCU is connected */ PCUIF.receive(tr_RAW_PCU_EV(PCU_EV_CONNECT)); - var template PCUIF_Sapi tr_ccch_sapi := (PCU_IF_SAPI_PCH, PCU_IF_SAPI_PCH_DT, PCU_IF_SAPI_AGCH); + var template PCUIF_Sapi tr_ccch_sapi := (PCU_IF_SAPI_PCH, PCU_IF_SAPI_PCH_2, PCU_IF_SAPI_AGCH); alt { /* Wait for TXT.ind (PCU_VERSION) and respond with INFO.ind (SI13) */ [] PCUIF.receive(tr_PCUIF_TXT_IND(bts_nr, PCU_VERSION, ?)) -> value pcu_msg { @@ -537,7 +537,7 @@ } [decode_data_req] PCUIF.receive(tr_PCUIF_DATA_REQ(bts_nr, ?, ?, sapi := tr_ccch_sapi)) -> value pcu_msg { var octetstring data; - var PCUIF_pch_dt pch_dt; + var PCUIF_pch pch; /* On PCH the payload is prefixed with paging group (3 octets): skip it. * TODO: add an additional template parameter, so we can match it. */ if (pcu_msg.u.data_req.sapi == PCU_IF_SAPI_PCH) { @@ -548,11 +548,11 @@ pcu_msg_rr.bts_nr := bts_nr; pcu_msg_rr.raw := pcu_msg.u.data_req; - if (pcu_msg_rr.raw.sapi == PCU_IF_SAPI_PCH_DT) { - pch_dt := dec_PCUIF_pch_dt(pcu_msg_rr.raw.data); - pcu_msg_rr.msg_id := pch_dt.msg_id; - pcu_msg_rr.imsi := pch_dt.imsi; - pcu_msg_rr.rr_msg := dec_GsmRrMessage(pch_dt.data); + if (pcu_msg_rr.raw.sapi == PCU_IF_SAPI_PCH_2) { + pch := dec_PCUIF_pch(pcu_msg_rr.raw.data); + pcu_msg_rr.msg_id := pch.msg_id; + pcu_msg_rr.imsi := pch.imsi; + pcu_msg_rr.rr_msg := dec_GsmRrMessage(pch.data); } else { pcu_msg_rr.msg_id := omit; pcu_msg_rr.imsi := omit; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34138 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: I15e754ce3ceed92a517586a073d3e3ed008b5eef Gerrit-Change-Number: 34138 Gerrit-PatchSet: 1 Gerrit-Owner: dexter &lt;pmaier(a)sysmocom.de&gt; Gerrit-MessageType: newchange