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

bgpd/ospfd: resolve warnings for bgp/ospf json commit

Browse Source 
Signed-off-by: Don Slice <dslice@cumulusnetwork.com>
This commit is contained in:
Don Slice 2018-08-30 15:54:46 +00:00
parent 9f049418bc
commit 94d4c685c5
7 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bgpd/bgp_damp.h
View File

@ -140,8 +140,10 @@ extern int bgp_damp_decay(time_t, int);
extern void bgp_config_write_damp(struct vty *); extern void bgp_config_write_damp(struct vty *);
extern void bgp_damp_info_vty(struct vty *, struct bgp_info *, extern void bgp_damp_info_vty(struct vty *, struct bgp_info *,
json_object *json_path); json_object *json_path);
extern const char *bgp_damp_reuse_time_vty(struct vty *, struct bgp_info *, extern const char *bgp_damp_reuse_time_vty(struct vty *vty,
char *, size_t, bool, json_object *); struct bgp_info *binfo,
char *timebuf, size_t len,
bool use_json, json_object *json);
extern int bgp_show_dampening_parameters(struct vty *vty, afi_t, safi_t); extern int bgp_show_dampening_parameters(struct vty *vty, afi_t, safi_t);
#endif /* _QUAGGA_BGP_DAMP_H */ #endif /* _QUAGGA_BGP_DAMP_H */

4
bgpd/bgp_open.h
View File

@ -86,8 +86,8 @@ struct graceful_restart_af {
extern int bgp_open_option_parse(struct peer *, uint8_t, int *); extern int bgp_open_option_parse(struct peer *, uint8_t, int *);
extern void bgp_open_capability(struct stream *, struct peer *); extern void bgp_open_capability(struct stream *, struct peer *);
extern void bgp_capability_vty_out(struct vty *, struct peer *, bool, extern void bgp_capability_vty_out(struct vty *vty, struct peer *peer,
json_object *); bool use_json, json_object *json_neigh);
extern as_t peek_for_as4_capability(struct peer *, uint8_t); extern as_t peek_for_as4_capability(struct peer *, uint8_t);
#endif /* _QUAGGA_BGP_OPEN_H */ #endif /* _QUAGGA_BGP_OPEN_H */

5
bgpd/bgp_route.h
View File

@ -435,8 +435,9 @@ extern void route_vty_out(struct vty *, struct prefix *, struct bgp_info *, int,
safi_t, json_object *); safi_t, json_object *);
extern void route_vty_out_tag(struct vty *, struct prefix *, struct bgp_info *, extern void route_vty_out_tag(struct vty *, struct prefix *, struct bgp_info *,
int, safi_t, json_object *); int, safi_t, json_object *);
extern void route_vty_out_tmp(struct vty *, struct prefix *, struct attr *, extern void route_vty_out_tmp(struct vty *vty, struct prefix *p,
safi_t, bool, json_object *); struct attr *attr, safi_t safi, bool use_json,
json_object *json_ar);
extern void route_vty_out_overlay(struct vty *vty, struct prefix *p, extern void route_vty_out_overlay(struct vty *vty, struct prefix *p,
struct bgp_info *binfo, int display, struct bgp_info *binfo, int display,
json_object *json); json_object *json);

7
bgpd/bgp_vty.c
View File

@ -11045,13 +11045,12 @@ static int bgp_show_route_leak_vty(struct vty *vty, const char *name, afi_t afi,
json_object_free(json); json_object_free(json);
return CMD_WARNING; return CMD_WARNING;
} else { }
/* Provide context for the block */ /* Provide context for the block */
json_object_string_add(json, "vrf", json_object_string_add(json, "vrf", name ? name : "default");
name ? name : "default");
json_object_string_add(json, "afiSafi", json_object_string_add(json, "afiSafi",
afi_safi_print(afi, safi)); afi_safi_print(afi, safi));
}
if (!CHECK_FLAG(bgp->af_flags[afi][safi], if (!CHECK_FLAG(bgp->af_flags[afi][safi],
BGP_CONFIG_VRF_TO_VRF_IMPORT)) { BGP_CONFIG_VRF_TO_VRF_IMPORT)) {

3
bgpd/bgpd.h
View File

@ -1513,7 +1513,8 @@ extern struct peer *peer_create(union sockunion *, const char *, struct bgp *,
struct peer_group *); struct peer_group *);
extern struct peer *peer_create_accept(struct bgp *); extern struct peer *peer_create_accept(struct bgp *);
extern void peer_xfer_config(struct peer *dst, struct peer *src); extern void peer_xfer_config(struct peer *dst, struct peer *src);
extern char *peer_uptime(time_t, char *, size_t, bool, json_object *); extern char *peer_uptime(time_t uptime2, char *buf, size_t len, bool use_json,
json_object *json);
extern int bgp_config_write(struct vty *); extern int bgp_config_write(struct vty *);

3
lib/plist.h
View File

@ -72,6 +72,7 @@ extern struct stream *prefix_bgp_orf_entry(struct stream *,
uint8_t, uint8_t); uint8_t, uint8_t);
extern int prefix_bgp_orf_set(char *, afi_t, struct orf_prefix *, int, int); extern int prefix_bgp_orf_set(char *, afi_t, struct orf_prefix *, int, int);
extern void prefix_bgp_orf_remove_all(afi_t, char *); extern void prefix_bgp_orf_remove_all(afi_t, char *);
extern int prefix_bgp_show_prefix_list(struct vty *, afi_t, char *, bool); extern int prefix_bgp_show_prefix_list(struct vty *vty, afi_t afi, char *name,
bool use_json);
#endif /* _QUAGGA_PLIST_H */ #endif /* _QUAGGA_PLIST_H */

5
ospfd/ospf_vty.c
View File

@ -3263,6 +3263,7 @@ DEFUN (show_ip_ospf,
if (vrf_name) { if (vrf_name) {
bool ospf_output = FALSE; bool ospf_output = FALSE;
use_vrf = 1; use_vrf = 1;
if (all_vrf) { if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(om->ospf, node, ospf)) { for (ALL_LIST_ELEMENTS_RO(om->ospf, node, ospf)) {
if (!ospf->oi_running) if (!ospf->oi_running)
@ -6339,6 +6340,7 @@ DEFUN (show_ip_ospf_database_max,
if (vrf_name) { if (vrf_name) {
bool ospf_output = FALSE; bool ospf_output = FALSE;
use_vrf = 1; use_vrf = 1;
if (all_vrf) { if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(om->ospf, node, ospf)) { for (ALL_LIST_ELEMENTS_RO(om->ospf, node, ospf)) {
if (!ospf->oi_running) if (!ospf->oi_running)
@ -6578,6 +6580,7 @@ DEFUN (show_ip_ospf_instance_database_type_adv_router,
if (vrf_name) { if (vrf_name) {
bool ospf_output = FALSE; bool ospf_output = FALSE;
use_vrf = 1; use_vrf = 1;
if (all_vrf) { if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(om->ospf, node, ospf)) { for (ALL_LIST_ELEMENTS_RO(om->ospf, node, ospf)) {
if (!ospf->oi_running) if (!ospf->oi_running)
@ -9345,6 +9348,7 @@ DEFUN (show_ip_ospf_border_routers,
if (vrf_name) { if (vrf_name) {
bool ospf_output = FALSE; bool ospf_output = FALSE;
use_vrf = 1; use_vrf = 1;
if (all_vrf) { if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(om->ospf, node, ospf)) { for (ALL_LIST_ELEMENTS_RO(om->ospf, node, ospf)) {
if (!ospf->oi_running) if (!ospf->oi_running)
@ -9487,6 +9491,7 @@ DEFUN (show_ip_ospf_route,
if (vrf_name) { if (vrf_name) {
bool ospf_output = FALSE; bool ospf_output = FALSE;
use_vrf = 1; use_vrf = 1;
if (all_vrf) { if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(om->ospf, node, ospf)) { for (ALL_LIST_ELEMENTS_RO(om->ospf, node, ospf)) {
if (!ospf->oi_running) if (!ospf->oi_running)