dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34068 )
Change subject: PCUIF_Components: add compatibility for PCU_IF_SAPI_AGCH_DT
......................................................................
PCUIF_Components: add compatibility for PCU_IF_SAPI_AGCH_DT
When we receive a PCUIF_DATA_REQ, f_BTS_CT_handler will mangle the
incoming message for us. The resulting BTS_CCCH_Block that is sent up to
the component not only contains the PCUIF message, but will also have
the already parsed MAC block attached. This currently only works for
PCU_IF_SAPI_PCH and PCU_IF_SAPI_PCH_DT but not for PCU_IF_SAPI_AGCH_DT.
Let's add compatibility for PCU_IF_SAPI_AGCH_DT.
Related: OS#5927
Change-Id: Ife67bde444d957822a953391b80d01d49fff064b
---
M pcu/PCUIF_Components.ttcn
1 file changed, 25 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/68/34068/1
diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn
index 8a1207a..af33a14 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_DT, PCU_IF_SAPI_AGCH, PCU_IF_SAPI_AGCH_DT);
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 {
@@ -538,6 +538,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_agch_dt agch_dt;
/* 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) {
@@ -553,6 +554,11 @@
pcu_msg_rr.tlli := pch_dt.tlli;
pcu_msg_rr.imsi := pch_dt.imsi;
pcu_msg_rr.rr_msg := dec_GsmRrMessage(pch_dt.data);
+ } else if (pcu_msg_rr.raw.sapi == PCU_IF_SAPI_AGCH_DT) {
+ agch_dt := dec_PCUIF_agch_dt(pcu_msg_rr.raw.data);
+ pcu_msg_rr.imsi := omit;
+ pcu_msg_rr.tlli := agch_dt.tlli;
+ pcu_msg_rr.rr_msg := dec_GsmRrMessage(agch_dt.data);
} else {
pcu_msg_rr.tlli := omit;
pcu_msg_rr.imsi := omit;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34068
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: Ife67bde444d957822a953391b80d01d49fff064b
Gerrit-Change-Number: 34068
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pma...@sysmocom.de>
Gerrit-MessageType: newchange
