aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/vrrp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/vrrp')
-rw-r--r--src/plugins/vrrp/vrrp.c6
-rw-r--r--src/plugins/vrrp/vrrp_api.c18
-rw-r--r--src/plugins/vrrp/vrrp_cli.c17
3 files changed, 20 insertions, 21 deletions
diff --git a/src/plugins/vrrp/vrrp.c b/src/plugins/vrrp/vrrp.c
index 771cd709a2a..5ee011cceb1 100644
--- a/src/plugins/vrrp/vrrp.c
+++ b/src/plugins/vrrp/vrrp.c
@@ -423,11 +423,11 @@ vrrp_intf_enable_disable_mcast (u8 enable, u32 sw_if_index, u8 is_ipv6)
fib_index = mfib_table_get_index_for_sw_if_index (proto, sw_if_index);
/* *INDENT-OFF* */
- pool_foreach (vr, vrm->vrs,
- ({
+ pool_foreach (vr, vrm->vrs)
+ {
if (vrrp_vr_is_ipv6 (vr) == is_ipv6)
n_vrs++;
- }));
+ }
/* *INDENT-ON* */
if (enable)
diff --git a/src/plugins/vrrp/vrrp_api.c b/src/plugins/vrrp/vrrp_api.c
index 27ca56a6b55..9a206fa6cdc 100644
--- a/src/plugins/vrrp/vrrp_api.c
+++ b/src/plugins/vrrp/vrrp_api.c
@@ -216,14 +216,14 @@ vl_api_vrrp_vr_dump_t_handler (vl_api_vrrp_vr_dump_t * mp)
sw_if_index = htonl (mp->sw_if_index);
/* *INDENT-OFF* */
- pool_foreach (vr, vmp->vrs, ({
+ pool_foreach (vr, vmp->vrs) {
if (sw_if_index && (sw_if_index != ~0) &&
(sw_if_index != vr->config.sw_if_index))
continue;
send_vrrp_vr_details (vr, reg, mp->context);
- }));
+ }
/* *INDENT-ON* */
}
@@ -364,14 +364,14 @@ vl_api_vrrp_vr_peer_dump_t_handler (vl_api_vrrp_vr_peer_dump_t * mp)
}
/* *INDENT-OFF* */
- pool_foreach (vr, vmp->vrs, ({
+ pool_foreach (vr, vmp->vrs) {
if (!vec_len (vr->config.peer_addrs))
continue;
send_vrrp_vr_details (vr, reg, mp->context);
- }));
+ }
/* *INDENT-ON* */
}
@@ -468,14 +468,14 @@ vl_api_vrrp_vr_track_if_dump_t_handler (vl_api_vrrp_vr_track_if_dump_t * mp)
}
/* *INDENT-OFF* */
- pool_foreach (vr, vmp->vrs, ({
+ pool_foreach (vr, vmp->vrs) {
if (!vec_len (vr->tracking.interfaces))
continue;
send_vrrp_vr_track_if_details (vr, reg, mp->context);
- }));
+ }
/* *INDENT-ON* */
}
@@ -511,12 +511,12 @@ vrrp_vr_event (vrrp_vr_t * vr, vrrp_vr_state_t new_state)
vl_api_registration_t *vl_reg;
/* *INDENT-OFF* */
- pool_foreach(reg, vam->vrrp_vr_events_registrations,
- ({
+ pool_foreach (reg, vam->vrrp_vr_events_registrations)
+ {
vl_reg = vl_api_client_index_to_registration (reg->client_index);
if (vl_reg)
send_vrrp_vr_event (reg, vl_reg, vr, new_state);
- }));
+ }
/* *INDENT-ON* */
}
diff --git a/src/plugins/vrrp/vrrp_cli.c b/src/plugins/vrrp/vrrp_cli.c
index 447b4749a28..a154a11a8fa 100644
--- a/src/plugins/vrrp/vrrp_cli.c
+++ b/src/plugins/vrrp/vrrp_cli.c
@@ -196,15 +196,14 @@ vrrp_show_vr_command_fn (vlib_main_t * vm,
break;
}
- pool_foreach (vr, vmp->vrs, (
- {
-
- if (sw_if_index && (sw_if_index != ~0) &&
- (sw_if_index != vr->config.sw_if_index))
- continue;
- vlib_cli_output (vm, "%U", format_vrrp_vr,
- vr);}
- ));
+ pool_foreach (vr, vmp->vrs)
+ {
+
+ if (sw_if_index && (sw_if_index != ~0) &&
+ (sw_if_index != vr->config.sw_if_index))
+ continue;
+ vlib_cli_output (vm, "%U", format_vrrp_vr, vr);
+ }
return 0;
}