mirror of https://gerrit.osmocom.org/libosmocore
gprs_ns2_vty: dump_nsvc: change output depending on NSVCI
If the NSVCI is valid, there is no signalling or data weight defined (internally this is 1). For NSVC with NSVCI don't print the signalling or data weight. For NSVC without NSVCI, don't print NSVCI at all. Related: OS#5180 Change-Id: Iaadc806a9136436468e2b02eb0bc1f4570a10ecc
This commit is contained in:
parent
6ba77a3770
commit
5e040bf1f1
|
@ -1873,18 +1873,17 @@ DEFUN(cfg_no_ns_nse_ip_sns_bind, cfg_no_ns_nse_ip_sns_bind_cmd,
|
||||||
/* non-config commands */
|
/* non-config commands */
|
||||||
void ns2_vty_dump_nsvc(struct vty *vty, struct gprs_ns2_vc *nsvc, bool stats)
|
void ns2_vty_dump_nsvc(struct vty *vty, struct gprs_ns2_vc *nsvc, bool stats)
|
||||||
{
|
{
|
||||||
char nsvci_str[32];
|
|
||||||
|
|
||||||
if (nsvc->nsvci_is_valid)
|
if (nsvc->nsvci_is_valid)
|
||||||
snprintf(nsvci_str, sizeof(nsvci_str), "%05u", nsvc->nsvci);
|
vty_out(vty, " NSVCI %05u: %s %s %s%s", nsvc->nsvci,
|
||||||
|
osmo_fsm_inst_state_name(nsvc->fi),
|
||||||
|
nsvc->persistent ? "PERSIST" : "DYNAMIC",
|
||||||
|
gprs_ns2_ll_str(nsvc), VTY_NEWLINE);
|
||||||
else
|
else
|
||||||
snprintf(nsvci_str, sizeof(nsvci_str), "none");
|
vty_out(vty, " %s %s sig_weight=%u data_weight=%u %s%s",
|
||||||
|
osmo_fsm_inst_state_name(nsvc->fi),
|
||||||
vty_out(vty, " NSVCI %s: %s %s data_weight=%u sig_weight=%u %s%s", nsvci_str,
|
nsvc->persistent ? "PERSIST" : "DYNAMIC",
|
||||||
osmo_fsm_inst_state_name(nsvc->fi),
|
nsvc->sig_weight, nsvc->data_weight,
|
||||||
nsvc->persistent ? "PERSIST" : "DYNAMIC",
|
gprs_ns2_ll_str(nsvc), VTY_NEWLINE);
|
||||||
nsvc->data_weight, nsvc->sig_weight,
|
|
||||||
gprs_ns2_ll_str(nsvc), VTY_NEWLINE);
|
|
||||||
|
|
||||||
if (stats) {
|
if (stats) {
|
||||||
vty_out_rate_ctr_group(vty, " ", nsvc->ctrg);
|
vty_out_rate_ctr_group(vty, " ", nsvc->ctrg);
|
||||||
|
|
|
@ -40,11 +40,11 @@ OsmoNSdummy(config-ns-nse)# end
|
||||||
OsmoNSdummy# show ns
|
OsmoNSdummy# show ns
|
||||||
NSEI 01234: UDP, DEAD
|
NSEI 01234: UDP, DEAD
|
||||||
1 NS-VC:
|
1 NS-VC:
|
||||||
NSVCI none: RECOVERING PERSIST data_weight=1 sig_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496
|
RECOVERING PERSIST sig_weight=1 data_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496
|
||||||
UDP bind: 127.0.0.14:42999 DSCP: 0 Priority: 0
|
UDP bind: 127.0.0.14:42999 DSCP: 0 Priority: 0
|
||||||
IP-SNS signalling weight: 1 data weight: 1
|
IP-SNS signalling weight: 1 data weight: 1
|
||||||
1 NS-VC:
|
1 NS-VC:
|
||||||
NSVCI none: RECOVERING PERSIST data_weight=1 sig_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496
|
RECOVERING PERSIST sig_weight=1 data_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496
|
||||||
OsmoNSdummy# configure terminal
|
OsmoNSdummy# configure terminal
|
||||||
OsmoNSdummy(config)# ns
|
OsmoNSdummy(config)# ns
|
||||||
OsmoNSdummy(config-ns)# nse 1234
|
OsmoNSdummy(config-ns)# nse 1234
|
||||||
|
@ -54,15 +54,15 @@ OsmoNSdummy(config-ns-nse)# end
|
||||||
OsmoNSdummy# show ns
|
OsmoNSdummy# show ns
|
||||||
NSEI 01234: UDP, DEAD
|
NSEI 01234: UDP, DEAD
|
||||||
3 NS-VC:
|
3 NS-VC:
|
||||||
NSVCI none: RECOVERING PERSIST data_weight=1 sig_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496
|
RECOVERING PERSIST sig_weight=1 data_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496
|
||||||
NSVCI none: RECOVERING PERSIST data_weight=9 sig_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.16]:9496
|
RECOVERING PERSIST sig_weight=0 data_weight=9 udp)[127.0.0.14]:42999<>[127.0.0.16]:9496
|
||||||
NSVCI none: RECOVERING PERSIST data_weight=0 sig_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.17]:9496
|
RECOVERING PERSIST sig_weight=0 data_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.17]:9496
|
||||||
UDP bind: 127.0.0.14:42999 DSCP: 0 Priority: 0
|
UDP bind: 127.0.0.14:42999 DSCP: 0 Priority: 0
|
||||||
IP-SNS signalling weight: 1 data weight: 1
|
IP-SNS signalling weight: 1 data weight: 1
|
||||||
3 NS-VC:
|
3 NS-VC:
|
||||||
NSVCI none: RECOVERING PERSIST data_weight=1 sig_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496
|
RECOVERING PERSIST sig_weight=1 data_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496
|
||||||
NSVCI none: RECOVERING PERSIST data_weight=9 sig_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.16]:9496
|
RECOVERING PERSIST sig_weight=0 data_weight=9 udp)[127.0.0.14]:42999<>[127.0.0.16]:9496
|
||||||
NSVCI none: RECOVERING PERSIST data_weight=0 sig_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.17]:9496
|
RECOVERING PERSIST sig_weight=0 data_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.17]:9496
|
||||||
OsmoNSdummy# configure terminal
|
OsmoNSdummy# configure terminal
|
||||||
OsmoNSdummy(config)# ns
|
OsmoNSdummy(config)# ns
|
||||||
OsmoNSdummy(config-ns)# nse 1234
|
OsmoNSdummy(config-ns)# nse 1234
|
||||||
|
|
Loading…
Reference in New Issue