Merge pull request #1180 from dwalton76/ipv6-static-route-null0

[mirror_frr.git] / zebra / zebra_vty.c

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index c450b82a255dbf3919fd9935157c4c2d5044bb26..04cd17cedb1d5720b06d55c49c81f3cece53cbcb 100644 (file)
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -437,8 +437,7 @@ static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
        char buf[SRCDEST2STR_BUFFER];
        struct zebra_vrf *zvrf;
 
-       RNODE_FOREACH_RE(rn, re)
-       {
+       RNODE_FOREACH_RE (rn, re) {
                const char *mcast_info = "";
                if (mcast) {
                        rib_table_info_t *info = srcdest_rnode_table_info(rn);
@@ -985,8 +984,7 @@ static int do_show_ip_route(struct vty *vty, const char *vrf_name, afi_t afi,
 
        /* Show all routes. */
        for (rn = route_top(table); rn; rn = route_next(rn)) {
-               RNODE_FOREACH_RE(rn, re)
-               {
+               RNODE_FOREACH_RE (rn, re) {
                        if (use_fib
                            && !CHECK_FLAG(re->status,
                                           ROUTE_ENTRY_SELECTED_FIB))
@@ -1090,12 +1088,12 @@ DEFUN (show_ip_nht_vrf_all,
        struct vrf *vrf;
        struct zebra_vrf *zvrf;
 
-       RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
-       if ((zvrf = vrf->info) != NULL) {
-               vty_out(vty, "\nVRF %s:\n", zvrf_name(zvrf));
-               zebra_print_rnh_table(zvrf_id(zvrf), AF_INET, vty,
-                                     RNH_NEXTHOP_TYPE);
-       }
+       RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
+               if ((zvrf = vrf->info) != NULL) {
+                       vty_out(vty, "\nVRF %s:\n", zvrf_name(zvrf));
+                       zebra_print_rnh_table(zvrf_id(zvrf), AF_INET, vty,
+                                             RNH_NEXTHOP_TYPE);
+               }
 
        return CMD_SUCCESS;
 }
@@ -1130,12 +1128,12 @@ DEFUN (show_ipv6_nht_vrf_all,
        struct vrf *vrf;
        struct zebra_vrf *zvrf;
 
-       RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
-       if ((zvrf = vrf->info) != NULL) {
-               vty_out(vty, "\nVRF %s:\n", zvrf_name(zvrf));
-               zebra_print_rnh_table(zvrf_id(zvrf), AF_INET6, vty,
-                                     RNH_NEXTHOP_TYPE);
-       }
+       RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
+               if ((zvrf = vrf->info) != NULL) {
+                       vty_out(vty, "\nVRF %s:\n", zvrf_name(zvrf));
+                       zebra_print_rnh_table(zvrf_id(zvrf), AF_INET6, vty,
+                                             RNH_NEXTHOP_TYPE);
+               }
 
        return CMD_SUCCESS;
 }
@@ -1294,8 +1292,7 @@ DEFUN (show_ip_route,
        }
 
        if (vrf_all) {
-               RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
-               {
+               RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
                        if ((zvrf = vrf->info) == NULL
                            || (table = zvrf->table[AFI_IP][SAFI_UNICAST])
                                       == NULL)
@@ -1419,8 +1416,7 @@ static void vty_show_ip_route_summary(struct vty *vty,
        memset(&rib_cnt, 0, sizeof(rib_cnt));
        memset(&fib_cnt, 0, sizeof(fib_cnt));
        for (rn = route_top(table); rn; rn = srcdest_route_next(rn))
-               RNODE_FOREACH_RE(rn, re)
-               {
+               RNODE_FOREACH_RE (rn, re) {
                        is_ibgp = (re->type == ZEBRA_ROUTE_BGP
                                   && CHECK_FLAG(re->flags, ZEBRA_FLAG_IBGP));
 
@@ -1489,8 +1485,7 @@ static void vty_show_ip_route_summary_prefix(struct vty *vty,
        memset(&rib_cnt, 0, sizeof(rib_cnt));
        memset(&fib_cnt, 0, sizeof(fib_cnt));
        for (rn = route_top(table); rn; rn = srcdest_route_next(rn))
-               RNODE_FOREACH_RE(rn, re)
-               {
+               RNODE_FOREACH_RE (rn, re) {
 
                        /*
                         * In case of ECMP, count only once.
@@ -1619,8 +1614,7 @@ DEFUN (show_ip_route_vrf_all_addr,
                return CMD_WARNING;
        }
 
-       RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
-       {
+       RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
                if ((zvrf = vrf->info) == NULL
                    || (table = zvrf->table[AFI_IP][SAFI_UNICAST]) == NULL)
                        continue;
@@ -1660,8 +1654,7 @@ DEFUN (show_ip_route_vrf_all_prefix,
                return CMD_WARNING;
        }
 
-       RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
-       {
+       RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
                if ((zvrf = vrf->info) == NULL
                    || (table = zvrf->table[AFI_IP][SAFI_UNICAST]) == NULL)
                        continue;
@@ -1694,10 +1687,10 @@ DEFUN (show_ip_route_vrf_all_summary,
        struct vrf *vrf;
        struct zebra_vrf *zvrf;
 
-       RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
-       if ((zvrf = vrf->info) != NULL)
-               vty_show_ip_route_summary(vty,
-                                         zvrf->table[AFI_IP][SAFI_UNICAST]);
+       RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
+               if ((zvrf = vrf->info) != NULL)
+                       vty_show_ip_route_summary(
+                               vty, zvrf->table[AFI_IP][SAFI_UNICAST]);
 
        return CMD_SUCCESS;
 }
@@ -1715,10 +1708,10 @@ DEFUN (show_ip_route_vrf_all_summary_prefix,
        struct vrf *vrf;
        struct zebra_vrf *zvrf;
 
-       RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
-       if ((zvrf = vrf->info) != NULL)
-               vty_show_ip_route_summary_prefix(
-                       vty, zvrf->table[AFI_IP][SAFI_UNICAST]);
+       RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
+               if ((zvrf = vrf->info) != NULL)
+                       vty_show_ip_route_summary_prefix(
+                               vty, zvrf->table[AFI_IP][SAFI_UNICAST]);
 
        return CMD_SUCCESS;
 }
@@ -1735,8 +1728,7 @@ static int static_config(struct vty *vty, afi_t afi, safi_t safi,
        char buf[SRCDEST2STR_BUFFER];
        int write = 0;
 
-       RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
-       {
+       RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
                if (!(zvrf = vrf->info))
                        continue;
                if ((stable = zvrf->stable[afi][safi]) == NULL)
@@ -1986,8 +1978,7 @@ DEFUN (show_ipv6_route,
        }
 
        if (vrf_all) {
-               RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
-               {
+               RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
                        if ((zvrf = vrf->info) == NULL
                            || (table = zvrf->table[AFI_IP6][SAFI_UNICAST])
                                       == NULL)
@@ -2175,8 +2166,7 @@ DEFUN (show_ipv6_mroute,
 
        /* Show all IPv6 route. */
        for (rn = route_top(table); rn; rn = srcdest_route_next(rn))
-               RNODE_FOREACH_RE(rn, re)
-               {
+               RNODE_FOREACH_RE (rn, re) {
                        if (first) {
                                vty_out(vty, SHOW_ROUTE_V6_HEADER);
                                first = 0;
@@ -2209,8 +2199,7 @@ DEFUN (show_ipv6_route_vrf_all_addr,
                return CMD_WARNING;
        }
 
-       RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
-       {
+       RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
                if ((zvrf = vrf->info) == NULL
                    || (table = zvrf->table[AFI_IP6][SAFI_UNICAST]) == NULL)
                        continue;
@@ -2250,8 +2239,7 @@ DEFUN (show_ipv6_route_vrf_all_prefix,
                return CMD_WARNING;
        }
 
-       RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
-       {
+       RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
                if ((zvrf = vrf->info) == NULL
                    || (table = zvrf->table[AFI_IP6][SAFI_UNICAST]) == NULL)
                        continue;
@@ -2284,10 +2272,10 @@ DEFUN (show_ipv6_route_vrf_all_summary,
        struct vrf *vrf;
        struct zebra_vrf *zvrf;
 
-       RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
-       if ((zvrf = vrf->info) != NULL)
-               vty_show_ip_route_summary(vty,
-                                         zvrf->table[AFI_IP6][SAFI_UNICAST]);
+       RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
+               if ((zvrf = vrf->info) != NULL)
+                       vty_show_ip_route_summary(
+                               vty, zvrf->table[AFI_IP6][SAFI_UNICAST]);
 
        return CMD_SUCCESS;
 }
@@ -2307,16 +2295,14 @@ DEFUN (show_ipv6_mroute_vrf_all,
        struct zebra_vrf *zvrf;
        int first = 1;
 
-       RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
-       {
+       RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
                if ((zvrf = vrf->info) == NULL
                    || (table = zvrf->table[AFI_IP6][SAFI_MULTICAST]) == NULL)
                        continue;
 
                /* Show all IPv6 route. */
                for (rn = route_top(table); rn; rn = srcdest_route_next(rn))
-                       RNODE_FOREACH_RE(rn, re)
-                       {
+                       RNODE_FOREACH_RE (rn, re) {
                                if (first) {
                                        vty_out(vty, SHOW_ROUTE_V6_HEADER);
                                        first = 0;
@@ -2340,10 +2326,10 @@ DEFUN (show_ipv6_route_vrf_all_summary_prefix,
        struct vrf *vrf;
        struct zebra_vrf *zvrf;
 
-       RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
-       if ((zvrf = vrf->info) != NULL)
-               vty_show_ip_route_summary_prefix(
-                       vty, zvrf->table[AFI_IP6][SAFI_UNICAST]);
+       RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
+               if ((zvrf = vrf->info) != NULL)
+                       vty_show_ip_route_summary_prefix(
+                               vty, zvrf->table[AFI_IP6][SAFI_UNICAST]);
 
        return CMD_SUCCESS;
 }
@@ -2379,8 +2365,7 @@ DEFUN (show_vrf,
        struct vrf *vrf;
        struct zebra_vrf *zvrf;
 
-       RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
-       {
+       RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
                if (!(zvrf = vrf->info))
                        continue;
                if (!zvrf_id(zvrf))