[1/2] gprs-ns/test: Re-add return value check for gprs_nsvc_reset
diff mbox

Message ID 1412845676-13076-1-git-send-email-jerlbeck@sysmocom.de
State Accepted
Headers show

Commit Message

Jacob Erlbeck Oct. 9, 2014, 9:07 a.m. UTC
The return value check has been removed in the commit 'Use
gprs_nsvc_reset instead of gprs_ns_tx_reset', because gprs_nsvc_reset
had no return value then. Since a compatible return value has been
added by 'Let gprs_nsvc_reset return a value', the former patch is
partly reverted by this commit.

Sponsored-by: On-Waves ehf
---
 tests/gb/gprs_ns_test.c  | 9 ++++++++-
 tests/gb/gprs_ns_test.ok | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

Patch
diff mbox

diff --git a/tests/gb/gprs_ns_test.c b/tests/gb/gprs_ns_test.c
index 2185ff8..eab71e7 100644
--- a/tests/gb/gprs_ns_test.c
+++ b/tests/gb/gprs_ns_test.c
@@ -592,6 +592,7 @@  static void test_bss_reset_ack()
 	struct sockaddr_in peer[4] = {{0},};
 	struct gprs_nsvc *nsvc;
 	struct sockaddr_in *nse[4];
+	int rc;
 
 	peer[0].sin_family = AF_INET;
 	peer[0].sin_port = htons(1111);
@@ -641,7 +642,13 @@  static void test_bss_reset_ack()
 	printf("--- Setup VC 2 SGSN -> BSS (hits NSEI 2) ---\n\n");
 
 	nsvc = gprs_nsvc_by_nsvci(nsi, 0x2001);
-	gprs_nsvc_reset(nsvc, NS_CAUSE_OM_INTERVENTION);
+	rc = gprs_nsvc_reset(nsvc, NS_CAUSE_OM_INTERVENTION);
+	if (rc < 0)
+		printf("Failed to send RESET to %s\n\n", gprs_ns_ll_str(nsvc));
+	else {
+		send_ns_reset_ack(nsi, nse[1], 0x2001, 0x2000);
+		gprs_dump_nsi(nsi);
+	}
 
 	printf("--- Setup VC 1 SGSN -> BSS (hits NSEI 1) ---\n\n");
 
diff --git a/tests/gb/gprs_ns_test.ok b/tests/gb/gprs_ns_test.ok
index 1e0bf7f..d6be1a9 100644
--- a/tests/gb/gprs_ns_test.ok
+++ b/tests/gb/gprs_ns_test.ok
@@ -375,6 +375,8 @@  Current NS-VCIs:
 
 --- Setup VC 2 SGSN -> BSS (hits NSEI 2) ---
 
+Failed to send RESET to 0.0.0.0:0
+
 --- Setup VC 1 SGSN -> BSS (hits NSEI 1) ---
 
 MESSAGE to BSS, msg length 12