From 4ce24c45b9286c3946135f97d6ca6f2d4074526e Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 23 Oct 2017 15:09:23 +0200 Subject: 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 --- src/gb/gprs_ns_vty.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/gb/gprs_ns_vty.c b/src/gb/gprs_ns_vty.c index 3b1a6987..317a6a10 100644 --- a/src/gb/gprs_ns_vty.c +++ b/src/gb/gprs_ns_vty.c @@ -160,11 +160,11 @@ static void dump_nse(struct vty *vty, struct gprs_nsvc *nsvc, int stats) { 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", -- cgit v1.2.3