From 12d19b81a73634848f36ada2111131035afda26c Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 9 Oct 2020 11:41:06 +0200 Subject: BSSGP_Emulation: Ensure BVC-RESET for BVCO=0 has no CellId IE This is required by the spec, and implemented libosmocore since Change-Id Ie87820537d6d616da4fd4bbf73eab06e28fda5e1 So let's change our test expectations. Meanwhile, introduce mp_tolerate_bvc_reset_cellid for working around the bug in 'latest'. Change-Id: If6245d73ed701e631b67146ace4ba028bdb4226c --- library/BSSGP_Emulation.ttcnpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'library') diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp index 931ff37b..c1d297d4 100644 --- a/library/BSSGP_Emulation.ttcnpp +++ b/library/BSSGP_Emulation.ttcnpp @@ -28,6 +28,12 @@ import from LLC_Templates all; import from SNDCP_Types all; + +modulepar { + /* tolerate CellID absence/presence in BVC-RESET in violation to spec */ + boolean mp_tolerate_bvc_reset_cellid := false; +} + /*********************************************************************** * Communication between Client Components and Main Component ***********************************************************************/ @@ -478,7 +484,13 @@ altstep as_allstate() runs on BSSGP_CT { } /* Respond to RESET for signalling BVCI 0 */ - [] BSCP.receive(f_BnsUdInd(tr_BVC_RESET(?, 0, g_cfg.cell_id), 0)) -> value udi { + [] BSCP.receive(f_BnsUdInd(tr_BVC_RESET(?, 0, omit), 0)) -> value udi { + log("Rx BVC-RESET for Signaling BVCI=0"); + f_send_bvc_reset_ack(0); + } + + /* work-around for old, buggy libosmogb before Change-Id Ie87820537d6d616da4fd4bbf73eab06e28fda5e1 */ + [mp_tolerate_bvc_reset_cellid] BSCP.receive(f_BnsUdInd(tr_BVC_RESET(?, 0, g_cfg.cell_id), 0)) -> value udi { log("Rx BVC-RESET for Signaling BVCI=0"); f_send_bvc_reset_ack(0); } -- cgit v1.2.3