]> git.proxmox.com Git - mirror_frr.git/commitdiff
bgpd: Cleanup indentation a tiny bit
authorDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 25 Oct 2017 00:21:09 +0000 (20:21 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Mon, 27 Nov 2017 13:21:52 +0000 (08:21 -0500)
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
bgpd/bgp_route.c

index a5f9c5f2ab748dda618a48d84b8a3707592f0550..cc7b80df8271fe166cfac6bd37188aa90dc6c8f4 100644 (file)
@@ -10180,70 +10180,72 @@ static void show_adj_route(struct vty *vty, struct peer *peer, afi_t afi,
                        }
                } else {
                        for (adj = rn->adj_out; adj; adj = adj->next)
-                               SUBGRP_FOREACH_PEER (adj->subgroup, paf)
-                                       if (paf->peer == peer) {
-                                               if (header1) {
-                                                       if (use_json) {
-                                                               json_object_int_add(
-                                                                       json,
-                                                                       "bgpTableVersion",
-                                                                       table->version);
-                                                               json_object_string_add(
-                                                                       json,
-                                                                       "bgpLocalRouterId",
-                                                                       inet_ntoa(
-                                                                               bgp->router_id));
-                                                               json_object_object_add(
-                                                                       json,
-                                                                       "bgpStatusCodes",
-                                                                       json_scode);
-                                                               json_object_object_add(
-                                                                       json,
-                                                                       "bgpOriginCodes",
-                                                                       json_ocode);
-                                                       } else {
-                                                               vty_out(vty,
-                                                                       "BGP table version is %" PRIu64
-                                                                       ", local router ID is %s\n",
-                                                                       table->version,
-                                                                       inet_ntoa(
-                                                                               bgp->router_id));
-                                                               vty_out(vty,
-                                                                       BGP_SHOW_SCODE_HEADER);
-                                                               vty_out(vty,
-                                                                       BGP_SHOW_OCODE_HEADER);
-                                                       }
-                                                       header1 = 0;
-                                               }
+                               SUBGRP_FOREACH_PEER (adj->subgroup, paf) {
+                                       if (paf->peer != peer)
+                                               continue;
 
-                                               if (header2) {
-                                                       if (!use_json)
-                                                               vty_out(vty,
-                                                                       BGP_SHOW_HEADER);
-                                                       header2 = 0;
+                                       if (header1) {
+                                               if (use_json) {
+                                                       json_object_int_add(
+                                                               json,
+                                                               "bgpTableVersion",
+                                                               table->version);
+                                                       json_object_string_add(
+                                                               json,
+                                                               "bgpLocalRouterId",
+                                                               inet_ntoa(
+                                                                       bgp->router_id));
+                                                       json_object_object_add(
+                                                               json,
+                                                               "bgpStatusCodes",
+                                                               json_scode);
+                                                       json_object_object_add(
+                                                               json,
+                                                               "bgpOriginCodes",
+                                                               json_ocode);
+                                               } else {
+                                                       vty_out(vty,
+                                                               "BGP table version is %" PRIu64
+                                                               ", local router ID is %s\n",
+                                                               table->version,
+                                                               inet_ntoa(
+                                                                       bgp->router_id));
+                                                       vty_out(vty,
+                                                               BGP_SHOW_SCODE_HEADER);
+                                                       vty_out(vty,
+                                                               BGP_SHOW_OCODE_HEADER);
                                                }
+                                               header1 = 0;
+                                       }
+
+                                       if (header2) {
+                                               if (!use_json)
+                                                       vty_out(vty,
+                                                               BGP_SHOW_HEADER);
+                                               header2 = 0;
+                                       }
 
-                                               if (adj->attr) {
-                                                       bgp_attr_dup(&attr,
-                                                                    adj->attr);
-                                                       ret = bgp_output_modifier(
-                                                               peer, &rn->p,
-                                                               &attr, afi,
+                                       if (adj->attr) {
+                                               bgp_attr_dup(&attr,
+                                                            adj->attr);
+                                               ret = bgp_output_modifier(
+                                                       peer, &rn->p,
+                                                       &attr, afi,
+                                                       safi,
+                                                       rmap_name);
+                                               if (ret != RMAP_DENY) {
+                                                       route_vty_out_tmp(
+                                                               vty,
+                                                               &rn->p,
+                                                               &attr,
                                                                safi,
-                                                               rmap_name);
-                                                       if (ret != RMAP_DENY) {
-                                                               route_vty_out_tmp(
-                                                                       vty,
-                                                                       &rn->p,
-                                                                       &attr,
-                                                                       safi,
-                                                                       use_json,
-                                                                       json_ar);
-                                                               output_count++;
-                                                       } else
-                                                               filtered_count++;
-                                               }
+                                                               use_json,
+                                                               json_ar);
+                                                       output_count++;
+                                               } else
+                                                       filtered_count++;
                                        }
+                               }
                }
        }
        if (use_json)