From 445fc61dc77652ef011769a497d8d5718afbbe10 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Tue, 10 Nov 2020 19:15:30 +0100 Subject: BSSGP_Emulation: Match on proper NSEI from NS layer Change-Id: I682574bc54b4432357adef2b4662b1f74495578c --- library/BSSGP_Emulation.ttcnpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp index 87b35ac1..a4a939d2 100644 --- a/library/BSSGP_Emulation.ttcnpp +++ b/library/BSSGP_Emulation.ttcnpp @@ -359,7 +359,7 @@ altstep as_sig_unblocked() runs on BSSGP_CT { /* We are in BVC_S_WAIT_NS_ALIVE_UNBLOCKED (only happens in BSS role) */ altstep as_sig_wait_ns_alive_unblocked() runs on BSSGP_CT { var NsStatusIndication nsi; - [] BSCP.receive(NsStatusIndication:{?,?, complement (NSVC_S_ALIVE_UNBLOCKED), NSVC_S_ALIVE_UNBLOCKED}) -> value nsi { + [] BSCP.receive(NsStatusIndication:{g_cfg.nsei,?, complement (NSVC_S_ALIVE_UNBLOCKED), NSVC_S_ALIVE_UNBLOCKED}) -> value nsi { /* if we just became NS-unblocked, send a BCC-RESET */ if (g_cfg.sgsn_role == false) { BSCP.send(f_BnsUdReq(ts_BVC_RESET(BSSGP_CAUSE_OM_INTERVENTION, 0, omit), 0)); @@ -450,7 +450,11 @@ altstep as_sig_allstate() runs on BSSGP_CT { } } /* Keep NS Status Indicaitons to us; no need to inform per-BVC components [for now?] */ - [] BSCP.receive(NsStatusIndication:?) -> value nsi { } + [] BSCP.receive(NsStatusIndication:{g_cfg.nsei, ?, ?, ?}) -> value nsi { } + /* We should never see any different NSEI: There's one BSSGP_CT per NSE */ + [] BSCP.receive(NsStatusIndication:{?, ?, ?, ?}) -> value nsi { + setverdict(fail, "Rx NsStatusInd for wrong NSEI ", nsi); + } /* Procedure port request to resolve the per-BVC component for a given ptp BVCI */ [] PROC.getcall(BSSGP_get_bvci_ct:{?}) -> param(bvci) sender vc_conn { -- cgit v1.2.3