From 79bd2e93d0dc90f301d74d9980d3ea63ff0e96d6 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 15 Oct 2020 01:54:55 +0000 Subject: Revert "BSSAP_LE_Emulation: configure sending vs receiving RESET" This should not have been merged. It is an intermediate attempt to make the BSC send the BSSMAP-LE RESET, which doesn't work because the BSC is not restarted across test runs. I dropped the patch from my branch, while it remained on gerrit accidentally; then someone else merged it without noticing that it was no longer part of my lcs branch. This reverts commit b2b3704d2a0289332798ba4aeff5b8e29d297ee5. Change-Id: If191cf0ee5c239066fa41621e812efbdcca2a2b8 --- library/BSSAP_LE_Emulation.ttcn | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'library') diff --git a/library/BSSAP_LE_Emulation.ttcn b/library/BSSAP_LE_Emulation.ttcn index 7818be19..d95506cb 100644 --- a/library/BSSAP_LE_Emulation.ttcn +++ b/library/BSSAP_LE_Emulation.ttcn @@ -341,8 +341,7 @@ type record BssapLeOps { boolean role_ms, /* needed for performing BSSMAP RESET */ SCCP_PAR_Address sccp_addr_local optional, - SCCP_PAR_Address sccp_addr_peer optional, - boolean send_reset + SCCP_PAR_Address sccp_addr_peer optional } private altstep as_reset_ack() runs on BSSAP_LE_Emulation_CT { @@ -505,8 +504,7 @@ function main(BssapLeOps ops, charstring id) runs on BSSAP_LE_Emulation_CT { f_conn_table_init(); f_expect_table_init(); - if (g_ran_ops.send_reset - and isvalue(ops.sccp_addr_peer) and isvalue(ops.sccp_addr_local)) { + if (isvalue(ops.sccp_addr_peer) and isvalue(ops.sccp_addr_local)) { f_sleep(1.0); /* HACK to wait for M3UA/ASP to be ACTIVE */ f_bssap_le_reset(ops.sccp_addr_peer, ops.sccp_addr_local); } @@ -522,8 +520,6 @@ function main(BssapLeOps ops, charstring id) runs on BSSAP_LE_Emulation_CT { var integer targetPointCode; alt { - [not g_ran_ops.send_reset] as_reset_ack(); - [] as_main_bssap_le(); [g_ran_ops.role_ms] CLIENT.receive(PDU_DTAP_MO:?) -> value dtap_mo sender vc_conn { -- cgit v1.2.3