GPRS: unify NS state printing
* introduce defines with NS state names
* use them for vty and tests
* expand test output to print complete NS state
Change-Id: I69f8d536135ae76dbca623c2f1ffba625adcb1e9
Related: SYS#3610
diff --git a/src/gb/gprs_ns_vty.c b/src/gb/gprs_ns_vty.c
index 3b1a698..317a6a1 100644
--- a/src/gb/gprs_ns_vty.c
+++ b/src/gb/gprs_ns_vty.c
@@ -160,11 +160,11 @@
{
vty_out(vty, "NSEI %5u, NS-VC %5u, %5s %9s, Remote: %-4s, %5s %9s",
nsvc->nsei, nsvc->nsvci,
- nsvc->state & NSE_S_ALIVE ? "ALIVE" : "DEAD",
- nsvc->state & NSE_S_BLOCKED ? "BLOCKED" : "UNBLOCKED",
+ NS_DESC_A(nsvc->state),
+ NS_DESC_B(nsvc->state),
nsvc->remote_end_is_sgsn ? "SGSN" : "BSS",
- nsvc->remote_state & NSE_S_ALIVE ? "ALIVE" : "DEAD",
- nsvc->remote_state & NSE_S_BLOCKED ? "BLOCKED" : "UNBLOCKED");
+ NS_DESC_A(nsvc->remote_state),
+ NS_DESC_B(nsvc->remote_state));
if (nsvc->ll == GPRS_NS_LL_UDP || nsvc->ll == GPRS_NS_LL_FR_GRE)
vty_out(vty, ", %s %15s:%u",
nsvc->ll == GPRS_NS_LL_UDP ? "UDP " : "FR-GRE",