diff options
| author | Harald Welte <laforge@gnumonks.org> | 2019-02-23 14:07:00 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2019-02-26 12:18:30 +0100 |
| commit | 35042a29197bd086a545976e5fa38d01c434f8ac (patch) | |
| tree | 738cde0f4e50a006ffec9b3200c7372725ababf3 | |
| parent | 17a642d8ff309119532bf85f4ad95d1b049047f0 (diff) | |
NS: Factor out gprs_nsvc_start_test() and use it
This function performs sending a NS-ALIVE PDU and starting Tns-Test,
let's use it in all places where we used to do that.
As part of this, also fix a bug where the sendto() return value (number
of bytes sent) would actually propagate up all the way to
gprs_ns_rx_reset() return value, which in turn affects the test results
on stdout.
Change-Id: I4d303117f77fabb74bbb91887b9914a81c2a084a
| -rw-r--r-- | src/gb/gb_internal.h | 1 | ||||
| -rw-r--r-- | src/gb/gprs_ns.c | 15 | ||||
| -rw-r--r-- | tests/gb/gprs_ns_test.ok | 20 |
3 files changed, 21 insertions, 15 deletions
diff --git a/src/gb/gb_internal.h b/src/gb/gb_internal.h index c1fa8e19..72d940f5 100644 --- a/src/gb/gb_internal.h +++ b/src/gb/gb_internal.h @@ -4,6 +4,7 @@ #include <osmocom/gsm/tlv.h> #include <osmocom/gprs/gprs_ns.h> +void gprs_nsvc_start_test(struct gprs_nsvc *nsvc); int gprs_ns_tx_sns_ack(struct gprs_nsvc *nsvc, uint8_t trans_id, uint8_t *cause, const struct gprs_ns_ie_ip4_elem *ip4_elems,unsigned int num_ip4_elems); diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index 660dfece..ad68bc99 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -1171,8 +1171,7 @@ static int gprs_ns_rx_reset(struct gprs_nsvc **nsvc, struct msgb *msg) rc = gprs_ns_tx_reset_ack(*nsvc); /* start the test procedure */ - gprs_ns_tx_alive(*nsvc); - nsvc_start_timer((*nsvc), NSVC_TIMER_TNS_TEST); + gprs_nsvc_start_test(*nsvc); return rc; } @@ -1295,10 +1294,9 @@ static int gprs_ns_rx_reset_ack(struct gprs_nsvc **nsvc, struct msgb *msg) osmo_timer_del(&(*nsvc)->timer); } /* Initiate TEST proc.: Send ALIVE and start timer */ - rc = gprs_ns_tx_alive(*nsvc); - nsvc_start_timer(*nsvc, NSVC_TIMER_TNS_TEST); + gprs_nsvc_start_test(*nsvc); - return rc; + return 0; } static int gprs_ns_rx_block(struct gprs_nsvc *nsvc, struct msgb *msg) @@ -1949,4 +1947,11 @@ char *gprs_nsvc_state_append(char *s, struct gprs_nsvc *nsvc) return s; } +/*! Start the ALIVE timer procedure in all NS-VCs part of this NS Instance */ +void gprs_nsvc_start_test(struct gprs_nsvc *nsvc) +{ + gprs_ns_tx_alive(nsvc); + nsvc_start_timer(nsvc, NSVC_TIMER_TNS_TEST); +} + /*! @} */ diff --git a/tests/gb/gprs_ns_test.ok b/tests/gb/gprs_ns_test.ok index 3cb1dfcf..57ae1885 100644 --- a/tests/gb/gprs_ns_test.ok +++ b/tests/gb/gprs_ns_test.ok @@ -344,7 +344,7 @@ PROCESSING RESET_ACK from 0x01020304:1111 MESSAGE to BSS, msg length 1 0a -result (RESET_ACK) = 1 +result (RESET_ACK) = 0 Current NS-VCIs: VCI 0x2001, NSEI 0x2000, peer 0x01020304:2222, ALIVE, UNBLOCKED, UNRESET @@ -365,7 +365,7 @@ PROCESSING RESET_ACK from 0x01020304:2222 MESSAGE to BSS, msg length 1 0a -result (RESET_ACK) = 1 +result (RESET_ACK) = 0 Current NS-VCIs: VCI 0x2001, NSEI 0x2000, peer 0x00000000:0, DEAD, BLOCKED, RESET @@ -386,7 +386,7 @@ PROCESSING RESET_ACK from 0x01020304:2222 MESSAGE to BSS, msg length 1 0a -result (RESET_ACK) = 1 +result (RESET_ACK) = 0 Current NS-VCIs: VCI 0x2001, NSEI 0x2000, peer 0x00000000:0, DEAD, BLOCKED, RESET @@ -534,7 +534,7 @@ PROCESSING RESET_ACK from 0x01020304:2222 MESSAGE to BSS, msg length 1 0a -result (RESET_ACK) = 1 +result (RESET_ACK) = 0 Current NS-VCIs: VCI 0xf001, NSEI 0x1000, peer 0x00000000:0, ALIVE, BLOCKED, UNRESET @@ -557,7 +557,7 @@ PROCESSING RESET_ACK from 0x01020304:2222 MESSAGE to BSS, msg length 1 0a -result (RESET_ACK) = 1 +result (RESET_ACK) = 0 Current NS-VCIs: VCI 0xf001, NSEI 0x1000, peer 0x01020304:2222, ALIVE, BLOCKED, UNRESET @@ -641,7 +641,7 @@ PROCESSING RESET_ACK from 0x01020304:2222 MESSAGE to BSS, msg length 1 0a -result (RESET_ACK) = 1 +result (RESET_ACK) = 0 Current NS-VCIs: VCI 0xf001, NSEI 0x1000, peer 0x00000000:0, ALIVE, BLOCKED, UNRESET @@ -666,7 +666,7 @@ PROCESSING RESET_ACK from 0x05060708:32000 MESSAGE to SGSN, msg length 1 0a -result (RESET_ACK) = 1 +result (RESET_ACK) = 0 PROCESSING ALIVE_ACK from 0x05060708:32000 0b @@ -818,7 +818,7 @@ PROCESSING RESET_ACK from 0x05060708:32000 MESSAGE to SGSN, msg length 1 0a -result (RESET_ACK) = 1 +result (RESET_ACK) = 0 PROCESSING ALIVE_ACK from 0x05060708:32000 0b @@ -898,7 +898,7 @@ PROCESSING RESET_ACK from 0x05060708:32000 MESSAGE to SGSN, msg length 1 0a -result (RESET_ACK) = 1 +result (RESET_ACK) = 0 PROCESSING ALIVE_ACK from 0x05060708:32000 0b @@ -956,7 +956,7 @@ PROCESSING RESET_ACK from 0x05060708:32000 MESSAGE to SGSN, msg length 1 0a -result (RESET_ACK) = 1 +result (RESET_ACK) = 0 PROCESSING ALIVE_ACK from 0x05060708:32000 0b |