diff options
author | Don Slice <dslice@cumulusnetworks.com> | 2018-08-29 14:19:54 +0200 |
---|---|---|
committer | Don Slice <dslice@cumulusnetworks.com> | 2018-08-30 14:40:18 +0200 |
commit | 9f049418bc2fe2500a4c7dbba11d1eefa9c1408c (patch) | |
tree | f92eaaecf3885a43bb7cd392b7e4b6f546c1570f /bgpd/bgp_vty.h | |
parent | Merge pull request #2930 from donaldsharp/pim_debug (diff) | |
download | frr-9f049418bc2fe2500a4c7dbba11d1eefa9c1408c.tar.xz frr-9f049418bc2fe2500a4c7dbba11d1eefa9c1408c.zip |
bgpd/ospfd: make bgp and ospf json response a bit more consistent
Problem reported that some bgp and ospf json commands did not return
any json output at all if the bgp/ospf instance did not exist.
Additionally, some bgp and ospf json commands did not return any json
output if the instance existed but no neighbors were defined. This
fix makes these commands more consistent in returning empty braces for
json output and issue a message if not using json output. Additionally,
made the flag "use_json" a bool to make it consistent since previously,
it had been defined as an int, char, u_char, and bool at various places.
Ticket: CM-21040
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
Diffstat (limited to 'bgpd/bgp_vty.h')
-rw-r--r-- | bgpd/bgp_vty.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bgpd/bgp_vty.h b/bgpd/bgp_vty.h index afb85f112..d9df2b4cf 100644 --- a/bgpd/bgp_vty.h +++ b/bgpd/bgp_vty.h @@ -69,9 +69,10 @@ extern int argv_find_and_parse_safi(struct cmd_token **argv, int argc, extern int bgp_vty_find_and_parse_afi_safi_bgp(struct vty *vty, struct cmd_token **argv, int argc, int *idx, afi_t *afi, - safi_t *safi, struct bgp **bgp); + safi_t *safi, struct bgp **bgp, + bool use_json); extern int bgp_show_summary_vty(struct vty *vty, const char *name, afi_t afi, - safi_t safi, uint8_t use_json); + safi_t safi, bool use_json); extern void bgp_vpn_policy_config_write_afi(struct vty *vty, struct bgp *bgp, afi_t afi); #endif /* _QUAGGA_BGP_VTY_H */ |