diff options
| author | Harald Welte <laforge@osmocom.org> | 2020-11-17 19:57:40 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@osmocom.org> | 2020-11-21 22:52:51 +0100 |
| commit | 80a249aa07ed0bc14d73194dc043f8158cc67c8d (patch) | |
| tree | 4a821b4d1d1d117cd95f5280271f8ff98ca04156 /library | |
| parent | 670bbc0c4ef75150887ac4cbbc8a2dca464fe6d7 (diff) | |
NS_Emulation: Include NS-VCI in NsUnitdataIndication
The primitive normally only contains NSE + BVCI, but in a tester
we actually want to verify which NS-VC a given message has arrived on,
and hence it makes sense to add the NSVCI, too.
Change-Id: I9402bf0be47e5b93c9cfb081eb8f9fa6734c9227
Diffstat (limited to 'library')
| -rw-r--r-- | library/BSSGP_Emulation.ttcnpp | 2 | ||||
| -rw-r--r-- | library/NS_Emulation.ttcnpp | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp index b9006a2..898b38d 100644 --- a/library/BSSGP_Emulation.ttcnpp +++ b/library/BSSGP_Emulation.ttcnpp @@ -553,6 +553,7 @@ runs on BSSGP_CT return template (present) NsUnitdataIndication { var template (present) NsUnitdataIndication udi := { bvci := bvci, nsei := g_cfg.nsei, + nsvci := ?, sdu := *, bssgp := pdu } @@ -1232,6 +1233,7 @@ template (value) NsUnitdataRequest ts_ptp_BnsUdReq(template (value) PDU_BSSGP pd template (present) NsUnitdataIndication tr_ptp_BnsUdInd(template (present) PDU_BSSGP pdu, template (present) BssgpBvci bvci) := { bvci := bvci, nsei := ?, + nsvci := ?, sdu := *, bssgp := pdu } diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp index 2e03880..ab1c136 100644 --- a/library/NS_Emulation.ttcnpp +++ b/library/NS_Emulation.ttcnpp @@ -53,6 +53,7 @@ module NS_Emulation { type record NsUnitdataIndication { BssgpBvci bvci, Nsei nsei, + Nsvci nsvci, octetstring sdu optional, PDU_BSSGP bssgp optional } @@ -62,13 +63,15 @@ module NS_Emulation { template octetstring sdu) := { bvci := bvci, nsei := nsei, + nsvci := ?, sdu := sdu, bssgp := ? } - template (value) NsUnitdataIndication ts_NsUdInd(Nsei nsei, BssgpBvci bvci, octetstring sdu) := { + template (value) NsUnitdataIndication ts_NsUdInd(Nsei nsei, Nsvci nsvci, BssgpBvci bvci, octetstring sdu) := { bvci := bvci, nsei := nsei, + nsvci := nsvci, sdu := sdu, bssgp := dec_PDU_BSSGP(sdu) } @@ -582,7 +585,7 @@ module NS_Emulation { } /* NS-UNITDATA PDU from network to NS-UNITDATA.ind to user */ [] NSCP.receive(tr_NS_UNITDATA(?, ?, ?)) -> value rf { - NS_SP.send(ts_NsUdInd(g_config.nsei, + NS_SP.send(ts_NsUdInd(g_config.nsei, g_nsvc_config.nsvci, oct2int(rf.pDU_NS_Unitdata.bVCI), rf.pDU_NS_Unitdata.nS_SDU)); } |