proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 22:29:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

all: Replace "JavaScript Object Notation\n" with JSON_STR

Browse Source 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2016-11-29 23:26:03 +00:00
parent 3a2d747c2e
commit 9973d18404
6 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bgpd/bgp_mplsvpn.c
View File

@ -1051,7 +1051,7 @@ DEFUN (show_ip_bgp_vpnv4_all_neighbor_routes,
"Detailed information on TCP and BGP neighbor connections\n" "Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n" "Neighbor to display information about\n"
"Display routes learned from neighbor\n" "Display routes learned from neighbor\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_ipv4 = 6; int idx_ipv4 = 6;
union sockunion su; union sockunion su;
@ -1106,7 +1106,7 @@ DEFUN (show_ip_bgp_vpnv4_rd_neighbor_routes,
"Detailed information on TCP and BGP neighbor connections\n" "Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n" "Neighbor to display information about\n"
"Display routes learned from neighbor\n" "Display routes learned from neighbor\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_ext_community = 5; int idx_ext_community = 5;
int idx_ipv4 = 7; int idx_ipv4 = 7;
@ -1178,7 +1178,7 @@ DEFUN (show_ip_bgp_vpnv4_all_neighbor_advertised_routes,
"Detailed information on TCP and BGP neighbor connections\n" "Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n" "Neighbor to display information about\n"
"Display the routes advertised to a BGP neighbor\n" "Display the routes advertised to a BGP neighbor\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_ipv4 = 6; int idx_ipv4 = 6;
int ret; int ret;
@ -1232,7 +1232,7 @@ DEFUN (show_ip_bgp_vpnv4_rd_neighbor_advertised_routes,
"Detailed information on TCP and BGP neighbor connections\n" "Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n" "Neighbor to display information about\n"
"Display the routes advertised to a BGP neighbor\n" "Display the routes advertised to a BGP neighbor\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_ext_community = 5; int idx_ext_community = 5;
int idx_ipv4 = 7; int idx_ipv4 = 7;

26
bgpd/bgp_route.c
View File

@ -7895,7 +7895,7 @@ DEFUN (show_ip_bgp_ipv4,
"Display route and more specific routes\n" "Display route and more specific routes\n"
"IPv6 prefix\n" "IPv6 prefix\n"
"Display route and more specific routes\n" "Display route and more specific routes\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
char *vrf = NULL; char *vrf = NULL;
afi_t afi = AFI_IP6; afi_t afi = AFI_IP6;
@ -8012,7 +8012,7 @@ DEFUN (show_ip_bgp_route,
"IPv6 prefix\n" "IPv6 prefix\n"
"Display only the bestpath\n" "Display only the bestpath\n"
"Display only multipaths\n" "Display only multipaths\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int prefix_check = 0; int prefix_check = 0;
@ -8143,7 +8143,7 @@ DEFUN (show_ip_bgp_instance_all,
"Address Family modifier\n" "Address Family modifier\n"
"Address Family\n" "Address Family\n"
"Address Family modifier\n" "Address Family modifier\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
afi_t afi = AFI_IP; afi_t afi = AFI_IP;
safi_t safi = SAFI_UNICAST; safi_t safi = SAFI_UNICAST;
@ -9059,7 +9059,7 @@ DEFUN (show_ip_bgp_neighbor_prefix_counts,
"Neighbor to display information about\n" "Neighbor to display information about\n"
"Neighbor on BGP configured interface\n" "Neighbor on BGP configured interface\n"
"Display detailed prefix count information\n" "Display detailed prefix count information\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_peer = 4; int idx_peer = 4;
struct peer *peer; struct peer *peer;
@ -9084,7 +9084,7 @@ DEFUN (show_ip_bgp_instance_neighbor_prefix_counts,
"Neighbor to display information about\n" "Neighbor to display information about\n"
"Neighbor on BGP configured interface\n" "Neighbor on BGP configured interface\n"
"Display detailed prefix count information\n" "Display detailed prefix count information\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_word = 4; int idx_word = 4;
int idx_peer = 6; int idx_peer = 6;
@ -9109,7 +9109,7 @@ DEFUN (show_bgp_ipv6_neighbor_prefix_counts,
"Neighbor to display information about\n" "Neighbor to display information about\n"
"Neighbor on BGP configured interface\n" "Neighbor on BGP configured interface\n"
"Display detailed prefix count information\n" "Display detailed prefix count information\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_peer = 4; int idx_peer = 4;
struct peer *peer; struct peer *peer;
@ -9134,7 +9134,7 @@ DEFUN (show_bgp_instance_ipv6_neighbor_prefix_counts,
"Neighbor to display information about\n" "Neighbor to display information about\n"
"Neighbor on BGP configured interface\n" "Neighbor on BGP configured interface\n"
"Display detailed prefix count information\n" "Display detailed prefix count information\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_word = 3; int idx_word = 3;
int idx_peer = 6; int idx_peer = 6;
@ -9162,7 +9162,7 @@ DEFUN (show_ip_bgp_ipv4_neighbor_prefix_counts,
"Neighbor to display information about\n" "Neighbor to display information about\n"
"Neighbor on BGP configured interface\n" "Neighbor on BGP configured interface\n"
"Display detailed prefix count information\n" "Display detailed prefix count information\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_safi = 4; int idx_safi = 4;
int idx_peer = 6; int idx_peer = 6;
@ -9192,7 +9192,7 @@ DEFUN (show_ip_bgp_vpnv4_neighbor_prefix_counts,
"Neighbor to display information about\n" "Neighbor to display information about\n"
"Neighbor on BGP configured interface\n" "Neighbor on BGP configured interface\n"
"Display detailed prefix count information\n" "Display detailed prefix count information\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_peer = 6; int idx_peer = 6;
struct peer *peer; struct peer *peer;
@ -9215,7 +9215,7 @@ DEFUN (show_ip_bgp_vpnv4_all_route_prefix,
"Display information about all VPNv4 NLRIs\n" "Display information about all VPNv4 NLRIs\n"
"Network in the BGP routing table to display\n" "Network in the BGP routing table to display\n"
"Network in the BGP routing table to display\n" "Network in the BGP routing table to display\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx = 0; int idx = 0;
char *network = argv_find (argv, argc, "A.B.C.D", &idx) ? argv[idx]->arg : NULL; char *network = argv_find (argv, argc, "A.B.C.D", &idx) ? argv[idx]->arg : NULL;
@ -9487,7 +9487,7 @@ DEFUN (show_ip_bgp_instance_neighbor_advertised_route,
"Display the routes advertised to a BGP neighbor\n" "Display the routes advertised to a BGP neighbor\n"
"Route-map to modify the attributes\n" "Route-map to modify the attributes\n"
"Name of the route map\n" "Name of the route map\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
afi_t afi = AFI_IP6; afi_t afi = AFI_IP6;
safi_t safi = SAFI_UNICAST; safi_t safi = SAFI_UNICAST;
@ -9560,7 +9560,7 @@ DEFUN (show_ip_bgp_neighbor_received_prefix_filter,
"Neighbor on BGP configured interface\n" "Neighbor on BGP configured interface\n"
"Display information received from a BGP neighbor\n" "Display information received from a BGP neighbor\n"
"Display the prefixlist filter\n" "Display the prefixlist filter\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
afi_t afi = AFI_IP6; afi_t afi = AFI_IP6;
safi_t safi = SAFI_UNICAST; safi_t safi = SAFI_UNICAST;
@ -9678,7 +9678,7 @@ DEFUN (show_ip_bgp_neighbor_routes,
"Display flap statistics of the routes learned from neighbor\n" "Display flap statistics of the routes learned from neighbor\n"
"Display the dampened routes received from neighbor\n" "Display the dampened routes received from neighbor\n"
"Display routes learned from neighbor\n" "Display routes learned from neighbor\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
char *vrf = NULL; char *vrf = NULL;
char *peerstr = NULL; char *peerstr = NULL;

6
bgpd/bgp_vty.c
View File

@ -5975,7 +5975,7 @@ DEFUN (show_bgp_vrfs,
IP_STR IP_STR
BGP_STR BGP_STR
"Show BGP VRFs\n" "Show BGP VRFs\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
struct list *inst = bm->bgp; struct list *inst = bm->bgp;
struct listnode *node; struct listnode *node;
@ -6668,7 +6668,7 @@ DEFUN (show_ip_bgp_summary,
"Display information for a route distinguisher\n" "Display information for a route distinguisher\n"
"VPN Route Distinguisher\n" "VPN Route Distinguisher\n"
"Summary of BGP neighbor status\n" "Summary of BGP neighbor status\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
char *vrf = NULL; char *vrf = NULL;
afi_t afi = AFI_IP6; afi_t afi = AFI_IP6;
@ -8558,7 +8558,7 @@ DEFUN (show_ip_bgp_neighbors,
"Neighbor to display information about\n" "Neighbor to display information about\n"
"Neighbor to display information about\n" "Neighbor to display information about\n"
"Neighbor on BGP configured interface\n" "Neighbor on BGP configured interface\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
char *vrf = NULL; char *vrf = NULL;
char *sh_arg = NULL; char *sh_arg = NULL;

36
ospfd/ospf_vty.c
View File

@ -3397,7 +3397,7 @@ DEFUN (show_ip_ospf,
SHOW_STR SHOW_STR
IP_STR IP_STR
"OSPF information\n" "OSPF information\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
struct ospf *ospf; struct ospf *ospf;
u_char uj = use_json(argc, argv); u_char uj = use_json(argc, argv);
@ -3415,7 +3415,7 @@ DEFUN (show_ip_ospf_instance,
IP_STR IP_STR
"OSPF information\n" "OSPF information\n"
"Instance ID\n" "Instance ID\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_number = 3; int idx_number = 3;
struct ospf *ospf; struct ospf *ospf;
@ -3808,7 +3808,7 @@ DEFUN (show_ip_ospf_interface,
"OSPF information\n" "OSPF information\n"
"Interface information\n" "Interface information\n"
"Interface name\n" "Interface name\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
struct ospf *ospf; struct ospf *ospf;
u_char uj = use_json(argc, argv); u_char uj = use_json(argc, argv);
@ -3828,7 +3828,7 @@ DEFUN (show_ip_ospf_instance_interface,
"Instance ID\n" "Instance ID\n"
"Interface information\n" "Interface information\n"
"Interface name\n" "Interface name\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_number = 3; int idx_number = 3;
struct ospf *ospf; struct ospf *ospf;
@ -3965,7 +3965,7 @@ DEFUN (show_ip_ospf_neighbor,
IP_STR IP_STR
"OSPF information\n" "OSPF information\n"
"Neighbor list\n" "Neighbor list\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
struct ospf *ospf; struct ospf *ospf;
u_char uj = use_json(argc, argv); u_char uj = use_json(argc, argv);
@ -3985,7 +3985,7 @@ DEFUN (show_ip_ospf_instance_neighbor,
"OSPF information\n" "OSPF information\n"
"Instance ID\n" "Instance ID\n"
"Neighbor list\n" "Neighbor list\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_number = 3; int idx_number = 3;
struct ospf *ospf; struct ospf *ospf;
@ -4078,7 +4078,7 @@ DEFUN (show_ip_ospf_neighbor_all,
"OSPF information\n" "OSPF information\n"
"Neighbor list\n" "Neighbor list\n"
"include down status neighbor\n" "include down status neighbor\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
struct ospf *ospf; struct ospf *ospf;
u_char uj = use_json(argc, argv); u_char uj = use_json(argc, argv);
@ -4098,7 +4098,7 @@ DEFUN (show_ip_ospf_instance_neighbor_all,
"Instance ID\n" "Instance ID\n"
"Neighbor list\n" "Neighbor list\n"
"include down status neighbor\n" "include down status neighbor\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_number = 3; int idx_number = 3;
struct ospf *ospf; struct ospf *ospf;
@ -4173,7 +4173,7 @@ DEFUN (show_ip_ospf_neighbor_int,
"OSPF information\n" "OSPF information\n"
"Neighbor list\n" "Neighbor list\n"
"Interface name\n" "Interface name\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
struct ospf *ospf; struct ospf *ospf;
u_char uj = use_json(argc, argv); u_char uj = use_json(argc, argv);
@ -4193,7 +4193,7 @@ DEFUN (show_ip_ospf_instance_neighbor_int,
"Instance ID\n" "Instance ID\n"
"Neighbor list\n" "Neighbor list\n"
"Interface name\n" "Interface name\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_number = 3; int idx_number = 3;
struct ospf *ospf; struct ospf *ospf;
@ -4540,7 +4540,7 @@ DEFUN (show_ip_ospf_neighbor_id,
"OSPF information\n" "OSPF information\n"
"Neighbor list\n" "Neighbor list\n"
"Neighbor ID\n" "Neighbor ID\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
struct ospf *ospf; struct ospf *ospf;
u_char uj = use_json(argc, argv); u_char uj = use_json(argc, argv);
@ -4560,7 +4560,7 @@ DEFUN (show_ip_ospf_instance_neighbor_id,
"Instance ID\n" "Instance ID\n"
"Neighbor list\n" "Neighbor list\n"
"Neighbor ID\n" "Neighbor ID\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_number = 3; int idx_number = 3;
struct ospf *ospf; struct ospf *ospf;
@ -4632,7 +4632,7 @@ DEFUN (show_ip_ospf_neighbor_detail,
"OSPF information\n" "OSPF information\n"
"Neighbor list\n" "Neighbor list\n"
"detail of all neighbors\n" "detail of all neighbors\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
struct ospf *ospf; struct ospf *ospf;
u_char uj = use_json(argc, argv); u_char uj = use_json(argc, argv);
@ -4652,7 +4652,7 @@ DEFUN (show_ip_ospf_instance_neighbor_detail,
"Instance ID\n" "Instance ID\n"
"Neighbor list\n" "Neighbor list\n"
"detail of all neighbors\n" "detail of all neighbors\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_number = 3; int idx_number = 3;
struct ospf *ospf; struct ospf *ospf;
@ -4731,7 +4731,7 @@ DEFUN (show_ip_ospf_neighbor_detail_all,
"Neighbor list\n" "Neighbor list\n"
"detail of all neighbors\n" "detail of all neighbors\n"
"include down status neighbor\n" "include down status neighbor\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
struct ospf *ospf; struct ospf *ospf;
u_char uj = use_json(argc, argv); u_char uj = use_json(argc, argv);
@ -4752,7 +4752,7 @@ DEFUN (show_ip_ospf_instance_neighbor_detail_all,
"Neighbor list\n" "Neighbor list\n"
"detail of all neighbors\n" "detail of all neighbors\n"
"include down status neighbor\n" "include down status neighbor\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_number = 3; int idx_number = 3;
struct ospf *ospf; struct ospf *ospf;
@ -4834,7 +4834,7 @@ DEFUN (show_ip_ospf_neighbor_int_detail,
"Neighbor list\n" "Neighbor list\n"
"Interface name\n" "Interface name\n"
"detail of all neighbors\n" "detail of all neighbors\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
struct ospf *ospf; struct ospf *ospf;
u_char uj = use_json(argc, argv); u_char uj = use_json(argc, argv);
@ -4855,7 +4855,7 @@ DEFUN (show_ip_ospf_instance_neighbor_int_detail,
"Neighbor list\n" "Neighbor list\n"
"Interface name\n" "Interface name\n"
"detail of all neighbors\n" "detail of all neighbors\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_number = 3; int idx_number = 3;
struct ospf *ospf; struct ospf *ospf;

4
zebra/zebra_mpls_vty.c
View File

@ -786,7 +786,7 @@ DEFUN (show_mpls_table,
SHOW_STR SHOW_STR
MPLS_STR MPLS_STR
"MPLS table\n" "MPLS table\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
struct zebra_vrf *zvrf; struct zebra_vrf *zvrf;
u_char use_json = (argv[3]->arg != NULL); u_char use_json = (argv[3]->arg != NULL);
@ -803,7 +803,7 @@ DEFUN (show_mpls_table_lsp,
MPLS_STR MPLS_STR
"MPLS table\n" "MPLS table\n"
"LSP to display information about\n" "LSP to display information about\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
u_int32_t label; u_int32_t label;
struct zebra_vrf *zvrf; struct zebra_vrf *zvrf;

4
zebra/zebra_vty.c
View File

@ -1197,7 +1197,7 @@ DEFUN (show_ip_route,
SHOW_STR SHOW_STR
IP_STR IP_STR
"IP routing table\n" "IP routing table\n"
"JavaScript Object Notation\n") JSON_STR)
{ {
return do_show_ip_route (vty, VRF_DEFAULT_NAME, SAFI_UNICAST, use_json(argc, argv)); return do_show_ip_route (vty, VRF_DEFAULT_NAME, SAFI_UNICAST, use_json(argc, argv));
} }
@ -1293,7 +1293,7 @@ DEFUN (show_ip_route_vrf,
IP_STR IP_STR
"IP routing table\n" "IP routing table\n"
VRF_CMD_HELP_STR VRF_CMD_HELP_STR
"JavaScript Object Notation\n") JSON_STR)
{ {
int idx_vrf = 4; int idx_vrf = 4;
u_char uj = use_json(argc, argv); u_char uj = use_json(argc, argv);