matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

pimd: fix formatting in pim_cmd.c

Browse source 
Fix whitespace/indentation in pim_cmd.c

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2020-11-20 16:06:34 -05:00
parent 5c90f56906
commit 521c5b9de8
1 changed files with 463 additions and 455 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
pimd/pim_cmd.c
View file

@ -722,8 +722,8 @@ static void igmp_show_interfaces_single(struct pim_instance *pim,
} else { } else {
vty_out(vty, "Interface : %s\n", ifp->name); vty_out(vty, "Interface : %s\n", ifp->name);
vty_out(vty, "State : %s\n", vty_out(vty, "State : %s\n",
if_is_up(ifp) if_is_up(ifp) ? (igmp->mtrace_only ?
? (igmp->mtrace_only ? "mtrace" "mtrace"
: "up") : "up")
: "down"); : "down");
vty_out(vty, "Address : %pI4\n", vty_out(vty, "Address : %pI4\n",
@ -3894,9 +3894,9 @@ static void clear_mroute(struct pim_instance *pim)
} }
/* clean up all upstreams*/ /* clean up all upstreams*/
while ((up = rb_pim_upstream_first(&pim->upstream_head))) { while ((up = rb_pim_upstream_first(&pim->upstream_head)))
pim_upstream_del(pim, up, __func__); pim_upstream_del(pim, up, __func__);
}
} }
DEFUN (clear_ip_mroute, DEFUN (clear_ip_mroute,
@ -4713,8 +4713,10 @@ DEFUN (show_ip_pim_local_membership,
} }
static void pim_show_mlag_up_entry_detail(struct vrf *vrf, static void pim_show_mlag_up_entry_detail(struct vrf *vrf,
struct vty *vty, struct pim_upstream *up, struct vty *vty,
char *src_str, char *grp_str, json_object *json) struct pim_upstream *up,
char *src_str, char *grp_str,
json_object *json)
{ {
if (json) { if (json) {
json_object *json_row = NULL; json_object *json_row = NULL;
@ -4865,11 +4867,13 @@ static void pim_show_mlag_up_vrf(struct vrf *vrf, struct vty *vty, bool uj)
if (pim_up_mlag_is_local(up)) { if (pim_up_mlag_is_local(up)) {
json_object_array_add(own_list, json_object_array_add(own_list,
json_object_new_string("local")); json_object_new_string(
"local"));
} }
if (up->flags & (PIM_UPSTREAM_FLAG_MASK_MLAG_PEER)) { if (up->flags & (PIM_UPSTREAM_FLAG_MASK_MLAG_PEER)) {
json_object_array_add(own_list, json_object_array_add(own_list,
json_object_new_string("peer")); json_object_new_string(
"peer"));
} }
json_object_object_add(json_row, "owners", own_list); json_object_object_add(json_row, "owners", own_list);
@ -8720,7 +8724,8 @@ DEFUN (interface_ip_mroute,
return nb_cli_apply_changes(vty, return nb_cli_apply_changes(vty,
"./frr-pim:pim/address-family[address-family='%s']/mroute[source-addr='%s'][group-addr='%s']", "./frr-pim:pim/address-family[address-family='%s']/mroute[source-addr='%s'][group-addr='%s']",
"frr-routing:ipv4", source_str, argv[idx_ipv4]->arg); "frr-routing:ipv4", source_str,
argv[idx_ipv4]->arg);
} }
DEFUN (interface_no_ip_mroute, DEFUN (interface_no_ip_mroute,
@ -8745,7 +8750,8 @@ DEFUN (interface_no_ip_mroute,
return nb_cli_apply_changes(vty, return nb_cli_apply_changes(vty,
"./frr-pim:pim/address-family[address-family='%s']/mroute[source-addr='%s'][group-addr='%s']", "./frr-pim:pim/address-family[address-family='%s']/mroute[source-addr='%s'][group-addr='%s']",
"frr-routing:ipv4", source_str, argv[idx_ipv4]->arg); "frr-routing:ipv4", source_str,
argv[idx_ipv4]->arg);
} }
DEFUN (interface_ip_pim_hello, DEFUN (interface_ip_pim_hello,
@ -10910,7 +10916,8 @@ static void pim_show_vxlan_sg(struct pim_instance *pim,
} }
static void pim_show_vxlan_sg_match_addr(struct pim_instance *pim, static void pim_show_vxlan_sg_match_addr(struct pim_instance *pim,
struct vty *vty, char *addr_str, bool uj) struct vty *vty, char *addr_str,
bool uj)
{ {
json_object *json = NULL; json_object *json = NULL;
struct pim_sg_cache_walk_data cwd; struct pim_sg_cache_walk_data cwd;
@ -10945,7 +10952,8 @@ static void pim_show_vxlan_sg_match_addr(struct pim_instance *pim,
} }
static void pim_show_vxlan_sg_one(struct pim_instance *pim, static void pim_show_vxlan_sg_one(struct pim_instance *pim,
struct vty *vty, char *src_str, char *grp_str, bool uj) struct vty *vty, char *src_str, char *grp_str,
bool uj)
{ {
json_object *json = NULL; json_object *json = NULL;
struct prefix_sg sg; struct prefix_sg sg;