Change in osmo-ttcn3-hacks[master]: RAW_NS: add missing idx to as_rx_alive_tx_ack

laforge gerrit-no-reply at lists.osmocom.org
Sat Jun 5 15:49:45 UTC 2021


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24398 )

Change subject: RAW_NS: add missing idx to as_rx_alive_tx_ack
......................................................................

RAW_NS: add missing idx to as_rx_alive_tx_ack

Without the index the message got send and received
via the wrong NSVC.

Change-Id: Ic5d1f4aa5e8a2373a4f46feef44e71b9688035c9
---
M library/RAW_NS.ttcnpp
1 file changed, 7 insertions(+), 7 deletions(-)

Approvals:
  daniel: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/library/RAW_NS.ttcnpp b/library/RAW_NS.ttcnpp
index ff73348..93c43f0 100644
--- a/library/RAW_NS.ttcnpp
+++ b/library/RAW_NS.ttcnpp
@@ -100,7 +100,7 @@
 	var default d := activate(ax_rx_fail_on_any_ns());
 	alt {
 	[] NSCP[idx].receive(PDU_NS: exp_rx) -> value nrf { }
-	[g_handle_rx_alive] as_rx_alive_tx_ack();
+	[g_handle_rx_alive] as_rx_alive_tx_ack(idx := idx);
 	}
 	deactivate(d);
 	return nrf;
@@ -111,7 +111,7 @@
 	NSCP[idx].send(t_NS_ALIVE);
 	alt {
 	[] NSCP[idx].receive(t_NS_ALIVE_ACK);
-	[g_handle_rx_alive] as_rx_alive_tx_ack();
+	[g_handle_rx_alive] as_rx_alive_tx_ack(idx := idx);
 	[] NSCP[idx].receive { repeat; }
 	}
 }
@@ -125,7 +125,7 @@
 	[] NSCP[idx].receive(t_NS_ALIVE_ACK) {
 		setverdict(fail, "Received unexpected NS-ALIVE ACK");
 		}
-	[g_handle_rx_alive] as_rx_alive_tx_ack();
+	[g_handle_rx_alive] as_rx_alive_tx_ack(idx := idx);
 	[] NSCP[idx].receive { repeat; }
 	[] T.timeout {
 		setverdict(pass);
@@ -142,7 +142,7 @@
 	[] NSCP[idx].receive(ts_NS_RESET_ACK(g_nsconfig.nsvc[idx].nsvci, g_nsconfig.nsei)) {
 		setverdict(pass);
 		}
-	[g_handle_rx_alive] as_rx_alive_tx_ack();
+	[g_handle_rx_alive] as_rx_alive_tx_ack(idx := idx);
 	[] NSCP[idx].receive { repeat; }
 	[] T.timeout {
 		setverdict(fail, "Failed to receive a RESET ACK");
@@ -155,7 +155,7 @@
 	NSCP[idx].send(ts_NS_BLOCK(cause, g_nsconfig.nsvc[idx].nsvci));
 	alt {
 	[] NSCP[idx].receive(tr_NS_BLOCK_ACK(g_nsconfig.nsvc[idx].nsvci));
-	[g_handle_rx_alive] as_rx_alive_tx_ack();
+	[g_handle_rx_alive] as_rx_alive_tx_ack(idx := idx);
 	[] NSCP[idx].receive { repeat; }
 	}
 }
@@ -165,7 +165,7 @@
 	NSCP[idx].send(t_NS_UNBLOCK);
 	alt {
 	[] NSCP[idx].receive(t_NS_UNBLOCK_ACK);
-	[g_handle_rx_alive] as_rx_alive_tx_ack();
+	[g_handle_rx_alive] as_rx_alive_tx_ack(idx := idx);
 	[] NSCP[idx].receive { repeat; }
 	}
 }
@@ -205,7 +205,7 @@
 	[not exp_ack] T.timeout {
 		setverdict(pass);
 		}
-	[g_handle_rx_alive] as_rx_alive_tx_ack();
+	[g_handle_rx_alive] as_rx_alive_tx_ack(idx := idx);
 	[] NSCP[idx].receive { repeat; }
 	}
 }

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24398
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ic5d1f4aa5e8a2373a4f46feef44e71b9688035c9
Gerrit-Change-Number: 24398
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210605/b6756611/attachment.htm>


More information about the gerrit-log mailing list