From 57ec88be9aaf3b337f99f29faa18111454b844a1 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Wed, 24 Jun 2020 00:37:14 +0200 Subject: Revert "RAN_Emulation: only respond to RESET with correct PC" This reverts commit 54cfdfa3396d48c1c09455b98f8d9788d14db27c. --- library/RAN_Emulation.ttcnpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 70326073..a400dcda 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -790,16 +790,16 @@ private altstep as_reset_ack(boolean append_osmux_support := false) runs on RAN_ var RANAP_N_UNITDATA_ind rud_ind; #endif #ifdef RAN_EMULATION_BSSAP - [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(g_ran_ops.sccp_addr_local, g_ran_ops.sccp_addr_peer, tr_BSSMAP_Reset(append_osmux_support))) -> value ud_ind { - log("Respoding to inbound RESET from ", g_ran_ops.sccp_addr_peer, " to ", g_ran_ops.sccp_addr_local, " with RESET-ACK"); + [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?, tr_BSSMAP_Reset(append_osmux_support))) -> value ud_ind { + log("Respoding to inbound RESET with RESET-ACK"); BSSAP.send(ts_BSSAP_UNITDATA_req(ud_ind.callingAddress, ud_ind.calledAddress, ts_BSSMAP_ResetAck(append_osmux_support))); repeat; } #endif #ifdef RAN_EMULATION_RANAP - [] RANAP.receive(tr_RANAP_UNITDATA_ind(g_ran_ops.sccp_addr_local, g_ran_ops.sccp_addr_peer, tr_RANAP_Reset)) -> value rud_ind { - log("Respoding to inbound IuRESET from ", g_ran_ops.sccp_addr_peer, " to ", g_ran_ops.sccp_addr_local, " with IuRESET-ACK"); + [] RANAP.receive(tr_RANAP_UNITDATA_ind(?, ?, tr_RANAP_Reset)) -> value rud_ind { + log("Respoding to inbound IuRESET with IuRESET-ACK"); var CN_DomainIndicator dom; dom := rud_ind.userData.initiatingMessage.value_.Reset.protocolIEs[1].value_.cN_DomainIndicator; RANAP.send(ts_RANAP_UNITDATA_req(rud_ind.callingAddress, rud_ind.calledAddress, -- cgit v1.2.3