output_arg, show_flags,
rpki_target_state);
} else {
+ struct listnode *node;
+ struct bgp *abgp;
/* show <ip> bgp ipv4 all: AFI_IP, show <ip> bgp ipv6 all:
* AFI_IP6 */
afi = CHECK_FLAG(show_flags, BGP_SHOW_OPT_AFI_IP)
? AFI_IP
: AFI_IP6;
- FOREACH_SAFI (safi) {
- if (!bgp_afi_safi_peer_exists(bgp, afi, safi))
- continue;
+ for (ALL_LIST_ELEMENTS_RO(bm->bgp, node, abgp)) {
+ FOREACH_SAFI (safi) {
+ if (!bgp_afi_safi_peer_exists(abgp, afi,
+ safi))
+ continue;
- if (uj) {
- if (first)
- first = false;
+ if (uj) {
+ if (first)
+ first = false;
+ else
+ vty_out(vty, ",\n");
+ vty_out(vty, "\"%s\":{\n",
+ get_afi_safi_str(afi,
+ safi,
+ true));
+ } else
+ vty_out(vty,
+ "\nFor address family: %s\n",
+ get_afi_safi_str(
+ afi, safi,
+ false));
+
+ if (community)
+ bgp_show_community(
+ vty, abgp, community,
+ exact_match, afi, safi,
+ show_flags);
else
- vty_out(vty, ",\n");
- vty_out(vty, "\"%s\":{\n",
- get_afi_safi_str(afi, safi,
- true));
- } else
- vty_out(vty,
- "\nFor address family: %s\n",
- get_afi_safi_str(afi, safi,
- false));
-
- if (community)
- bgp_show_community(vty, bgp, community,
- exact_match, afi,
- safi, show_flags);
- else
- bgp_show(vty, bgp, afi, safi, sh_type,
- output_arg, show_flags,
- rpki_target_state);
- if (uj)
- vty_out(vty, "}\n");
+ bgp_show(vty, abgp, afi, safi,
+ sh_type, output_arg,
+ show_flags,
+ rpki_target_state);
+ if (uj)
+ vty_out(vty, "}\n");
+ }
}
} else {
/* show <ip> bgp all: for each AFI and SAFI*/
- FOREACH_AFI_SAFI (afi, safi) {
- if (!bgp_afi_safi_peer_exists(bgp, afi, safi))
- continue;
+ for (ALL_LIST_ELEMENTS_RO(bm->bgp, node, abgp)) {
+ FOREACH_AFI_SAFI (afi, safi) {
+ if (!bgp_afi_safi_peer_exists(abgp, afi,
+ safi))
+ continue;
- if (uj) {
- if (first)
- first = false;
- else
- vty_out(vty, ",\n");
+ if (uj) {
+ if (first)
+ first = false;
+ else
+ vty_out(vty, ",\n");
- vty_out(vty, "\"%s\":{\n",
- get_afi_safi_str(afi, safi,
- true));
- } else
- vty_out(vty,
- "\nFor address family: %s\n",
- get_afi_safi_str(afi, safi,
- false));
-
- if (community)
- bgp_show_community(vty, bgp, community,
- exact_match, afi,
- safi, show_flags);
- else
- bgp_show(vty, bgp, afi, safi, sh_type,
- output_arg, show_flags,
- rpki_target_state);
- if (uj)
- vty_out(vty, "}\n");
+ vty_out(vty, "\"%s\":{\n",
+ get_afi_safi_str(afi,
+ safi,
+ true));
+ } else
+ vty_out(vty,
+ "\nFor address family: %s\n",
+ get_afi_safi_str(
+ afi, safi,
+ false));
+
+ if (community)
+ bgp_show_community(
+ vty, abgp, community,
+ exact_match, afi, safi,
+ show_flags);
+ else
+ bgp_show(vty, abgp, afi, safi,
+ sh_type, output_arg,
+ show_flags,
+ rpki_target_state);
+ if (uj)
+ vty_out(vty, "}\n");
+ }
}
}
if (uj)