diff options
author | Damjan Marion <damarion@cisco.com> | 2024-03-12 17:42:49 +0100 |
---|---|---|
committer | Florin Coras <florin.coras@gmail.com> | 2024-03-12 19:29:56 +0000 |
commit | c3148b1be8f519c80c4417c21b978dfef72b351b (patch) | |
tree | 2511eb86e5c429ab018716fed0366164e6faf679 /src/plugins/acl | |
parent | e2ed59933153d665ee43add2de03a581627b73fa (diff) |
misc: remove GNU Indent directives
Type: refactor
Change-Id: I5235bf3e9aff58af6ba2c14e8c6529c4fc9ec86c
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/plugins/acl')
-rw-r--r-- | src/plugins/acl/acl.c | 24 | ||||
-rw-r--r-- | src/plugins/acl/dataplane_node.c | 4 | ||||
-rw-r--r-- | src/plugins/acl/dataplane_node_nonip.c | 6 | ||||
-rw-r--r-- | src/plugins/acl/hash_lookup.c | 4 | ||||
-rw-r--r-- | src/plugins/acl/sess_mgmt_node.c | 4 |
5 files changed, 0 insertions, 42 deletions
diff --git a/src/plugins/acl/acl.c b/src/plugins/acl/acl.c index f834425b5c9..e52e82fcf28 100644 --- a/src/plugins/acl/acl.c +++ b/src/plugins/acl/acl.c @@ -52,12 +52,10 @@ acl_main_t acl_main; #include <vppinfra/bihash_template.h> #include <vppinfra/bihash_template.c> -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Access Control Lists (ACL)", }; -/* *INDENT-ON* */ /* methods exported from ACL-as-a-service */ static acl_plugin_methods_t acl_plugin; @@ -109,12 +107,10 @@ vl_api_acl_plugin_control_ping_t_handler (vl_api_acl_plugin_control_ping_t * acl_main_t *am = &acl_main; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_ACL_PLUGIN_CONTROL_PING_REPLY, ({ rmp->vpe_pid = ntohl (getpid ()); })); - /* *INDENT-ON* */ } static void @@ -687,7 +683,6 @@ acl_interface_set_inout_acl_list (acl_main_t * am, u32 sw_if_index, format_bitmap_hex, old_seen_acl_bitmap, format_bitmap_hex, seen_acl_bitmap, format_bitmap_hex, change_acl_bitmap); -/* *INDENT-OFF* */ clib_bitmap_foreach (acln, change_acl_bitmap) { if (clib_bitmap_get(old_seen_acl_bitmap, acln)) { /* ACL is being removed. */ @@ -701,7 +696,6 @@ acl_interface_set_inout_acl_list (acl_main_t * am, u32 sw_if_index, vec_add1((*pinout_sw_if_index_vec_by_acl)[acln], sw_if_index); } } -/* *INDENT-ON* */ vec_free ((*pinout_acl_vec_by_sw_if_index)[sw_if_index]); (*pinout_acl_vec_by_sw_if_index)[sw_if_index] = @@ -1810,12 +1804,10 @@ vl_api_acl_add_replace_t_handler (vl_api_acl_add_replace_t * mp) rv = VNET_API_ERROR_INVALID_VALUE; } - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_ACL_ADD_REPLACE_REPLY, ({ rmp->acl_index = htonl(acl_list_index); })); - /* *INDENT-ON* */ } static void @@ -1977,13 +1969,11 @@ vl_api_acl_dump_t_handler (vl_api_acl_dump_t * mp) if (mp->acl_index == ~0) { - /* *INDENT-OFF* */ /* Just dump all ACLs */ pool_foreach (acl, am->acls) { send_acl_details(am, reg, acl, mp->context); } - /* *INDENT-ON* */ } else { @@ -2063,12 +2053,10 @@ vl_api_acl_interface_list_dump_t_handler (vl_api_acl_interface_list_dump_t * if (mp->sw_if_index == ~0) { - /* *INDENT-OFF* */ pool_foreach (swif, im->sw_interfaces) { send_acl_interface_list_details(am, reg, swif->sw_if_index, mp->context); } - /* *INDENT-ON* */ } else { @@ -2099,12 +2087,10 @@ vl_api_macip_acl_add_t_handler (vl_api_macip_acl_add_t * mp) rv = VNET_API_ERROR_INVALID_VALUE; } - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_MACIP_ACL_ADD_REPLY, ({ rmp->acl_index = htonl(acl_list_index); })); - /* *INDENT-ON* */ } static void @@ -2126,12 +2112,10 @@ vl_api_macip_acl_add_replace_t_handler (vl_api_macip_acl_add_replace_t * mp) rv = VNET_API_ERROR_INVALID_VALUE; } - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_MACIP_ACL_ADD_REPLACE_REPLY, ({ rmp->acl_index = htonl(acl_list_index); })); - /* *INDENT-ON* */ } static void @@ -2228,12 +2212,10 @@ vl_api_macip_acl_dump_t_handler (vl_api_macip_acl_dump_t * mp) if (mp->acl_index == ~0) { /* Just dump all ACLs for now, with sw_if_index = ~0 */ - /* *INDENT-OFF* */ pool_foreach (acl, am->macip_acls) { send_macip_acl_details (am, reg, acl, mp->context); } - /* *INDENT-ON* */ } else { @@ -2437,12 +2419,10 @@ static void if (mp->sw_if_index == ~0) { - /* *INDENT-OFF* */ pool_foreach (swif, im->sw_interfaces) { send_acl_interface_etype_whitelist_details(am, reg, swif->sw_if_index, mp->context); } - /* *INDENT-ON* */ } else { @@ -3350,7 +3330,6 @@ acl_plugin_show_sessions (acl_main_t * am, vlib_cli_output (vm, " link list id: %u", sess->link_list_id); } vlib_cli_output (vm, " connection add/del stats:", wk); - /* *INDENT-OFF* */ pool_foreach (swif, im->sw_interfaces) { u32 sw_if_index = swif->sw_if_index; @@ -3375,7 +3354,6 @@ acl_plugin_show_sessions (acl_main_t * am, n_dels, n_epoch_changes); } - /* *INDENT-ON* */ vlib_cli_output (vm, " connection timeout type lists:", wk); u8 tt = 0; @@ -3537,7 +3515,6 @@ acl_clear_aclplugin_fn (vlib_main_t * vm, return error; } - /* *INDENT-OFF* */ VLIB_CLI_COMMAND (aclplugin_set_command, static) = { .path = "set acl-plugin", .short_help = "set acl-plugin session timeout {{udp idle}|tcp {idle|transient}} <seconds>", @@ -3653,7 +3630,6 @@ VLIB_CLI_COMMAND (aclplugin_set_acl_command, static) = { "rules}", .function = acl_set_aclplugin_acl_fn, }; -/* *INDENT-ON* */ /*? * Delete an Access Control List (ACL) diff --git a/src/plugins/acl/dataplane_node.c b/src/plugins/acl/dataplane_node.c index 4bef8f07770..027afc0f660 100644 --- a/src/plugins/acl/dataplane_node.c +++ b/src/plugins/acl/dataplane_node.c @@ -44,7 +44,6 @@ typedef struct u8 action; } acl_fa_trace_t; -/* *INDENT-OFF* */ #define foreach_acl_fa_error \ _(ACL_DROP, "ACL deny packets") \ _(ACL_PERMIT, "ACL permit packets") \ @@ -63,7 +62,6 @@ typedef enum ACL_FA_N_ERROR, } acl_fa_error_t; -/* *INDENT-ON* */ always_inline u16 get_current_policy_epoch (acl_main_t * am, int is_input, u32 sw_if_index0) @@ -728,7 +726,6 @@ format_acl_plugin_trace (u8 * s, va_list * args) return s; } -/* *INDENT-OFF* */ static char *acl_fa_error_strings[] = { #define _(sym,string) string, @@ -973,7 +970,6 @@ VNET_FEATURE_INIT (acl_out_ip4_fa_feature, static) = { .runs_before = VNET_FEATURES ("ip4-dvr-reinject", "interface-output"), }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/acl/dataplane_node_nonip.c b/src/plugins/acl/dataplane_node_nonip.c index 9954ea0258e..1126b57343d 100644 --- a/src/plugins/acl/dataplane_node_nonip.c +++ b/src/plugins/acl/dataplane_node_nonip.c @@ -45,7 +45,6 @@ typedef struct u8 action; } acl_fa_trace_t; -/* *INDENT-OFF* */ #define foreach_acl_fa_error \ _(ACL_DROP, "ACL deny packets") \ _(ACL_PERMIT, "ACL permit packets") \ @@ -64,7 +63,6 @@ typedef enum ACL_FA_N_ERROR, } acl_fa_error_t; -/* *INDENT-ON* */ typedef struct { @@ -109,7 +107,6 @@ _(DROP, "dropped outbound non-whitelisted non-ip packets") \ _(PERMIT, "permitted outbound whitelisted non-ip packets") \ -/* *INDENT-OFF* */ typedef enum { @@ -138,7 +135,6 @@ static char *fa_out_nonip_error_strings[] = { foreach_nonip_out_error #undef _ }; -/* *INDENT-ON* */ always_inline int @@ -237,7 +233,6 @@ VLIB_NODE_FN (acl_out_nonip_node) (vlib_main_t * vm, } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (acl_in_nonip_node) = { @@ -283,7 +278,6 @@ VNET_FEATURE_INIT (acl_out_l2_nonip_fa_feature, static) = .runs_before = VNET_FEATURES ("l2-output-feat-arc-end"), }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/acl/hash_lookup.c b/src/plugins/acl/hash_lookup.c index c137b15a080..9c3c662a8f1 100644 --- a/src/plugins/acl/hash_lookup.c +++ b/src/plugins/acl/hash_lookup.c @@ -261,13 +261,11 @@ static u32 find_mask_type_index(acl_main_t *am, fa_5tuple_t *mask) { ace_mask_type_entry_t *mte; - /* *INDENT-OFF* */ pool_foreach (mte, am->ace_mask_type_pool) { if(memcmp(&mte->mask, mask, sizeof(*mask)) == 0) return (mte - am->ace_mask_type_pool); } - /* *INDENT-ON* */ return ~0; } @@ -1159,7 +1157,6 @@ acl_plugin_show_tables_mask_type (void) ace_mask_type_entry_t *mte; vlib_cli_output (vm, "Mask-type entries:"); - /* *INDENT-OFF* */ pool_foreach (mte, am->ace_mask_type_pool) { vlib_cli_output(vm, " %3d: %016llx %016llx %016llx %016llx %016llx %016llx refcount %d", @@ -1167,7 +1164,6 @@ acl_plugin_show_tables_mask_type (void) mte->mask.kv_40_8.key[0], mte->mask.kv_40_8.key[1], mte->mask.kv_40_8.key[2], mte->mask.kv_40_8.key[3], mte->mask.kv_40_8.key[4], mte->mask.kv_40_8.value, mte->refcount); } - /* *INDENT-ON* */ } void diff --git a/src/plugins/acl/sess_mgmt_node.c b/src/plugins/acl/sess_mgmt_node.c index eb73fd0bb45..e049a3ffa85 100644 --- a/src/plugins/acl/sess_mgmt_node.c +++ b/src/plugins/acl/sess_mgmt_node.c @@ -328,7 +328,6 @@ acl_fa_check_idle_sessions (acl_main_t * am, u16 thread_index, u64 now) */ -/* *INDENT-OFF* */ #define foreach_acl_fa_cleaner_error \ _(UNKNOWN_EVENT, "unknown event received") \ /* end of errors */ @@ -347,7 +346,6 @@ static char *acl_fa_cleaner_error_strings[] = { #undef _ }; -/* *INDENT-ON* */ static vlib_node_registration_t acl_fa_session_cleaner_process_node; static vlib_node_registration_t acl_fa_worker_session_cleaner_process_node; @@ -927,7 +925,6 @@ show_fa_sessions_hash (vlib_main_t * vm, u32 verbose) } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (acl_fa_worker_session_cleaner_process_node, static) = { .function = acl_fa_worker_conn_cleaner_process, @@ -947,7 +944,6 @@ VLIB_REGISTER_NODE (acl_fa_session_cleaner_process_node, static) = { }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON |