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 | |
| 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')
323 files changed, 0 insertions, 2144 deletions
diff --git a/src/plugins/abf/abf_api.c b/src/plugins/abf/abf_api.c index ffb32d582c5..2330e7b7d21 100644 --- a/src/plugins/abf/abf_api.c +++ b/src/plugins/abf/abf_api.c @@ -250,12 +250,10 @@ abf_api_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (abf_api_init); -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Access Control List (ACL) Based Forwarding", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/abf/abf_itf_attach.c b/src/plugins/abf/abf_itf_attach.c index a14717e1999..04e5c4c40c2 100644 --- a/src/plugins/abf/abf_itf_attach.c +++ b/src/plugins/abf/abf_itf_attach.c @@ -399,7 +399,6 @@ abf_itf_attach_cmd (vlib_main_t * vm, return (NULL); } -/* *INDENT-OFF* */ /** * Attach an ABF policy to an interface. */ @@ -409,7 +408,6 @@ VLIB_CLI_COMMAND (abf_itf_attach_cmd_node, static) = { .short_help = "abf attach <ip4|ip6> [del] policy <value> <interface>", // this is not MP safe }; -/* *INDENT-ON* */ static clib_error_t * abf_show_attach_cmd (vlib_main_t * vm, @@ -438,7 +436,6 @@ abf_show_attach_cmd (vlib_main_t * vm, vlib_cli_output (vm, "specify an interface"); } - /* *INDENT-OFF* */ FOR_EACH_FIB_IP_PROTOCOL(fproto) { if (sw_if_index < vec_len(abf_per_itf[fproto])) @@ -453,31 +450,26 @@ abf_show_attach_cmd (vlib_main_t * vm, } } } - /* *INDENT-ON* */ return (NULL); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (abf_show_attach_cmd_node, static) = { .path = "show abf attach", .function = abf_show_attach_cmd, .short_help = "show abf attach <interface>", .is_mp_safe = 1, }; -/* *INDENT-ON* */ void abf_itf_attach_walk (abf_itf_attach_walk_cb_t cb, void *ctx) { u32 aii; - /* *INDENT-OFF* */ pool_foreach_index (aii, abf_itf_attach_pool) { if (!cb(aii, ctx)) break; } - /* *INDENT-ON* */ } typedef enum abf_next_t_ @@ -657,7 +649,6 @@ static char *abf_error_strings[] = { #undef abf_error }; -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (abf_ip4_node) = { .function = abf_input_ip4, @@ -703,7 +694,6 @@ VNET_FEATURE_INIT (abf_ip6_feat, static) = .node_name = "abf-input-ip6", .runs_after = VNET_FEATURES ("acl-plugin-in-ip6-fa"), }; -/* *INDENT-ON* */ static fib_node_t * abf_itf_attach_get_node (fib_node_index_t index) @@ -772,12 +762,10 @@ abf_itf_bond_init (vlib_main_t * vm) return (NULL); } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (abf_itf_bond_init) = { .runs_after = VLIB_INITS("acl_init"), }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/abf/abf_policy.c b/src/plugins/abf/abf_policy.c index 8f0fc116144..e6dfe4fff55 100644 --- a/src/plugins/abf/abf_policy.c +++ b/src/plugins/abf/abf_policy.c @@ -315,7 +315,6 @@ out: return (NULL); } -/* *INDENT-OFF* */ /** * Create an ABF policy. */ @@ -325,7 +324,6 @@ VLIB_CLI_COMMAND (abf_policy_cmd_node, static) = { .short_help = "abf policy [add|del] id <index> acl <index> via ...", .is_mp_safe = 1, }; -/* *INDENT-ON* */ static u8 * format_abf (u8 * s, va_list * args) @@ -352,13 +350,11 @@ abf_policy_walk (abf_policy_walk_cb_t cb, void *ctx) { u32 api; - /* *INDENT-OFF* */ pool_foreach_index (api, abf_policy_pool) { if (!cb(api, ctx)) break; } - /* *INDENT-ON* */ } static clib_error_t * @@ -381,12 +377,10 @@ abf_show_policy_cmd (vlib_main_t * vm, if (INDEX_INVALID == policy_id) { - /* *INDENT-OFF* */ pool_foreach (ap, abf_policy_pool) { vlib_cli_output(vm, "%U", format_abf, ap); } - /* *INDENT-ON* */ } else { @@ -401,14 +395,12 @@ abf_show_policy_cmd (vlib_main_t * vm, return (NULL); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (abf_policy_show_policy_cmd_node, static) = { .path = "show abf policy", .function = abf_show_policy_cmd, .short_help = "show abf policy <value>", .is_mp_safe = 1, }; -/* *INDENT-ON* */ static fib_node_t * abf_policy_get_node (fib_node_index_t index) 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 diff --git a/src/plugins/adl/adl.c b/src/plugins/adl/adl.c index 832bfd4a982..c6ea57a18be 100644 --- a/src/plugins/adl/adl.c +++ b/src/plugins/adl/adl.c @@ -150,21 +150,17 @@ adl_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (adl_init) = { .runs_after = VLIB_INITS ("ip4_allowlist_init", "ip6_allowlist_init"), }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VNET_FEATURE_INIT (adl, static) = { .arc_name = "device-input", .node_name = "adl-input", .runs_before = VNET_FEATURES ("ethernet-input"), }; -/* *INDENT-ON */ int adl_interface_enable_disable (u32 sw_if_index, int enable_disable) { @@ -389,7 +385,6 @@ adl_allowlist_enable_disable_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (adl_allowlist_command, static) = { .path = "adl allowlist", @@ -397,15 +392,12 @@ VLIB_CLI_COMMAND (adl_allowlist_command, static) = "adl allowlist <interface-name> [ip4][ip6][default][fib-id <NN>][disable]", .function = adl_allowlist_enable_disable_command_fn, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Allow/deny list plugin", }; -/* *INDENT-ON* */ /* diff --git a/src/plugins/af_xdp/cli.c b/src/plugins/af_xdp/cli.c index 660725813aa..12d3b875a71 100644 --- a/src/plugins/af_xdp/cli.c +++ b/src/plugins/af_xdp/cli.c @@ -46,7 +46,6 @@ af_xdp_create_command_fn (vlib_main_t * vm, unformat_input_t * input, return args.error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (af_xdp_create_command, static) = { .path = "create interface af_xdp", .short_help = @@ -55,7 +54,6 @@ VLIB_CLI_COMMAND (af_xdp_create_command, static) = { "[prog pathname] [netns ns] [zero-copy|no-zero-copy] [no-syscall-lock]", .function = af_xdp_create_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * af_xdp_delete_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -100,14 +98,12 @@ af_xdp_delete_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (af_xdp_delete_command, static) = { .path = "delete interface af_xdp", .short_help = "delete interface af_xdp " "{<interface> | sw_if_index <sw_idx>}", .function = af_xdp_delete_command_fn, }; -/* *INDENT-ON* */ clib_error_t * af_xdp_cli_init (vlib_main_t * vm) diff --git a/src/plugins/af_xdp/device.c b/src/plugins/af_xdp/device.c index da8b58c37e4..63a276ce51e 100644 --- a/src/plugins/af_xdp/device.c +++ b/src/plugins/af_xdp/device.c @@ -857,7 +857,6 @@ af_xdp_clear (u32 dev_instance) clib_error_free (ad->error); } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (af_xdp_device_class) = { .name = "AF_XDP interface", .format_device = format_af_xdp_device, @@ -870,7 +869,6 @@ VNET_DEVICE_CLASS (af_xdp_device_class) = { .mac_addr_change_function = af_xdp_mac_change, .clear_counters = af_xdp_clear, }; -/* *INDENT-ON* */ clib_error_t * af_xdp_init (vlib_main_t * vm) diff --git a/src/plugins/af_xdp/input.c b/src/plugins/af_xdp/input.c index 0d890419696..9177b3ffc5b 100644 --- a/src/plugins/af_xdp/input.c +++ b/src/plugins/af_xdp/input.c @@ -352,7 +352,6 @@ af_xdp_device_input_refill (af_xdp_device_t *ad) } #endif /* CLIB_MARCH_VARIANT */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (af_xdp_input_node) = { .name = "af_xdp-input", .sibling_of = "device-input", @@ -363,7 +362,6 @@ VLIB_REGISTER_NODE (af_xdp_input_node) = { .error_strings = af_xdp_input_error_strings, .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/af_xdp/plugin.c b/src/plugins/af_xdp/plugin.c index 444ee553cbf..7be7afeac83 100644 --- a/src/plugins/af_xdp/plugin.c +++ b/src/plugins/af_xdp/plugin.c @@ -19,12 +19,10 @@ #include <vnet/plugin/plugin.h> #include <vpp/app/version.h> -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "AF_XDP Device Plugin", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/avf/avf_api.c b/src/plugins/avf/avf_api.c index 05b4ead90fb..ee39c87e666 100644 --- a/src/plugins/avf/avf_api.c +++ b/src/plugins/avf/avf_api.c @@ -52,10 +52,8 @@ vl_api_avf_create_t_handler (vl_api_avf_create_t * mp) avf_create_if (vm, &args); rv = args.rv; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_AVF_CREATE_REPLY, ({ rmp->sw_if_index = ntohl (args.sw_if_index); })); - /* *INDENT-ON* */ } static void diff --git a/src/plugins/avf/cli.c b/src/plugins/avf/cli.c index 54d167d2b03..391ff25567a 100644 --- a/src/plugins/avf/cli.c +++ b/src/plugins/avf/cli.c @@ -63,7 +63,6 @@ avf_create_command_fn (vlib_main_t * vm, unformat_input_t * input, return args.error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (avf_create_command, static) = { .path = "create interface avf", .short_help = "create interface avf <pci-address> " @@ -71,7 +70,6 @@ VLIB_CLI_COMMAND (avf_create_command, static) = { "[num-rx-queues <size>]", .function = avf_create_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * avf_delete_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -107,7 +105,6 @@ avf_delete_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (avf_delete_command, static) = { .path = "delete interface avf", .short_help = "delete interface avf " @@ -115,7 +112,6 @@ VLIB_CLI_COMMAND (avf_delete_command, static) = { .function = avf_delete_command_fn, .is_mp_safe = 1, }; -/* *INDENT-ON* */ static clib_error_t * avf_test_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -167,14 +163,12 @@ avf_test_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (avf_test_command, static) = { .path = "test avf", .short_help = "test avf [<interface> | sw_if_index <sw_idx>] [irq] " "[elog-on] [elog-off]", .function = avf_test_command_fn, }; -/* *INDENT-ON* */ clib_error_t * avf_cli_init (vlib_main_t * vm) diff --git a/src/plugins/avf/device.c b/src/plugins/avf/device.c index 67f9227a7e5..1618800c432 100644 --- a/src/plugins/avf/device.c +++ b/src/plugins/avf/device.c @@ -1131,7 +1131,6 @@ avf_process_one_device (vlib_main_t * vm, avf_device_t * ad, int is_irq) if (is_irq == 0) avf_op_get_stats (vm, ad, &ad->eth_stats); - /* *INDENT-OFF* */ vec_foreach (e, ad->events) { avf_log_debug (ad, "event: %s (%u) sev %d", @@ -1227,7 +1226,6 @@ avf_process_one_device (vlib_main_t * vm, avf_device_t * ad, int is_irq) } } } - /* *INDENT-ON* */ vec_reset_length (ad->events); return; @@ -1403,7 +1401,6 @@ avf_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) /* create local list of device pointers as device pool may grow * during suspend */ vec_reset_length (dev_pointers); - /* *INDENT-OFF* */ pool_foreach_index (i, am->devices) { vec_add1 (dev_pointers, avf_get_device (i)); @@ -1413,19 +1410,16 @@ avf_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) { avf_process_one_device (vm, dev_pointers[i], irq); }; - /* *INDENT-ON* */ last_run_duration = vlib_time_now (vm) - last_periodic_time; } return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (avf_process_node) = { .function = avf_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "avf-process", }; -/* *INDENT-ON* */ static void avf_irq_0_handler (vlib_main_t * vm, vlib_pci_dev_handle_t h, u16 line) @@ -1438,13 +1432,11 @@ avf_irq_0_handler (vlib_main_t * vm, vlib_pci_dev_handle_t h, u16 line) if (ad->flags & AVF_DEVICE_F_ELOG) { - /* *INDENT-OFF* */ ELOG_TYPE_DECLARE (el) = { .format = "avf[%d] irq 0: icr0 0x%x", .format_args = "i4i4", }; - /* *INDENT-ON* */ struct { u32 dev_instance; @@ -1474,13 +1466,11 @@ avf_irq_n_handler (vlib_main_t * vm, vlib_pci_dev_handle_t h, u16 line) if (ad->flags & AVF_DEVICE_F_ELOG) { - /* *INDENT-OFF* */ ELOG_TYPE_DECLARE (el) = { .format = "avf[%d] irq %d: received", .format_args = "i4i2", }; - /* *INDENT-ON* */ struct { u32 dev_instance; @@ -1526,7 +1516,6 @@ avf_delete_if (vlib_main_t * vm, avf_device_t * ad, int with_barrier) vlib_physmem_free (vm, ad->atq_bufs); vlib_physmem_free (vm, ad->arq_bufs); - /* *INDENT-OFF* */ vec_foreach_index (i, ad->rxqs) { avf_rxq_t *rxq = vec_elt_at_index (ad->rxqs, i); @@ -1536,10 +1525,8 @@ avf_delete_if (vlib_main_t * vm, avf_device_t * ad, int with_barrier) rxq->n_enqueued); vec_free (rxq->bufs); } - /* *INDENT-ON* */ vec_free (ad->rxqs); - /* *INDENT-OFF* */ vec_foreach_index (i, ad->txqs) { avf_txq_t *txq = vec_elt_at_index (ad->txqs, i); @@ -1559,7 +1546,6 @@ avf_delete_if (vlib_main_t * vm, avf_device_t * ad, int with_barrier) vec_free (txq->tmp_descs); clib_spinlock_free (&txq->lock); } - /* *INDENT-ON* */ vec_free (ad->txqs); vec_free (ad->name); @@ -1622,7 +1608,6 @@ avf_create_if (vlib_main_t * vm, avf_create_if_args_t * args) if (avf_validate_queue_size (args) != 0) return; - /* *INDENT-OFF* */ pool_foreach (adp, am->devices) { if ((*adp)->pci_addr.as_u32 == args->addr.as_u32) { @@ -1633,7 +1618,6 @@ avf_create_if (vlib_main_t * vm, avf_create_if_args_t * args) return; } } - /* *INDENT-ON* */ pool_get (am->devices, adp); adp[0] = ad = clib_mem_alloc_aligned (sizeof (avf_device_t), @@ -1927,7 +1911,6 @@ avf_program_flow (u32 dev_instance, int is_add, enum virthnl_adv_ops vc_op, return avf_process_request (vm, &req); } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (avf_device_class, ) = { .name = "Adaptive Virtual Function (AVF) interface", .clear_counters = avf_clear_hw_interface_counters, @@ -1941,7 +1924,6 @@ VNET_DEVICE_CLASS (avf_device_class, ) = { .tx_function_error_strings = avf_tx_func_error_strings, .flow_ops_function = avf_flow_ops_fn, }; -/* *INDENT-ON* */ clib_error_t * avf_init (vlib_main_t * vm) diff --git a/src/plugins/avf/input.c b/src/plugins/avf/input.c index ca69407fc59..06007db540d 100644 --- a/src/plugins/avf/input.c +++ b/src/plugins/avf/input.c @@ -566,7 +566,6 @@ VLIB_NODE_FN (avf_input_node) (vlib_main_t * vm, vlib_node_runtime_t * node, return n_rx; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (avf_input_node) = { .name = "avf-input", .sibling_of = "device-input", @@ -578,7 +577,6 @@ VLIB_REGISTER_NODE (avf_input_node) = { .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED, }; -/* *INDENT-ON* */ /* diff --git a/src/plugins/avf/plugin.c b/src/plugins/avf/plugin.c index b5123175fe7..928dee543a6 100644 --- a/src/plugins/avf/plugin.c +++ b/src/plugins/avf/plugin.c @@ -19,12 +19,10 @@ #include <vnet/plugin/plugin.h> #include <vpp/app/version.h> -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Intel Adaptive Virtual Function (AVF) Device Driver", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/builtinurl/builtins.c b/src/plugins/builtinurl/builtins.c index 24323cd596e..b04e9dd5c7c 100644 --- a/src/plugins/builtinurl/builtins.c +++ b/src/plugins/builtinurl/builtins.c @@ -97,12 +97,10 @@ handle_get_interface_stats (hss_url_handler_args_t *args) } else /* default, HTTP_BUILTIN_METHOD_GET */ { - /* *INDENT-OFF* */ pool_foreach (hi, im->hw_interfaces) { vec_add1 (sw_if_indices, hi->sw_if_index); } - /* *INDENT-ON* */ } s = format (s, "{%sinterface_stats%s: [\n", q, q); @@ -150,14 +148,12 @@ handle_get_interface_list (hss_url_handler_args_t *args) int need_comma = 0; /* Construct vector of active hw_if_indexes ... */ - /* *INDENT-OFF* */ pool_foreach (hi, im->hw_interfaces) { /* No point in mentioning "local0"... */ if (hi - im->hw_interfaces) vec_add1 (hw_if_indices, hi - im->hw_interfaces); } - /* *INDENT-ON* */ /* Build answer */ s = format (s, "{\"interface_list\": [\n"); diff --git a/src/plugins/builtinurl/builtinurl.c b/src/plugins/builtinurl/builtinurl.c index 8782906a8d2..749a2c93b8a 100644 --- a/src/plugins/builtinurl/builtinurl.c +++ b/src/plugins/builtinurl/builtinurl.c @@ -85,14 +85,12 @@ builtinurl_enable_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (builtinurl_enable_command, static) = { .path = "builtinurl enable", .short_help = "Turn on builtin http/https GET and POST urls", .function = builtinurl_enable_command_fn, }; -/* *INDENT-ON* */ /* API message handler */ static void vl_api_builtinurl_enable_t_handler @@ -124,13 +122,11 @@ builtinurl_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (builtinurl_init); -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "vpp built-in URL support", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/cdp/cdp.c b/src/plugins/cdp/cdp.c index 1fe557fe82e..00784ccd0bc 100644 --- a/src/plugins/cdp/cdp.c +++ b/src/plugins/cdp/cdp.c @@ -86,14 +86,12 @@ cdp_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cdp_command, static) = { .path = "cdp", .short_help = "cdp enable | disable", .function = cdp_command_fn, }; -/* *INDENT-ON* */ /* API message handler */ static void vl_api_cdp_enable_disable_t_handler @@ -124,13 +122,11 @@ cdp_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (cdp_init); -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Cisco Discovery Protocol (CDP)", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/cdp/cdp_input.c b/src/plugins/cdp/cdp_input.c index c6198d81de1..914d4dec66f 100644 --- a/src/plugins/cdp/cdp_input.c +++ b/src/plugins/cdp/cdp_input.c @@ -416,12 +416,10 @@ cdp_input_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (cdp_input_init) = { .runs_after = VLIB_INITS("cdp_periodic_init"), }; -/* *INDENT-ON* */ static u8 * @@ -437,7 +435,6 @@ format_cdp_neighbors (u8 * s, va_list * va) "%=25s %=25s %=25s %=10s\n", "Our Port", "Peer System", "Peer Port", "Last Heard"); - /* *INDENT-OFF* */ pool_foreach (n, cm->neighbors) { hw = vnet_get_sup_hw_interface (vnm, n->sw_if_index); @@ -447,7 +444,6 @@ format_cdp_neighbors (u8 * s, va_list * va) hw->name, n->device_name, n->port_id, n->last_heard); } - /* *INDENT-ON* */ return s; } @@ -465,13 +461,11 @@ show_cdp (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_cdp_command, static) = { .path = "show cdp", .short_help = "Show cdp command", .function = show_cdp, }; -/* *INDENT-ON* */ /* diff --git a/src/plugins/cdp/cdp_node.c b/src/plugins/cdp/cdp_node.c index f9ee251c022..49b1e3844e4 100644 --- a/src/plugins/cdp/cdp_node.c +++ b/src/plugins/cdp/cdp_node.c @@ -100,7 +100,6 @@ cdp_node_fn (vlib_main_t * vm, /* * cdp input graph node declaration */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (cdp_input_node, static) = { .function = cdp_node_fn, .name = "cdp-input", @@ -117,7 +116,6 @@ VLIB_REGISTER_NODE (cdp_input_node, static) = { [CDP_INPUT_NEXT_NORMAL] = "error-drop", }, }; -/* *INDENT-ON* */ /* * cdp periodic function diff --git a/src/plugins/cdp/cdp_periodic.c b/src/plugins/cdp/cdp_periodic.c index 295cf8fcfb1..03a2de0d9ab 100644 --- a/src/plugins/cdp/cdp_periodic.c +++ b/src/plugins/cdp/cdp_periodic.c @@ -357,12 +357,10 @@ cdp_periodic (vlib_main_t * vm) int i; static cdp_neighbor_t **n_list = 0; - /* *INDENT-OFF* */ pool_foreach (n, cm->neighbors) { vec_add1 (n_list, n); } - /* *INDENT-ON* */ /* Across all cdp neighbors known to the system */ for (i = 0; i < vec_len (n_list); i++) diff --git a/src/plugins/crypto_ipsecmb/ipsecmb.c b/src/plugins/crypto_ipsecmb/ipsecmb.c index 9d874101163..064c129ba12 100644 --- a/src/plugins/crypto_ipsecmb/ipsecmb.c +++ b/src/plugins/crypto_ipsecmb/ipsecmb.c @@ -864,7 +864,6 @@ crypto_ipsecmb_init (vlib_main_t * vm) vec_validate_aligned (imbm->per_thread_data, tm->n_vlib_mains - 1, CLIB_CACHE_LINE_BYTES); - /* *INDENT-OFF* */ vec_foreach (ptd, imbm->per_thread_data) { ptd->mgr = alloc_mb_mgr (0); @@ -882,7 +881,6 @@ crypto_ipsecmb_init (vlib_main_t * vm) if (ptd == imbm->per_thread_data) m = ptd->mgr; } - /* *INDENT-ON* */ #define _(a, b, c, d, e, f) \ vnet_crypto_register_ops_handler (vm, eidx, VNET_CRYPTO_OP_##a##_HMAC, \ @@ -945,20 +943,16 @@ crypto_ipsecmb_init (vlib_main_t * vm) return (NULL); } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (crypto_ipsecmb_init) = { .runs_after = VLIB_INITS ("vnet_crypto_init"), }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Intel IPSEC Multi-buffer Crypto Engine", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/crypto_openssl/main.c b/src/plugins/crypto_openssl/main.c index 545edf42426..b070cf336a5 100644 --- a/src/plugins/crypto_openssl/main.c +++ b/src/plugins/crypto_openssl/main.c @@ -688,20 +688,16 @@ crypto_openssl_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (crypto_openssl_init) = { .runs_after = VLIB_INITS ("vnet_crypto_init"), }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "OpenSSL Crypto Engine", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/crypto_sw_scheduler/main.c b/src/plugins/crypto_sw_scheduler/main.c index 26ab02cdde5..b32c8ae0594 100644 --- a/src/plugins/crypto_sw_scheduler/main.c +++ b/src/plugins/crypto_sw_scheduler/main.c @@ -625,14 +625,12 @@ sw_scheduler_set_worker_crypto (vlib_main_t * vm, unformat_input_t * input, * @cliexstart{set sw_scheduler worker 0 crypto off} * @cliexend ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cmd_set_sw_scheduler_worker_crypto, static) = { .path = "set sw_scheduler", .short_help = "set sw_scheduler worker <idx> crypto <on|off>", .function = sw_scheduler_set_worker_crypto, .is_mp_safe = 1, }; -/* *INDENT-ON* */ static clib_error_t * sw_scheduler_show_workers (vlib_main_t * vm, unformat_input_t * input, @@ -661,14 +659,12 @@ sw_scheduler_show_workers (vlib_main_t * vm, unformat_input_t * input, * @cliexstart{show sw_scheduler workers} * @cliexend ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cmd_show_sw_scheduler_workers, static) = { .path = "show sw_scheduler workers", .short_help = "show sw_scheduler workers", .function = sw_scheduler_show_workers, .is_mp_safe = 1, }; -/* *INDENT-ON* */ clib_error_t * sw_scheduler_cli_init (vlib_main_t * vm) @@ -723,7 +719,6 @@ crypto_sw_scheduler_init (vlib_main_t * vm) crypto_sw_scheduler_api_init (vm); - /* *INDENT-OFF* */ #define _(n, s, k, t, a) \ vnet_crypto_register_enqueue_handler ( \ vm, cm->crypto_engine_index, VNET_CRYPTO_OP_##n##_TAG##t##_AAD##a##_ENC, \ @@ -743,7 +738,6 @@ crypto_sw_scheduler_init (vlib_main_t * vm) crypto_sw_scheduler_frame_enqueue_decrypt); foreach_crypto_link_async_alg #undef _ - /* *INDENT-ON* */ vnet_crypto_register_dequeue_handler (vm, cm->crypto_engine_index, crypto_sw_scheduler_dequeue); @@ -754,7 +748,6 @@ crypto_sw_scheduler_init (vlib_main_t * vm) return error; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (crypto_sw_scheduler_init) = { .runs_after = VLIB_INITS ("vnet_crypto_init"), }; @@ -763,7 +756,6 @@ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "SW Scheduler Crypto Async Engine plugin", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/ct6/ct6.c b/src/plugins/ct6/ct6.c index 205cd3f50ef..e5c69be2c9d 100644 --- a/src/plugins/ct6/ct6.c +++ b/src/plugins/ct6/ct6.c @@ -153,7 +153,6 @@ set_ct6_enable_disable_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_ct6_command, static) = { .path = "set ct6", @@ -161,7 +160,6 @@ VLIB_CLI_COMMAND (set_ct6_command, static) = "set ct6 [inside|outside] <interface-name> [disable]", .function = set_ct6_enable_disable_command_fn, }; -/* *INDENT-ON* */ /* API message handler */ static void vl_api_ct6_enable_disable_t_handler @@ -216,30 +214,24 @@ ct6_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (ct6_init); -/* *INDENT-OFF* */ VNET_FEATURE_INIT (ct6out2in, static) = { .arc_name = "ip6-unicast", .node_name = "ct6-out2in", .runs_before = VNET_FEATURES ("ip6-lookup"), }; -/* *INDENT-ON */ -/* *INDENT-OFF* */ VNET_FEATURE_INIT (ct6in2out, static) = { .arc_name = "interface-output", .node_name = "ct6-in2out", .runs_before = VNET_FEATURES ("interface-output-arc-end"), }; -/* *INDENT-ON */ -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "IPv6 Connection Tracker", }; -/* *INDENT-ON* */ u8 * format_ct6_session (u8 * s, va_list * args) @@ -320,26 +312,22 @@ show_ct6_command_fn_command_fn (vlib_main_t * vm, format (s, "%U", format_ct6_session, cmp, 0 /* pool */ , 0 /* header */ , verbose); - /* *INDENT-OFF* */ pool_foreach (s0, cmp->sessions[i]) { s = format (s, "%U", format_ct6_session, cmp, i, s0, verbose); } - /* *INDENT-ON* */ } vlib_cli_output (cmp->vlib_main, "%v", s); vec_free (s); return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_ct6_command_fn_command, static) = { .path = "show ip6 connection-tracker", .short_help = "show ip6 connection-tracker", .function = show_ct6_command_fn_command_fn, }; -/* *INDENT-ON* */ static void increment_v6_address (ip6_address_t * a) @@ -429,12 +417,10 @@ test_ct6_command_fn_command_fn (vlib_main_t * vm, created = 0; } - /* *INDENT-OFF* */ pool_foreach (s0, cmp->sessions[0]) { s = format (s, "%U", format_ct6_session, cmp, 0, s0, 1 /* verbose */); } - /* *INDENT-ON* */ vlib_cli_output (vm, "\nEnd state: first index %d last index %d\n%v", cmp->first_index[0], cmp->last_index[0], s); @@ -449,12 +435,10 @@ test_ct6_command_fn_command_fn (vlib_main_t * vm, ct6_update_session_hit (cmp, s0, 234.0); - /* *INDENT-OFF* */ pool_foreach (s0, cmp->sessions[0]) { s = format (s, "%U", format_ct6_session, cmp, 0, s0, 1 /* verbose */); } - /* *INDENT-ON* */ vlib_cli_output (vm, "\nEnd state: first index %d last index %d\n%v", cmp->first_index[0], cmp->last_index[0], s); @@ -464,14 +448,12 @@ test_ct6_command_fn_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_ct6_command_fn_command, static) = { .path = "test ip6 connection-tracker", .short_help = "test ip6 connection-tracker", .function = test_ct6_command_fn_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * ct6_config (vlib_main_t * vm, unformat_input_t * input) diff --git a/src/plugins/ct6/ct6.h b/src/plugins/ct6/ct6.h index 534534f5c99..0b7deb07839 100644 --- a/src/plugins/ct6/ct6.h +++ b/src/plugins/ct6/ct6.h @@ -26,7 +26,6 @@ #include <vppinfra/hash.h> #include <vppinfra/error.h> -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { union @@ -43,7 +42,6 @@ typedef CLIB_PACKED (struct u64 as_u64[6]; }; }) ct6_session_key_t; -/* *INDENT-ON* */ typedef struct { diff --git a/src/plugins/ct6/ct6_in2out.c b/src/plugins/ct6/ct6_in2out.c index b8bda18370c..c5d26c8caa7 100644 --- a/src/plugins/ct6/ct6_in2out.c +++ b/src/plugins/ct6/ct6_in2out.c @@ -344,7 +344,6 @@ VLIB_NODE_FN (ct6_in2out_node) (vlib_main_t * vm, vlib_node_runtime_t * node, return ct6_in2out_inline (vm, node, frame, 0 /* is_trace */ ); } -/* *INDENT-OFF* */ #ifndef CLIB_MARCH_VARIANT VLIB_REGISTER_NODE (ct6_in2out_node) = { @@ -365,7 +364,6 @@ VLIB_REGISTER_NODE (ct6_in2out_node) = .unformat_buffer = unformat_ethernet_header, }; #endif /* CLIB_MARCH_VARIANT */ -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/ct6/ct6_out2in.c b/src/plugins/ct6/ct6_out2in.c index ebb6da56134..a94ae38f0c5 100644 --- a/src/plugins/ct6/ct6_out2in.c +++ b/src/plugins/ct6/ct6_out2in.c @@ -246,7 +246,6 @@ VLIB_NODE_FN (ct6_out2in_node) (vlib_main_t * vm, vlib_node_runtime_t * node, return ct6_out2in_inline (vm, node, frame, 0 /* is_trace */ ); } -/* *INDENT-OFF* */ #ifndef CLIB_MARCH_VARIANT VLIB_REGISTER_NODE (ct6_out2in_node) = { @@ -266,7 +265,6 @@ VLIB_REGISTER_NODE (ct6_out2in_node) = }, }; #endif /* CLIB_MARCH_VARIANT */ -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/dhcp/client.c b/src/plugins/dhcp/client.c index f93643390e9..8fa67c616b2 100644 --- a/src/plugins/dhcp/client.c +++ b/src/plugins/dhcp/client.c @@ -149,7 +149,6 @@ dhcp_client_acquire_address (dhcp_client_main_t * dcm, dhcp_client_t * c) .ip4 = c->learned.router_address, }; - /* *INDENT-OFF* */ fib_table_entry_path_add ( fib_table_get_index_for_sw_if_index ( FIB_PROTOCOL_IP4, @@ -161,7 +160,6 @@ dhcp_client_acquire_address (dhcp_client_main_t * dcm, dhcp_client_t * c) &nh, c->sw_if_index, ~0, 1, NULL, // no label stack FIB_ROUTE_PATH_FLAG_NONE); - /* *INDENT-ON* */ } } clib_memcpy (&c->installed, &c->learned, sizeof (c->installed)); @@ -870,7 +868,6 @@ dhcp_client_process (vlib_main_t * vm, case ~0: if (pool_elts (dcm->clients)) { - /* *INDENT-OFF* */ next_expire_time = 1e70; pool_foreach (c, dcm->clients) { @@ -886,7 +883,6 @@ dhcp_client_process (vlib_main_t * vm, clib_warning ("BUG"); timeout = 1.13; } - /* *INDENT-ON* */ } else timeout = 1000.0; @@ -900,7 +896,6 @@ dhcp_client_process (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dhcp_client_process_node,static) = { .function = dhcp_client_process, .type = VLIB_NODE_TYPE_PROCESS, @@ -909,7 +904,6 @@ VLIB_REGISTER_NODE (dhcp_client_process_node,static) = { .n_errors = ARRAY_LEN(dhcp_client_process_stat_strings), .error_strings = dhcp_client_process_stat_strings, }; -/* *INDENT-ON* */ static clib_error_t * show_dhcp_client_command_fn (vlib_main_t * vm, @@ -943,25 +937,21 @@ show_dhcp_client_command_fn (vlib_main_t * vm, return 0; } - /* *INDENT-OFF* */ pool_foreach (c, dcm->clients) { vlib_cli_output (vm, "%U", format_dhcp_client, dcm, c, verbose); } - /* *INDENT-ON* */ return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_dhcp_client_command, static) = { .path = "show dhcp client", .short_help = "show dhcp client [intfc <intfc>][verbose]", .function = show_dhcp_client_command_fn, }; -/* *INDENT-ON* */ int @@ -1118,13 +1108,11 @@ dhcp_client_walk (dhcp_client_walk_cb_t cb, void *ctx) dhcp_client_main_t *dcm = &dhcp_client_main; dhcp_client_t *c; - /* *INDENT-OFF* */ pool_foreach (c, dcm->clients) { if (!cb(c, ctx)) break; } - /* *INDENT-ON* */ } @@ -1229,13 +1217,11 @@ dhcp_client_set_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (dhcp_client_set_command, static) = { .path = "set dhcp client", .short_help = "set dhcp client [del] intfc <interface> [hostname <name>]", .function = dhcp_client_set_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * dhcp_client_init (vlib_main_t * vm) diff --git a/src/plugins/dhcp/dhcp4_proxy_node.c b/src/plugins/dhcp/dhcp4_proxy_node.c index 56e14d422a8..2b49d49bb7f 100644 --- a/src/plugins/dhcp/dhcp4_proxy_node.c +++ b/src/plugins/dhcp/dhcp4_proxy_node.c @@ -463,7 +463,6 @@ dhcp_proxy_to_server_input (vlib_main_t * vm, return from_frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dhcp_proxy_to_server_node, static) = { .function = dhcp_proxy_to_server_input, .name = "dhcp-proxy-to-server", @@ -486,7 +485,6 @@ VLIB_REGISTER_NODE (dhcp_proxy_to_server_node, static) = { .unformat_buffer = unformat_dhcp_proxy_header, #endif }; -/* *INDENT-ON* */ typedef enum { @@ -783,7 +781,6 @@ dhcp_proxy_to_client_input (vlib_main_t * vm, return from_frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dhcp_proxy_to_client_node, static) = { .function = dhcp_proxy_to_client_input, .name = "dhcp-proxy-to-client", @@ -803,7 +800,6 @@ VLIB_REGISTER_NODE (dhcp_proxy_to_client_node, static) = { [DHCP4_PROXY_NEXT_TX] = "interface-output", }, }; -/* *INDENT-ON* */ void dhcp_maybe_register_udp_ports (dhcp_port_reg_flags_t ports) @@ -956,13 +952,11 @@ dhcp4_proxy_set_command_fn (vlib_main_t * vm, format_unformat_error, input); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (dhcp_proxy_set_command, static) = { .path = "set dhcp proxy", .short_help = "set dhcp proxy [del] server <ip-addr> src-address <ip-addr> [server-fib-id <n>] [rx-fib-id <n>]", .function = dhcp4_proxy_set_command_fn, }; -/* *INDENT-ON* */ static u8 * format_dhcp4_proxy_server (u8 * s, va_list * args) @@ -1015,13 +1009,11 @@ dhcp4_proxy_show_command_fn (vlib_main_t * vm, return (NULL); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (dhcp_proxy_show_command, static) = { .path = "show dhcp proxy", .short_help = "Display dhcp proxy server info", .function = dhcp4_proxy_show_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * dhcp_option_82_vss_fn (vlib_main_t * vm, @@ -1066,13 +1058,11 @@ dhcp_option_82_vss_fn (vlib_main_t * vm, } } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (dhcp_proxy_vss_command,static) = { .path = "set dhcp option-82 vss", .short_help = "set dhcp option-82 vss [del] table <table id> [oui <n> vpn-id <n> | vpn-ascii-id <text>]", .function = dhcp_option_82_vss_fn, }; -/* *INDENT-ON* */ static clib_error_t * dhcp_vss_show_command_fn (vlib_main_t * vm, @@ -1083,13 +1073,11 @@ dhcp_vss_show_command_fn (vlib_main_t * vm, return (NULL); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (dhcp_proxy_vss_show_command, static) = { .path = "show dhcp vss", .short_help = "show dhcp VSS", .function = dhcp_vss_show_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * dhcp_option_82_address_show_command_fn (vlib_main_t * vm, @@ -1132,13 +1120,11 @@ dhcp_option_82_address_show_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (dhcp_proxy_address_show_command,static) = { .path = "show dhcp option-82-address interface", .short_help = "show dhcp option-82-address interface <interface>", .function = dhcp_option_82_address_show_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/dhcp/dhcp6_client_common_dp.c b/src/plugins/dhcp/dhcp6_client_common_dp.c index da6f61aa2d5..40c4ba94c24 100644 --- a/src/plugins/dhcp/dhcp6_client_common_dp.c +++ b/src/plugins/dhcp/dhcp6_client_common_dp.c @@ -61,14 +61,12 @@ generate_client_duid (void) vnet_hw_interface_t *hi; ethernet_interface_t *eth_if = 0; - /* *INDENT-OFF* */ pool_foreach (hi, im->hw_interfaces) { eth_if = ethernet_get_interface (ðernet_main, hi->hw_if_index); if (eth_if) break; } - /* *INDENT-ON* */ if (eth_if) clib_memcpy (client_duid.lla, ð_if->address, 6); @@ -425,7 +423,6 @@ dhcpv6_client_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dhcpv6_client_node, static) = { .function = dhcpv6_client_node_fn, .name = "dhcpv6-client", @@ -442,7 +439,6 @@ VLIB_REGISTER_NODE (dhcpv6_client_node, static) = { .format_trace = format_dhcpv6_client_trace, }; -/* *INDENT-ON* */ void dhcp6_clients_enable_disable (u8 enable) diff --git a/src/plugins/dhcp/dhcp6_ia_na_client_cp.c b/src/plugins/dhcp/dhcp6_ia_na_client_cp.c index 4a1156f6e8a..ddaf92c6e42 100644 --- a/src/plugins/dhcp/dhcp6_ia_na_client_cp.c +++ b/src/plugins/dhcp/dhcp6_ia_na_client_cp.c @@ -271,7 +271,6 @@ dhcp6_reply_event_handler (vl_api_dhcp6_reply_event_t * mp) continue; u8 address_already_present = 0; - /* *INDENT-OFF* */ pool_foreach (address_info, rm->address_pool) { if (address_info->sw_if_index != sw_if_index) @@ -284,7 +283,6 @@ dhcp6_reply_event_handler (vl_api_dhcp6_reply_event_t * mp) goto address_pool_foreach_out; } } - /* *INDENT-ON* */ address_pool_foreach_out: if (address_already_present) @@ -344,7 +342,6 @@ create_address_list (u32 sw_if_index) dhcp6_client_cp_main_t *rm = &dhcp6_client_cp_main; address_info_t *address_info, *address_list = 0;; - /* *INDENT-OFF* */ pool_foreach (address_info, rm->address_pool) { if (address_info->sw_if_index == sw_if_index) @@ -354,7 +351,6 @@ create_address_list (u32 sw_if_index) clib_memcpy (&address_list[pos], address_info, sizeof (*address_info)); } } - /* *INDENT-ON* */ return address_list; } @@ -393,7 +389,6 @@ dhcp6_client_cp_process (vlib_main_t * vm, vlib_node_runtime_t * rt, do { due_time = current_time + 1e9; - /* *INDENT-OFF* */ pool_foreach (address_info, rm->address_pool) { if (address_info->due_time > current_time) @@ -423,7 +418,6 @@ dhcp6_client_cp_process (vlib_main_t * vm, vlib_node_runtime_t * rt, } } } - /* *INDENT-ON* */ for (i = 0; i < vec_len (rm->client_state_by_sw_if_index); i++) { client_state_t *cs = &rm->client_state_by_sw_if_index[i]; @@ -473,13 +467,11 @@ dhcp6_client_cp_process (vlib_main_t * vm, vlib_node_runtime_t * rt, return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dhcp6_client_cp_process_node) = { .function = dhcp6_client_cp_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "dhcp6-client-cp-process", }; -/* *INDENT-ON* */ static void interrupt_process (void) @@ -524,7 +516,6 @@ dhcp6_addresses_show_command_function (vlib_main_t * vm, address_info_t *address_info; f64 current_time = vlib_time_now (vm); - /* *INDENT-OFF* */ pool_foreach (address_info, dm->address_pool) { vlib_cli_output (vm, "address: %U, " @@ -534,18 +525,15 @@ dhcp6_addresses_show_command_function (vlib_main_t * vm, address_info->preferred_lt, address_info->valid_lt, address_info->due_time - current_time); } - /* *INDENT-ON* */ return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (dhcp6_addresses_show_command, static) = { .path = "show dhcp6 addresses", .short_help = "show dhcp6 addresses", .function = dhcp6_addresses_show_command_function, }; -/* *INDENT-ON* */ static clib_error_t * dhcp6_clients_show_command_function (vlib_main_t * vm, @@ -601,13 +589,11 @@ dhcp6_clients_show_command_function (vlib_main_t * vm, return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (dhcp6_clients_show_command, static) = { .path = "show dhcp6 clients", .short_help = "show dhcp6 clients", .function = dhcp6_clients_show_command_function, }; -/* *INDENT-ON* */ int dhcp6_client_enable_disable (u32 sw_if_index, u8 enable) @@ -659,7 +645,6 @@ dhcp6_client_enable_disable (u32 sw_if_index, u8 enable) disable_process (); } - /* *INDENT-OFF* */ pool_foreach (address_info, rm->address_pool) { if (address_info->sw_if_index == sw_if_index) @@ -680,7 +665,6 @@ dhcp6_client_enable_disable (u32 sw_if_index, u8 enable) pool_put (rm->address_pool, address_info); } } - /* *INDENT-ON* */ } if (!enable) @@ -745,13 +729,11 @@ done: * @cliexcmd{dhcp6 client GigabitEthernet2/0/0 disable} * @endparblock ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (dhcp6_client_enable_disable_command, static) = { .path = "dhcp6 client", .short_help = "dhcp6 client <interface> [disable]", .function = dhcp6_client_enable_disable_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * dhcp_ia_na_client_cp_init (vlib_main_t * vm) diff --git a/src/plugins/dhcp/dhcp6_ia_na_client_dp.c b/src/plugins/dhcp/dhcp6_ia_na_client_dp.c index c240beb3eb3..e957f88884a 100644 --- a/src/plugins/dhcp/dhcp6_ia_na_client_dp.c +++ b/src/plugins/dhcp/dhcp6_ia_na_client_dp.c @@ -346,13 +346,11 @@ send_dhcp6_client_message_process (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (send_dhcp6_client_message_process_node, static) = { .function = send_dhcp6_client_message_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "send-dhcp6-client-message-process", }; -/* *INDENT-ON* */ void dhcp6_send_client_message (vlib_main_t * vm, u32 sw_if_index, u8 stop, diff --git a/src/plugins/dhcp/dhcp6_packet.h b/src/plugins/dhcp/dhcp6_packet.h index d5467952a64..78a665f926d 100644 --- a/src/plugins/dhcp/dhcp6_packet.h +++ b/src/plugins/dhcp/dhcp6_packet.h @@ -119,7 +119,6 @@ typedef struct dhcpv6_hdr_ u8 data[0]; } dhcpv6_header_t; -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct dhcpv6_relay_ctx_ { dhcpv6_header_t *pkt; u32 pkt_len; @@ -130,10 +129,8 @@ typedef CLIB_PACKED (struct dhcpv6_relay_ctx_ { char ctx_name[32+1]; u8 dhcp_msg_type; }) dhcpv6_relay_ctx_t; -/* *INDENT-ON* */ //Structure for DHCPv6 RELAY-FORWARD and DHCPv6 RELAY-REPLY pkts -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct dhcpv6_relay_hdr_ { u8 msg_type; u8 hop_count; @@ -141,7 +138,6 @@ typedef CLIB_PACKED (struct dhcpv6_relay_hdr_ { ip6_address_t peer_addr; u8 data[0]; }) dhcpv6_relay_hdr_t; -/* *INDENT-ON* */ typedef enum dhcp_stats_action_type_ { @@ -171,51 +167,39 @@ typedef enum dhcpv6_stats_drop_reason_ #define dhcpv6_optlen(opt) clib_net_to_host_u16((opt)->length) -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { u16 option; u16 length; u8 data[0]; }) dhcpv6_option_t; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { dhcpv6_option_t opt; u16 status_code; }) dhcpv6_status_code_t; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { dhcpv6_option_t opt; u32 int_idx; }) dhcpv6_int_id_t; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { dhcpv6_option_t opt; u8 vss_type; u8 data[0]; }) dhcpv6_vss_t; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { dhcpv6_option_t opt; u32 ent_num; u32 rmt_id; }) dhcpv6_rmt_id_t; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { dhcpv6_option_t opt; u16 link_type; u8 data[6]; // data[0]:data[5]: MAC address }) dhcpv6_client_mac_t; -/* *INDENT-ON* */ typedef CLIB_PACKED (struct { diff --git a/src/plugins/dhcp/dhcp6_pd_client_cp.c b/src/plugins/dhcp/dhcp6_pd_client_cp.c index b1784bd9420..b30f7c0af79 100644 --- a/src/plugins/dhcp/dhcp6_pd_client_cp.c +++ b/src/plugins/dhcp/dhcp6_pd_client_cp.c @@ -371,12 +371,10 @@ dhcp6_pd_reply_event_handler (vl_api_dhcp6_pd_reply_event_t * mp) * We're going to loop through the pool multiple times, * so collect active indices. */ - /* *INDENT-OFF* */ pool_foreach (prefix_info, pm->prefix_pool) { vec_add1 (pm->indices, prefix_info - pm->prefix_pool); } - /* *INDENT-ON* */ for (i = 0; i < n_prefixes; i++) { @@ -480,7 +478,6 @@ create_prefix_list (u32 sw_if_index) ip6_prefix_main_t *pm = &ip6_prefix_main; prefix_info_t *prefix_info, *prefix_list = 0;; - /* *INDENT-OFF* */ pool_foreach (prefix_info, pm->prefix_pool) { if (is_dhcpv6_pd_prefix (prefix_info) && @@ -491,7 +488,6 @@ create_prefix_list (u32 sw_if_index) clib_memcpy (&prefix_list[pos], prefix_info, sizeof (*prefix_info)); } } - /* *INDENT-ON* */ return prefix_list; } @@ -530,7 +526,6 @@ dhcp6_pd_client_cp_process (vlib_main_t * vm, vlib_node_runtime_t * rt, do { due_time = current_time + 1e9; - /* *INDENT-OFF* */ pool_foreach (prefix_info, pm->prefix_pool) { if (is_dhcpv6_pd_prefix (prefix_info)) @@ -559,7 +554,6 @@ dhcp6_pd_client_cp_process (vlib_main_t * vm, vlib_node_runtime_t * rt, } } } - /* *INDENT-ON* */ for (i = 0; i < vec_len (rm->client_state_by_sw_if_index); i++) { client_state_t *cs = &rm->client_state_by_sw_if_index[i]; @@ -608,13 +602,11 @@ dhcp6_pd_client_cp_process (vlib_main_t * vm, vlib_node_runtime_t * rt, return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dhcp6_pd_client_cp_process_node) = { .function = dhcp6_pd_client_cp_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "dhcp6-pd-client-cp-process", }; -/* *INDENT-ON* */ static void interrupt_process (void) @@ -787,14 +779,12 @@ cp_ip6_address_find_new_active_prefix (u32 prefix_group_index, ip6_prefix_main_t *pm = &ip6_prefix_main; prefix_info_t *prefix_info; - /* *INDENT-OFF* */ pool_foreach (prefix_info, pm->prefix_pool) { if (prefix_info->prefix_group_index == prefix_group_index && prefix_info - pm->prefix_pool != ignore_prefix_index) return prefix_info - pm->prefix_pool; } - /* *INDENT-ON* */ return ~0; } @@ -1080,14 +1070,12 @@ done: * prefix group my-prefix-group ::7/64 del} * @endparblock ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (ip6_address_add_del_command, static) = { .path = "set ip6 address", .short_help = "set ip6 address <interface> [prefix group <string>] " "<address> [del]", .function = cp_ip6_address_add_del_command_function, }; -/* *INDENT-ON* */ static clib_error_t * cp_ip6_addresses_show_command_function (vlib_main_t * vm, @@ -1119,13 +1107,11 @@ cp_ip6_addresses_show_command_function (vlib_main_t * vm, return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (ip6_addresses_show_command, static) = { .path = "show ip6 addresses", .short_help = "show ip6 addresses", .function = cp_ip6_addresses_show_command_function, }; -/* *INDENT-ON* */ static clib_error_t * cp_ip6_prefixes_show_command_function (vlib_main_t * vm, @@ -1138,7 +1124,6 @@ cp_ip6_prefixes_show_command_function (vlib_main_t * vm, const u8 *prefix_group; f64 current_time = vlib_time_now (vm); - /* *INDENT-OFF* */ pool_foreach (prefix_info, pm->prefix_pool) { prefix_group = @@ -1152,18 +1137,15 @@ cp_ip6_prefixes_show_command_function (vlib_main_t * vm, prefix_info->preferred_lt, prefix_info->valid_lt, prefix_info->due_time - current_time); } - /* *INDENT-ON* */ return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (ip6_prefixes_show_command, static) = { .path = "show ip6 prefixes", .short_help = "show ip6 prefixes", .function = cp_ip6_prefixes_show_command_function, }; -/* *INDENT-ON* */ static clib_error_t * ip6_pd_clients_show_command_function (vlib_main_t * vm, @@ -1224,13 +1206,11 @@ ip6_pd_clients_show_command_function (vlib_main_t * vm, return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (ip6_pd_clients_show_command, static) = { .path = "show ip6 pd clients", .short_help = "show ip6 pd clients", .function = ip6_pd_clients_show_command_function, }; -/* *INDENT-ON* */ @@ -1304,7 +1284,6 @@ dhcp6_pd_client_enable_disable (u32 sw_if_index, vec_validate (prefix_list, 0); - /* *INDENT-OFF* */ pool_foreach (prefix_info, pm->prefix_pool) { if (is_dhcpv6_pd_prefix (prefix_info) && @@ -1325,7 +1304,6 @@ dhcp6_pd_client_enable_disable (u32 sw_if_index, pool_put (pm->prefix_pool, prefix_info); } } - /* *INDENT-ON* */ vec_free (prefix_list); @@ -1398,13 +1376,11 @@ done: * @cliexcmd{dhcp6 pd client GigabitEthernet2/0/0 disable} * @endparblock ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (dhcp6_pd_client_enable_disable_command, static) = { .path = "dhcp6 pd client", .short_help = "dhcp6 pd client <interface> (prefix group <string> | disable)", .function = dhcp6_pd_client_enable_disable_command_fn, }; -/* *INDENT-ON* */ #include <vlib/unix/plugin.h> diff --git a/src/plugins/dhcp/dhcp6_pd_client_dp.c b/src/plugins/dhcp/dhcp6_pd_client_dp.c index b43e5a4754d..340930c913e 100644 --- a/src/plugins/dhcp/dhcp6_pd_client_dp.c +++ b/src/plugins/dhcp/dhcp6_pd_client_dp.c @@ -352,13 +352,11 @@ send_dhcp6_pd_client_message_process (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (send_dhcp6_pd_client_message_process_node, static) = { .function = send_dhcp6_pd_client_message_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "send-dhcp6-pd-client-message-process", }; -/* *INDENT-ON* */ void dhcp6_pd_send_client_message (vlib_main_t * vm, u32 sw_if_index, u8 stop, diff --git a/src/plugins/dhcp/dhcp6_proxy_node.c b/src/plugins/dhcp/dhcp6_proxy_node.c index ad0b70498a0..a1d41e83b0f 100644 --- a/src/plugins/dhcp/dhcp6_proxy_node.c +++ b/src/plugins/dhcp/dhcp6_proxy_node.c @@ -105,7 +105,6 @@ ip6_interface_first_global_or_site_address (ip6_main_t * im, u32 sw_if_index) ip_interface_address_t *ia = 0; ip6_address_t *result = 0; - /* *INDENT-OFF* */ foreach_ip_interface_address (lm, ia, sw_if_index, 1 /* honor unnumbered */, ({ @@ -116,7 +115,6 @@ ip6_interface_first_global_or_site_address (ip6_main_t * im, u32 sw_if_index) break; } })); - /* *INDENT-ON* */ return result; } @@ -532,7 +530,6 @@ dhcpv6_proxy_to_server_input (vlib_main_t * vm, return from_frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dhcpv6_proxy_to_server_node, static) = { .function = dhcpv6_proxy_to_server_input, .name = "dhcpv6-proxy-to-server", @@ -555,7 +552,6 @@ VLIB_REGISTER_NODE (dhcpv6_proxy_to_server_node, static) = { .unformat_buffer = unformat_dhcpv6_proxy_header, #endif }; -/* *INDENT-ON* */ static uword dhcpv6_proxy_to_client_input (vlib_main_t * vm, @@ -826,7 +822,6 @@ dhcpv6_proxy_to_client_input (vlib_main_t * vm, } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dhcpv6_proxy_to_client_node, static) = { .function = dhcpv6_proxy_to_client_input, .name = "dhcpv6-proxy-to-client", @@ -841,7 +836,6 @@ VLIB_REGISTER_NODE (dhcpv6_proxy_to_client_node, static) = { .unformat_buffer = unformat_dhcpv6_proxy_header, #endif }; -/* *INDENT-ON* */ static clib_error_t * dhcp6_proxy_init (vlib_main_t * vm) @@ -1016,14 +1010,12 @@ dhcpv6_proxy_set_command_fn (vlib_main_t * vm, format_unformat_error, input); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (dhcpv6_proxy_set_command, static) = { .path = "set dhcpv6 proxy", .short_help = "set dhcpv6 proxy [del] server <ipv6-addr> src-address <ipv6-addr> " "[server-fib-id <fib-id>] [rx-fib-id <fib-id>] ", .function = dhcpv6_proxy_set_command_fn, }; -/* *INDENT-ON* */ static u8 * format_dhcp6_proxy_server (u8 * s, va_list * args) @@ -1080,13 +1072,11 @@ dhcpv6_proxy_show_command_fn (vlib_main_t * vm, return (NULL); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (dhcpv6_proxy_show_command, static) = { .path = "show dhcpv6 proxy", .short_help = "Display dhcpv6 proxy info", .function = dhcpv6_proxy_show_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * dhcpv6_vss_command_fn (vlib_main_t * vm, @@ -1129,13 +1119,11 @@ dhcpv6_vss_command_fn (vlib_main_t * vm, } } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (dhcpv6_proxy_vss_command, static) = { .path = "set dhcpv6 vss", .short_help = "set dhcpv6 vss table <table-id> [oui <n> vpn-id <n> | vpn-ascii-id <text>]", .function = dhcpv6_vss_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * dhcpv6_vss_show_command_fn (vlib_main_t * vm, @@ -1147,13 +1135,11 @@ dhcpv6_vss_show_command_fn (vlib_main_t * vm, return (NULL); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (dhcpv6_proxy_vss_show_command, static) = { .path = "show dhcpv6 vss", .short_help = "show dhcpv6 VSS", .function = dhcpv6_vss_show_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * dhcpv6_link_address_show_command_fn (vlib_main_t * vm, @@ -1195,13 +1181,11 @@ dhcpv6_link_address_show_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (dhcpv6_proxy_address_show_command, static) = { .path = "show dhcpv6 link-address interface", .short_help = "show dhcpv6 link-address interface <interface>", .function = dhcpv6_link_address_show_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/dhcp/dhcp_api.c b/src/plugins/dhcp/dhcp_api.c index 20b00422a73..1458db3527d 100644 --- a/src/plugins/dhcp/dhcp_api.c +++ b/src/plugins/dhcp/dhcp_api.c @@ -76,12 +76,10 @@ vl_api_dhcp_plugin_control_ping_t_handler (vl_api_dhcp_plugin_control_ping_t * vl_api_dhcp_plugin_control_ping_reply_t *rmp; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_DHCP_PLUGIN_CONTROL_PING_REPLY, ({ rmp->vpe_pid = ntohl (getpid ()); })); - /* *INDENT-ON* */ } static void @@ -726,7 +724,6 @@ dhcp6_reply_process (vlib_main_t * vm, vlib_node_runtime_t * rt, call_dhcp6_reply_event_callbacks (event, dcpm->functions); vpe_client_registration_t *reg; - /* *INDENT-OFF* */ pool_foreach (reg, vpe_api_main.dhcp6_reply_events_registrations) { vl_api_registration_t *vl_reg; @@ -743,7 +740,6 @@ dhcp6_reply_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vl_api_send_msg (vl_reg, (u8 *) msg); } } - /* *INDENT-ON* */ clib_mem_free (event); } @@ -754,13 +750,11 @@ dhcp6_reply_process (vlib_main_t * vm, vlib_node_runtime_t * rt, return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dhcp6_reply_process_node) = { .function = dhcp6_reply_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "dhcp6-reply-publisher-process", }; -/* *INDENT-ON* */ static clib_error_t * call_dhcp6_pd_reply_event_callbacks (void *data, @@ -838,7 +832,6 @@ dhcp6_pd_reply_process (vlib_main_t * vm, vlib_node_runtime_t * rt, call_dhcp6_pd_reply_event_callbacks (event, dpcpm->functions); vpe_client_registration_t *reg; - /* *INDENT-OFF* */ pool_foreach (reg, vpe_api_main.dhcp6_pd_reply_events_registrations) { vl_api_registration_t *vl_reg; @@ -855,7 +848,6 @@ dhcp6_pd_reply_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vl_api_send_msg (vl_reg, (u8 *) msg); } } - /* *INDENT-ON* */ clib_mem_free (event); } @@ -866,13 +858,11 @@ dhcp6_pd_reply_process (vlib_main_t * vm, vlib_node_runtime_t * rt, return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dhcp6_pd_reply_process_node) = { .function = dhcp6_pd_reply_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "dhcp6-pd-reply-publisher-process", }; -/* *INDENT-ON* */ /* * dhcp_api_hookup @@ -904,12 +894,10 @@ VLIB_API_INIT_FUNCTION (dhcp_api_hookup); #include <vlib/unix/plugin.h> #include <vpp/app/version.h> -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Dynamic Host Configuration Protocol (DHCP)", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/dhcp/dhcp_client_detect.c b/src/plugins/dhcp/dhcp_client_detect.c index 598bd16cf8d..c02693f2ccf 100644 --- a/src/plugins/dhcp/dhcp_client_detect.c +++ b/src/plugins/dhcp/dhcp_client_detect.c @@ -286,7 +286,6 @@ format_dhcp_client_detect_trace (u8 * s, va_list * args) return s; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dhcp_client_detect_node) = { .name = "ip4-dhcp-client-detect", .vector_size = sizeof (u32), @@ -313,7 +312,6 @@ VNET_FEATURE_INIT (ip4_dvr_reinject_feat_node, static) = .runs_before = VNET_FEATURES ("ip4-not-enabled"), }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/dns/dns.c b/src/plugins/dns/dns.c index d07a1dac43b..3cecf942d55 100644 --- a/src/plugins/dns/dns.c +++ b/src/plugins/dns/dns.c @@ -61,13 +61,11 @@ dns_cache_clear (dns_main_t * dm) dns_cache_lock (dm, 1); - /* *INDENT-OFF* */ pool_foreach (ep, dm->entries) { vec_free (ep->name); vec_free (ep->pending_requests); } - /* *INDENT-ON* */ pool_free (dm->entries); hash_free (dm->cache_entry_by_name); @@ -1403,7 +1401,6 @@ vl_api_dns_resolve_name_t_handler (vl_api_dns_resolve_name_t * mp) if (ep == 0) return; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_DNS_RESOLVE_NAME_REPLY, ({ ip_address_copy_addr (rmp->ip4_address, &rn.address); if (ip_addr_version (&rn.address) == AF_IP4) @@ -1411,7 +1408,6 @@ vl_api_dns_resolve_name_t_handler (vl_api_dns_resolve_name_t * mp) else rmp->ip6_set = 1; })); - /* *INDENT-ON* */ } static void @@ -1480,13 +1476,11 @@ vl_api_dns_resolve_ip_t_handler (vl_api_dns_resolve_ip_t * mp) if (ep == 0) return; - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_DNS_RESOLVE_IP_REPLY, ({ rv = vnet_dns_response_to_name (ep->dns_response, rmp, 0 /* ttl-ptr */); rmp->retval = clib_host_to_net_u32 (rv); })); - /* *INDENT-ON* */ } static clib_error_t * @@ -2096,7 +2090,6 @@ format_dns_cache (u8 * s, va_list * args) if (verbose > 0) { - /* *INDENT-OFF* */ pool_foreach (ep, dm->entries) { if (ep->flags & DNS_CACHE_ENTRY_FLAG_VALID) @@ -2135,7 +2128,6 @@ format_dns_cache (u8 * s, va_list * args) } vec_add1 (s, '\n'); } - /* *INDENT-ON* */ } dns_cache_unlock (dm); @@ -2170,14 +2162,12 @@ show_dns_cache_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_dns_cache_command) = { .path = "show dns cache", .short_help = "show dns cache [verbose [nn]]", .function = show_dns_cache_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * show_dns_servers_command_fn (vlib_main_t * vm, @@ -2207,14 +2197,12 @@ show_dns_servers_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_dns_server_command) = { .path = "show dns servers", .short_help = "show dns servers", .function = show_dns_servers_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -2309,14 +2297,12 @@ dns_cache_add_del_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (dns_cache_add_del_command) = { .path = "dns cache", .short_help = "dns cache [add|del|clear] <name> [ip4][ip6]", .function = dns_cache_add_del_command_fn, }; -/* *INDENT-ON* */ #define DNS_FORMAT_TEST 1 @@ -2557,14 +2543,12 @@ test_dns_fmt_command_fn (vlib_main_t * vm, } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_dns_fmt_command) = { .path = "test dns format", .short_help = "test dns format", .function = test_dns_fmt_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * test_dns_unfmt_command_fn (vlib_main_t * vm, @@ -2597,14 +2581,12 @@ test_dns_unfmt_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_dns_unfmt_command) = { .path = "test dns unformat", .short_help = "test dns unformat <name> [ip4][ip6]", .function = test_dns_unfmt_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * test_dns_expire_command_fn (vlib_main_t * vm, @@ -2640,14 +2622,12 @@ test_dns_expire_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_dns_expire_command) = { .path = "test dns expire", .short_help = "test dns expire <name>", .function = test_dns_expire_command_fn, }; -/* *INDENT-ON* */ #endif void @@ -2889,7 +2869,6 @@ dns_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (dns_init) = { .init_order = VLIB_INITS ("flow_classify_init", "dns_init"), }; @@ -2899,7 +2878,6 @@ VLIB_PLUGIN_REGISTER () = .version = VPP_BUILD_VER, .description = "Simple DNS name resolver", }; -/* *INDENT-ON* */ /* diff --git a/src/plugins/dns/dns_packet.h b/src/plugins/dns/dns_packet.h index da5ddfa64fe..13daf7849de 100644 --- a/src/plugins/dns/dns_packet.h +++ b/src/plugins/dns/dns_packet.h @@ -20,7 +20,6 @@ * DNS packet header format */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { u16 id; /**< transaction ID */ u16 flags; /**< flags */ @@ -29,7 +28,6 @@ typedef CLIB_PACKED (struct { u16 nscount; /**< number of name servers */ u16 arcount; /**< number of additional records */ }) dns_header_t; -/* *INDENT-ON* */ #define DNS_RCODE_MASK (0xf) #define DNS_RCODE_NO_ERROR 0 @@ -99,17 +97,14 @@ typedef CLIB_PACKED (struct { /** * DNS "question" fixed header. */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { u16 type; /**< record type requested */ u16 class; /**< class, 1 = internet */ }) dns_query_t; -/* *INDENT-ON* */ /** * DNS RR fixed header. */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { u16 type; /**< record type */ u16 class; /**< class, 1 = internet */ @@ -118,7 +113,6 @@ typedef CLIB_PACKED (struct { /**< length of r */ u8 rdata[0]; }) dns_rr_t; -/* *INDENT-ON* */ /* * There are quite a number of DNS record types diff --git a/src/plugins/dns/reply_node.c b/src/plugins/dns/reply_node.c index b15943a6448..cc9f6065474 100644 --- a/src/plugins/dns/reply_node.c +++ b/src/plugins/dns/reply_node.c @@ -200,7 +200,6 @@ dns46_reply_node_fn (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dns46_reply_node) = { .function = dns46_reply_node_fn, @@ -216,7 +215,6 @@ VLIB_REGISTER_NODE (dns46_reply_node) = [DNS46_REPLY_NEXT_PUNT] = "error-punt", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/dns/request_node.c b/src/plugins/dns/request_node.c index 9e76a56f961..13ebc4c2c13 100644 --- a/src/plugins/dns/request_node.c +++ b/src/plugins/dns/request_node.c @@ -288,7 +288,6 @@ dns4_request_node_fn (vlib_main_t * vm, return dns46_request_inline (vm, node, frame, 0 /* is_ip6 */ ); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dns4_request_node) = { .function = dns4_request_node_fn, @@ -305,7 +304,6 @@ VLIB_REGISTER_NODE (dns4_request_node) = [DNS46_REQUEST_NEXT_IP_LOOKUP] = "ip4-lookup", }, }; -/* *INDENT-ON* */ static uword dns6_request_node_fn (vlib_main_t * vm, @@ -315,7 +313,6 @@ dns6_request_node_fn (vlib_main_t * vm, return dns46_request_inline (vm, node, frame, 1 /* is_ip6 */ ); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dns6_request_node) = { .function = dns6_request_node_fn, @@ -332,7 +329,6 @@ VLIB_REGISTER_NODE (dns6_request_node) = [DNS46_REQUEST_NEXT_IP_LOOKUP] = "ip6-lookup", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/dpdk/buffer.c b/src/plugins/dpdk/buffer.c index 2379a9aa7d0..f3137a996d6 100644 --- a/src/plugins/dpdk/buffer.c +++ b/src/plugins/dpdk/buffer.c @@ -460,11 +460,9 @@ dpdk_buffer_pools_create (vlib_main_t * vm) ops.dequeue = dpdk_ops_vpp_dequeue_no_cache; rte_mempool_register_ops (&ops); - /* *INDENT-OFF* */ vec_foreach (bp, vm->buffer_main->buffer_pools) if (bp->start && (err = dpdk_buffer_pool_init (vm, bp))) return err; - /* *INDENT-ON* */ return 0; } diff --git a/src/plugins/dpdk/device/cli.c b/src/plugins/dpdk/device/cli.c index af522a56198..c838800deb4 100644 --- a/src/plugins/dpdk/device/cli.c +++ b/src/plugins/dpdk/device/cli.c @@ -77,14 +77,12 @@ show_dpdk_buffer (vlib_main_t * vm, unformat_input_t * input, * name="mbuf_pool_socket0" available = 15104 allocated = 1280 total = 16384 * @cliexend ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cmd_show_dpdk_buffer,static) = { .path = "show dpdk buffer", .short_help = "show dpdk buffer", .function = show_dpdk_buffer, .is_mp_safe = 1, }; -/* *INDENT-ON* */ static clib_error_t * show_dpdk_physmem (vlib_main_t * vm, unformat_input_t * input, @@ -162,14 +160,12 @@ error: * @cliexstart{show dpdk physmem} * @cliexend ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cmd_show_dpdk_physmem,static) = { .path = "show dpdk physmem", .short_help = "show dpdk physmem", .function = show_dpdk_physmem, .is_mp_safe = 1, }; -/* *INDENT-ON* */ static clib_error_t * test_dpdk_buffer (vlib_main_t * vm, unformat_input_t * input, @@ -250,14 +246,12 @@ test_dpdk_buffer (vlib_main_t * vm, unformat_input_t * input, * @cliexend * @endparblock ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cmd_test_dpdk_buffer,static) = { .path = "test dpdk buffer", .short_help = "test dpdk buffer [allocate <nn>] [free <nn>]", .function = test_dpdk_buffer, .is_mp_safe = 1, }; -/* *INDENT-ON* */ static clib_error_t * set_dpdk_if_desc (vlib_main_t * vm, unformat_input_t * input, @@ -336,13 +330,11 @@ done: * Example of how to set the DPDK interface descriptors: * @cliexcmd{set dpdk interface descriptors GigabitEthernet0/8/0 rx 512 tx 512} ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cmd_set_dpdk_if_desc,static) = { .path = "set dpdk interface descriptors", .short_help = "set dpdk interface descriptors <interface> [rx <nn>] [tx <nn>]", .function = set_dpdk_if_desc, }; -/* *INDENT-ON* */ static clib_error_t * show_dpdk_version_command_fn (vlib_main_t * vm, @@ -368,13 +360,11 @@ show_dpdk_version_command_fn (vlib_main_t * vm, * -w 0000:00:08.0 -w 0000:00:09.0 * @cliexend ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_vpe_version_command, static) = { .path = "show dpdk version", .short_help = "show dpdk version", .function = show_dpdk_version_command_fn, }; -/* *INDENT-ON* */ /* Dummy function to get us linked in. */ void diff --git a/src/plugins/dpdk/device/device.c b/src/plugins/dpdk/device/device.c index 1d97eee8055..0ba59562838 100644 --- a/src/plugins/dpdk/device/device.c +++ b/src/plugins/dpdk/device/device.c @@ -624,7 +624,6 @@ dpdk_interface_set_rss_queues (struct vnet_main_t *vnm, clib_memset (reta, 0, dev_info.reta_size * sizeof (*reta)); valid_queue_count = 0; - /* *INDENT-OFF* */ clib_bitmap_foreach (i, bitmap) { if (i >= dev_info.nb_rx_queues) { @@ -633,7 +632,6 @@ dpdk_interface_set_rss_queues (struct vnet_main_t *vnm, } reta[valid_queue_count++] = i; } - /* *INDENT-ON* */ /* check valid_queue_count not zero, make coverity happy */ if (valid_queue_count == 0) @@ -723,7 +721,6 @@ dpdk_interface_rx_mode_change (vnet_main_t *vnm, u32 hw_if_index, u32 qid, return 0; } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (dpdk_device_class) = { .name = "dpdk", .tx_function_n_errors = DPDK_TX_FUNC_N_ERROR, @@ -742,7 +739,6 @@ VNET_DEVICE_CLASS (dpdk_device_class) = { .set_rss_queues_function = dpdk_interface_set_rss_queues, .rx_mode_change_function = dpdk_interface_rx_mode_change, }; -/* *INDENT-ON* */ #define UP_DOWN_FLAG_EVENT 1 @@ -789,14 +785,12 @@ admin_up_down_process (vlib_main_t * vm, return 0; /* or not */ } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (admin_up_down_process_node) = { .function = admin_up_down_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "admin-up-down-process", .process_log2_n_stack_bytes = 17, // 256KB }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/dpdk/device/format.c b/src/plugins/dpdk/device/format.c index 0e612c60405..c4170c20329 100644 --- a/src/plugins/dpdk/device/format.c +++ b/src/plugins/dpdk/device/format.c @@ -565,7 +565,6 @@ format_dpdk_device (u8 * s, va_list * args) if (ret >= 0 && ret <= len) { - /* *INDENT-OFF* */ vec_foreach_index(i, xd->xstats) { xstat = vec_elt_at_index(xd->xstats, i); @@ -577,7 +576,6 @@ format_dpdk_device (u8 * s, va_list * args) xstat->value); } } - /* *INDENT-ON* */ vec_free (xstat_names); } diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index 2da0258ca06..d15cfd7233a 100644 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -548,7 +548,6 @@ dpdk_bind_devices_to_uio (dpdk_config_main_t * conf) int i; addrs = vlib_pci_get_all_dev_addrs (); - /* *INDENT-OFF* */ vec_foreach (addr, addrs) { dpdk_device_config_t * devconf = 0; @@ -734,7 +733,6 @@ dpdk_bind_devices_to_uio (dpdk_config_main_t * conf) clib_error_report (error); } } - /* *INDENT-ON* */ vec_free (pci_addr); vlib_pci_free_device_info (d); } @@ -749,7 +747,6 @@ dpdk_bind_vmbus_devices_to_uio (dpdk_config_main_t * conf) addrs = vlib_vmbus_get_all_dev_addrs (); - /* *INDENT-OFF* */ vec_foreach (addr, addrs) { dpdk_device_config_t *devconf = 0; @@ -814,7 +811,6 @@ dpdk_bind_vmbus_devices_to_uio (dpdk_config_main_t * conf) clib_error_report (error); } } - /* *INDENT-ON* */ } uword @@ -1254,7 +1250,6 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) default_hugepage_sz = clib_mem_get_default_hugepage_size (); - /* *INDENT-OFF* */ clib_bitmap_foreach (x, tm->cpu_socket_bitmap) { clib_error_t *e; @@ -1267,7 +1262,6 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) if ((e = clib_sysfs_prealloc_hugepages(x, 0, n_pages))) clib_error_report (e); } - /* *INDENT-ON* */ } /* on/off dpdk's telemetry thread */ @@ -1569,14 +1563,12 @@ dpdk_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dpdk_process_node,static) = { .function = dpdk_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "dpdk-process", .process_log2_n_stack_bytes = 17, }; -/* *INDENT-ON* */ static clib_error_t * dpdk_init (vlib_main_t * vm) diff --git a/src/plugins/dpdk/device/node.c b/src/plugins/dpdk/device/node.c index 045b3ff1ce6..ca1690b708f 100644 --- a/src/plugins/dpdk/device/node.c +++ b/src/plugins/dpdk/device/node.c @@ -560,7 +560,6 @@ VLIB_NODE_FN (dpdk_input_node) (vlib_main_t * vm, vlib_node_runtime_t * node, return n_rx_packets; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dpdk_input_node) = { .type = VLIB_NODE_TYPE_INPUT, .name = "dpdk-input", @@ -576,7 +575,6 @@ VLIB_REGISTER_NODE (dpdk_input_node) = { .n_errors = DPDK_N_ERROR, .error_strings = dpdk_error_strings, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/dpdk/main.c b/src/plugins/dpdk/main.c index ec0e8fb7ffe..47007219482 100644 --- a/src/plugins/dpdk/main.c +++ b/src/plugins/dpdk/main.c @@ -87,7 +87,6 @@ static clib_error_t * dpdk_main_init (vlib_main_t * vm) return error; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (dpdk_main_init) = { .runs_after = VLIB_INITS("dpdk_init"), @@ -97,4 +96,3 @@ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Data Plane Development Kit (DPDK)", }; -/* *INDENT-ON* */ diff --git a/src/plugins/flowprobe/flowprobe.c b/src/plugins/flowprobe/flowprobe.c index 30521b5a0ca..58a7cfe22f1 100644 --- a/src/plugins/flowprobe/flowprobe.c +++ b/src/plugins/flowprobe/flowprobe.c @@ -45,7 +45,6 @@ uword flowprobe_walker_process (vlib_main_t * vm, vlib_node_runtime_t * rt, #include <vlibapi/api_helper_macros.h> /* Define the per-interface configurable features */ -/* *INDENT-OFF* */ VNET_FEATURE_INIT (flowprobe_input_ip4_unicast, static) = { .arc_name = "ip4-unicast", .node_name = "flowprobe-input-ip4", @@ -88,7 +87,6 @@ VNET_FEATURE_INIT (flowprobe_output_l2, static) = { .node_name = "flowprobe-output-l2", .runs_before = VNET_FEATURES ("interface-output-arc-end"), }; -/* *INDENT-ON* */ #define FINISH \ vec_add1 (s, 0); \ @@ -1026,12 +1024,10 @@ vl_api_flowprobe_get_params_t_handler (vl_api_flowprobe_get_params_t *mp) // clang-format on } -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Flow per Packet", }; -/* *INDENT-ON* */ u8 * format_flowprobe_direction (u8 *s, va_list *args) @@ -1115,14 +1111,12 @@ flowprobe_show_table_fn (vlib_main_t * vm, for (i = 0; i < vec_len (fm->pool_per_worker); i++) { - /* *INDENT-OFF* */ pool_foreach (e, fm->pool_per_worker[i]) { vlib_cli_output (vm, "%U", format_flowprobe_entry, e); } - /* *INDENT-ON* */ } return 0; @@ -1324,7 +1318,6 @@ flowprobe_show_params_command_fn (vlib_main_t * vm, * @cliexend * @endparblock ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (flowprobe_enable_disable_command, static) = { .path = "flowprobe feature add-del", .short_help = "flowprobe feature add-del <interface-name> [(l2|ip4|ip6)] " @@ -1360,7 +1353,6 @@ VLIB_CLI_COMMAND (flowprobe_show_stats_command, static) = { .short_help = "show flowprobe statistics", .function = flowprobe_show_stats_fn, }; -/* *INDENT-ON* */ /* * Main-core process, sending an interrupt to the per worker input @@ -1414,13 +1406,11 @@ timer_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) return 0; /* or not */ } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (flowprobe_timer_node,static) = { .function = timer_process, .name = "flowprobe-timer-process", .type = VLIB_NODE_TYPE_PROCESS, }; -/* *INDENT-ON* */ #include <flowprobe/flowprobe.api.c> diff --git a/src/plugins/flowprobe/flowprobe.h b/src/plugins/flowprobe/flowprobe.h index 0a70303b470..1fde5f94491 100644 --- a/src/plugins/flowprobe/flowprobe.h +++ b/src/plugins/flowprobe/flowprobe.h @@ -42,7 +42,6 @@ typedef enum FLOW_N_RECORDS = 1 << 5, } flowprobe_record_t; -/* *INDENT-OFF* */ typedef enum __attribute__ ((__packed__)) { FLOW_VARIANT_IP4 = 0, @@ -59,7 +58,6 @@ typedef enum __attribute__ ((__packed__)) FLOW_DIRECTION_TX, FLOW_DIRECTION_BOTH, } flowprobe_direction_t; -/* *INDENT-ON* */ STATIC_ASSERT (sizeof (flowprobe_variant_t) == 1, "flowprobe_variant_t is expected to be 1 byte, " @@ -79,7 +77,6 @@ typedef struct u16 *next_record_offset_per_worker; } flowprobe_protocol_context_t; -/* *INDENT-OFF* */ typedef struct __attribute__ ((aligned (8))) { u32 rx_sw_if_index; u32 tx_sw_if_index; @@ -94,7 +91,6 @@ typedef struct __attribute__ ((aligned (8))) { flowprobe_variant_t which; flowprobe_direction_t direction; } flowprobe_key_t; -/* *INDENT-ON* */ typedef struct { @@ -142,9 +138,7 @@ typedef struct u8 ht_log2len; /* Hash table size is 2^log2len */ u32 **hash_per_worker; flowprobe_entry_t **pool_per_worker; - /* *INDENT-OFF* */ TWT (tw_timer_wheel) ** timers_per_worker; - /* *INDENT-ON* */ u32 **expired_passive_per_worker; flowprobe_record_t record; diff --git a/src/plugins/flowprobe/node.c b/src/plugins/flowprobe/node.c index cf03449e13a..03511689dda 100644 --- a/src/plugins/flowprobe/node.c +++ b/src/plugins/flowprobe/node.c @@ -392,9 +392,7 @@ add_to_flow_record_state (vlib_main_t *vm, vlib_node_runtime_t *node, ethernet_buffer_get_header (b); u16 ethertype = clib_net_to_host_u16 (eth->type); i16 l3_hdr_offset = (u8 *) eth - b->data + sizeof (ethernet_header_t); - /* *INDENT-OFF* */ flowprobe_key_t k = {}; - /* *INDENT-ON* */ ip4_header_t *ip4 = 0; ip6_header_t *ip6 = 0; udp_header_t *udp = 0; @@ -1130,7 +1128,6 @@ flowprobe_flush_l2 (vlib_main_t *vm, vlib_node_runtime_t *rt, vlib_frame_t *f) return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (flowprobe_input_ip4_node) = { .function = flowprobe_input_ip4_node_fn, .name = "flowprobe-input-ip4", @@ -1221,7 +1218,6 @@ VLIB_REGISTER_NODE (flowprobe_flush_l2_node) = { .type = VLIB_NODE_TYPE_INPUT, .state = VLIB_NODE_STATE_INTERRUPT, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/geneve/decap.c b/src/plugins/geneve/decap.c index bd189913f71..c64121e2829 100644 --- a/src/plugins/geneve/decap.c +++ b/src/plugins/geneve/decap.c @@ -812,7 +812,6 @@ static char *geneve_error_strings[] = { #undef _ }; -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (geneve4_input_node) = { .name = "geneve4-input", /* Takes a vector of packets. */ @@ -847,7 +846,6 @@ VLIB_REGISTER_NODE (geneve6_input_node) = { .format_trace = format_geneve_rx_trace, // $$$$ .unformat_buffer = unformat_geneve_header, }; -/* *INDENT-ON* */ typedef enum { @@ -1252,7 +1250,6 @@ VLIB_NODE_FN (ip4_geneve_bypass_node) (vlib_main_t * vm, return ip_geneve_bypass_inline (vm, node, frame, /* is_ip4 */ 1); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (ip4_geneve_bypass_node) = { .name = "ip4-geneve-bypass", @@ -1265,7 +1262,6 @@ VLIB_REGISTER_NODE (ip4_geneve_bypass_node) = .format_buffer = format_ip4_header, .format_trace = format_ip4_forward_next_trace, }; -/* *INDENT-ON* */ VLIB_NODE_FN (ip6_geneve_bypass_node) (vlib_main_t * vm, vlib_node_runtime_t * node, @@ -1274,7 +1270,6 @@ VLIB_NODE_FN (ip6_geneve_bypass_node) (vlib_main_t * vm, return ip_geneve_bypass_inline (vm, node, frame, /* is_ip4 */ 0); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (ip6_geneve_bypass_node) = { .name = "ip6-geneve-bypass", @@ -1288,7 +1283,6 @@ VLIB_REGISTER_NODE (ip6_geneve_bypass_node) = .format_buffer = format_ip6_header, .format_trace = format_ip6_forward_next_trace, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/geneve/encap.c b/src/plugins/geneve/encap.c index 6a84d0c5490..609da2218cf 100644 --- a/src/plugins/geneve/encap.c +++ b/src/plugins/geneve/encap.c @@ -544,7 +544,6 @@ VLIB_NODE_FN (geneve6_encap_node) (vlib_main_t * vm, return geneve_encap_inline (vm, node, from_frame, /* is_ip4 */ 0); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (geneve4_encap_node) = { .name = "geneve4-encap", .vector_size = sizeof (u32), @@ -570,7 +569,6 @@ VLIB_REGISTER_NODE (geneve6_encap_node) = { [GENEVE_ENCAP_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/geneve/geneve.c b/src/plugins/geneve/geneve.c index 2bdd1627564..37b83d01761 100644 --- a/src/plugins/geneve/geneve.c +++ b/src/plugins/geneve/geneve.c @@ -114,7 +114,6 @@ geneve_mac_change (vnet_hw_interface_t * hi, return (NULL); } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (geneve_device_class, static) = { .name = "GENEVE", .format_device_name = format_geneve_name, @@ -122,7 +121,6 @@ VNET_DEVICE_CLASS (geneve_device_class, static) = { .admin_up_down_function = geneve_interface_admin_up_down, .mac_addr_change_function = geneve_mac_change, }; -/* *INDENT-ON* */ static u8 * format_geneve_header_with_length (u8 * s, va_list * args) @@ -132,13 +130,11 @@ format_geneve_header_with_length (u8 * s, va_list * args) return s; } -/* *INDENT-OFF* */ VNET_HW_INTERFACE_CLASS (geneve_hw_class) = { .name = "GENEVE", .format_header = format_geneve_header_with_length, .build_rewrite = default_build_rewrite, }; -/* *INDENT-ON* */ static void geneve_tunnel_restack_dpo (geneve_tunnel_t * t) @@ -878,7 +874,6 @@ done: * Example of how to delete a GENEVE Tunnel: * @cliexcmd{create geneve tunnel local 10.0.3.1 remote 10.0.3.3 vni 13 del} ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (create_geneve_tunnel_command, static) = { .path = "create geneve tunnel", .short_help = @@ -887,7 +882,6 @@ VLIB_CLI_COMMAND (create_geneve_tunnel_command, static) = { " [encap-vrf-id <nn>] [decap-next [l2|node <name>]] [l3-mode] [del]", .function = geneve_add_del_tunnel_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * show_geneve_tunnel_command_fn (vlib_main_t * vm, @@ -917,13 +911,11 @@ show_geneve_tunnel_command_fn (vlib_main_t * vm, * [0] local 10.0.3.1 remote 10.0.3.3 vni 13 encap_fib_index 0 sw_if_index 5 decap_next l2 * @cliexend ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_geneve_tunnel_command, static) = { .path = "show geneve tunnel", .short_help = "show geneve tunnel", .function = show_geneve_tunnel_command_fn, }; -/* *INDENT-ON* */ void @@ -1031,13 +1023,11 @@ set_ip4_geneve_bypass (vlib_main_t * vm, * @cliexcmd{set interface ip geneve-bypass GigabitEthernet2/0/0 del} * @endparblock ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_interface_ip_geneve_bypass_command, static) = { .path = "set interface ip geneve-bypass", .function = set_ip4_geneve_bypass, .short_help = "set interface ip geneve-bypass <interface> [del]", }; -/* *INDENT-ON* */ static clib_error_t * set_ip6_geneve_bypass (vlib_main_t * vm, @@ -1088,13 +1078,11 @@ set_ip6_geneve_bypass (vlib_main_t * vm, * @cliexcmd{set interface ip6 geneve-bypass GigabitEthernet2/0/0 del} * @endparblock ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_interface_ip6_geneve_bypass_command, static) = { .path = "set interface ip6 geneve-bypass", .function = set_ip6_geneve_bypass, .short_help = "set interface ip6 geneve-bypass <interface> [del]", }; -/* *INDENT-ON* */ clib_error_t * geneve_init (vlib_main_t * vm) diff --git a/src/plugins/geneve/geneve_api.c b/src/plugins/geneve/geneve_api.c index 5a983948c26..120fab93561 100644 --- a/src/plugins/geneve/geneve_api.c +++ b/src/plugins/geneve/geneve_api.c @@ -97,12 +97,10 @@ static void vl_api_geneve_add_del_tunnel_t_handler rv = vnet_geneve_add_del_tunnel (&a, &sw_if_index); out: - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_GENEVE_ADD_DEL_TUNNEL_REPLY, ({ rmp->sw_if_index = ntohl (sw_if_index); })); - /* *INDENT-ON* */ } static void vl_api_geneve_add_del_tunnel2_t_handler @@ -149,12 +147,10 @@ static void vl_api_geneve_add_del_tunnel2_t_handler rv = vnet_geneve_add_del_tunnel (&a, &sw_if_index); out: - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_GENEVE_ADD_DEL_TUNNEL2_REPLY, ({ rmp->sw_if_index = ntohl (sw_if_index); })); - /* *INDENT-ON* */ } static void send_geneve_tunnel_details @@ -201,12 +197,10 @@ static void vl_api_geneve_tunnel_dump_t_handler if (~0 == sw_if_index) { - /* *INDENT-OFF* */ pool_foreach (t, vxm->tunnels) { send_geneve_tunnel_details(t, reg, mp->context); } - /* *INDENT-ON* */ } else { @@ -249,12 +243,10 @@ VLIB_API_INIT_FUNCTION (geneve_api_hookup); #include <vlib/unix/plugin.h> #include <vpp/app/version.h> -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "GENEVE Tunnels", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/gre/gre.c b/src/plugins/gre/gre.c index a15717475f8..ce11ee9ecb2 100644 --- a/src/plugins/gre/gre.c +++ b/src/plugins/gre/gre.c @@ -666,7 +666,6 @@ VLIB_NODE_FN (gre_erspan_encap_node) return (gre_encap_inline (vm, node, frame, GRE_TUNNEL_TYPE_ERSPAN)); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (gre_teb_encap_node) = { .name = "gre-teb-encap", @@ -693,7 +692,6 @@ VLIB_REGISTER_NODE (gre_erspan_encap_node) = [GRE_ENCAP_NEXT_L2_MIDCHAIN] = "adj-l2-midchain", }, }; -/* *INDENT-ON* */ #ifndef CLIB_MARCH_VARIANT static u8 * @@ -743,7 +741,6 @@ gre_tunnel_desc (u32 sw_if_index, ip46_address_t *src, ip46_address_t *dst, return (0); } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (gre_device_class) = { .name = "GRE tunnel device", .format_device_name = format_gre_tunnel_name, @@ -774,7 +771,6 @@ VNET_HW_INTERFACE_CLASS (mgre_hw_interface_class) = { .update_adjacency = mgre_update_adj, .flags = VNET_HW_INTERFACE_CLASS_FLAG_NBMA, }; -/* *INDENT-ON* */ #endif /* CLIB_MARCH_VARIANT */ static void diff --git a/src/plugins/gre/gre.h b/src/plugins/gre/gre.h index 9e17efcf7ef..ce57454f9b7 100644 --- a/src/plugins/gre/gre.h +++ b/src/plugins/gre/gre.h @@ -293,22 +293,18 @@ typedef struct /** * @brief IPv4 and GRE header. */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { ip4_header_t ip4; gre_header_t gre; }) ip4_and_gre_header_t; -/* *INDENT-ON* */ /** * @brief IPv6 and GRE header. */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { ip6_header_t ip6; gre_header_t gre; }) ip6_and_gre_header_t; -/* *INDENT-ON* */ always_inline gre_protocol_info_t * gre_get_protocol_info (gre_main_t * em, gre_protocol_t protocol) diff --git a/src/plugins/gre/gre_api.c b/src/plugins/gre/gre_api.c index f8e3ea654fc..5149f92fb80 100644 --- a/src/plugins/gre/gre_api.c +++ b/src/plugins/gre/gre_api.c @@ -118,10 +118,8 @@ vl_api_gre_tunnel_add_del_t_handler (vl_api_gre_tunnel_add_del_t *mp) rv = vnet_gre_tunnel_add_del (a, &sw_if_index); out: - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_GRE_TUNNEL_ADD_DEL_REPLY, ({ rmp->sw_if_index = ntohl (sw_if_index); })); - /* *INDENT-ON* */ } static void @@ -129,7 +127,6 @@ send_gre_tunnel_details (gre_tunnel_t *t, vl_api_gre_tunnel_dump_t *mp) { vl_api_gre_tunnel_details_t *rmp; - /* *INDENT-OFF* */ REPLY_MACRO_DETAILS2 ( VL_API_GRE_TUNNEL_DETAILS, ({ ip_address_encode (&t->tunnel_src, IP46_TYPE_ANY, &rmp->tunnel.src); @@ -146,7 +143,6 @@ send_gre_tunnel_details (gre_tunnel_t *t, vl_api_gre_tunnel_dump_t *mp) rmp->tunnel.sw_if_index = htonl (t->sw_if_index); rmp->tunnel.session_id = htons (t->session_id); })); - /* *INDENT-ON* */ } static void @@ -165,12 +161,10 @@ vl_api_gre_tunnel_dump_t_handler (vl_api_gre_tunnel_dump_t *mp) if (~0 == sw_if_index) { - /* *INDENT-OFF* */ pool_foreach (t, gm->tunnels) { send_gre_tunnel_details (t, mp); } - /* *INDENT-ON* */ } else diff --git a/src/plugins/gre/interface.c b/src/plugins/gre/interface.c index 8d93ebd0cf5..bd9a6078502 100644 --- a/src/plugins/gre/interface.c +++ b/src/plugins/gre/interface.c @@ -752,7 +752,6 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (create_gre_tunnel_command, static) = { .path = "create gre tunnel", .short_help = "create gre tunnel src <addr> dst <addr> [instance <n>] " @@ -760,7 +759,6 @@ VLIB_CLI_COMMAND (create_gre_tunnel_command, static) = { "[multipoint]", .function = create_gre_tunnel_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * show_gre_tunnel_command_fn (vlib_main_t *vm, unformat_input_t *input, @@ -783,12 +781,10 @@ show_gre_tunnel_command_fn (vlib_main_t *vm, unformat_input_t *input, if (~0 == ti) { - /* *INDENT-OFF* */ pool_foreach (t, gm->tunnels) { vlib_cli_output (vm, "%U", format_gre_tunnel, t); } - /* *INDENT-ON* */ } else { @@ -800,12 +796,10 @@ show_gre_tunnel_command_fn (vlib_main_t *vm, unformat_input_t *input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_gre_tunnel_command, static) = { .path = "show gre tunnel", .function = show_gre_tunnel_command_fn, }; -/* *INDENT-ON* */ const static teib_vft_t gre_teib_vft = { .nv_added = gre_teib_entry_added, diff --git a/src/plugins/gre/node.c b/src/plugins/gre/node.c index 7ee22c3cb11..5235888cc6f 100644 --- a/src/plugins/gre/node.c +++ b/src/plugins/gre/node.c @@ -434,7 +434,6 @@ static char *gre_error_strings[] = { #undef gre_error }; -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (gre4_input_node) = { .name = "gre4-input", /* Takes a vector of packets. */ @@ -476,7 +475,6 @@ VLIB_REGISTER_NODE (gre6_input_node) = { .format_trace = format_gre_rx_trace, .unformat_buffer = unformat_gre_header, }; -/* *INDENT-ON* */ #ifndef CLIB_MARCH_VARIANT void diff --git a/src/plugins/gtpu/gtpu.c b/src/plugins/gtpu/gtpu.c index 1307794b9e5..a2013c91c3f 100644 --- a/src/plugins/gtpu/gtpu.c +++ b/src/plugins/gtpu/gtpu.c @@ -35,7 +35,6 @@ gtpu_main_t gtpu_main; -/* *INDENT-OFF* */ VNET_FEATURE_INIT (ip4_gtpu_bypass, static) = { .arc_name = "ip4-unicast", .node_name = "ip4-gtpu-bypass", @@ -47,7 +46,6 @@ VNET_FEATURE_INIT (ip6_gtpu_bypass, static) = { .node_name = "ip6-gtpu-bypass", .runs_before = VNET_FEATURES ("ip6-lookup"), }; -/* *INDENT-on* */ u8 * format_gtpu_encap_trace (u8 * s, va_list * args) { @@ -154,14 +152,12 @@ gtpu_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags) return /* no error */ 0; } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (gtpu_device_class,static) = { .name = "GTPU", .format_device_name = format_gtpu_name, .format_tx_trace = format_gtpu_encap_trace, .admin_up_down_function = gtpu_interface_admin_up_down, }; -/* *INDENT-ON* */ static u8 * format_gtpu_header_with_length (u8 * s, va_list * args) @@ -171,7 +167,6 @@ format_gtpu_header_with_length (u8 * s, va_list * args) return s; } -/* *INDENT-OFF* */ VNET_HW_INTERFACE_CLASS (gtpu_hw_class) = { .name = "GTPU", @@ -179,7 +174,6 @@ VNET_HW_INTERFACE_CLASS (gtpu_hw_class) = .build_rewrite = default_build_rewrite, .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P, }; -/* *INDENT-ON* */ static void gtpu_tunnel_restack_dpo (gtpu_tunnel_t * t) @@ -1106,7 +1100,6 @@ done: * @cliexcmd{create gtpu tunnel src 10.0.3.1 dst 10.0.3.3 encap-vrf-id 7 * upd-tteid 55} ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (create_gtpu_tunnel_command, static) = { .path = "create gtpu tunnel", .short_help = @@ -1116,7 +1109,6 @@ VLIB_CLI_COMMAND (create_gtpu_tunnel_command, static) = { " [decap-next [l2|ip4|ip6|node <name>]] [qfi <nn>] [del | upd-tteid <nn>]", .function = gtpu_add_del_tunnel_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * show_gtpu_tunnel_command_fn (vlib_main_t * vm, @@ -1147,13 +1139,11 @@ show_gtpu_tunnel_command_fn (vlib_main_t * vm, sw_if_index 5 decap_next l2 pdu-disabled * @cliexend ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_gtpu_tunnel_command, static) = { .path = "show gtpu tunnel", .short_help = "show gtpu tunnel", .function = show_gtpu_tunnel_command_fn, }; -/* *INDENT-ON* */ void vnet_int_gtpu_bypass_mode (u32 sw_if_index, u8 is_ip6, u8 is_enable) @@ -1259,13 +1249,11 @@ set_ip4_gtpu_bypass (vlib_main_t * vm, * @cliexcmd{set interface ip gtpu-bypass GigabitEthernet2/0/0 del} * @endparblock ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_interface_ip_gtpu_bypass_command, static) = { .path = "set interface ip gtpu-bypass", .function = set_ip4_gtpu_bypass, .short_help = "set interface ip gtpu-bypass <interface> [del]", }; -/* *INDENT-ON* */ static clib_error_t * set_ip6_gtpu_bypass (vlib_main_t * vm, @@ -1316,13 +1304,11 @@ set_ip6_gtpu_bypass (vlib_main_t * vm, * @cliexcmd{set interface ip6 gtpu-bypass GigabitEthernet2/0/0 del} * @endparblock ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_interface_ip6_gtpu_bypass_command, static) = { .path = "set interface ip6 gtpu-bypass", .function = set_ip6_gtpu_bypass, .short_help = "set interface ip6 gtpu-bypass <interface> [del]", }; -/* *INDENT-ON* */ int vnet_gtpu_add_del_rx_flow (u32 hw_if_index, u32 t_index, int is_add) @@ -1445,14 +1431,12 @@ gtpu_offload_command_fn (vlib_main_t * vm, } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (gtpu_offload_command, static) = { .path = "set flow-offload gtpu", .short_help = "set flow-offload gtpu hw <inerface-name> rx <tunnel-name> [del]", .function = gtpu_offload_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * gtpu_forward_command_fn (vlib_main_t *vm, unformat_input_t *input, @@ -1622,12 +1606,10 @@ gtpu_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (gtpu_init); -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "GPRS Tunnelling Protocol, User Data (GTPv1-U)", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/gtpu/gtpu.h b/src/plugins/gtpu/gtpu.h index 0c224ebbfe3..881fbca936a 100644 --- a/src/plugins/gtpu/gtpu.h +++ b/src/plugins/gtpu/gtpu.h @@ -142,7 +142,6 @@ typedef CLIB_PACKED (struct { { \ .as_u64[0] = 0xffffffffb80d0120ull, .as_u64[1] = 0xffffffffffffffffull \ } -/* *INDENT-OFF* */ typedef CLIB_PACKED(struct { ip4_header_t ip4; /* 20 bytes */ @@ -150,9 +149,7 @@ typedef CLIB_PACKED(struct gtpu_header_t gtpu; /* 12 bytes */ gtpu_ext_with_pdu_session_header_t gtpu_ext; /* 4 bytes */ }) ip4_gtpu_header_t; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ typedef CLIB_PACKED(struct { ip6_header_t ip6; /* 40 bytes */ @@ -160,9 +157,7 @@ typedef CLIB_PACKED(struct gtpu_header_t gtpu; /* 12 bytes */ gtpu_ext_with_pdu_session_header_t gtpu_ext; /* 4 bytes */ }) ip6_gtpu_header_t; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { /* @@ -177,9 +172,7 @@ typedef CLIB_PACKED u64 as_u64; }; }) gtpu4_tunnel_key_t; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { /* @@ -189,7 +182,6 @@ typedef CLIB_PACKED ip6_address_t src; u32 teid; }) gtpu6_tunnel_key_t; -/* *INDENT-ON* */ typedef struct { diff --git a/src/plugins/gtpu/gtpu_api.c b/src/plugins/gtpu/gtpu_api.c index 1cc9fab6cd2..4efd9ac3bba 100644 --- a/src/plugins/gtpu/gtpu_api.c +++ b/src/plugins/gtpu/gtpu_api.c @@ -300,12 +300,10 @@ vl_api_gtpu_tunnel_dump_t_handler (vl_api_gtpu_tunnel_dump_t * mp) if (~0 == sw_if_index) { - /* *INDENT-OFF* */ pool_foreach (t, gtm->tunnels) { send_gtpu_tunnel_details(t, reg, mp->context); } - /* *INDENT-ON* */ } else { diff --git a/src/plugins/gtpu/gtpu_decap.c b/src/plugins/gtpu/gtpu_decap.c index 21e38297ccf..093d85ef13c 100644 --- a/src/plugins/gtpu/gtpu_decap.c +++ b/src/plugins/gtpu/gtpu_decap.c @@ -2372,7 +2372,6 @@ VLIB_NODE_FN (gtpu4_flow_input_node) (vlib_main_t * vm, } -/* *INDENT-OFF* */ #ifndef CLIB_MULTIARCH_VARIANT VLIB_REGISTER_NODE (gtpu4_flow_input_node) = { .name = "gtpu4-flow-input", @@ -2393,6 +2392,5 @@ VLIB_REGISTER_NODE (gtpu4_flow_input_node) = { }, }; #endif -/* *INDENT-ON* */ #endif /* CLIB_MARCH_VARIANT */ diff --git a/src/plugins/hs_apps/echo_server.c b/src/plugins/hs_apps/echo_server.c index 50dc03d86bd..0243252434a 100644 --- a/src/plugins/hs_apps/echo_server.c +++ b/src/plugins/hs_apps/echo_server.c @@ -765,7 +765,6 @@ cleanup: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (echo_server_create_command, static) = { .path = "test echo server", .short_help = @@ -775,7 +774,6 @@ VLIB_CLI_COMMAND (echo_server_create_command, static) = { "[uri <tcp://ip/port>]", .function = echo_server_create_command_fn, }; -/* *INDENT-ON* */ clib_error_t * echo_server_main_init (vlib_main_t * vm) diff --git a/src/plugins/hs_apps/hs_apps.c b/src/plugins/hs_apps/hs_apps.c index 5067919cc28..8e991954c7e 100644 --- a/src/plugins/hs_apps/hs_apps.c +++ b/src/plugins/hs_apps/hs_apps.c @@ -17,13 +17,11 @@ #include <vnet/plugin/plugin.h> #include <vpp/app/version.h> -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Host Stack Applications", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/hs_apps/proxy.c b/src/plugins/hs_apps/proxy.c index 1010bf4cfa7..e8fedf921a5 100644 --- a/src/plugins/hs_apps/proxy.c +++ b/src/plugins/hs_apps/proxy.c @@ -661,7 +661,6 @@ active_open_cleanup_callback (session_t * s, session_cleanup_ntf_t ntf) proxy_try_delete_session (s, 1 /* is_active_open */ ); } -/* *INDENT-OFF* */ static session_cb_vft_t active_open_clients = { .session_reset_callback = active_open_reset_callback, .session_connected_callback = active_open_connected_callback, @@ -673,7 +672,6 @@ static session_cb_vft_t active_open_clients = { .fifo_tuning_callback = common_fifo_tuning_callback, .proxy_alloc_session_fifos = active_open_alloc_session_fifos, }; -/* *INDENT-ON* */ static int proxy_server_attach () diff --git a/src/plugins/hs_apps/sapi/vpp_echo.c b/src/plugins/hs_apps/sapi/vpp_echo.c index e07e53d194e..08fd4e175e9 100644 --- a/src/plugins/hs_apps/sapi/vpp_echo.c +++ b/src/plugins/hs_apps/sapi/vpp_echo.c @@ -290,13 +290,11 @@ echo_free_sessions (echo_main_t * em) echo_session_t *s; u32 *session_indexes = 0, *session_index; - /* *INDENT-OFF* */ pool_foreach (s, em->sessions) { if (s->session_state == ECHO_SESSION_STATE_CLOSED) vec_add1 (session_indexes, s->session_index); } - /* *INDENT-ON* */ vec_foreach (session_index, session_indexes) { /* Free session */ @@ -1431,11 +1429,9 @@ main (int argc, char **argv) for (i = 0; i < em->tx_buf_size; i++) em->connect_test_data[i] = i & 0xff; - /* *INDENT-OFF* */ svm_msg_q_ring_cfg_t rc[1] = { {rpc_queue_size, sizeof (echo_rpc_msg_t), 0}, }; - /* *INDENT-ON* */ cfg->consumer_pid = getpid (); cfg->n_rings = 1; cfg->q_nitems = rpc_queue_size; diff --git a/src/plugins/hs_apps/sapi/vpp_echo_proto_quic.c b/src/plugins/hs_apps/sapi/vpp_echo_proto_quic.c index c67b35fd8e6..1b0dbf33e29 100644 --- a/src/plugins/hs_apps/sapi/vpp_echo_proto_quic.c +++ b/src/plugins/hs_apps/sapi/vpp_echo_proto_quic.c @@ -239,7 +239,6 @@ quic_echo_initiate_qsession_close_no_stream (echo_main_t * em) /* Close Quic session without streams */ echo_session_t *s; - /* *INDENT-OFF* */ pool_foreach (s, em->sessions) { if (s->session_type == ECHO_SESSION_TYPE_QUIC) @@ -261,7 +260,6 @@ quic_echo_initiate_qsession_close_no_stream (echo_main_t * em) ECHO_LOG (2,"%U: PASSIVE close", echo_format_session, s); } } - /* *INDENT-ON* */ } static void diff --git a/src/plugins/igmp/igmp.c b/src/plugins/igmp/igmp.c index d66a013e3f9..30f167d483a 100644 --- a/src/plugins/igmp/igmp.c +++ b/src/plugins/igmp/igmp.c @@ -35,7 +35,6 @@ igmp_main_t igmp_main; -/* *INDENT-OFF* */ /* General Query address */ const static mfib_prefix_t mpfx_general_query = { .fp_proto = FIB_PROTOCOL_IP4, @@ -57,7 +56,6 @@ const static mfib_prefix_t mpfx_report = { }, }, }; -/* *INDENT-ON* */ /** * @brief igmp send query (igmp_timer_function_t) @@ -345,7 +343,6 @@ igmp_enable_disable (u32 sw_if_index, u8 enable, igmp_mode_t mode) IGMP_DBG ("%s: %U", (enable ? "Enabled" : "Disabled"), format_vnet_sw_if_index_name, vnet_get_main (), sw_if_index); - /* *INDENT-OFF* */ fib_route_path_t via_itf_path = { .frp_proto = fib_proto_to_dpo (FIB_PROTOCOL_IP4), @@ -365,7 +362,6 @@ igmp_enable_disable (u32 sw_if_index, u8 enable, igmp_mode_t mode) .frp_mitf_flags = MFIB_ITF_FLAG_FORWARD, }; - /* *INDENT-ON* */ /* find configuration, if it doesn't exist, create new */ config = igmp_config_lookup (sw_if_index); mfib_index = mfib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4, @@ -488,7 +484,6 @@ igmp_init (vlib_main_t * vm) return (0); } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (igmp_init) = { .runs_after = VLIB_INITS("ip4_lookup_init"), @@ -498,7 +493,6 @@ VLIB_PLUGIN_REGISTER () = .version = VPP_BUILD_VER, .description = "Internet Group Management Protocol (IGMP)", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/igmp/igmp_api.c b/src/plugins/igmp/igmp_api.c index a4746ab5c5b..3f743d8fee1 100644 --- a/src/plugins/igmp/igmp_api.c +++ b/src/plugins/igmp/igmp_api.c @@ -154,7 +154,6 @@ igmp_config_dump (igmp_main_t * im, igmp_group_t *group; igmp_src_t *src; - /* *INDENT-OFF* */ FOR_EACH_GROUP (group, config, ({ FOR_EACH_SRC (src, group, IGMP_FILTER_MODE_INCLUDE, @@ -162,7 +161,6 @@ igmp_config_dump (igmp_main_t * im, send_igmp_details (rp, im, config, group, src, context); })); })); - /* *INDENT-ON* */ } static void @@ -180,12 +178,10 @@ vl_api_igmp_dump_t_handler (vl_api_igmp_dump_t * mp) sw_if_index = ntohl (mp->sw_if_index); if (~0 == sw_if_index) { - /* *INDENT-OFF* */ pool_foreach (config, im->configs) { igmp_config_dump(im, rp, mp->context, config); } - /* *INDENT-ON* */ } else { @@ -401,14 +397,12 @@ igmp_event (igmp_filter_mode_t filter, vnet_get_main (), sw_if_index, format_igmp_filter_mode, filter); - /* *INDENT-OFF* */ pool_foreach (api_client, im->api_clients) { rp = vl_api_client_index_to_registration (api_client->client_index); if (rp) send_igmp_event (rp, filter, sw_if_index, saddr, gaddr); } - /* *INDENT-ON* */ } /* Set up the API message handling tables */ diff --git a/src/plugins/igmp/igmp_cli.c b/src/plugins/igmp/igmp_cli.c index f84cdaf50f7..713f4c31bfb 100644 --- a/src/plugins/igmp/igmp_cli.c +++ b/src/plugins/igmp/igmp_cli.c @@ -69,13 +69,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (igmp_clear_interface_command, static) = { .path = "clear igmp", .short_help = "clear igmp int <interface>", .function = igmp_clear_interface_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * igmp_listen_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -150,14 +148,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (igmp_listen_command, static) = { .path = "igmp listen", .short_help = "igmp listen [<enable|disable>] " "int <interface> saddr <ip4-address> gaddr <ip4-address>", .function = igmp_listen_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * igmp_enable_cli (vlib_main_t * vm, @@ -211,13 +207,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (igmp_enable_command, static) = { .path = "igmp", .short_help = "igmp <enable|disable> <host|router> <interface>", .function = igmp_enable_cli, }; -/* *INDENT-ON* */ static clib_error_t * igmp_proxy_device_add_del_command_fn (vlib_main_t * vm, @@ -275,13 +269,11 @@ done: unformat_free (line_input); return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (igmp_proxy_device_add_del_command, static) = { .path = "igmp proxy-dev", .short_help = "igmp proxy-dev <add|del> vrf-id <table-id> <interface>", .function = igmp_proxy_device_add_del_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * igmp_proxy_device_add_del_interface_command_fn (vlib_main_t * vm, @@ -339,13 +331,11 @@ done: unformat_free (line_input); return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (igmp_proxy_device_add_del_interface_command, static) = { .path = "igmp proxy-dev itf", .short_help = "igmp proxy-dev itf <add|del> vrf-id <table-id> <interface>", .function = igmp_proxy_device_add_del_interface_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * igmp_show_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -355,23 +345,19 @@ igmp_show_command_fn (vlib_main_t * vm, unformat_input_t * input, igmp_main_t *im = &igmp_main; igmp_config_t *config; - /* *INDENT-OFF* */ pool_foreach (config, im->configs) { vlib_cli_output (vm, "%U", format_igmp_config, config); } - /* *INDENT-ON* */ return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (igmp_show_command, static) = { .path = "show igmp config", .short_help = "show igmp config", .function = igmp_show_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * igmp_show_timers_command_fn (vlib_main_t * vm, @@ -384,13 +370,11 @@ igmp_show_timers_command_fn (vlib_main_t * vm, return (NULL); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (igmp_show_timers_command, static) = { .path = "show igmp timers", .short_help = "show igmp timers", .function = igmp_show_timers_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * test_igmp_command_fn (vlib_main_t * vm, @@ -414,13 +398,11 @@ test_igmp_command_fn (vlib_main_t * vm, return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_igmp_command, static) = { .path = "test igmp timers", .short_help = "Change the default values for IGMP timers - only sensible during unit tests", .function = test_igmp_command_fn, }; -/* *INDENT-ON* */ clib_error_t * diff --git a/src/plugins/igmp/igmp_config.c b/src/plugins/igmp/igmp_config.c index 7637adba5bf..288d9c87222 100644 --- a/src/plugins/igmp/igmp_config.c +++ b/src/plugins/igmp/igmp_config.c @@ -28,12 +28,10 @@ igmp_clear_config (igmp_config_t * config) format_vnet_sw_if_index_name, vnet_get_main (), config->sw_if_index); - /* *INDENT-OFF* */ FOR_EACH_GROUP (group, config, ({ igmp_group_clear (&group); })); - /* *INDENT-ON* */ for (ii = 0; ii < IGMP_CONFIG_N_TIMERS; ii++) { @@ -125,12 +123,10 @@ format_igmp_config (u8 * s, va_list * args) format_igmp_timer_id, config->timers[ii]); } - /* *INDENT-OFF* */ FOR_EACH_GROUP (group, config, ({ s = format (s, "\n%U", format_igmp_group, group, 4); })); - /* *INDENT-ON* */ return (s); } diff --git a/src/plugins/igmp/igmp_group.c b/src/plugins/igmp/igmp_group.c index eec4c9b8f81..be3d997cbeb 100644 --- a/src/plugins/igmp/igmp_group.c +++ b/src/plugins/igmp/igmp_group.c @@ -23,12 +23,10 @@ igmp_group_free_all_srcs (igmp_group_t * group) { igmp_src_t *src; - /* *INDENT-OFF* */ FOR_EACH_SRC (src, group, IGMP_FILTER_MODE_INCLUDE, ({ igmp_src_free(src); })); - /* *INDENT-ON* */ hash_free (group->igmp_src_by_key[IGMP_FILTER_MODE_INCLUDE]); hash_free (group->igmp_src_by_key[IGMP_FILTER_MODE_EXCLUDE]); @@ -152,7 +150,6 @@ igmp_group_present_minus_new (igmp_group_t * group, pmn = NULL; - /* *INDENT-OFF* */ if (0 == vec_len(saddrs)) { FOR_EACH_SRC(src, group, mode, @@ -178,7 +175,6 @@ igmp_group_present_minus_new (igmp_group_t * group, vec_add1(pmn, *src->key); })); } - /* *INDENT-ON* */ return (pmn); } @@ -198,7 +194,6 @@ igmp_group_new_minus_present (igmp_group_t * group, npm = NULL; - /* *INDENT-OFF* */ vec_foreach(s1, saddrs) { found = 0; @@ -214,7 +209,6 @@ igmp_group_new_minus_present (igmp_group_t * group, if (!found) vec_add1(npm, *s1); } - /* *INDENT-ON* */ return (npm); } @@ -230,7 +224,6 @@ igmp_group_new_intersect_present (igmp_group_t * group, intersect = NULL; - /* *INDENT-OFF* */ FOR_EACH_SRC(src, group, mode, ({ vec_foreach(s1, saddrs) @@ -242,7 +235,6 @@ igmp_group_new_intersect_present (igmp_group_t * group, } } })); - /* *INDENT-ON* */ return (intersect); } @@ -311,12 +303,10 @@ format_igmp_group (u8 * s, va_list * args) format_igmp_group_timer_type, ii, format_igmp_timer_id, group->timers[ii]); - /* *INDENT-OFF* */ FOR_EACH_SRC (src, group, IGMP_FILTER_MODE_INCLUDE, ({ s = format (s, "\n%U", format_igmp_src, src, indent+4); })); - /* *INDENT-ON* */ return (s); } diff --git a/src/plugins/igmp/igmp_input.c b/src/plugins/igmp/igmp_input.c index 1858a1b4d66..012c22399de 100644 --- a/src/plugins/igmp/igmp_input.c +++ b/src/plugins/igmp/igmp_input.c @@ -219,7 +219,6 @@ igmp_input (vlib_main_t * vm, vlib_node_runtime_t * node, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (igmp_input_node) = { .function = igmp_input, @@ -239,7 +238,6 @@ VLIB_REGISTER_NODE (igmp_input_node) = [IGMP_INPUT_NEXT_PARSE_REPORT] = "igmp-parse-report", } }; -/* *INDENT-ON* */ static uword igmp_parse_query (vlib_main_t * vm, vlib_node_runtime_t * node, @@ -325,7 +323,6 @@ igmp_parse_query (vlib_main_t * vm, vlib_node_runtime_t * node, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (igmp_parse_query_node) = { .function = igmp_parse_query, @@ -343,7 +340,6 @@ VLIB_REGISTER_NODE (igmp_parse_query_node) = [IGMP_PARSE_QUERY_NEXT_DROP] = "error-drop", } }; -/* *INDENT-ON* */ static uword igmp_parse_report (vlib_main_t * vm, vlib_node_runtime_t * node, @@ -436,7 +432,6 @@ igmp_parse_report (vlib_main_t * vm, vlib_node_runtime_t * node, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (igmp_parse_report_node) = { .function = igmp_parse_report, @@ -454,7 +449,6 @@ VLIB_REGISTER_NODE (igmp_parse_report_node) = [IGMP_PARSE_REPORT_NEXT_DROP] = "error-drop", } }; -/* *INDENT-ON* */ static clib_error_t * igmp_input_init (vlib_main_t * vm) @@ -466,12 +460,10 @@ igmp_input_init (vlib_main_t * vm) return (0); } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (igmp_input_init) = { .runs_after = VLIB_INITS("igmp_init"), }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/igmp/igmp_pkt.c b/src/plugins/igmp/igmp_pkt.c index c2ce5c71255..7fadeb638a3 100644 --- a/src/plugins/igmp/igmp_pkt.c +++ b/src/plugins/igmp/igmp_pkt.c @@ -329,7 +329,6 @@ igmp_pkt_report_v3_add_report (igmp_pkt_build_report_t * br, if (NULL == igmp_group) return; - /* *INDENT-OFF* */ vec_foreach(s, srcs) { igmp_group = igmp_pkt_report_v3_append_src(br, igmp_group, @@ -337,7 +336,6 @@ igmp_pkt_report_v3_add_report (igmp_pkt_build_report_t * br, if (NULL == igmp_group) return; }; - /* *INDENT-ON* */ igmp_group->n_src_addresses = clib_host_to_net_u16 (br->n_srcs); @@ -378,7 +376,6 @@ igmp_pkt_report_v3_add_group (igmp_pkt_build_report_t * br, igmp_group = igmp_pkt_report_v3_append_group (br, group->key, type); - /* *INDENT-OFF* */ FOR_EACH_SRC (src, group, IGMP_FILTER_MODE_INCLUDE, ({ igmp_group = igmp_pkt_report_v3_append_src(br, igmp_group, @@ -387,7 +384,6 @@ igmp_pkt_report_v3_add_group (igmp_pkt_build_report_t * br, if (NULL == igmp_group) return; })); - /* *INDENT-ON* */ igmp_group->n_src_addresses = clib_host_to_net_u16 (br->n_srcs); IGMP_DBG (" ..add-group: %U srcs:%d", diff --git a/src/plugins/igmp/igmp_proxy.c b/src/plugins/igmp/igmp_proxy.c index 6d930ac791b..bf5e3aafad8 100644 --- a/src/plugins/igmp/igmp_proxy.c +++ b/src/plugins/igmp/igmp_proxy.c @@ -34,7 +34,6 @@ igmp_proxy_device_mfib_path_add_del (igmp_group_t * group, u8 add) mfib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4, config->sw_if_index); - /* *INDENT-OFF* */ mfib_prefix_t mpfx_group_addr = { .fp_proto = FIB_PROTOCOL_IP4, .fp_len = 32, @@ -51,7 +50,6 @@ igmp_proxy_device_mfib_path_add_del (igmp_group_t * group, u8 add) .frp_weight = 1, .frp_mitf_flags = MFIB_ITF_FLAG_FORWARD, }; - /* *INDENT-ON* */ if (add) mfib_table_entry_path_update (mfib_index, &mpfx_group_addr, @@ -346,12 +344,10 @@ igmp_proxy_device_merge_group (igmp_proxy_device_t * proxy_device, igmp_proxy_device_mfib_path_add_del (group, 0); } - /* *INDENT-OFF* */ FOR_EACH_SRC (src, group, group->router_filter_mode, ({ igmp_proxy_device_merge_src (&proxy_group, src, srcaddrs, block); })); - /* *INDENT-ON* */ return proxy_group; } @@ -370,7 +366,6 @@ igmp_proxy_device_merge_config (igmp_config_t * config, u8 block) igmp_pkt_build_report_init (&br, proxy_device->upstream_if); - /* *INDENT-OFF* */ FOR_EACH_GROUP(group, config, ({ proxy_group = igmp_proxy_device_merge_group (proxy_device, group, &srcaddrs, block); @@ -383,7 +378,6 @@ igmp_proxy_device_merge_config (igmp_config_t * config, u8 block) } vec_free (srcaddrs); })); - /* *INDENT-ON* */ igmp_pkt_report_v3_send (&br); diff --git a/src/plugins/igmp/igmp_query.c b/src/plugins/igmp/igmp_query.c index c75b01a295b..c5bf8fca992 100644 --- a/src/plugins/igmp/igmp_query.c +++ b/src/plugins/igmp/igmp_query.c @@ -155,14 +155,12 @@ igmp_send_general_report_v3 (u32 obj, void *data) igmp_pkt_build_report_init (&br, config->sw_if_index); - /* *INDENT-OFF* */ FOR_EACH_GROUP (group, config, ({ igmp_pkt_report_v3_add_group (&br, group, igmp_filter_mode_to_report_type(group->router_filter_mode)); })); - /* *INDENT-ON* */ igmp_pkt_report_v3_send (&br); } diff --git a/src/plugins/igmp/igmp_ssm_range.c b/src/plugins/igmp/igmp_ssm_range.c index c74d312b508..a71741cd5f8 100644 --- a/src/plugins/igmp/igmp_ssm_range.c +++ b/src/plugins/igmp/igmp_ssm_range.c @@ -127,13 +127,11 @@ igmp_ssm_range_show (vlib_main_t * vm, return (NULL); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (igmp_show_timers_command, static) = { .path = "show igmp ssm-ranges", .short_help = "show igmp ssm-ranges", .function = igmp_ssm_range_show, }; -/* *INDENT-ON* */ static clib_error_t * igmp_ssm_range_init (vlib_main_t * vm) @@ -145,12 +143,10 @@ igmp_ssm_range_init (vlib_main_t * vm) return (0); } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (igmp_ssm_range_init) = { .runs_after = VLIB_INITS("igmp_init"), }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/igmp/igmp_timer.c b/src/plugins/igmp/igmp_timer.c index 2d38dd07a99..8abef8e554e 100644 --- a/src/plugins/igmp/igmp_timer.c +++ b/src/plugins/igmp/igmp_timer.c @@ -181,7 +181,6 @@ igmp_timer_process (vlib_main_t * vm, vlib_node_runtime_t * rt, return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (igmp_timer_process_node) = { .function = igmp_timer_process, @@ -189,7 +188,6 @@ VLIB_REGISTER_NODE (igmp_timer_process_node) = .name = "igmp-timer-process", .n_next_nodes = 0, }; -/* *INDENT-ON* */ igmp_timer_id_t igmp_timer_schedule (f64 when, u32 obj, igmp_timer_function_t fn, void *data) diff --git a/src/plugins/ikev2/ikev2.c b/src/plugins/ikev2/ikev2.c index 4ee2f60b085..d559565487e 100644 --- a/src/plugins/ikev2/ikev2.c +++ b/src/plugins/ikev2/ikev2.c @@ -1110,7 +1110,6 @@ ikev2_initial_contact_cleanup_internal (ikev2_main_per_thread_data_t * ptd, ikev2_child_sa_t *c; /* find old IKE SAs with the same authenticated identity */ - /* *INDENT-OFF* */ pool_foreach (tmp, ptd->sas) { if (!ikev2_is_id_equal (&tmp->i_id, &sa->i_id) || !ikev2_is_id_equal(&tmp->r_id, &sa->r_id)) @@ -1119,7 +1118,6 @@ ikev2_initial_contact_cleanup_internal (ikev2_main_per_thread_data_t * ptd, if (sa->rspi != tmp->rspi) vec_add1(delete, tmp - ptd->sas); } - /* *INDENT-ON* */ for (i = 0; i < vec_len (delete); i++) { @@ -1831,7 +1829,6 @@ ikev2_sa_match_ts (ikev2_sa_t * sa) ikev2_ts_t *ts, *p_tsi, *p_tsr, *tsi = 0, *tsr = 0; ikev2_id_t *id_rem, *id_loc; - /* *INDENT-OFF* */ pool_foreach (p, km->profiles) { if (sa->is_initiator) @@ -1874,7 +1871,6 @@ ikev2_sa_match_ts (ikev2_sa_t * sa) break; } - /* *INDENT-ON* */ if (tsi && tsr) { @@ -2486,14 +2482,12 @@ ikev2_del_tunnel_from_main (ikev2_del_ipsec_tunnel_args_t * a) if (~0 == a->sw_if_index) { - /* *INDENT-OFF* */ ipip_tunnel_key_t key = { .src = a->local_ip, .dst = a->remote_ip, .transport = IPIP_TRANSPORT_IP4, .fib_index = 0, }; - /* *INDENT-ON* */ ipip = ipip_tunnel_db_find (&key); @@ -3013,13 +3007,11 @@ ikev2_retransmit_sa_init (ike_header_t * ike, ip_address_t iaddr, u32 res; ikev2_main_per_thread_data_t *ptd = ikev2_get_per_thread_data (); - /* *INDENT-OFF* */ pool_foreach (sa, ptd->sas) { res = ikev2_retransmit_sa_init_one (sa, ike, iaddr, raddr, rlen); if (res) return res; } - /* *INDENT-ON* */ /* req is not retransmit */ return 0; @@ -3766,7 +3758,6 @@ ikev2_ip6 (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) return ikev2_node_internal (vm, node, frame, 0 /* is_ip4 */, 0); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (ikev2_node_ip4,static) = { .function = ikev2_ip4, .name = "ikev2-ip4", @@ -3817,7 +3808,6 @@ VLIB_REGISTER_NODE (ikev2_node_ip6,static) = { [IKEV2_NEXT_IP6_ERROR_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ // set ikev2 proposals when vpp is used as initiator static clib_error_t * @@ -4159,12 +4149,10 @@ ikev2_cleanup_profile_sessions (ikev2_main_t * km, ikev2_profile_t * p) u32 *sai; u32 *del_sai = 0; - /* *INDENT-OFF* */ pool_foreach (sa, km->sais) { if (pi == sa->profile_index) vec_add1 (del_sai, sa - km->sais); } - /* *INDENT-ON* */ vec_foreach (sai, del_sai) { @@ -4177,12 +4165,10 @@ ikev2_cleanup_profile_sessions (ikev2_main_t * km, ikev2_profile_t * p) vec_foreach (tkm, km->per_thread_data) { - /* *INDENT-OFF* */ pool_foreach (sa, tkm->sas) { if (sa->profile_index != ~0 && pi == sa->profile_index) vec_add1 (del_sai, sa - tkm->sas); } - /* *INDENT-ON* */ vec_foreach (sai, del_sai) { @@ -4914,7 +4900,6 @@ ikev2_initiate_delete_child_sa (vlib_main_t * vm, u32 ispi) ikev2_sa_t *sa; if (fchild) break; - /* *INDENT-OFF* */ pool_foreach (sa, tkm->sas) { fchild = ikev2_sa_get_child(sa, ispi, IKEV2_PROTOCOL_ESP, 1); if (fchild) @@ -4923,7 +4908,6 @@ ikev2_initiate_delete_child_sa (vlib_main_t * vm, u32 ispi) break; } } - /* *INDENT-ON* */ } if (!fchild || !fsa) @@ -4954,7 +4938,6 @@ ikev2_initiate_delete_ike_sa (vlib_main_t * vm, u64 ispi) ikev2_sa_t *sa; if (fsa) break; - /* *INDENT-OFF* */ pool_foreach (sa, tkm->sas) { if (sa->ispi == ispi) { @@ -4963,7 +4946,6 @@ ikev2_initiate_delete_ike_sa (vlib_main_t * vm, u64 ispi) break; } } - /* *INDENT-ON* */ } if (!fsa) @@ -5039,7 +5021,6 @@ ikev2_initiate_rekey_child_sa (vlib_main_t * vm, u32 ispi) ikev2_sa_t *sa; if (fchild) break; - /* *INDENT-OFF* */ pool_foreach (sa, tkm->sas) { fchild = ikev2_sa_get_child(sa, ispi, IKEV2_PROTOCOL_ESP, 1); if (fchild) @@ -5048,7 +5029,6 @@ ikev2_initiate_rekey_child_sa (vlib_main_t * vm, u32 ispi) break; } } - /* *INDENT-ON* */ } if (!fchild || !fsa) @@ -5081,12 +5061,10 @@ ikev2_sa_del (ikev2_profile_t * p, u32 sw_if_index) vec_foreach (tkm, km->per_thread_data) { - /* *INDENT-OFF* */ pool_foreach (sa, tkm->sas) { if (ikev2_sa_sw_if_match (sa, sw_if_index)) vec_add1 (sa_vec, sa); } - /* *INDENT-ON* */ vec_foreach (sap, sa_vec) { @@ -5096,12 +5074,10 @@ ikev2_sa_del (ikev2_profile_t * p, u32 sw_if_index) } vec_free (sa_vec); - /* *INDENT-OFF* */ pool_foreach (sa, km->sais) { if (ikev2_sa_sw_if_match (sa, sw_if_index)) vec_add1 (ispi_vec, sa->ispi); } - /* *INDENT-ON* */ vec_foreach (ispi, ispi_vec) { @@ -5120,12 +5096,10 @@ ikev2_sw_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add) if (is_add) return 0; - /* *INDENT-OFF* */ pool_foreach (p, km->profiles) { if (p->responder.sw_if_index == sw_if_index) ikev2_sa_del (p, sw_if_index); } - /* *INDENT-ON* */ return 0; } @@ -5151,11 +5125,9 @@ ikev2_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (ikev2_init) = { .runs_after = VLIB_INITS ("ipsec_init", "ipsec_punt_init"), }; -/* *INDENT-ON* */ static u8 ikev2_mngr_process_child_sa (ikev2_sa_t * sa, ikev2_child_sa_t * csa, @@ -5226,14 +5198,12 @@ ikev2_mngr_process_child_sa (ikev2_sa_t * sa, ikev2_child_sa_t * csa, ip_addr_bytes (&sa->iaddr)); } - /* *INDENT-OFF* */ ipip_tunnel_key_t key = { .src = local_ip, .dst = remote_ip, .transport = IPIP_TRANSPORT_IP4, .fib_index = 0, }; - /* *INDENT-ON* */ ipip = ipip_tunnel_db_find (&key); @@ -5314,7 +5284,6 @@ ikev2_mngr_process_ipsec_sa (ipsec_sa_t * ipsec_sa) ikev2_sa_t *sa; if (fchild) break; - /* *INDENT-OFF* */ pool_foreach (sa, tkm->sas) { fchild = ikev2_sa_get_child(sa, ipsec_sa->spi, IKEV2_PROTOCOL_ESP, 1); if (fchild) @@ -5323,7 +5292,6 @@ ikev2_mngr_process_ipsec_sa (ipsec_sa_t * ipsec_sa) break; } } - /* *INDENT-ON* */ } vlib_get_combined_counter (&ipsec_sa_counters, ipsec_sa->stat_index, &counts); @@ -5421,7 +5389,6 @@ ikev2_process_pending_sa_init (vlib_main_t *vm, ikev2_main_t *km) u64 ispi; ikev2_sa_t *sa; - /* *INDENT-OFF* */ hash_foreach (ispi, sai, km->sa_by_ispi, ({ sa = pool_elt_at_index (km->sais, sai); @@ -5430,7 +5397,6 @@ ikev2_process_pending_sa_init (vlib_main_t *vm, ikev2_main_t *km) ikev2_process_pending_sa_init_one (vm, km, sa); })); - /* *INDENT-ON* */ } static void @@ -5535,7 +5501,6 @@ ikev2_mngr_process_fn (vlib_main_t * vm, vlib_node_runtime_t * rt, ikev2_sa_t *sa; u32 *to_be_deleted = 0; - /* *INDENT-OFF* */ pool_foreach (sa, tkm->sas) { ikev2_child_sa_t *c; u8 del_old_ids = 0; @@ -5596,19 +5561,16 @@ ikev2_mngr_process_fn (vlib_main_t * vm, vlib_node_runtime_t * rt, /* process ipsec sas */ ipsec_sa_t *sa; - /* *INDENT-OFF* */ pool_foreach (sa, ipsec_sa_pool) { ikev2_mngr_process_ipsec_sa (sa); } - /* *INDENT-ON* */ ikev2_process_pending_sa_init (vm, km); } return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (ikev2_mngr_process_node, static) = { .function = ikev2_mngr_process_fn, .type = VLIB_NODE_TYPE_PROCESS, @@ -5670,7 +5632,6 @@ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Internet Key Exchange (IKEv2) Protocol", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/ikev2/ikev2.h b/src/plugins/ikev2/ikev2.h index 020a3f01e5f..9ed0ecc494c 100644 --- a/src/plugins/ikev2/ikev2.h +++ b/src/plugins/ikev2/ikev2.h @@ -32,7 +32,6 @@ typedef u8 v8; -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { u64 ispi; u64 rspi; @@ -42,14 +41,12 @@ typedef CLIB_PACKED (struct { u8 flags; u32 msgid; u32 length; u8 payload[0]; }) ike_header_t; -/* *INDENT-ON* */ #define ike_hdr_is_response(_h) ((_h)->flags & IKEV2_HDR_FLAG_RESPONSE) #define ike_hdr_is_request(_h) (!ike_hdr_is_response(_h)) #define ike_hdr_is_initiator(_h) ((_h)->flags & IKEV2_HDR_FLAG_INITIATOR) #define ike_hdr_is_responder(_h) (!(ike_hdr_is_initiator(_h))) -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { u8 nextpayload; u8 flags; @@ -58,17 +55,13 @@ typedef CLIB_PACKED (struct { u8 reserved[2]; u8 payload[0]; }) ike_ke_payload_header_t; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { u8 nextpayload; u8 flags; u16 length; u8 payload[0]; }) ike_payload_header_t; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { u8 nextpayload; u8 flags; @@ -77,9 +70,7 @@ typedef CLIB_PACKED (struct { u8 reserved[3]; u8 payload[0]; }) ike_auth_payload_header_t; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { u8 nextpayload; u8 flags; @@ -87,7 +78,6 @@ typedef CLIB_PACKED (struct { u8 id_type; u8 reserved[3]; u8 payload[0]; }) ike_id_payload_header_t; -/* *INDENT-ON* */ #define IKE_VERSION_2 0x20 diff --git a/src/plugins/ikev2/ikev2_api.c b/src/plugins/ikev2/ikev2_api.c index 975212d4f92..bb44e9f364f 100644 --- a/src/plugins/ikev2/ikev2_api.c +++ b/src/plugins/ikev2/ikev2_api.c @@ -188,12 +188,10 @@ vl_api_ikev2_profile_dump_t_handler (vl_api_ikev2_profile_dump_t * mp) if (!reg) return; - /* *INDENT-OFF* */ pool_foreach (profile, im->profiles) { send_profile (profile, reg, mp->context); } - /* *INDENT-ON* */ } static void @@ -240,7 +238,6 @@ send_sa (ikev2_sa_t * sa, vl_api_ikev2_sa_dump_t * mp, u32 api_sa_index) int rv = 0; ikev2_sa_transform_t *tr; - /* *INDENT-OFF* */ REPLY_MACRO2_ZERO (VL_API_IKEV2_SA_DETAILS, { vl_api_ikev2_sa_t *rsa = &rmp->sa; @@ -296,7 +293,6 @@ send_sa (ikev2_sa_t * sa, vl_api_ikev2_sa_dump_t * mp, u32 api_sa_index) vl_api_ikev2_sa_t_endian(rsa); }); - /* *INDENT-ON* */ } static void @@ -308,14 +304,12 @@ vl_api_ikev2_sa_dump_t_handler (vl_api_ikev2_sa_dump_t * mp) vec_foreach (tkm, km->per_thread_data) { - /* *INDENT-OFF* */ pool_foreach (sa, tkm->sas) { u32 api_sa_index = ikev2_encode_sa_index (sa - tkm->sas, tkm - km->per_thread_data); send_sa (sa, mp, api_sa_index); } - /* *INDENT-ON* */ } } @@ -419,7 +413,6 @@ send_child_sa (ikev2_child_sa_t * child, int rv = 0; ikev2_sa_transform_t *tr; - /* *INDENT-OFF* */ REPLY_MACRO2_ZERO (VL_API_IKEV2_CHILD_SA_DETAILS, { vl_api_ikev2_keys_t *k = &rmp->child_sa.keys; @@ -464,7 +457,6 @@ send_child_sa (ikev2_child_sa_t * child, vl_api_ikev2_child_sa_t_endian (&rmp->child_sa); }); - /* *INDENT-ON* */ } static void @@ -530,7 +522,6 @@ static void vl_api_ikev2_traffic_selector_details_t *rmp = 0; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2_ZERO (VL_API_IKEV2_TRAFFIC_SELECTOR_DETAILS, { rmp->ts.sa_index = api_sa_index; @@ -538,7 +529,6 @@ static void cp_ts (&rmp->ts, ts, mp->is_initiator); vl_api_ikev2_ts_t_endian (&rmp->ts); }); - /* *INDENT-ON* */ } } @@ -567,13 +557,11 @@ vl_api_ikev2_nonce_get_t_handler (vl_api_ikev2_nonce_get_t * mp) int data_len = vec_len (nonce); int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO3_ZERO (VL_API_IKEV2_NONCE_GET_REPLY, data_len, { rmp->data_len = clib_host_to_net_u32 (data_len); clib_memcpy (rmp->nonce, nonce, data_len); }); - /* *INDENT-ON* */ } static void diff --git a/src/plugins/ikev2/ikev2_cli.c b/src/plugins/ikev2/ikev2_cli.c index e5516f834f4..733ae478b83 100644 --- a/src/plugins/ikev2/ikev2_cli.c +++ b/src/plugins/ikev2/ikev2_cli.c @@ -250,7 +250,6 @@ show_ikev2_sa_command_fn (vlib_main_t * vm, vec_foreach (tkm, km->per_thread_data) { - /* *INDENT-OFF* */ pool_foreach (sa, tkm->sas) { if (show_one) { @@ -263,7 +262,6 @@ show_ikev2_sa_command_fn (vlib_main_t * vm, else s = format (s, "%U\n", format_ikev2_sa, sa, details); } - /* *INDENT-ON* */ } vlib_cli_output (vm, "%v", s); @@ -271,13 +269,11 @@ show_ikev2_sa_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_ikev2_sa_command, static) = { .path = "show ikev2 sa", .short_help = "show ikev2 sa [rspi <rspi>] [details]", .function = show_ikev2_sa_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * ikev2_disable_dpd_command_fn (vlib_main_t * vm, @@ -288,13 +284,11 @@ ikev2_disable_dpd_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (ikev2_cli_disable_dpd_command, static) = { .path = "ikev2 dpd disable", .short_help = "ikev2 dpd disable", .function = ikev2_disable_dpd_command_fn, }; -/* *INDENT-ON* */ static uword unformat_ikev2_token (unformat_input_t * input, va_list * va) @@ -571,7 +565,6 @@ done: return r; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (ikev2_profile_add_del_command, static) = { .path = "ikev2 profile", .short_help = @@ -592,7 +585,6 @@ VLIB_CLI_COMMAND (ikev2_profile_add_del_command, static) = { "ikev2 profile set <id> disable natt\n", .function = ikev2_profile_add_del_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * show_ikev2_profile_command_fn (vlib_main_t * vm, @@ -602,7 +594,6 @@ show_ikev2_profile_command_fn (vlib_main_t * vm, ikev2_main_t *km = &ikev2_main; ikev2_profile_t *p; - /* *INDENT-OFF* */ pool_foreach (p, km->profiles) { vlib_cli_output(vm, "profile %v", p->name); @@ -669,18 +660,15 @@ show_ikev2_profile_command_fn (vlib_main_t * vm, vlib_cli_output(vm, " lifetime %d jitter %d handover %d maxdata %d", p->lifetime, p->lifetime_jitter, p->handover, p->lifetime_maxdata); } - /* *INDENT-ON* */ return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_ikev2_profile_command, static) = { .path = "show ikev2 profile", .short_help = "show ikev2 profile", .function = show_ikev2_profile_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * set_ikev2_liveness_period_fn (vlib_main_t * vm, @@ -713,13 +701,11 @@ done: return r; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_ikev2_liveness_command, static) = { .path = "ikev2 set liveness", .short_help = "ikev2 set liveness <period> <max-retires>", .function = set_ikev2_liveness_period_fn, }; -/* *INDENT-ON* */ static clib_error_t * set_ikev2_local_key_command_fn (vlib_main_t * vm, @@ -753,14 +739,12 @@ done: return r; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_ikev2_local_key_command, static) = { .path = "set ikev2 local key", .short_help = "set ikev2 local key <file>", .function = set_ikev2_local_key_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -811,7 +795,6 @@ done: return r; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (ikev2_initiate_command, static) = { .path = "ikev2 initiate", .short_help = @@ -821,7 +804,6 @@ VLIB_CLI_COMMAND (ikev2_initiate_command, static) = { "ikev2 initiate rekey-child-sa <child sa ispi>\n", .function = ikev2_initiate_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * ikev2_set_log_level_command_fn (vlib_main_t * vm, @@ -851,13 +833,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (ikev2_set_log_level_command, static) = { .path = "ikev2 set logging level", .function = ikev2_set_log_level_command_fn, .short_help = "ikev2 set logging level <0-5>", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/ikev2/ikev2_payload.c b/src/plugins/ikev2/ikev2_payload.c index 689c502d4a3..5801a1b3e87 100644 --- a/src/plugins/ikev2/ikev2_payload.c +++ b/src/plugins/ikev2/ikev2_payload.c @@ -24,7 +24,6 @@ #include <plugins/ikev2/ikev2.h> #include <plugins/ikev2/ikev2_priv.h> -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { u8 nextpayload; u8 flags; @@ -34,9 +33,7 @@ typedef CLIB_PACKED (struct { u16 msg_type; u8 payload[0]; }) ike_notify_payload_header_t; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { ip4_address_t start_addr; ip4_address_t end_addr; @@ -55,9 +52,7 @@ typedef CLIB_PACKED (struct { u16 end_port; u8 addr_pair[0]; }) ikev2_ts_payload_entry_t; -/* *INDENT-OFF* */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { u8 nextpayload; u8 flags; @@ -66,9 +61,7 @@ typedef CLIB_PACKED (struct { u8 reserved[3]; ikev2_ts_payload_entry_t ts[0]; }) ike_ts_payload_header_t; -/* *INDENT-OFF* */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { u8 last_or_more; u8 reserved; @@ -78,9 +71,7 @@ typedef CLIB_PACKED (struct { u8 spi_size; u8 num_transforms; u32 spi[0]; }) ike_sa_proposal_data_t; -/* *INDENT-OFF* */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { u8 last_or_more; u8 reserved; @@ -90,9 +81,7 @@ typedef CLIB_PACKED (struct { u16 transform_id; u8 attributes[0]; }) ike_sa_transform_data_t; -/* *INDENT-OFF* */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { u8 nextpayload; u8 flags; @@ -102,7 +91,6 @@ typedef CLIB_PACKED (struct { u16 num_of_spi; u32 spi[0]; }) ike_delete_payload_header_t; -/* *INDENT-OFF* */ static ike_payload_header_t * ikev2_payload_add_hdr (ikev2_payload_chain_t * c, u8 payload_type, int len) diff --git a/src/plugins/ila/ila.c b/src/plugins/ila/ila.c index 0672ad905fc..02acd84880c 100644 --- a/src/plugins/ila/ila.c +++ b/src/plugins/ila/ila.c @@ -385,7 +385,6 @@ ila_ila2sir (vlib_main_t * vm, return frame->n_vectors; } -/** *INDENT-OFF* */ VLIB_REGISTER_NODE (ila_ila2sir_node, static) = { .function = ila_ila2sir, @@ -400,7 +399,6 @@ VLIB_REGISTER_NODE (ila_ila2sir_node, static) = [ILA_ILA2SIR_NEXT_DROP] = "error-drop" }, }; -/** *INDENT-ON* */ typedef enum { @@ -585,7 +583,6 @@ ila_sir2ila (vlib_main_t * vm, return frame->n_vectors; } -/** *INDENT-OFF* */ VLIB_REGISTER_NODE (ila_sir2ila_node, static) = { .function = ila_sir2ila,.name = "sir-to-ila", @@ -599,16 +596,13 @@ VLIB_REGISTER_NODE (ila_sir2ila_node, static) = [ILA_SIR2ILA_NEXT_DROP] = "error-drop" }, }; -/** *INDENT-ON* */ -/** *INDENT-OFF* */ VNET_FEATURE_INIT (ila_sir2ila, static) = { .arc_name = "ip6-unicast", .node_name = "sir-to-ila", .runs_before = VNET_FEATURES ("ip6-lookup"), }; -/** *INDENT-ON* */ static void ila_entry_stack (ila_entry_t *ie) @@ -826,12 +820,10 @@ ila_interface (u32 sw_if_index, u8 disable) return 0; } -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Identifier Locator Addressing (ILA) for IPv6", }; -/* *INDENT-ON* */ u8 *format_ila_dpo (u8 * s, va_list * va) { diff --git a/src/plugins/ioam/analyse/ioam_summary_export.c b/src/plugins/ioam/analyse/ioam_summary_export.c index 09884fdb019..6856bcc2200 100644 --- a/src/plugins/ioam/analyse/ioam_summary_export.c +++ b/src/plugins/ioam/analyse/ioam_summary_export.c @@ -426,12 +426,10 @@ ioam_flow_report_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (ioam_flow_report_init) = { .runs_after = VLIB_INITS("flow_report_init"), }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/ioam/analyse/ip6/ip6_ioam_analyse.c b/src/plugins/ioam/analyse/ip6/ip6_ioam_analyse.c index 99ba3295d44..9db0485da61 100644 --- a/src/plugins/ioam/analyse/ip6/ip6_ioam_analyse.c +++ b/src/plugins/ioam/analyse/ip6/ip6_ioam_analyse.c @@ -94,13 +94,11 @@ set_ioam_analyse_command_fn (vlib_main_t * vm, unformat_input_t * input, return (ioam_analyse_enable_disable (vm, is_add, is_export, remote_listen)); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_ioam_analyse_command, static) = { .path = "set ioam analyse", .short_help = "set ioam analyse [export-ipfix-collector] [disable] [listen-ipfix]", .function = set_ioam_analyse_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * show_ioam_analyse_cmd_fn (vlib_main_t * vm, unformat_input_t * input, @@ -130,13 +128,11 @@ show_ioam_analyse_cmd_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (ip6_show_ioam_ipfix_cmd, static) = { .path = "show ioam analyse ", .short_help = "show ioam analyser information", .function = show_ioam_analyse_cmd_fn, }; -/* *INDENT-ON* */ static clib_error_t * ioam_analyse_init (vlib_main_t * vm) diff --git a/src/plugins/ioam/analyse/ip6/node.c b/src/plugins/ioam/analyse/ip6/node.c index ef35d0a9134..67895aa6486 100644 --- a/src/plugins/ioam/analyse/ip6/node.c +++ b/src/plugins/ioam/analyse/ip6/node.c @@ -466,7 +466,6 @@ ip6_ioam_analyse_unregister_handlers () ip6_ioam_analyse_unregister_hbh_handler (HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE); } -/* *INDENT-OFF* */ /* * Node for IP6 analyse - packets @@ -507,7 +506,6 @@ VLIB_REGISTER_NODE (analyse_node_remote) = }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/ioam/encap/ip6_ioam_e2e.c b/src/plugins/ioam/encap/ip6_ioam_e2e.c index a3dd048c659..0a811da6105 100644 --- a/src/plugins/ioam/encap/ip6_ioam_e2e.c +++ b/src/plugins/ioam/encap/ip6_ioam_e2e.c @@ -205,9 +205,7 @@ ioam_e2e_init (vlib_main_t * vm) * Init function for the E2E lib. * ip6_hop_by_hop_ioam_e2e_init gets called during init. */ -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (ioam_e2e_init) = { .runs_after = VLIB_INITS("ip6_hop_by_hop_ioam_init"), }; -/* *INDENT-ON* */ diff --git a/src/plugins/ioam/encap/ip6_ioam_e2e.h b/src/plugins/ioam/encap/ip6_ioam_e2e.h index fb83403da8f..f958e17669b 100644 --- a/src/plugins/ioam/encap/ip6_ioam_e2e.h +++ b/src/plugins/ioam/encap/ip6_ioam_e2e.h @@ -19,12 +19,10 @@ #include <ioam/lib-e2e/e2e_util.h> #include "ip6_ioam_seqno.h" -/* *INDENT-OFF* */ typedef CLIB_PACKED(struct { ip6_hop_by_hop_option_t hdr; ioam_e2e_packet_t e2e_hdr; }) ioam_e2e_option_t; -/* *INDENT-ON* */ typedef struct ioam_e2e_data_t_ { u32 flow_ctx; diff --git a/src/plugins/ioam/encap/ip6_ioam_pot.c b/src/plugins/ioam/encap/ip6_ioam_pot.c index 99c21b571a3..54d748455d2 100644 --- a/src/plugins/ioam/encap/ip6_ioam_pot.c +++ b/src/plugins/ioam/encap/ip6_ioam_pot.c @@ -255,9 +255,7 @@ ip6_hop_by_hop_ioam_pot_init (vlib_main_t * vm) return (0); } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (ip6_hop_by_hop_ioam_pot_init) = { .runs_after = VLIB_INITS("ip6_hop_by_hop_ioam_init"), }; -/* *INDENT-OFF* */ diff --git a/src/plugins/ioam/encap/ip6_ioam_pot.h b/src/plugins/ioam/encap/ip6_ioam_pot.h index 01ce4ac590f..ef6f4c7344c 100644 --- a/src/plugins/ioam/encap/ip6_ioam_pot.h +++ b/src/plugins/ioam/encap/ip6_ioam_pot.h @@ -18,7 +18,6 @@ #include <vnet/ip/ip6_hop_by_hop_packet.h> -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { ip6_hop_by_hop_option_t hdr; u8 pot_type; @@ -27,7 +26,6 @@ typedef CLIB_PACKED (struct { u64 random; u64 cumulative; }) ioam_pot_option_t; -/* *INDENT-ON* */ #endif /* PLUGINS_IOAM_PLUGIN_IOAM_ENCAP_IP6_IOAM_POT_H_ */ diff --git a/src/plugins/ioam/encap/ip6_ioam_trace.c b/src/plugins/ioam/encap/ip6_ioam_trace.c index ea496610433..b244af56a6b 100644 --- a/src/plugins/ioam/encap/ip6_ioam_trace.c +++ b/src/plugins/ioam/encap/ip6_ioam_trace.c @@ -399,20 +399,16 @@ ip6_show_ioam_trace_cmd_fn (vlib_main_t * vm, } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (ip6_show_ioam_trace_cmd, static) = { .path = "show ioam trace", .short_help = "iOAM trace statistics", .function = ip6_show_ioam_trace_cmd_fn, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Inbound Operations, Administration, and Maintenance (OAM)", }; -/* *INDENT-ON* */ static clib_error_t * ip6_hop_by_hop_ioam_trace_init (vlib_main_t * vm) @@ -443,13 +439,11 @@ ip6_hop_by_hop_ioam_trace_init (vlib_main_t * vm) return (0); } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (ip6_hop_by_hop_ioam_trace_init) = { .runs_after = VLIB_INITS ("ip_main_init", "ip6_lookup_init", "ip6_hop_by_hop_ioam_init"), }; -/* *INDENT-ON* */ int ip6_trace_profile_cleanup (void) diff --git a/src/plugins/ioam/encap/ip6_ioam_trace.h b/src/plugins/ioam/encap/ip6_ioam_trace.h index 4eda6110d24..25693dfc6cd 100644 --- a/src/plugins/ioam/encap/ip6_ioam_trace.h +++ b/src/plugins/ioam/encap/ip6_ioam_trace.h @@ -21,12 +21,10 @@ #include <vnet/ip/ip6_hop_by_hop_packet.h> #include <ioam/lib-trace/trace_util.h> -/* *INDENT-OFF* */ typedef CLIB_PACKED(struct { ip6_hop_by_hop_option_t hdr; ioam_trace_hdr_t trace_hdr; }) ioam_trace_option_t; -/* *INDENT-ON* */ always_inline void ip6_hbh_ioam_trace_set_bit (ioam_trace_option_t * trace, u8 trace_bit) diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c index f802a049365..1606f72224f 100644 --- a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c +++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c @@ -158,14 +158,12 @@ set_vxlan_gpe_ioam_export_ipfix_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_vxlan_gpe_ioam_ipfix_command, static) = { .path = "set vxlan-gpe-ioam export ipfix", .short_help = "set vxlan-gpe-ioam export ipfix collector <ip4-address> src <ip4-address>", .function = set_vxlan_gpe_ioam_export_ipfix_command_fn, }; -/* *INDENT-ON* */ #include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api.c> static clib_error_t * diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c index 7d66bd45849..5de10ba47f3 100644 --- a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c +++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c @@ -33,14 +33,12 @@ vxlan_gpe_ioam_export_process (vlib_main_t * vm, } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vxlan_gpe_ioam_export_process_node, static) = { .function = vxlan_gpe_ioam_export_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "vxlan-gpe-ioam-export-process", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_node.c b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_node.c index f8d90332d5c..839fd80b443 100644 --- a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_node.c +++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_node.c @@ -144,7 +144,6 @@ vxlan_gpe_export_node_fn (vlib_main_t * vm, /* * Node for VXLAN-GPE export */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vxlan_export_node) = { .function = vxlan_gpe_export_node_fn, @@ -159,7 +158,6 @@ VLIB_REGISTER_NODE (vxlan_export_node) = .next_nodes = {[EXPORT_NEXT_VXLAN_GPE_INPUT] = "vxlan-gpe-pop-ioam-v4"}, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/ioam/export/ioam_export.c b/src/plugins/ioam/export/ioam_export.c index 21695af3368..f38281182c8 100644 --- a/src/plugins/ioam/export/ioam_export.c +++ b/src/plugins/ioam/export/ioam_export.c @@ -137,13 +137,11 @@ set_ioam_export_ipfix_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_ipfix_command, static) = { .path = "set ioam export ipfix",.short_help = "set ioam export ipfix collector <ip4-address> src <ip4-address>",. function = set_ioam_export_ipfix_command_fn,}; -/* *INDENT-ON* */ #include <ioam/export/ioam_export.api.c> static clib_error_t * diff --git a/src/plugins/ioam/ip6/ioam_cache_node.c b/src/plugins/ioam/ip6/ioam_cache_node.c index 6a5465b86aa..9859ee6fbf0 100644 --- a/src/plugins/ioam/ip6/ioam_cache_node.c +++ b/src/plugins/ioam/ip6/ioam_cache_node.c @@ -179,7 +179,6 @@ ip6_ioam_cache_node_fn (vlib_main_t * vm, /* * Node for IP6 iOAM header cache */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (ioam_cache_node) = { .function = ip6_ioam_cache_node_fn, @@ -196,7 +195,6 @@ VLIB_REGISTER_NODE (ioam_cache_node) = [IOAM_CACHE_NEXT_POP_HBYH] = "ip6-pop-hop-by-hop" }, }; -/* *INDENT-ON* */ typedef struct { @@ -386,7 +384,6 @@ VLIB_NODE_FN (ip6_add_from_cache_hbh_node) (vlib_main_t * vm, processed); return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (ip6_add_from_cache_hbh_node) = { .name = "ip6-add-from-cache-hop-by-hop", @@ -404,7 +401,6 @@ VLIB_REGISTER_NODE (ip6_add_from_cache_hbh_node) = #undef _ }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c b/src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c index d2c7f20a778..61476ebd85c 100644 --- a/src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c +++ b/src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c @@ -235,7 +235,6 @@ ip6_ioam_cache_ts_node_fn (vlib_main_t * vm, /* * Node for IP6 iOAM header cache */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (ioam_cache_ts_node) = { .function = ip6_ioam_cache_ts_node_fn, @@ -253,7 +252,6 @@ VLIB_REGISTER_NODE (ioam_cache_ts_node) = [IOAM_CACHE_TS_ERROR_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ typedef struct { @@ -623,7 +621,6 @@ VLIB_NODE_FN (ip6_reset_ts_hbh_node) (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (ip6_reset_ts_hbh_node) = { .name = "ip6-add-syn-hop-by-hop", @@ -642,7 +639,6 @@ VLIB_REGISTER_NODE (ip6_reset_ts_hbh_node) = }, }; -/* *INDENT-ON* */ #ifndef CLIB_MARCH_VARIANT vlib_node_registration_t ioam_cache_ts_timer_tick_node; @@ -738,7 +734,6 @@ ioam_cache_ts_timer_tick_node_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (ioam_cache_ts_timer_tick_node) = { .function = ioam_cache_ts_timer_tick_node_fn, .name = "ioam-cache-ts-timer-tick", @@ -757,7 +752,6 @@ VLIB_REGISTER_NODE (ioam_cache_ts_timer_tick_node) = { [0] = "error-drop", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/ioam/ipfixcollector/node.c b/src/plugins/ioam/ipfixcollector/node.c index 098029d6ad6..73d7b57fab5 100644 --- a/src/plugins/ioam/ipfixcollector/node.c +++ b/src/plugins/ioam/ipfixcollector/node.c @@ -271,7 +271,6 @@ ipfix_collector_node_fn (vlib_main_t * vm, return from_frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (ipfix_collector_node) = { .function = ipfix_collector_node_fn, .name = "ipfix-collector", @@ -289,7 +288,6 @@ VLIB_REGISTER_NODE (ipfix_collector_node) = { [IPFIX_COLLECTOR_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/ioam/lib-e2e/e2e_util.h b/src/plugins/ioam/lib-e2e/e2e_util.h index f8a4ebd4797..a72b4030b2c 100644 --- a/src/plugins/ioam/lib-e2e/e2e_util.h +++ b/src/plugins/ioam/lib-e2e/e2e_util.h @@ -18,13 +18,11 @@ #include <ioam/lib-e2e/ioam_seqno_lib.h> -/* *INDENT-OFF* */ typedef CLIB_PACKED(struct { u8 e2e_type; u8 reserved; u32 e2e_data; }) ioam_e2e_packet_t; -/* *INDENT-ON* */ #endif /* PLUGINS_IOAM_PLUGIN_IOAM_LIB_E2E_E2E_UTIL_H_ */ diff --git a/src/plugins/ioam/lib-trace/trace_util.c b/src/plugins/ioam/lib-trace/trace_util.c index d935543cf23..31fbb2b7446 100644 --- a/src/plugins/ioam/lib-trace/trace_util.c +++ b/src/plugins/ioam/lib-trace/trace_util.c @@ -98,14 +98,12 @@ clear_trace_profiles (void) clear_trace_profile_command_fn (0, 0, 0); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND(clear_trace_profile_command) = { .path = "clear ioam-trace profile", .short_help = "clear ioam-trace profile [<index>|all]", .function = clear_trace_profile_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * set_trace_profile_command_fn (vlib_main_t * vm, @@ -137,7 +135,6 @@ set_trace_profile_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_trace_profile_command, static) = { .path = "set ioam-trace profile", @@ -146,7 +143,6 @@ VLIB_CLI_COMMAND (set_trace_profile_command, static) = node-id <node id in hex> app-data <app_data in hex>", .function = set_trace_profile_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * show_trace_profile_command_fn (vlib_main_t * vm, @@ -189,14 +185,12 @@ show_trace_profile_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_trace_profile_command, static) = { .path = "show ioam-trace profile", .short_help = "show ioam-trace profile", .function = show_trace_profile_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/ioam/lib-trace/trace_util.h b/src/plugins/ioam/lib-trace/trace_util.h index 61f18d9173a..869ea717cf8 100644 --- a/src/plugins/ioam/lib-trace/trace_util.h +++ b/src/plugins/ioam/lib-trace/trace_util.h @@ -75,14 +75,12 @@ int trace_profile_create (trace_profile * profile, u8 trace_type, u8 num_elts, void clear_trace_profiles (void); -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { u8 ioam_trace_type; u8 data_list_elts_left; u32 elts[0]; /* Variable type. So keep it generic */ }) ioam_trace_hdr_t; -/* *INDENT-ON* */ diff --git a/src/plugins/ioam/lib-vxlan-gpe/ioam_decap.c b/src/plugins/ioam/lib-vxlan-gpe/ioam_decap.c index 87e57d3605e..801faa98066 100644 --- a/src/plugins/ioam/lib-vxlan-gpe/ioam_decap.c +++ b/src/plugins/ioam/lib-vxlan-gpe/ioam_decap.c @@ -193,7 +193,6 @@ vxlan_gpe_decap_ioam_v4 (vlib_main_t * vm, } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vxlan_gpe_decap_ioam_v4_node) = { .function = vxlan_gpe_decap_ioam_v4, .name = "vxlan-gpe-decap-ioam-v4", @@ -211,7 +210,6 @@ VLIB_REGISTER_NODE (vxlan_gpe_decap_ioam_v4_node) = { [VXLAN_GPE_DECAP_IOAM_V4_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ /* diff --git a/src/plugins/ioam/lib-vxlan-gpe/ioam_encap.c b/src/plugins/ioam/lib-vxlan-gpe/ioam_encap.c index 1d15654464d..de375df4f7c 100644 --- a/src/plugins/ioam/lib-vxlan-gpe/ioam_encap.c +++ b/src/plugins/ioam/lib-vxlan-gpe/ioam_encap.c @@ -164,7 +164,6 @@ vxlan_gpe_encap_ioam_v4 (vlib_main_t * vm, -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vxlan_gpe_encap_ioam_v4_node) = { .function = vxlan_gpe_encap_ioam_v4, .name = "vxlan-gpe-encap-ioam-v4", @@ -182,7 +181,6 @@ VLIB_REGISTER_NODE (vxlan_gpe_encap_ioam_v4_node) = { [VXLAN_GPE_ENCAP_IOAM_V4_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ /* diff --git a/src/plugins/ioam/lib-vxlan-gpe/ioam_pop.c b/src/plugins/ioam/lib-vxlan-gpe/ioam_pop.c index 84900eb7e01..2fa0aa29450 100644 --- a/src/plugins/ioam/lib-vxlan-gpe/ioam_pop.c +++ b/src/plugins/ioam/lib-vxlan-gpe/ioam_pop.c @@ -321,7 +321,6 @@ vxlan_gpe_pop_ioam_v4 (vlib_main_t * vm, return vxlan_gpe_pop_ioam (vm, node, from_frame, 0); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vxlan_gpe_pop_ioam_v4_node) = { .function = vxlan_gpe_pop_ioam_v4, .name = "vxlan-gpe-pop-ioam-v4", @@ -340,7 +339,6 @@ VLIB_REGISTER_NODE (vxlan_gpe_pop_ioam_v4_node) = { #undef _ }, }; -/* *INDENT-ON* */ diff --git a/src/plugins/ioam/lib-vxlan-gpe/ioam_transit.c b/src/plugins/ioam/lib-vxlan-gpe/ioam_transit.c index 215f14b74bc..e3c82725e26 100644 --- a/src/plugins/ioam/lib-vxlan-gpe/ioam_transit.c +++ b/src/plugins/ioam/lib-vxlan-gpe/ioam_transit.c @@ -51,14 +51,12 @@ typedef enum } vxlan_gpe_transit_ioam_next_t; -/* *INDENT-OFF* */ VNET_FEATURE_INIT (vxlan_gpe_transit_ioam, static) = { .arc_name = "ip4-output", .node_name = "vxlan-gpe-transit-ioam", .runs_before = VNET_FEATURES ("interface-output"), }; -/* *INDENT-ON* */ static uword vxlan_gpe_transit_ioam (vlib_main_t * vm, @@ -156,7 +154,6 @@ vxlan_gpe_transit_ioam (vlib_main_t * vm, return from_frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vxlan_gpe_transit_ioam_node) = { .function = vxlan_gpe_transit_ioam, .name = "vxlan-gpe-transit-ioam", @@ -175,7 +172,6 @@ VLIB_REGISTER_NODE (vxlan_gpe_transit_ioam_node) = { }, }; -/* *INDENT-ON* */ /* diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c index 870de924e65..327afc3fb61 100644 --- a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c +++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c @@ -510,13 +510,11 @@ vxlan_gpe_set_ioam_rewrite_command_fn (vlib_main_t * } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (vxlan_gpe_set_ioam_rewrite_cmd, static) = { .path = "set vxlan-gpe-ioam", .short_help = "set vxlan-gpe-ioam vxlan <src-ip> <dst_ip> <vnid> [disable]", .function = vxlan_gpe_set_ioam_rewrite_command_fn, }; -/* *INDENT-ON* */ @@ -592,13 +590,11 @@ vxlan_gpe_set_ioam_flags_command_fn (vlib_main_t * vm, return rv; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (vxlan_gpe_set_ioam_flags_cmd, static) = { .path = "set vxlan-gpe-ioam rewrite", .short_help = "set vxlan-gpe-ioam [trace] [pot] [ppc <encap|decap>]", .function = vxlan_gpe_set_ioam_flags_command_fn,}; -/* *INDENT-ON* */ int vxlan_gpe_ioam_disable_for_dest @@ -683,13 +679,11 @@ static clib_error_t *vxlan_gpe_set_ioam_transit_rewrite_command_fn return rv; } - /* *INDENT-OFF* */ VLIB_CLI_COMMAND (vxlan_gpe_set_ioam_transit_rewrite_cmd, static) = { .path = "set vxlan-gpe-ioam-transit", .short_help = "set vxlan-gpe-ioam-transit dst-ip <dst_ip> [outer-fib-index <outer_fib_index>] [disable]", .function = vxlan_gpe_set_ioam_transit_rewrite_command_fn, }; -/* *INDENT-ON* */ clib_error_t *clear_vxlan_gpe_ioam_rewrite_command_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) @@ -697,14 +691,12 @@ clib_error_t *clear_vxlan_gpe_ioam_rewrite_command_fn return (vxlan_gpe_ioam_disable (0, 0, 0)); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (vxlan_gpe_clear_ioam_flags_cmd, static) = { .path = "clear vxlan-gpe-ioam rewrite", .short_help = "clear vxlan-gpe-ioam rewrite", .function = clear_vxlan_gpe_ioam_rewrite_command_fn, }; -/* *INDENT-ON* */ /** diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c index 1a37059396c..9c783c747d0 100644 --- a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c +++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c @@ -39,14 +39,12 @@ typedef union } time_u64_t; -/* *INDENT-OFF* */ typedef CLIB_PACKED(struct { vxlan_gpe_ioam_option_t hdr; u8 ioam_trace_type; u8 data_list_elts_left; u32 elts[0]; /* Variable type. So keep it generic */ }) vxlan_gpe_ioam_trace_option_t; -/* *INDENT-ON* */ #define foreach_vxlan_gpe_ioam_trace_stats \ @@ -422,13 +420,11 @@ vxlan_gpe_show_ioam_trace_cmd_fn (vlib_main_t * vm, } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (vxlan_gpe_show_ioam_trace_cmd, static) = { .path = "show ioam vxlan-gpe trace", .short_help = "iOAM trace statistics", .function = vxlan_gpe_show_ioam_trace_cmd_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -459,13 +455,11 @@ vxlan_gpe_ioam_trace_init (vlib_main_t * vm) return (0); } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (vxlan_gpe_ioam_trace_init) = { .runs_after = VLIB_INITS("ip_main_init", "ip6_lookup_init", "vxlan_gpe_init"), }; -/* *INDENT-ON* */ int diff --git a/src/plugins/ioam/udp-ping/udp_ping_export.c b/src/plugins/ioam/udp-ping/udp_ping_export.c index de0bad7a855..78d62233a7d 100644 --- a/src/plugins/ioam/udp-ping/udp_ping_export.c +++ b/src/plugins/ioam/udp-ping/udp_ping_export.c @@ -275,13 +275,11 @@ set_udp_ping_export_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_udp_ping_export_command, static) = { .path = "set udp-ping export-ipfix", .short_help = "set udp-ping export-ipfix [disable]", .function = set_udp_ping_export_command_fn, }; -/* *INDENT-ON* */ clib_error_t * udp_ping_flow_report_init (vlib_main_t * vm) @@ -289,12 +287,10 @@ udp_ping_flow_report_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (udp_ping_flow_report_init) = { .runs_after = VLIB_INITS ("flow_report_init"), }; -/* *INDENT-ON* */ /* diff --git a/src/plugins/ioam/udp-ping/udp_ping_node.c b/src/plugins/ioam/udp-ping/udp_ping_node.c index 6bfa8f67ef5..fbc3b13971c 100644 --- a/src/plugins/ioam/udp-ping/udp_ping_node.c +++ b/src/plugins/ioam/udp-ping/udp_ping_node.c @@ -93,14 +93,12 @@ format_udp_ping_trace (u8 * s, va_list * args) return s; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (udp_ping_node, static) = { .function = udp_ping_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "udp-ping-process", }; -/* *INDENT-ON* */ void udp_ping_calculate_timer_interval (void) @@ -301,7 +299,6 @@ set_udp_ping_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_udp_ping_command, static) = { .path = "set udp-ping", @@ -312,7 +309,6 @@ VLIB_CLI_COMMAND (set_udp_ping_command, static) = [disable]", .function = set_udp_ping_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * show_udp_ping_summary_cmd_fn (vlib_main_t * vm, @@ -374,14 +370,12 @@ show_udp_ping_summary_cmd_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_udp_ping_cmd, static) = { .path = "show udp-ping summary", .short_help = "Summary of udp-ping", .function = show_udp_ping_summary_cmd_fn, }; -/* *INDENT-ON* */ /** * @brief UDP-Ping Process node. @@ -790,7 +784,6 @@ udp_ping_local_node_fn (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ /* * Node for udp-ping-local */ @@ -814,7 +807,6 @@ VLIB_REGISTER_NODE (udp_ping_local, static) = [UDP_PING_NEXT_IP6_DROP] = "ip6-drop", }, }; -/* *INDENT-ON* */ static clib_error_t * udp_ping_init (vlib_main_t * vm) @@ -828,12 +820,10 @@ udp_ping_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (udp_ping_init) = { .runs_after = VLIB_INITS("ip_main_init"), }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/l2tp/decap.c b/src/plugins/l2tp/decap.c index 8c41bdd2357..e6ad8b0926c 100644 --- a/src/plugins/l2tp/decap.c +++ b/src/plugins/l2tp/decap.c @@ -249,7 +249,6 @@ VLIB_NODE_FN (l2t_decap_node) (vlib_main_t * vm, * while l2tp-decap-local drops it. */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (l2t_decap_node) = { .name = "l2tp-decap", .vector_size = sizeof (u32), @@ -267,11 +266,9 @@ VLIB_REGISTER_NODE (l2t_decap_node) = { [L2T_DECAP_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ extern vlib_node_function_t l2t_decap_node_fn; -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (l2t_decap_local_node) = { .function = l2t_decap_node_fn, .name = "l2tp-decap-local", @@ -290,7 +287,6 @@ VLIB_REGISTER_NODE (l2t_decap_local_node) = { [L2T_DECAP_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/l2tp/encap.c b/src/plugins/l2tp/encap.c index fbb5fc6ea46..3115b96f088 100644 --- a/src/plugins/l2tp/encap.c +++ b/src/plugins/l2tp/encap.c @@ -192,7 +192,6 @@ VLIB_NODE_FN (l2t_encap_node) (vlib_main_t * vm, } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (l2t_encap_node) = { .name = "l2tp-encap", .vector_size = sizeof (u32), @@ -211,7 +210,6 @@ VLIB_REGISTER_NODE (l2t_encap_node) = { [L2T_ENCAP_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ #ifndef CLIB_MARCH_VARIANT void diff --git a/src/plugins/l2tp/l2tp.c b/src/plugins/l2tp/l2tp.c index 308c0f1d659..907468b5900 100644 --- a/src/plugins/l2tp/l2tp.c +++ b/src/plugins/l2tp/l2tp.c @@ -127,24 +127,20 @@ show_l2tp_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "L2tp session lookup on %s", keystr); - /* *INDENT-OFF* */ pool_foreach (session, lm->sessions) { vlib_cli_output (vm, "%U", format_l2t_session, session); } - /* *INDENT-ON* */ } return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_session_detail_command, static) = { .path = "show l2tpv3", .short_help = "show l2tpv3 [verbose]", .function = show_l2tp_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * test_counters_command_fn (vlib_main_t * vm, @@ -157,7 +153,6 @@ test_counters_command_fn (vlib_main_t * vm, u32 nincr = 0; u32 thread_index = vm->thread_index; - /* *INDENT-OFF* */ pool_foreach (session, lm->sessions) { session_index = session - lm->sessions; @@ -175,19 +170,16 @@ test_counters_command_fn (vlib_main_t * vm, nincr++; } - /* *INDENT-ON* */ vlib_cli_output (vm, "Incremented %d active counters\n", nincr); return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_counters_command, static) = { .path = "test lt2p counters", .short_help = "increment all active counters", .function = test_counters_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * clear_counters_command_fn (vlib_main_t * vm, @@ -199,7 +191,6 @@ clear_counters_command_fn (vlib_main_t * vm, u32 counter_index; u32 nincr = 0; - /* *INDENT-OFF* */ pool_foreach (session, lm->sessions) { session_index = session - lm->sessions; @@ -210,19 +201,16 @@ clear_counters_command_fn (vlib_main_t * vm, vlib_zero_combined_counter (&lm->counter_main, counter_index+1); nincr++; } - /* *INDENT-ON* */ vlib_cli_output (vm, "Cleared %d active counters\n", nincr); return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (clear_counters_command, static) = { .path = "clear l2tp counters", .short_help = "clear all active counters", .function = clear_counters_command_fn, }; -/* *INDENT-ON* */ static u8 * format_l2tpv3_name (u8 * s, va_list * args) @@ -252,13 +240,11 @@ l2tpv3_name_renumber (vnet_hw_interface_t * hi, u32 new_dev_instance) return 0; } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (l2tpv3_device_class,static) = { .name = "L2TPv3", .format_device_name = format_l2tpv3_name, .name_renumber = l2tpv3_name_renumber, }; -/* *INDENT-ON* */ static u8 * format_l2tp_header_with_length (u8 * s, va_list * args) @@ -268,14 +254,12 @@ format_l2tp_header_with_length (u8 * s, va_list * args) return s; } -/* *INDENT-OFF* */ VNET_HW_INTERFACE_CLASS (l2tpv3_hw_class) = { .name = "L2TPV3", .format_header = format_l2tp_header_with_length, .build_rewrite = default_build_rewrite, .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P, }; -/* *INDENT-ON* */ int create_l2tpv3_ipv6_tunnel (l2t_main_t * lm, @@ -515,7 +499,6 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (create_l2tpv3_tunnel_command, static) = { .path = "create l2tpv3 tunnel", @@ -523,7 +506,6 @@ VLIB_CLI_COMMAND (create_l2tpv3_tunnel_command, static) = "create l2tpv3 tunnel client <ip6> our <ip6> local-cookie <hex> remote-cookie <hex> local-session <dec> remote-session <dec>", .function = create_l2tpv3_tunnel_command_fn, }; -/* *INDENT-ON* */ int l2tpv3_set_tunnel_cookies (l2t_main_t * lm, @@ -598,7 +580,6 @@ set_l2tp_tunnel_cookie_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_l2tp_tunnel_cookie_command, static) = { .path = "set l2tpv3 tunnel cookie", @@ -606,7 +587,6 @@ VLIB_CLI_COMMAND (set_l2tp_tunnel_cookie_command, static) = "set l2tpv3 tunnel cookie <intfc> local <hex> remote <hex>", .function = set_l2tp_tunnel_cookie_command_fn, }; -/* *INDENT-ON* */ int l2tpv3_interface_enable_disable (vnet_main_t * vnm, @@ -663,14 +643,12 @@ set_ip6_l2tpv3 (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_interface_ip6_l2tpv3, static) = { .path = "set interface ip6 l2tpv3", .function = set_ip6_l2tpv3, .short_help = "set interface ip6 l2tpv3 <intfc> [del]", }; -/* *INDENT-ON* */ static clib_error_t * l2tp_config (vlib_main_t * vm, unformat_input_t * input) diff --git a/src/plugins/l2tp/l2tp_api.c b/src/plugins/l2tp/l2tp_api.c index ba9d2681b35..9c5ad700e0c 100644 --- a/src/plugins/l2tp/l2tp_api.c +++ b/src/plugins/l2tp/l2tp_api.c @@ -89,12 +89,10 @@ vl_api_sw_if_l2tpv3_tunnel_dump_t_handler (vl_api_sw_if_l2tpv3_tunnel_dump_t * if (!reg) return; - /* *INDENT-OFF* */ pool_foreach (session, lm->sessions) { send_sw_if_l2tpv3_tunnel_details (am, reg, session, lm, mp->context); } - /* *INDENT-ON* */ } static void vl_api_l2tpv3_create_tunnel_t_handler @@ -146,12 +144,10 @@ static void vl_api_l2tpv3_create_tunnel_t_handler encap_fib_index, &sw_if_index); out: - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_L2TPV3_CREATE_TUNNEL_REPLY, ({ rmp->sw_if_index = ntohl (sw_if_index); })); - /* *INDENT-ON* */ } static void vl_api_l2tpv3_set_tunnel_cookies_t_handler @@ -234,12 +230,10 @@ VLIB_API_INIT_FUNCTION (l2tp_api_hookup); #include <vlib/unix/plugin.h> #include <vpp/app/version.h> -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Layer 2 Tunneling Protocol v3 (L2TP)", }; -/* *INDENT-ON* */ /* diff --git a/src/plugins/l2tp/packet.h b/src/plugins/l2tp/packet.h index 66dfea2194c..d7d78f85e53 100644 --- a/src/plugins/l2tp/packet.h +++ b/src/plugins/l2tp/packet.h @@ -24,14 +24,12 @@ * tunnels. It is not present in IOS XR l2tpv3 tunnels. * The Linux implementation is almost certainly wrong. */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { u32 session_id; u64 cookie; u32 l2_specific_sublayer; /* set to 0 (if present) */ }) l2tpv3_header_t; -/* *INDENT-ON* */ #endif /* __included_l2tp_packet_h__ */ diff --git a/src/plugins/l3xc/l3xc.c b/src/plugins/l3xc/l3xc.c index 0f7324c277d..427c38e9ab5 100644 --- a/src/plugins/l3xc/l3xc.c +++ b/src/plugins/l3xc/l3xc.c @@ -264,7 +264,6 @@ out: return (NULL); } -/* *INDENT-OFF* */ /** * Create an L3XC policy. */ @@ -274,7 +273,6 @@ VLIB_CLI_COMMAND (l3xc_cmd_node, static) = { .short_help = "l3xc [add|del] <INTERFACE> via ...", .is_mp_safe = 1, }; -/* *INDENT-ON* */ static u8 * format_l3xc (u8 * s, va_list * args) @@ -305,13 +303,11 @@ l3xc_walk (l3xc_walk_cb_t cb, void *ctx) { u32 l3xci; - /* *INDENT-OFF* */ pool_foreach_index (l3xci, l3xc_pool) { if (!cb(l3xci, ctx)) break; } - /* *INDENT-ON* */ } static clib_error_t * @@ -320,24 +316,20 @@ l3xc_show_cmd (vlib_main_t * vm, { l3xc_t *l3xc; - /* *INDENT-OFF* */ pool_foreach (l3xc, l3xc_pool) { vlib_cli_output(vm, "%U", format_l3xc, l3xc); } - /* *INDENT-ON* */ return (NULL); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (l3xc_show_cmd_node, static) = { .path = "show l3xc", .function = l3xc_show_cmd, .short_help = "show l3xc", .is_mp_safe = 1, }; -/* *INDENT-ON* */ static fib_node_t * l3xc_get_node (fib_node_index_t index) diff --git a/src/plugins/l3xc/l3xc_api.c b/src/plugins/l3xc/l3xc_api.c index d4a837d7d9c..f09100b3546 100644 --- a/src/plugins/l3xc/l3xc_api.c +++ b/src/plugins/l3xc/l3xc_api.c @@ -209,12 +209,10 @@ l3xc_api_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (l3xc_api_init); -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "L3 Cross-Connect (L3XC)", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/l3xc/l3xc_node.c b/src/plugins/l3xc/l3xc_node.c index 62db8c328b0..0f79bebeff9 100644 --- a/src/plugins/l3xc/l3xc_node.c +++ b/src/plugins/l3xc/l3xc_node.c @@ -199,7 +199,6 @@ static char *l3xc_error_strings[] = { #undef l3xc_error }; -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (l3xc_ip4_node) = { .function = l3xc_input_ip4, @@ -245,7 +244,6 @@ VNET_FEATURE_INIT (l3xc_ip6_feat, static) = .node_name = "l3xc-input-ip6", .runs_after = VNET_FEATURES ("acl-plugin-in-ip6-fa"), }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/lacp/cli.c b/src/plugins/lacp/cli.c index fee9a5a2269..7cf97e09dc4 100644 --- a/src/plugins/lacp/cli.c +++ b/src/plugins/lacp/cli.c @@ -28,7 +28,6 @@ lacp_dump_ifs (lacp_interface_details_t ** out_lacpifs) lacp_interface_details_t *r_lacpifs = NULL; lacp_interface_details_t *lacpif = NULL; - /* *INDENT-OFF* */ pool_foreach (mif, bm->neighbors) { if (mif->lacp_enabled == 0) continue; @@ -61,7 +60,6 @@ lacp_dump_ifs (lacp_interface_details_t ** out_lacpifs) lacpif->ptx_state = mif->ptx_state; lacpif->mux_state = mif->mux_state; } - /* *INDENT-ON* */ *out_lacpifs = r_lacpifs; @@ -309,14 +307,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_lacp_command, static) = { .path = "show lacp", .short_help = "show lacp [<interface>] [details]", .function = show_lacp_fn, .is_mp_safe = 1, }; -/* *INDENT-ON* */ static clib_error_t * debug_lacp_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -384,13 +380,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (debug_lacp_command, static) = { .path = "debug lacp", .short_help = "debug lacp <interface> <on | off>", .function = debug_lacp_command_fn, }; -/* *INDENT-ON* */ clib_error_t * lacp_cli_init (vlib_main_t * vm) diff --git a/src/plugins/lacp/input.c b/src/plugins/lacp/input.c index 31450286f34..5ccd1037fdb 100644 --- a/src/plugins/lacp/input.c +++ b/src/plugins/lacp/input.c @@ -239,12 +239,10 @@ lacp_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (lacp_init) = { .runs_after = VLIB_INITS("lacp_periodic_init"), }; -/* *INDENT-ON* */ /* * packet trace format function, very similar to diff --git a/src/plugins/lacp/lacp.c b/src/plugins/lacp/lacp.c index ad7710266f9..ba66f7b245d 100644 --- a/src/plugins/lacp/lacp.c +++ b/src/plugins/lacp/lacp.c @@ -142,7 +142,6 @@ lacp_periodic (vlib_main_t * vm) bond_if_t *bif; u8 actor_state, partner_state; - /* *INDENT-OFF* */ pool_foreach (mif, bm->neighbors) { if (mif->port_enabled == 0) @@ -185,7 +184,6 @@ lacp_periodic (vlib_main_t * vm) mif->partner.state); } } - /* *INDENT-ON* */ } static void @@ -216,12 +214,10 @@ lacp_interface_enable_disable (vlib_main_t * vm, bond_if_t * bif, ASSERT (lm->lacp_int >= 1); if (lm->lacp_int == 0) { - /* *INDENT-OFF* */ ELOG_TYPE_DECLARE (e) = { .format = "lacp-int-en-dis: BUG lacp_int == 0", }; - /* *INDENT-ON* */ ELOG_DATA (&vlib_global_main.elog_main, e); } else @@ -453,12 +449,10 @@ lacp_hw_interface_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags) VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION (lacp_hw_interface_up_down); -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Link Aggregation Control Protocol (LACP)", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/lacp/mux_machine.c b/src/plugins/lacp/mux_machine.c index 974dbd9dac9..ee43894cd53 100644 --- a/src/plugins/lacp/mux_machine.c +++ b/src/plugins/lacp/mux_machine.c @@ -208,13 +208,11 @@ lacp_mux_debug_func (member_if_t * mif, int event, int state, lacp_fsm_state_t * transition) { vlib_worker_thread_t *w = vlib_worker_threads + os_get_thread_index (); - /* *INDENT-OFF* */ ELOG_TYPE_DECLARE (e) = { .format = "%s", .format_args = "T4", }; - /* *INDENT-ON* */ struct { u32 event; diff --git a/src/plugins/lacp/node.c b/src/plugins/lacp/node.c index f70ea69deef..4426dafab5b 100644 --- a/src/plugins/lacp/node.c +++ b/src/plugins/lacp/node.c @@ -112,7 +112,6 @@ lacp_node_fn (vlib_main_t * vm, /* * lacp input graph node declaration */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (lacp_input_node, static) = { .function = lacp_node_fn, .name = "lacp-input", @@ -129,19 +128,16 @@ VLIB_REGISTER_NODE (lacp_input_node, static) = { [LACP_INPUT_NEXT_NORMAL] = "error-drop", }, }; -/* *INDENT-ON* */ static void lacp_elog_start_event (void) { lacp_main_t *lm = &lacp_main; - /* *INDENT-OFF* */ ELOG_TYPE_DECLARE (e) = { .format = "Starting LACP process, interface count = %d", .format_args = "i4", }; - /* *INDENT-ON* */ struct { u32 count; @@ -155,13 +151,11 @@ static void lacp_elog_stop_event (void) { lacp_main_t *lm = &lacp_main; - /* *INDENT-OFF* */ ELOG_TYPE_DECLARE (e) = { .format = "Stopping LACP process, interface count = %d", .format_args = "i4", }; - /* *INDENT-ON* */ struct { u32 count; diff --git a/src/plugins/lacp/ptx_machine.c b/src/plugins/lacp/ptx_machine.c index bb9d033c13a..92a99c920e9 100644 --- a/src/plugins/lacp/ptx_machine.c +++ b/src/plugins/lacp/ptx_machine.c @@ -195,13 +195,11 @@ lacp_ptx_debug_func (member_if_t * mif, int event, int state, lacp_fsm_state_t * transition) { vlib_worker_thread_t *w = vlib_worker_threads + os_get_thread_index (); - /* *INDENT-OFF* */ ELOG_TYPE_DECLARE (e) = { .format = "%s", .format_args = "T4", }; - /* *INDENT-ON* */ struct { u32 event; diff --git a/src/plugins/lacp/rx_machine.c b/src/plugins/lacp/rx_machine.c index 2fadbe636cf..9c161b02078 100644 --- a/src/plugins/lacp/rx_machine.c +++ b/src/plugins/lacp/rx_machine.c @@ -343,7 +343,6 @@ lacp_port_is_moved (vlib_main_t * vm, member_if_t * mif) member_if_t *mif2; lacp_pdu_t *lacpdu = (lacp_pdu_t *) mif->last_rx_pkt; - /* *INDENT-OFF* */ pool_foreach (mif2, bm->neighbors) { { if ((mif != mif2) && (mif2->rx_state == LACP_RX_STATE_PORT_DISABLED) && @@ -353,7 +352,6 @@ lacp_port_is_moved (vlib_main_t * vm, member_if_t * mif) return 1; } } - /* *INDENT-ON* */ return 0; } @@ -400,13 +398,11 @@ lacp_rx_debug_func (member_if_t * mif, int event, int state, lacp_fsm_state_t * transition) { vlib_worker_thread_t *w = vlib_worker_threads + os_get_thread_index (); - /* *INDENT-OFF* */ ELOG_TYPE_DECLARE (e) = { .format = "%s", .format_args = "T4", }; - /* *INDENT-ON* */ struct { u32 event; diff --git a/src/plugins/lacp/tx_machine.c b/src/plugins/lacp/tx_machine.c index 1eb3bc1c4b7..c36f44c07ce 100644 --- a/src/plugins/lacp/tx_machine.c +++ b/src/plugins/lacp/tx_machine.c @@ -84,13 +84,11 @@ lacp_tx_debug_func (member_if_t * mif, int event, int state, lacp_fsm_state_t * transition) { vlib_worker_thread_t *w = vlib_worker_threads + os_get_thread_index (); - /* *INDENT-OFF* */ ELOG_TYPE_DECLARE (e) = { .format = "%s", .format_args = "T4", }; - /* *INDENT-ON* */ struct { u32 event; diff --git a/src/plugins/lb/api.c b/src/plugins/lb/api.c index fe1d7e43d69..ea2e482135b 100644 --- a/src/plugins/lb/api.c +++ b/src/plugins/lb/api.c @@ -330,7 +330,6 @@ vl_api_lb_as_dump_t_handler dump_all = (prefix.ip6.as_u64[0] == 0) && (prefix.ip6.as_u64[1] == 0); - /* *INDENT-OFF* */ pool_foreach (vip, lbm->vips) { if ( dump_all @@ -342,7 +341,6 @@ vl_api_lb_as_dump_t_handler send_lb_as_details(reg, mp->context, vip); } } - /* *INDENT-ON* */ } static void diff --git a/src/plugins/lb/lb.c b/src/plugins/lb/lb.c index c0a443b2cda..f8d5fe8d833 100644 --- a/src/plugins/lb/lb.c +++ b/src/plugins/lb/lb.c @@ -1256,12 +1256,10 @@ int lb_vip_del(u32 vip_index) return rv; } -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Load Balancer (LB)", }; -/* *INDENT-ON* */ u8 *format_lb_dpo (u8 * s, va_list * va) { diff --git a/src/plugins/lisp/lisp-cp/control.c b/src/plugins/lisp/lisp-cp/control.c index 4f5dc55d12c..692048ebd21 100644 --- a/src/plugins/lisp/lisp-cp/control.c +++ b/src/plugins/lisp/lisp-cp/control.c @@ -581,7 +581,6 @@ vnet_lisp_adjacencies_get_by_vni (u32 vni) fwd_entry_t *fwd; lisp_adjacency_t *adjs = 0, adj; - /* *INDENT-OFF* */ pool_foreach (fwd, lcm->fwd_entry_pool) { if (gid_address_vni (&fwd->reid) != vni) @@ -591,7 +590,6 @@ vnet_lisp_adjacencies_get_by_vni (u32 vni) gid_address_copy (&adj.leid, &fwd->leid); vec_add1 (adjs, adj); } - /* *INDENT-ON* */ return adjs; } @@ -804,7 +802,6 @@ vnet_lisp_map_cache_add_del (vnet_lisp_add_del_mapping_args_t * a, /* Remove remote (if present) from the vectors of lcl-to-rmts * TODO: Address this in a more efficient way. */ - /* *INDENT-OFF* */ pool_foreach (rmts, lcm->lcl_to_rmt_adjacencies) { vec_foreach_index (rmts_itr, rmts[0]) @@ -817,7 +814,6 @@ vnet_lisp_map_cache_add_del (vnet_lisp_add_del_mapping_args_t * a, } } } - /* *INDENT-ON* */ } /* remove mapping from dictionary */ @@ -1389,12 +1385,10 @@ vnet_lisp_clear_all_remote_adjacencies (void) vnet_lisp_add_del_mapping_args_t _dm_args, *dm_args = &_dm_args; vnet_lisp_add_del_locator_set_args_t _ls, *ls = &_ls; - /* *INDENT-OFF* */ pool_foreach_index (mi, lcm->mapping_pool) { vec_add1 (map_indices, mi); } - /* *INDENT-ON* */ vec_foreach (map_indexp, map_indices) { @@ -2167,7 +2161,6 @@ lisp_cp_enable_l2_l3_ifaces (lisp_cp_main_t * lcm, u8 with_default_route) { u32 vni, dp_table; - /* *INDENT-OFF* */ hash_foreach(vni, dp_table, lcm->table_id_by_vni, ({ dp_add_del_iface(lcm, vni, /* is_l2 */ 0, /* is_add */1, with_default_route); @@ -2176,7 +2169,6 @@ lisp_cp_enable_l2_l3_ifaces (lisp_cp_main_t * lcm, u8 with_default_route) dp_add_del_iface(lcm, vni, /* is_l2 */ 1, 1, with_default_route); })); - /* *INDENT-ON* */ } static void @@ -2188,12 +2180,10 @@ lisp_cp_disable_l2_l3_ifaces (lisp_cp_main_t * lcm) hash_free (lcm->fwd_entry_by_mapping_index); pool_free (lcm->fwd_entry_pool); /* Clear state tracking rmt-lcl fwd entries */ - /* *INDENT-OFF* */ pool_foreach (rmts, lcm->lcl_to_rmt_adjacencies) { vec_free(rmts[0]); } - /* *INDENT-ON* */ hash_free (lcm->lcl_to_rmt_adjs_by_lcl_idx); pool_free (lcm->lcl_to_rmt_adjacencies); } @@ -2465,7 +2455,6 @@ build_itr_rloc_list (lisp_cp_main_t * lcm, locator_set_t * loc_set) /* Add ipv4 locators first TODO sort them */ - /* *INDENT-OFF* */ foreach_ip_interface_address (&lcm->im4->lookup_main, ia, loc->sw_if_index, 1 /* unnumbered */, ({ @@ -2486,7 +2475,6 @@ build_itr_rloc_list (lisp_cp_main_t * lcm, locator_set_t * loc_set) ip_prefix_normalize (ippref); vec_add1 (rlocs, gid[0]); })); - /* *INDENT-ON* */ } return rlocs; @@ -2638,7 +2626,6 @@ add_locators (lisp_cp_main_t * lcm, mapping_t * m, u32 locator_set_index, new = loc[0]; if (loc->local) { - /* *INDENT-OFF* */ foreach_ip_interface_address (&lcm->im4->lookup_main, ia, loc->sw_if_index, 1 /* unnumbered */, ({ @@ -2655,7 +2642,6 @@ add_locators (lisp_cp_main_t * lcm, mapping_t * m, u32 locator_set_index, ia); ip_address_set (new_ip, addr, AF_IP6); })); - /* *INDENT-ON* */ if (probed_loc && ip_address_cmp (probed_loc, new_ip) == 0) new.probed = 1; @@ -2669,7 +2655,6 @@ build_map_register_record_list (lisp_cp_main_t * lcm) { mapping_t *recs = 0, rec, *m; - /* *INDENT-OFF* */ pool_foreach (m, lcm->mapping_pool) { /* for now build only local mappings */ @@ -2680,7 +2665,6 @@ build_map_register_record_list (lisp_cp_main_t * lcm) add_locators (lcm, &rec, m->locator_set_index, NULL); vec_add1 (recs, rec); } - /* *INDENT-ON* */ return recs; } @@ -2834,7 +2818,6 @@ lisp_cp_output (vlib_main_t * vm, vlib_node_runtime_t * node, } /* placeholder node used only for statistics */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (lisp_cp_output_node) = { .function = lisp_cp_output, .name = "lisp-cp-output", @@ -2851,7 +2834,6 @@ VLIB_REGISTER_NODE (lisp_cp_output_node) = { [LISP_CP_INPUT_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ static int send_rloc_probe (lisp_cp_main_t * lcm, gid_address_t * deid, @@ -2899,7 +2881,6 @@ send_rloc_probes (lisp_cp_main_t * lcm) locator_pair_t *lp; u32 si, rloc_probes_sent = 0; - /* *INDENT-OFF* */ pool_foreach (e, lcm->fwd_entry_pool) { if (vec_len (e->locator_pairs) == 0) @@ -2929,7 +2910,6 @@ send_rloc_probes (lisp_cp_main_t * lcm) rloc_probes_sent++; } } - /* *INDENT-ON* */ vlib_node_increment_counter (vlib_get_main (), lisp_cp_output_node.index, LISP_CP_OUTPUT_ERROR_RLOC_PROBES_SENT, @@ -3038,7 +3018,6 @@ _send_encapsulated_map_request (lisp_cp_main_t * lcm, /* if there is already a pending request remember it */ - /* *INDENT-OFF* */ pool_foreach (pmr, lcm->pending_map_requests_pool) { if (!gid_address_cmp (&pmr->src, seid) @@ -3048,7 +3027,6 @@ _send_encapsulated_map_request (lisp_cp_main_t * lcm, break; } } - /* *INDENT-ON* */ if (!is_resend && duplicate_pmr) { @@ -3597,7 +3575,6 @@ lisp_cp_lookup_nsh (vlib_main_t * vm, return (lisp_cp_lookup_inline (vm, node, from_frame, LISP_AFI_LCAF)); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (lisp_cp_lookup_ip4_node) = { .function = lisp_cp_lookup_ip4, .name = "lisp-cp-lookup-ip4", @@ -3615,9 +3592,7 @@ VLIB_REGISTER_NODE (lisp_cp_lookup_ip4_node) = { [LISP_CP_LOOKUP_NEXT_ARP_NDP_REPLY_TX] = "interface-output", }, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (lisp_cp_lookup_ip6_node) = { .function = lisp_cp_lookup_ip6, .name = "lisp-cp-lookup-ip6", @@ -3635,9 +3610,7 @@ VLIB_REGISTER_NODE (lisp_cp_lookup_ip6_node) = { [LISP_CP_LOOKUP_NEXT_ARP_NDP_REPLY_TX] = "interface-output", }, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (lisp_cp_lookup_l2_node) = { .function = lisp_cp_lookup_l2, .name = "lisp-cp-lookup-l2", @@ -3655,9 +3628,7 @@ VLIB_REGISTER_NODE (lisp_cp_lookup_l2_node) = { [LISP_CP_LOOKUP_NEXT_ARP_NDP_REPLY_TX] = "interface-output", }, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (lisp_cp_lookup_nsh_node) = { .function = lisp_cp_lookup_nsh, .name = "lisp-cp-lookup-nsh", @@ -3675,7 +3646,6 @@ VLIB_REGISTER_NODE (lisp_cp_lookup_nsh_node) = { [LISP_CP_LOOKUP_NEXT_ARP_NDP_REPLY_TX] = "interface-output", }, }; -/* *INDENT-ON* */ /* lisp_cp_input statistics */ #define foreach_lisp_cp_input_error \ @@ -3890,11 +3860,9 @@ process_map_reply (map_records_arg_t * a) /* remove pending map request entry */ - /* *INDENT-OFF* */ clib_fifo_foreach (noncep, pmr->nonces, ({ hash_unset(lcm->pending_map_requests_by_nonce, noncep[0]); })); - /* *INDENT-ON* */ clib_fifo_free (pmr->nonces); pool_put (lcm->pending_map_requests_pool, pmr); @@ -4063,12 +4031,10 @@ map_record_args_get () map_records_arg_t *rec; /* Cleanup first */ - /* *INDENT-OFF* */ pool_foreach (rec, lcm->map_records_args_pool[vlib_get_thread_index()]) { if (rec->is_free) map_records_arg_free (rec); } - /* *INDENT-ON* */ pool_get (lcm->map_records_args_pool[vlib_get_thread_index ()], rec); return rec; @@ -4448,7 +4414,6 @@ lisp_cp_input (vlib_main_t * vm, vlib_node_runtime_t * node, return from_frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (lisp_cp_input_node) = { .function = lisp_cp_input, .name = "lisp-cp-input", @@ -4465,7 +4430,6 @@ VLIB_REGISTER_NODE (lisp_cp_input_node) = { [LISP_CP_INPUT_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ clib_error_t * lisp_cp_init (vlib_main_t * vm) @@ -4553,13 +4517,11 @@ vnet_lisp_get_stats (void) lisp_stats_key_t *key; u32 index; - /* *INDENT-OFF* */ hash_foreach_mem (key, index, lgm->lisp_stats_index_by_key, { if (lisp_stats_api_fill (lcm, lgm, &stat, key, index)) vec_add1 (stats, stat); }); - /* *INDENT-ON* */ return stats; } @@ -4655,7 +4617,6 @@ remove_dead_pending_map_requests (lisp_cp_main_t * lcm) pending_map_request_t *pmr; u32 *to_be_removed = 0, *pmr_index; - /* *INDENT-OFF* */ pool_foreach (pmr, lcm->pending_map_requests_pool) { if (pmr->to_be_removed) @@ -4667,7 +4628,6 @@ remove_dead_pending_map_requests (lisp_cp_main_t * lcm) vec_add1 (to_be_removed, pmr - lcm->pending_map_requests_pool); } } - /* *INDENT-ON* */ vec_foreach (pmr_index, to_be_removed) pool_put_index (lcm->pending_map_requests_pool, pmr_index[0]); @@ -4753,7 +4713,6 @@ update_map_register (lisp_cp_main_t * lcm, f64 dt) if (!lcm->is_enabled || !lcm->map_registering) return; - /* *INDENT-OFF* */ pool_foreach (pmr, lcm->pending_map_registers_pool) { if (!update_pending_map_register (pmr, dt, &del_all)) @@ -4763,7 +4722,6 @@ update_map_register (lisp_cp_main_t * lcm, f64 dt) vec_add1 (to_be_removed, pmr - lcm->pending_map_registers_pool); } } - /* *INDENT-ON* */ if (del_all) { @@ -4813,13 +4771,11 @@ send_map_resolver_service (vlib_main_t * vm, /* currently no signals are expected - just wait for clock */ (void) vlib_process_get_events (vm, 0); - /* *INDENT-OFF* */ pool_foreach (pmr, lcm->pending_map_requests_pool) { if (!pmr->to_be_removed) update_pending_request (pmr, period); } - /* *INDENT-ON* */ remove_dead_pending_map_requests (lcm); diff --git a/src/plugins/lisp/lisp-cp/gid_dictionary.c b/src/plugins/lisp/lisp-cp/gid_dictionary.c index a0cc9c09e3c..995678ceadc 100644 --- a/src/plugins/lisp/lisp-cp/gid_dictionary.c +++ b/src/plugins/lisp/lisp-cp/gid_dictionary.c @@ -488,13 +488,11 @@ ip4_compute_prefix_lengths_in_search_order (gid_ip4_table_t * db) vec_reset_length (db->ip4_prefix_lengths_in_search_order); /* Note: bitmap reversed so this is in fact a longest prefix match */ - /* *INDENT-OFF* */ clib_bitmap_foreach (i, db->ip4_non_empty_dst_address_length_bitmap) { int dst_address_length = 32 - i; vec_add1 (db->ip4_prefix_lengths_in_search_order, dst_address_length); } - /* *INDENT-ON* */ } @@ -671,13 +669,11 @@ ip6_compute_prefix_lengths_in_search_order (gid_ip6_table_t * db) vec_reset_length (db->ip6_prefix_lengths_in_search_order); /* Note: bitmap reversed so this is in fact a longest prefix match */ - /* *INDENT-OFF* */ clib_bitmap_foreach (i, db->ip6_non_empty_dst_address_length_bitmap) { int dst_address_length = 128 - i; vec_add1 (db->ip6_prefix_lengths_in_search_order, dst_address_length); } - /* *INDENT-ON* */ } static u32 diff --git a/src/plugins/lisp/lisp-cp/lisp_api.c b/src/plugins/lisp/lisp-cp/lisp_api.c index d8f889a24fa..37267635d85 100644 --- a/src/plugins/lisp/lisp-cp/lisp_api.c +++ b/src/plugins/lisp/lisp-cp/lisp_api.c @@ -109,12 +109,10 @@ vl_api_lisp_add_del_locator_set_t_handler (vl_api_lisp_add_del_locator_set_t * vec_free (locator_name); vec_free (a->locators); - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_LISP_ADD_DEL_LOCATOR_SET_REPLY, ({ rmp->ls_index = clib_host_to_net_u32 (ls_index); })); - /* *INDENT-ON* */ } static void @@ -287,12 +285,10 @@ static void int rv = 0; vl_api_show_lisp_map_request_mode_reply_t *rmp; - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_SHOW_LISP_MAP_REQUEST_MODE_REPLY, ({ rmp->is_src_dst = vnet_lisp_get_map_request_mode (); })); - /* *INDENT-ON* */ } static void @@ -362,13 +358,11 @@ vl_api_show_lisp_use_petr_t_handler (vl_api_show_lisp_use_petr_t * mp) } } - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_SHOW_LISP_USE_PETR_REPLY, { rmp->is_petr_enable = status; ip_address_encode2 (&gid_address_ip (&addr), &rmp->ip_address); }); - /* *INDENT-ON* */ } static void @@ -589,7 +583,6 @@ vl_api_lisp_locator_set_dump_t_handler (vl_api_lisp_locator_set_dump_t * mp) return; filter = mp->filter; - /* *INDENT-OFF* */ pool_foreach (lsit, lcm->locator_set_pool) { if (filter && !((1 == filter && lsit->local) || @@ -600,7 +593,6 @@ vl_api_lisp_locator_set_dump_t_handler (vl_api_lisp_locator_set_dump_t * mp) send_lisp_locator_set_details (lcm, lsit, reg, mp->context, lsit - lcm->locator_set_pool); } - /* *INDENT-ON* */ } static void @@ -703,13 +695,11 @@ vl_api_lisp_eid_table_dump_t_handler (vl_api_lisp_eid_table_dump_t * mp) } else { - /* *INDENT-OFF* */ pool_foreach (mapit, lcm->mapping_pool) { send_lisp_eid_table_details(mapit, reg, mp->context, mp->filter); } - /* *INDENT-ON* */ } } @@ -820,12 +810,10 @@ vl_api_lisp_eid_table_map_dump_t_handler (vl_api_lisp_eid_table_map_dump_t * vni_table = lcm->table_id_by_vni; } - /* *INDENT-OFF* */ hash_foreach_pair (p, vni_table, ({ send_eid_table_map_pair (p, reg, mp->context); })); - /* *INDENT-ON* */ } static void @@ -868,12 +856,10 @@ static void vl_api_show_lisp_rloc_probe_state_reply_t *rmp = 0; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_SHOW_LISP_RLOC_PROBE_STATE_REPLY, { rmp->is_enabled = vnet_lisp_rloc_probe_state_get (); }); - /* *INDENT-ON* */ } static void @@ -883,12 +869,10 @@ static void vl_api_show_lisp_map_register_state_reply_t *rmp = 0; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_SHOW_LISP_MAP_REGISTER_STATE_REPLY, { rmp->is_enabled = vnet_lisp_map_register_state_get (); }); - /* *INDENT-ON* */ } static void @@ -903,13 +887,11 @@ vl_api_lisp_adjacencies_get_t_handler (vl_api_lisp_adjacencies_get_t * mp) adjs = vnet_lisp_adjacencies_get_by_vni (vni); size = vec_len (adjs) * sizeof (vl_api_lisp_adjacency_t); - /* *INDENT-OFF* */ REPLY_MACRO4 (VL_API_LISP_ADJACENCIES_GET_REPLY, size, { rmp->count = clib_host_to_net_u32 (vec_len (adjs)); lisp_adjacency_copy (rmp->adjacencies, adjs); }); - /* *INDENT-ON* */ vec_free (adjs); } @@ -927,7 +909,6 @@ vl_api_lisp_eid_table_vni_dump_t_handler (vl_api_lisp_eid_table_vni_dump_t * if (!reg) return; - /* *INDENT-OFF* */ hash_foreach_pair (p, lcm->table_id_by_vni, ({ hash_set (vnis, p->key, 0); @@ -942,7 +923,6 @@ vl_api_lisp_eid_table_vni_dump_t_handler (vl_api_lisp_eid_table_vni_dump_t * ({ send_eid_table_vni (p->key, reg, mp->context); })); - /* *INDENT-ON* */ hash_free (vnis); } @@ -953,13 +933,11 @@ vl_api_show_lisp_status_t_handler (vl_api_show_lisp_status_t * mp) vl_api_show_lisp_status_reply_t *rmp = NULL; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_SHOW_LISP_STATUS_REPLY, ({ rmp->is_gpe_enabled = vnet_lisp_gpe_enable_disable_status (); rmp->is_lisp_enabled = vnet_lisp_enable_disable_status (); })); - /* *INDENT-ON* */ } static void @@ -983,13 +961,11 @@ static void tmp_str = format (0, "%s", loc_set->name); } - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_LISP_GET_MAP_REQUEST_ITR_RLOCS_REPLY, ({ strncpy((char *) rmp->locator_set_name, (char *) tmp_str, ARRAY_LEN(rmp->locator_set_name) - 1); })); - /* *INDENT-ON* */ vec_free (tmp_str); } @@ -1027,14 +1003,12 @@ vl_api_show_lisp_pitr_t_handler (vl_api_show_lisp_pitr_t * mp) } vec_add1 (tmp_str, 0); - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_SHOW_LISP_PITR_REPLY, ({ rmp->is_enabled = lcm->flags & LISP_FLAG_PITR_MODE; strncpy((char *) rmp->locator_set_name, (char *) tmp_str, ARRAY_LEN(rmp->locator_set_name) - 1); })); - /* *INDENT-ON* */ } /* diff --git a/src/plugins/lisp/lisp-cp/lisp_cli.c b/src/plugins/lisp/lisp-cp/lisp_cli.c index 569d695b033..6c15898216d 100644 --- a/src/plugins/lisp/lisp-cp/lisp_cli.c +++ b/src/plugins/lisp/lisp-cp/lisp_cli.c @@ -64,13 +64,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_show_adjacencies_command) = { .path = "show lisp adjacencies", .short_help = "show lisp adjacencies", .function = lisp_show_adjacencies_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_add_del_map_server_command_fn (vlib_main_t * vm, @@ -120,13 +118,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_add_del_map_server_command) = { .path = "lisp map-server", .short_help = "lisp map-server add|del <ip>", .function = lisp_add_del_map_server_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -227,14 +223,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_add_del_local_eid_command) = { .path = "lisp eid-table", .short_help = "lisp eid-table add/del [vni <vni>] eid <eid> " "locator-set <locator-set> [key <secret-key> key-id sha1|sha256 ]", .function = lisp_add_del_local_eid_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_eid_table_map_command_fn (vlib_main_t * vm, @@ -274,13 +268,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_eid_table_map_command) = { .path = "lisp eid-table map", .short_help = "lisp eid-table map [del] vni <vni> vrf <vrf> | bd <bdi>", .function = lisp_eid_table_map_command_fn, }; -/* *INDENT-ON* */ /** * Handler for add/del remote mapping CLI. @@ -418,7 +410,6 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_add_del_remote_mapping_command) = { .path = "lisp remote-mapping", .short_help = "lisp remote-mapping add|del [del-all] vni <vni> " @@ -427,7 +418,6 @@ VLIB_CLI_COMMAND (lisp_add_del_remote_mapping_command) = { "w <weight> [rloc <dst-locator> ... ]", .function = lisp_add_del_remote_mapping_command_fn, }; -/* *INDENT-ON* */ /** * Handler for add/del adjacency CLI. @@ -525,14 +515,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_add_del_adjacency_command) = { .path = "lisp adjacency", .short_help = "lisp adjacency add|del vni <vni> reid <remote-eid> " "leid <local-eid>", .function = lisp_add_del_adjacency_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -575,13 +563,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_map_request_mode_command) = { .path = "lisp map-request mode", .short_help = "lisp map-request mode dst-only|src-dst", .function = lisp_map_request_mode_command_fn, }; -/* *INDENT-ON* */ static u8 * @@ -609,13 +595,11 @@ lisp_show_map_request_mode_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_show_map_request_mode_command) = { .path = "show lisp map-request mode", .short_help = "show lisp map-request mode", .function = lisp_show_map_request_mode_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_map_resolvers_command_fn (vlib_main_t * vm, @@ -632,13 +616,11 @@ lisp_show_map_resolvers_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_show_map_resolvers_command) = { .path = "show lisp map-resolvers", .short_help = "show lisp map-resolvers", .function = lisp_show_map_resolvers_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -691,13 +673,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_pitr_set_locator_set_command) = { .path = "lisp pitr", .short_help = "lisp pitr [disable] ls <locator-set-name>", .function = lisp_pitr_set_locator_set_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_pitr_command_fn (vlib_main_t * vm, @@ -744,13 +724,11 @@ lisp_show_pitr_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_show_pitr_command) = { .path = "show lisp pitr", .short_help = "Show pitr", .function = lisp_show_pitr_command_fn, }; -/* *INDENT-ON* */ static u8 * format_eid_entry (u8 * s, va_list * args) @@ -840,7 +818,6 @@ lisp_show_eid_table_command_fn (vlib_main_t * vm, if (print_all) { - /* *INDENT-OFF* */ pool_foreach (mapit, lcm->mapping_pool) { if (mapit->pitr_set) @@ -856,7 +833,6 @@ lisp_show_eid_table_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%U", format_eid_entry, lcm->vnet_main, lcm, mapit, ls); } - /* *INDENT-ON* */ } else { @@ -884,13 +860,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_cp_show_eid_table_command) = { .path = "show lisp eid-table", .short_help = "show lisp eid-table [local|remote|eid <eid>]", .function = lisp_show_eid_table_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -906,13 +880,11 @@ lisp_enable_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_cp_enable_command) = { .path = "lisp enable", .short_help = "lisp enable", .function = lisp_enable_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_disable_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -927,13 +899,11 @@ lisp_disable_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_cp_disable_command) = { .path = "lisp disable", .short_help = "lisp disable", .function = lisp_disable_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_map_register_enable_disable_command_fn (vlib_main_t * vm, @@ -980,13 +950,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_map_register_enable_disable_command) = { .path = "lisp map-register", .short_help = "lisp map-register [enable|disable]", .function = lisp_map_register_enable_disable_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_rloc_probe_enable_disable_command_fn (vlib_main_t * vm, @@ -1033,13 +1001,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_rloc_probe_enable_disable_command) = { .path = "lisp rloc-probe", .short_help = "lisp rloc-probe [enable|disable]", .function = lisp_rloc_probe_enable_disable_command_fn, }; -/* *INDENT-ON* */ static u8 * format_lisp_status (u8 * s, va_list * args) @@ -1060,13 +1026,11 @@ lisp_show_status_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_show_status_command) = { .path = "show lisp status", .short_help = "show lisp status", .function = lisp_show_status_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_eid_table_map_command_fn (vlib_main_t * vm, @@ -1112,12 +1076,10 @@ lisp_show_eid_table_map_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%=10s%=10s", "VNI", is_l2 ? "BD" : "VRF"); - /* *INDENT-OFF* */ hash_foreach_pair (p, vni_table, ({ vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]); })); - /* *INDENT-ON* */ done: unformat_free (line_input); @@ -1125,13 +1087,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_show_eid_table_map_command) = { .path = "show lisp eid-table map", .short_help = "show lisp eid-table map l2|l3", .function = lisp_show_eid_table_map_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -1201,14 +1161,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_cp_add_del_locator_set_command) = { .path = "lisp locator-set", .short_help = "lisp locator-set add/del <name> [iface <iface-name> " "p <priority> w <weight>]", .function = lisp_add_del_locator_set_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_add_del_locator_in_set_command_fn (vlib_main_t * vm, @@ -1277,14 +1235,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_cp_add_del_locator_in_set_command) = { .path = "lisp locator", .short_help = "lisp locator add/del locator-set <name> iface <iface-name> " "p <priority> w <weight>", .function = lisp_add_del_locator_in_set_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm, @@ -1299,7 +1255,6 @@ lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%s%=16s%=16s%=16s", "Locator-set", "Locator", "Priority", "Weight"); - /* *INDENT-OFF* */ pool_foreach (lsit, lcm->locator_set_pool) { u8 * msg = 0; @@ -1331,17 +1286,14 @@ lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%v", msg); vec_free (msg); } - /* *INDENT-ON* */ return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_cp_show_locator_sets_command) = { .path = "show lisp locator-set", .short_help = "Shows locator-sets", .function = lisp_cp_show_locator_sets_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -1396,13 +1348,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_add_del_map_resolver_command) = { .path = "lisp map-resolver", .short_help = "lisp map-resolver add/del <ip_address>", .function = lisp_add_del_map_resolver_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -1451,13 +1401,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_add_del_map_request_command) = { .path = "lisp map-request itr-rlocs", .short_help = "lisp map-request itr-rlocs add/del <locator_set_name>", .function = lisp_add_del_mreq_itr_rlocs_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_mreq_itr_rlocs_command_fn (vlib_main_t * vm, @@ -1481,13 +1429,11 @@ lisp_show_mreq_itr_rlocs_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_show_map_request_command) = { .path = "show lisp map-request itr-rlocs", .short_help = "Shows map-request itr-rlocs", .function = lisp_show_mreq_itr_rlocs_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_use_petr_set_locator_set_command_fn (vlib_main_t * vm, @@ -1534,7 +1480,6 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_use_petr_set_locator_set_command) = { .path = "lisp use-petr", .short_help = "lisp use-petr [disable] <petr-ip>", @@ -1586,13 +1531,11 @@ lisp_show_petr_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_show_petr_command) = { .path = "show lisp petr", .short_help = "Show petr", .function = lisp_show_petr_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/lisp/lisp-cp/lisp_cp_test.c b/src/plugins/lisp/lisp-cp/lisp_cp_test.c index 8657aae0bb1..a6c3ca92ce0 100644 --- a/src/plugins/lisp/lisp-cp/lisp_cp_test.c +++ b/src/plugins/lisp/lisp-cp/lisp_cp_test.c @@ -116,7 +116,6 @@ format_lisp_eid_vat (u8 * s, va_list * args) -/* *INDENT-OFF* */ /** Used for parsing LISP eids */ typedef struct lisp_eid_vat_t_ { @@ -130,7 +129,6 @@ typedef struct lisp_eid_vat_t_ /**< type of eid */ u8 type; } __clib_packed lisp_eid_vat_t; -/* *INDENT-ON* */ static uword unformat_lisp_eid_vat (unformat_input_t * input, va_list * args) diff --git a/src/plugins/lisp/lisp-cp/lisp_types.h b/src/plugins/lisp/lisp-cp/lisp_types.h index 324320b4758..21bd72178d7 100644 --- a/src/plugins/lisp/lisp-cp/lisp_types.h +++ b/src/plugins/lisp/lisp-cp/lisp_types.h @@ -238,7 +238,6 @@ void gid_address_ip_set (gid_address_t * dst, void *src, u8 version); _(nsh) \ _(sd) -/* *INDENT-OFF* */ #define _(_n) \ u16 _n ## _size_to_write (void * pref); \ u16 _n ## _write (u8 * p, void * pref); \ @@ -248,7 +247,6 @@ void _n ## _copy (void * dst , void * src); foreach_gid_address_type_fcns #undef _ -/* *INDENT-ON* */ always_inline u64 mac_to_u64 (u8 * m) diff --git a/src/plugins/lisp/lisp-cp/one_api.c b/src/plugins/lisp/lisp-cp/one_api.c index c88c45e1712..b5b523433f2 100644 --- a/src/plugins/lisp/lisp-cp/one_api.c +++ b/src/plugins/lisp/lisp-cp/one_api.c @@ -160,12 +160,10 @@ static void int rv = 0; u32 ttl = vnet_lisp_map_register_get_ttl (); - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_SHOW_ONE_MAP_REGISTER_TTL_REPLY, ({ rmp->ttl = clib_host_to_net_u32 (ttl); })); - /* *INDENT-ON* */ } static void @@ -212,12 +210,10 @@ vl_api_one_add_del_locator_set_t_handler (vl_api_one_add_del_locator_set_t * vec_free (locator_name); vec_free (a->locators); - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_ONE_ADD_DEL_LOCATOR_SET_REPLY, ({ rmp->ls_index = clib_host_to_net_u32 (ls_index); })); - /* *INDENT-ON* */ } static void @@ -466,12 +462,10 @@ static void int rv = 0; vl_api_show_one_map_request_mode_reply_t *rmp; - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_SHOW_ONE_MAP_REQUEST_MODE_REPLY, ({ rmp->mode = vnet_lisp_get_map_request_mode (); })); - /* *INDENT-ON* */ } static void @@ -559,7 +553,6 @@ vl_api_show_one_use_petr_t_handler (vl_api_show_one_use_petr_t * mp) } } - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_SHOW_ONE_USE_PETR_REPLY, { rmp->status = status; @@ -567,7 +560,6 @@ vl_api_show_one_use_petr_t_handler (vl_api_show_one_use_petr_t * mp) ip_address_encode2 (ip, &rmp->ip_address); }); - /* *INDENT-ON* */ } static void @@ -789,7 +781,6 @@ vl_api_one_locator_set_dump_t_handler (vl_api_one_locator_set_dump_t * mp) return; filter = mp->filter; - /* *INDENT-OFF* */ pool_foreach (lsit, lcm->locator_set_pool) { if (filter && !((1 == filter && lsit->local) || @@ -800,7 +791,6 @@ vl_api_one_locator_set_dump_t_handler (vl_api_one_locator_set_dump_t * mp) send_one_locator_set_details (lcm, lsit, reg, mp->context, lsit - lcm->locator_set_pool); } - /* *INDENT-ON* */ } static void @@ -919,13 +909,11 @@ vl_api_one_eid_table_dump_t_handler (vl_api_one_eid_table_dump_t * mp) } else { - /* *INDENT-OFF* */ pool_foreach (mapit, lcm->mapping_pool) { send_one_eid_table_details(mapit, reg, mp->context, mp->filter); } - /* *INDENT-ON* */ } } @@ -1034,12 +1022,10 @@ vl_api_one_eid_table_map_dump_t_handler (vl_api_one_eid_table_map_dump_t * mp) vni_table = lcm->table_id_by_vni; } - /* *INDENT-OFF* */ hash_foreach_pair (p, vni_table, ({ send_eid_table_map_pair (p, reg, mp->context); })); - /* *INDENT-ON* */ } static void @@ -1112,12 +1098,10 @@ static void vl_api_show_one_rloc_probe_state_reply_t *rmp = 0; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_SHOW_ONE_RLOC_PROBE_STATE_REPLY, { rmp->is_enable = vnet_lisp_rloc_probe_state_get (); }); - /* *INDENT-ON* */ } static void @@ -1127,12 +1111,10 @@ static void vl_api_show_one_map_register_state_reply_t *rmp = 0; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_SHOW_ONE_MAP_REGISTER_STATE_REPLY, { rmp->is_enable = vnet_lisp_map_register_state_get (); }); - /* *INDENT-ON* */ } static void @@ -1147,13 +1129,11 @@ vl_api_one_adjacencies_get_t_handler (vl_api_one_adjacencies_get_t * mp) adjs = vnet_lisp_adjacencies_get_by_vni (vni); size = vec_len (adjs) * sizeof (vl_api_one_adjacency_t); - /* *INDENT-OFF* */ REPLY_MACRO4 (VL_API_ONE_ADJACENCIES_GET_REPLY, size, { rmp->count = clib_host_to_net_u32 (vec_len (adjs)); one_adjacency_copy (rmp->adjacencies, adjs); }); - /* *INDENT-ON* */ vec_free (adjs); } @@ -1170,7 +1150,6 @@ vl_api_one_eid_table_vni_dump_t_handler (vl_api_one_eid_table_vni_dump_t * mp) if (!reg) return; - /* *INDENT-OFF* */ hash_foreach_pair (p, lcm->table_id_by_vni, ({ hash_set (vnis, p->key, 0); @@ -1185,7 +1164,6 @@ vl_api_one_eid_table_vni_dump_t_handler (vl_api_one_eid_table_vni_dump_t * mp) ({ send_eid_table_vni (p->key, reg, mp->context); })); - /* *INDENT-ON* */ hash_free (vnis); } @@ -1196,13 +1174,11 @@ vl_api_show_one_status_t_handler (vl_api_show_one_status_t * mp) vl_api_show_one_status_reply_t *rmp = NULL; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_SHOW_ONE_STATUS_REPLY, ({ rmp->gpe_status = vnet_lisp_gpe_enable_disable_status (); rmp->feature_status = vnet_lisp_enable_disable_status (); })); - /* *INDENT-ON* */ } static void @@ -1226,13 +1202,11 @@ static void tmp_str = format (0, "%s", loc_set->name); } - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_ONE_GET_MAP_REQUEST_ITR_RLOCS_REPLY, ({ strncpy((char *) rmp->locator_set_name, (char *) tmp_str, ARRAY_LEN(rmp->locator_set_name) - 1); })); - /* *INDENT-ON* */ vec_free (tmp_str); } @@ -1269,14 +1243,12 @@ vl_api_show_one_nsh_mapping_t_handler (vl_api_show_one_nsh_mapping_t * mp) } vec_add1 (tmp_str, 0); - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_SHOW_ONE_NSH_MAPPING_REPLY, ({ rmp->is_set = is_set; strncpy((char *) rmp->locator_set_name, (char *) tmp_str, ARRAY_LEN(rmp->locator_set_name) - 1); })); - /* *INDENT-ON* */ } static void @@ -1312,14 +1284,12 @@ vl_api_show_one_pitr_t_handler (vl_api_show_one_pitr_t * mp) } vec_add1 (tmp_str, 0); - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_SHOW_ONE_PITR_REPLY, ({ rmp->status = lcm->flags & LISP_FLAG_PITR_MODE; strncpy((char *) rmp->locator_set_name, (char *) tmp_str, ARRAY_LEN(rmp->locator_set_name) - 1); })); - /* *INDENT-ON* */ } static void @@ -1329,12 +1299,10 @@ static void vl_api_show_one_stats_enable_disable_reply_t *rmp = NULL; vnet_api_error_t rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_SHOW_ONE_STATS_ENABLE_DISABLE_REPLY, ({ rmp->is_enable = vnet_lisp_stats_enable_disable_state (); })); - /* *INDENT-ON* */ } static void @@ -1366,7 +1334,6 @@ vl_api_one_stats_dump_t_handler (vl_api_one_stats_dump_t * mp) stats = vnet_lisp_get_stats (); vec_foreach (stat, stats) { - /* *INDENT-OFF* */ REPLY_DETAILS (VL_API_ONE_STATS_DETAILS, ({ fid_to_api_eid (&stat->deid, &rmp->deid); @@ -1379,7 +1346,6 @@ vl_api_one_stats_dump_t_handler (vl_api_one_stats_dump_t * mp) rmp->pkt_count = clib_host_to_net_u32 (stat->counters.packets); rmp->bytes = clib_host_to_net_u32 (stat->counters.bytes); })); - /* *INDENT-ON* */ } } @@ -1439,7 +1405,6 @@ vl_api_one_ndp_bd_get_t_handler (vl_api_one_ndp_bd_get_t * mp) u32 *bds = vnet_lisp_ndp_bds_get (); u32 size = hash_elts (bds) * sizeof (u32); - /* *INDENT-OFF* */ REPLY_MACRO4 (VL_API_ONE_NDP_BD_GET_REPLY, size, { rmp->count = clib_host_to_net_u32 (hash_elts (bds)); @@ -1448,7 +1413,6 @@ vl_api_one_ndp_bd_get_t_handler (vl_api_one_ndp_bd_get_t * mp) rmp->bridge_domains[i++] = clib_host_to_net_u32 (p->key); })); }); - /* *INDENT-ON* */ hash_free (bds); } @@ -1464,7 +1428,6 @@ vl_api_one_l2_arp_bd_get_t_handler (vl_api_one_l2_arp_bd_get_t * mp) u32 *bds = vnet_lisp_l2_arp_bds_get (); u32 size = hash_elts (bds) * sizeof (u32); - /* *INDENT-OFF* */ REPLY_MACRO4 (VL_API_ONE_L2_ARP_BD_GET_REPLY, size, { rmp->count = clib_host_to_net_u32 (hash_elts (bds)); @@ -1473,7 +1436,6 @@ vl_api_one_l2_arp_bd_get_t_handler (vl_api_one_l2_arp_bd_get_t * mp) rmp->bridge_domains[i++] = clib_host_to_net_u32 (p->key); })); }); - /* *INDENT-ON* */ hash_free (bds); } @@ -1491,7 +1453,6 @@ vl_api_one_l2_arp_entries_get_t_handler (vl_api_one_l2_arp_entries_get_t * mp) entries = vnet_lisp_l2_arp_entries_get_by_bd (bd); u32 size = vec_len (entries) * sizeof (vl_api_one_l2_arp_entry_t); - /* *INDENT-OFF* */ REPLY_MACRO4 (VL_API_ONE_L2_ARP_ENTRIES_GET_REPLY, size, { rmp->count = clib_host_to_net_u32 (vec_len (entries)); @@ -1502,7 +1463,6 @@ vl_api_one_l2_arp_entries_get_t_handler (vl_api_one_l2_arp_entries_get_t * mp) i++; } }); - /* *INDENT-ON* */ vec_free (entries); } @@ -1528,12 +1488,10 @@ static void u32 value = vnet_lisp_map_register_fallback_threshold_get (); - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_SHOW_ONE_MAP_REGISTER_FALLBACK_THRESHOLD_REPLY, ({ rmp->value = clib_host_to_net_u32 (value); })); - /* *INDENT-ON* */ } static void @@ -1556,12 +1514,10 @@ static void int rv = 0; u8 proto = (u8) vnet_lisp_get_transport_protocol (); - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_ONE_GET_TRANSPORT_PROTOCOL_REPLY, ({ rmp->protocol = proto; })); - /* *INDENT-ON* */ } static void @@ -1577,7 +1533,6 @@ vl_api_one_ndp_entries_get_t_handler (vl_api_one_ndp_entries_get_t * mp) entries = vnet_lisp_ndp_entries_get_by_bd (bd); u32 size = vec_len (entries) * sizeof (vl_api_one_ndp_entry_t); - /* *INDENT-OFF* */ REPLY_MACRO4 (VL_API_ONE_NDP_ENTRIES_GET_REPLY, size, { rmp->count = clib_host_to_net_u32 (vec_len (entries)); @@ -1588,7 +1543,6 @@ vl_api_one_ndp_entries_get_t_handler (vl_api_one_ndp_entries_get_t * mp) i++; } }); - /* *INDENT-ON* */ vec_free (entries); } @@ -1609,12 +1563,10 @@ vl_api_one_show_xtr_mode_t_handler (vl_api_one_show_xtr_mode_t * mp) vl_api_one_show_xtr_mode_reply_t *rmp = 0; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_ONE_SHOW_XTR_MODE_REPLY, { rmp->is_enable = vnet_lisp_get_xtr_mode (); }); - /* *INDENT-ON* */ } static void @@ -1633,12 +1585,10 @@ vl_api_one_show_pitr_mode_t_handler (vl_api_one_show_pitr_mode_t * mp) vl_api_one_show_pitr_mode_reply_t *rmp = 0; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_ONE_SHOW_PITR_MODE_REPLY, { rmp->is_enable = vnet_lisp_get_pitr_mode (); }); - /* *INDENT-ON* */ } static void @@ -1657,12 +1607,10 @@ vl_api_one_show_petr_mode_t_handler (vl_api_one_show_petr_mode_t * mp) vl_api_one_show_petr_mode_reply_t *rmp = 0; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_ONE_SHOW_PETR_MODE_REPLY, { rmp->is_enable = vnet_lisp_get_petr_mode (); }); - /* *INDENT-ON* */ } /* @@ -1687,12 +1635,10 @@ VLIB_API_INIT_FUNCTION (one_api_hookup); #include <vlib/unix/plugin.h> #include <vpp/app/version.h> -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Locator ID Separation Protocol (LISP)", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/lisp/lisp-cp/one_cli.c b/src/plugins/lisp/lisp-cp/one_cli.c index b85fea16ea7..8658d5fafd7 100644 --- a/src/plugins/lisp/lisp-cp/one_cli.c +++ b/src/plugins/lisp/lisp-cp/one_cli.c @@ -62,13 +62,11 @@ lisp_show_adjacencies_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_adjacencies_command) = { .path = "show one adjacencies", .short_help = "show one adjacencies", .function = lisp_show_adjacencies_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_add_del_map_server_command_fn (vlib_main_t * vm, @@ -116,13 +114,11 @@ lisp_add_del_map_server_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_add_del_map_server_command) = { .path = "one map-server", .short_help = "one map-server add|del <ip>", .function = lisp_add_del_map_server_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -224,14 +220,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_add_del_local_eid_command) = { .path = "one eid-table", .short_help = "one eid-table add/del [vni <vni>] eid <eid> " "locator-set <locator-set> [key <secret-key> key-id sha1|sha256 ]", .function = lisp_add_del_local_eid_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_eid_table_map_command_fn (vlib_main_t * vm, @@ -271,13 +265,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_eid_table_map_command) = { .path = "one eid-table map", .short_help = "one eid-table map [del] vni <vni> vrf <vrf> | bd <bdi>", .function = lisp_eid_table_map_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_add_del_ndp_entry_command_fn (vlib_main_t * vm, @@ -335,13 +327,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_add_del_ndp_entry_command) = { .path = "one ndp", .short_help = "one ndp [del] bd <bd> mac <mac> ip <ipv6>", .function = lisp_add_del_ndp_entry_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_add_del_l2_arp_entry_command_fn (vlib_main_t * vm, @@ -399,13 +389,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_add_del_l2_arp_entry_command) = { .path = "one l2 arp", .short_help = "one l2 arp [del] bd <bd> mac <mac> ip <ipv4>", .function = lisp_add_del_l2_arp_entry_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_l2_arp_entries_command_fn (vlib_main_t * vm, @@ -416,7 +404,6 @@ lisp_show_l2_arp_entries_command_fn (vlib_main_t * vm, lisp_api_l2_arp_entry_t *entries, *e; hash_pair_t *p; - /* *INDENT-OFF* */ hash_foreach_pair (p, ht, ({ entries = vnet_lisp_l2_arp_entries_get_by_bd (p->key); @@ -429,19 +416,16 @@ lisp_show_l2_arp_entries_command_fn (vlib_main_t * vm, } vec_free (entries); })); - /* *INDENT-ON* */ hash_free (ht); return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_l2_arp_entries_command) = { .path = "show one l2 arp entries", .short_help = "Show ONE L2 ARP entries", .function = lisp_show_l2_arp_entries_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_ndp_entries_command_fn (vlib_main_t * vm, @@ -452,7 +436,6 @@ lisp_show_ndp_entries_command_fn (vlib_main_t * vm, lisp_api_ndp_entry_t *entries, *e; hash_pair_t *p; - /* *INDENT-OFF* */ hash_foreach_pair (p, ht, ({ entries = vnet_lisp_ndp_entries_get_by_bd (p->key); @@ -465,19 +448,16 @@ lisp_show_ndp_entries_command_fn (vlib_main_t * vm, } vec_free (entries); })); - /* *INDENT-ON* */ hash_free (ht); return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_ndp_entries_command) = { .path = "show one ndp entries", .short_help = "Show ONE NDP entries", .function = lisp_show_ndp_entries_command_fn, }; -/* *INDENT-ON* */ /** * Handler for add/del remote mapping CLI. @@ -613,7 +593,6 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_add_del_remote_mapping_command) = { .path = "one remote-mapping", .short_help = @@ -623,7 +602,6 @@ VLIB_CLI_COMMAND (one_add_del_remote_mapping_command) = { "[rloc <dst-locator> ... ]", .function = lisp_add_del_remote_mapping_command_fn, }; -/* *INDENT-ON* */ /** * Handler for add/del adjacency CLI. @@ -721,14 +699,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_add_del_adjacency_command) = { .path = "one adjacency", .short_help = "one adjacency add|del vni <vni> reid <remote-eid> " "leid <local-eid>", .function = lisp_add_del_adjacency_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -770,13 +746,11 @@ done: return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_map_request_mode_command) = { .path = "one map-request mode", .short_help = "one map-request mode dst-only|src-dst", .function = lisp_map_request_mode_command_fn, }; -/* *INDENT-ON* */ static u8 * @@ -804,13 +778,11 @@ lisp_show_map_request_mode_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_map_request_mode_command) = { .path = "show one map-request mode", .short_help = "show one map-request mode", .function = lisp_show_map_request_mode_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_map_resolvers_command_fn (vlib_main_t * vm, @@ -827,13 +799,11 @@ lisp_show_map_resolvers_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_map_resolvers_command) = { .path = "show one map-resolvers", .short_help = "show one map-resolvers", .function = lisp_show_map_resolvers_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_nsh_set_locator_set_command_fn (vlib_main_t * vm, @@ -884,13 +854,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_nsh_set_locator_set_command) = { .path = "one nsh-mapping", .short_help = "one nsh-mapping [del] ls <locator-set-name>", .function = lisp_nsh_set_locator_set_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_map_register_fallback_threshold_show_command_fn (vlib_main_t * vm, @@ -904,14 +872,12 @@ lisp_map_register_fallback_threshold_show_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_map_register_fallback_threshold_show_command) = { .path = "show one map-register fallback-threshold", .short_help = "show one map-register fallback-threshold", .function = lisp_map_register_fallback_threshold_show_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_map_register_fallback_threshold_command_fn (vlib_main_t * vm, @@ -949,13 +915,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_map_register_fallback_threshold_command) = { .path = "one map-register fallback-threshold", .short_help = "one map-register fallback-threshold <count>", .function = lisp_map_register_fallback_threshold_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_pitr_set_locator_set_command_fn (vlib_main_t * vm, @@ -1006,13 +970,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_pitr_set_locator_set_command) = { .path = "one pitr", .short_help = "one pitr [disable] ls <locator-set-name>", .function = lisp_pitr_set_locator_set_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_pitr_command_fn (vlib_main_t * vm, @@ -1059,13 +1021,11 @@ lisp_show_pitr_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_pitr_command) = { .path = "show one pitr", .short_help = "Show pitr", .function = lisp_show_pitr_command_fn, }; -/* *INDENT-ON* */ static u8 * format_eid_entry (u8 * s, va_list * args) @@ -1156,7 +1116,6 @@ lisp_show_eid_table_command_fn (vlib_main_t * vm, if (print_all) { - /* *INDENT-OFF* */ pool_foreach (mapit, lcm->mapping_pool) { if (mapit->pitr_set || mapit->nsh_set) @@ -1172,7 +1131,6 @@ lisp_show_eid_table_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%U", format_eid_entry, lcm->vnet_main, lcm, mapit, ls); } - /* *INDENT-ON* */ } else { @@ -1200,13 +1158,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_show_eid_table_command) = { .path = "show one eid-table", .short_help = "show one eid-table [local|remote|eid <eid>]", .function = lisp_show_eid_table_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_enable_disable_pitr_mode_command_fn (vlib_main_t * vm, @@ -1253,13 +1209,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_enable_disable_pitr_mode_command) = { .path = "one pitr mode", .short_help = "one pitr mode [enable|disable]", .function = lisp_enable_disable_pitr_mode_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -1307,13 +1261,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_enable_disable_petr_mode_command) = { .path = "one petr mode", .short_help = "one petr mode [enable|disable]", .function = lisp_enable_disable_petr_mode_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_enable_disable_xtr_mode_command_fn (vlib_main_t * vm, @@ -1360,13 +1312,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_enable_disable_xtr_mode_command) = { .path = "one xtr mode", .short_help = "one xtr mode [enable|disable]", .function = lisp_enable_disable_xtr_mode_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * one_enable_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -1381,13 +1331,11 @@ one_enable_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_enable_command) = { .path = "one enable", .short_help = "one enable", .function = one_enable_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * one_disable_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -1402,13 +1350,11 @@ one_disable_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_disable_command) = { .path = "one disable", .short_help = "one disable", .function = one_disable_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_map_register_set_ttl_command_fn (vlib_main_t * vm, @@ -1449,13 +1395,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_map_register_set_ttl_command) = { .path = "one map-register ttl", .short_help = "one map-register ttl", .function = lisp_map_register_set_ttl_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_map_register_show_ttl_command_fn (vlib_main_t * vm, @@ -1468,14 +1412,12 @@ lisp_map_register_show_ttl_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_map_register_show_ttl_command) = { .path = "show one map-register ttl", .short_help = "show one map-register ttl", .function = lisp_map_register_show_ttl_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_map_register_enable_disable_command_fn (vlib_main_t * vm, @@ -1522,13 +1464,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_map_register_enable_disable_command) = { .path = "one map-register", .short_help = "one map-register [enable|disable]", .function = lisp_map_register_enable_disable_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_rloc_probe_enable_disable_command_fn (vlib_main_t * vm, @@ -1575,13 +1515,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_rloc_probe_enable_disable_command) = { .path = "one rloc-probe", .short_help = "one rloc-probe [enable|disable]", .function = lisp_rloc_probe_enable_disable_command_fn, }; -/* *INDENT-ON* */ static u8 * format_lisp_status (u8 * s, va_list * args) @@ -1602,13 +1540,11 @@ lisp_show_status_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_status_command) = { .path = "show one status", .short_help = "show one status", .function = lisp_show_status_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_eid_table_map_command_fn (vlib_main_t * vm, @@ -1654,12 +1590,10 @@ lisp_show_eid_table_map_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%=10s%=10s", "VNI", is_l2 ? "BD" : "VRF"); - /* *INDENT-OFF* */ hash_foreach_pair (p, vni_table, ({ vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]); })); - /* *INDENT-ON* */ done: unformat_free (line_input); @@ -1667,13 +1601,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_eid_table_map_command) = { .path = "show one eid-table map", .short_help = "show one eid-table map l2|l3", .function = lisp_show_eid_table_map_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -1742,14 +1674,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_add_del_locator_set_command) = { .path = "one locator-set", .short_help = "one locator-set add/del <name> [iface <iface-name> " "p <priority> w <weight>]", .function = lisp_add_del_locator_set_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_add_del_locator_in_set_command_fn (vlib_main_t * vm, @@ -1818,14 +1748,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_add_del_locator_in_set_command) = { .path = "one locator", .short_help = "one locator add/del locator-set <name> iface <iface-name> " "p <priority> w <weight>", .function = lisp_add_del_locator_in_set_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm, @@ -1840,7 +1768,6 @@ lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%s%=16s%=16s%=16s", "Locator-set", "Locator", "Priority", "Weight"); - /* *INDENT-OFF* */ pool_foreach (lsit, lcm->locator_set_pool) { u8 * msg = 0; @@ -1872,17 +1799,14 @@ lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%v", msg); vec_free (msg); } - /* *INDENT-ON* */ return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_show_locator_sets_command) = { .path = "show one locator-set", .short_help = "Shows locator-sets", .function = lisp_cp_show_locator_sets_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -1936,13 +1860,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_add_del_map_resolver_command) = { .path = "one map-resolver", .short_help = "one map-resolver add/del <ip_address>", .function = lisp_add_del_map_resolver_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -1991,13 +1913,11 @@ done: } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_add_del_map_request_command) = { .path = "one map-request itr-rlocs", .short_help = "one map-request itr-rlocs add/del <locator_set_name>", .function = lisp_add_del_mreq_itr_rlocs_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_mreq_itr_rlocs_command_fn (vlib_main_t * vm, @@ -2021,13 +1941,11 @@ lisp_show_mreq_itr_rlocs_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_map_request_command) = { .path = "show one map-request itr-rlocs", .short_help = "Shows map-request itr-rlocs", .function = lisp_show_mreq_itr_rlocs_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_use_petr_set_locator_set_command_fn (vlib_main_t * vm, @@ -2073,7 +1991,6 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_use_petr_set_locator_set_command) = { .path = "one use-petr", .short_help = "one use-petr [disable] <petr-ip>", @@ -2125,13 +2042,11 @@ lisp_show_petr_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_petr_command) = { .path = "show one petr", .short_help = "Show petr", .function = lisp_show_petr_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_map_servers_command_fn (vlib_main_t * vm, @@ -2148,13 +2063,11 @@ lisp_show_map_servers_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_map_servers_command) = { .path = "show one map-servers", .short_help = "show one map servers", .function = lisp_show_map_servers_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_map_register_state_command_fn (vlib_main_t * vm, @@ -2170,13 +2083,11 @@ lisp_show_map_register_state_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_map_register_state_command) = { .path = "show one map-register state", .short_help = "show one map-register state", .function = lisp_show_map_register_state_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_rloc_probe_state_command_fn (vlib_main_t * vm, @@ -2192,13 +2103,11 @@ lisp_show_rloc_probe_state_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_rloc_probe_state_command) = { .path = "show one rloc state", .short_help = "show one RLOC state", .function = lisp_show_rloc_probe_state_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_stats_command_fn (vlib_main_t * vm, @@ -2210,13 +2119,11 @@ lisp_show_stats_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_stats_command) = { .path = "show one statistics status", .short_help = "show ONE statistics enable/disable status", .function = lisp_show_stats_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_stats_details_command_fn (vlib_main_t * vm, @@ -2244,13 +2151,11 @@ lisp_show_stats_details_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_stats_details_command) = { .path = "show one statistics details", .short_help = "show ONE statistics", .function = lisp_show_stats_details_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_stats_enable_disable_command_fn (vlib_main_t * vm, @@ -2282,13 +2187,11 @@ done: return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_stats_enable_disable_command) = { .path = "one statistics", .short_help = "enable/disable ONE statistics collecting", .function = lisp_stats_enable_disable_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_stats_flush_command_fn (vlib_main_t * vm, @@ -2299,13 +2202,11 @@ lisp_stats_flush_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_stats_flush_command) = { .path = "one statistics flush", .short_help = "Flush ONE statistics", .function = lisp_stats_flush_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_one_modes_command_fn (vlib_main_t * vm, @@ -2323,13 +2224,11 @@ lisp_show_one_modes_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_show_one_modes_modes_command) = { .path = "show one modes", .short_help = "show one modes", .function = lisp_show_one_modes_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/lisp/lisp-cp/one_test.c b/src/plugins/lisp/lisp-cp/one_test.c index ad308b73c5e..475b52de15e 100644 --- a/src/plugins/lisp/lisp-cp/one_test.c +++ b/src/plugins/lisp/lisp-cp/one_test.c @@ -671,7 +671,6 @@ vl_api_show_one_pitr_reply_t_handler (vl_api_show_one_pitr_reply_t * mp) vam->result_ready = 1; } -/* *INDENT-OFF* */ /** Used for parsing LISP eids */ typedef CLIB_PACKED(struct{ union { @@ -682,7 +681,6 @@ typedef CLIB_PACKED(struct{ u32 len; /**< prefix length if IP */ u8 type; /**< type of eid */ }) lisp_eid_vat_t; -/* *INDENT-ON* */ static uword unformat_lisp_eid_vat (unformat_input_t * input, va_list * args) diff --git a/src/plugins/lisp/lisp-cp/packets.c b/src/plugins/lisp/lisp-cp/packets.c index 3f4292b4841..6c36a550ab4 100644 --- a/src/plugins/lisp/lisp-cp/packets.c +++ b/src/plugins/lisp/lisp-cp/packets.c @@ -217,7 +217,6 @@ pkt_push_ecm_hdr (vlib_buffer_t * b) return h; } -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/lisp/lisp-cp/packets.h b/src/plugins/lisp/lisp-cp/packets.h index 68cd949e75d..c10fdb28c79 100644 --- a/src/plugins/lisp/lisp-cp/packets.h +++ b/src/plugins/lisp/lisp-cp/packets.h @@ -27,7 +27,6 @@ void *pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, void *pkt_push_ecm_hdr (vlib_buffer_t * b); -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/lisp/lisp-gpe/decap.c b/src/plugins/lisp/lisp-gpe/decap.c index 59fd5646ee7..18e32675a32 100644 --- a/src/plugins/lisp/lisp-gpe/decap.c +++ b/src/plugins/lisp/lisp-gpe/decap.c @@ -456,7 +456,6 @@ static char *lisp_gpe_ip4_input_error_strings[] = { #undef lisp_gpe_error }; -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (lisp_gpe_ip4_input_node) = { .function = lisp_gpe_ip4_input, .name = "lisp-gpe-ip4-input", @@ -476,9 +475,7 @@ VLIB_REGISTER_NODE (lisp_gpe_ip4_input_node) = { .format_trace = format_lisp_gpe_rx_trace, // $$$$ .unformat_buffer = unformat_lisp_gpe_header, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (lisp_gpe_ip6_input_node) = { .function = lisp_gpe_ip6_input, .name = "lisp-gpe-ip6-input", @@ -498,7 +495,6 @@ VLIB_REGISTER_NODE (lisp_gpe_ip6_input_node) = { .format_trace = format_lisp_gpe_rx_trace, // $$$$ .unformat_buffer = unformat_lisp_gpe_header, }; -/* *INDENT-ON* */ /** * Adds arc from lisp-gpe-input to nsh-input if nsh-input is available @@ -556,7 +552,6 @@ static char *lisp_gpe_nsh_placeholder_error_strings[] = { "lisp gpe placeholder nsh decap", }; -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (lisp_gpe_nsh_placeholder_input_node) = { .function = lisp_gpe_nsh_placeholder_input, .name = "lisp-gpe-nsh-placeholder-input", @@ -571,7 +566,6 @@ VLIB_REGISTER_NODE (lisp_gpe_nsh_placeholder_input_node) = { [0] = "error-drop", }, }; -/* *INDENT-ON* */ static clib_error_t * lisp_add_placeholder_nsh_node_command_fn (vlib_main_t * vm, @@ -586,12 +580,10 @@ lisp_add_placeholder_nsh_node_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_add_placeholder_nsh_node_command, static) = { .path = "test one nsh add-placeholder-decap-node", .function = lisp_add_placeholder_nsh_node_command_fn, }; -/* *INDENT-ON* */ VLIB_INIT_FUNCTION (gpe_decap_init); diff --git a/src/plugins/lisp/lisp-gpe/interface.c b/src/plugins/lisp/lisp-gpe/interface.c index 05669ae975f..ed2b08f9aaf 100644 --- a/src/plugins/lisp/lisp-gpe/interface.c +++ b/src/plugins/lisp/lisp-gpe/interface.c @@ -158,12 +158,10 @@ format_lisp_gpe_name (u8 * s, va_list * args) return format (s, "lisp_gpe%d", dev_instance); } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (lisp_gpe_device_class) = { .name = "LISP_GPE", .format_device_name = format_lisp_gpe_name, }; -/* *INDENT-ON* */ u8 * format_lisp_gpe_header_with_length (u8 * s, va_list * args) @@ -188,14 +186,12 @@ format_lisp_gpe_header_with_length (u8 * s, va_list * args) return s; } -/* *INDENT-OFF* */ VNET_HW_INTERFACE_CLASS (lisp_gpe_hw_class) = { .name = "LISP_GPE", .format_header = format_lisp_gpe_header_with_length, .build_rewrite = lisp_gpe_build_rewrite, .update_adjacency = lisp_gpe_update_adjacency, }; -/* *INDENT-ON* */ typedef struct @@ -300,14 +296,12 @@ format_l2_lisp_gpe_name (u8 * s, va_list * args) return format (s, "l2_lisp_gpe%d", dev_instance); } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (l2_lisp_gpe_device_class,static) = { .name = "L2_LISP_GPE", .format_device_name = format_l2_lisp_gpe_name, .format_tx_trace = format_l2_lisp_gpe_tx_trace, .tx_function = l2_lisp_gpe_interface_tx, }; -/* *INDENT-ON* */ typedef struct { @@ -404,14 +398,12 @@ format_nsh_lisp_gpe_name (u8 * s, va_list * args) return format (s, "nsh_lisp_gpe%d", dev_instance); } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (nsh_lisp_gpe_device_class,static) = { .name = "NSH_LISP_GPE", .format_device_name = format_nsh_lisp_gpe_name, .format_tx_trace = format_nsh_lisp_gpe_tx_trace, .tx_function = nsh_lisp_gpe_interface_tx, }; -/* *INDENT-ON* */ static vnet_hw_interface_t * lisp_gpe_create_iface (lisp_gpe_main_t * lgm, u32 vni, u32 dp_table, @@ -924,13 +916,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (add_del_lisp_gpe_iface_command, static) = { .path = "gpe iface", .short_help = "gpe iface add/del vni <vni> vrf <vrf>", .function = lisp_gpe_add_del_iface_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe.c b/src/plugins/lisp/lisp-gpe/lisp_gpe.c index 1ae3131323c..7474d0fb6a5 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe.c @@ -169,7 +169,6 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_gpe_add_del_fwd_entry_command, static) = { .path = "gpe entry", .short_help = "gpe entry add/del vni <vni> vrf/bd <id> [leid <leid>]" @@ -177,7 +176,6 @@ VLIB_CLI_COMMAND (lisp_gpe_add_del_fwd_entry_command, static) = { "[negative action <action>]", .function = lisp_gpe_add_del_fwd_entry_command_fn, }; -/* *INDENT-ON* */ /** Check if LISP-GPE is enabled. */ u8 @@ -271,13 +269,11 @@ gpe_set_encap_mode_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (gpe_set_encap_mode_command, static) = { .path = "gpe encap", .short_help = "gpe encap [lisp|vxlan]", .function = gpe_set_encap_mode_command_fn, }; -/* *INDENT-ON* */ /** Format GPE encap mode. */ u8 * @@ -307,13 +303,11 @@ gpe_show_encap_mode_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (gpe_show_encap_mode_command, static) = { .path = "show gpe encap", .short_help = "show GPE encapulation mode", .function = gpe_show_encap_mode_command_fn, }; -/* *INDENT-ON* */ /** CLI command to enable/disable LISP-GPE. */ static clib_error_t * @@ -352,13 +346,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (enable_disable_lisp_gpe_command, static) = { .path = "gpe", .short_help = "gpe [enable|disable]", .function = lisp_gpe_enable_disable_command_fn, }; -/* *INDENT-ON* */ /** CLI command to show LISP-GPE interfaces. */ static clib_error_t * @@ -371,31 +363,25 @@ lisp_show_iface_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%=10s%=12s", "vrf", "hw_if_index"); - /* *INDENT-OFF* */ hash_foreach_pair (p, lgm->l3_ifaces.hw_if_index_by_dp_table, ({ vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]); })); - /* *INDENT-ON* */ if (0 != lgm->l2_ifaces.hw_if_index_by_dp_table) { vlib_cli_output (vm, "%=10s%=12s", "bd_id", "hw_if_index"); - /* *INDENT-OFF* */ hash_foreach_pair (p, lgm->l2_ifaces.hw_if_index_by_dp_table, ({ vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]); })); - /* *INDENT-ON* */ } return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_show_iface_command) = { .path = "show gpe interface", .short_help = "show gpe interface", .function = lisp_show_iface_command_fn, }; -/* *INDENT-ON* */ /** CLI command to show GPE fwd native route path. */ static clib_error_t * @@ -428,13 +414,11 @@ gpe_show_native_fwd_rpath_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (gpe_show_native_fwd_rpath_command) = { .path = "show gpe native-forward", .short_help = "show gpe native-forward", .function = gpe_show_native_fwd_rpath_command_fn, }; -/* *INDENT-ON* */ void gpe_update_native_fwd_path (u8 ip_version) @@ -578,14 +562,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (gpe_native_forward_command) = { .path = "gpe native-forward", .short_help = "gpe native-forward [del] via <nh-ip-addr> [iface] " "[table <table>]", .function = gpe_native_forward_command_fn, }; -/* *INDENT-ON* */ /** Format LISP-GPE status. */ u8 * @@ -709,13 +691,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_test_nsh_command, static) = { .path = "test one nsh", .short_help = "test gpe nsh pcap <path-to-pcap-file>", .function = lisp_test_nsh_command_fn, }; -/* *INDENT-ON* */ VLIB_INIT_FUNCTION (lisp_gpe_init); diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe.h b/src/plugins/lisp/lisp-gpe/lisp_gpe.h index 10dc4fe7aa7..d7e877124a1 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe.h +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe.h @@ -36,22 +36,18 @@ #include <vppinfra/bihash_template.h> /** IP4-UDP-LISP encap header */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { ip4_header_t ip4; /* 20 bytes */ udp_header_t udp; /* 8 bytes */ lisp_gpe_header_t lisp; /* 8 bytes */ }) ip4_udp_lisp_gpe_header_t; -/* *INDENT-ON* */ /** IP6-UDP-LISP encap header */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { ip6_header_t ip6; /* 40 bytes */ udp_header_t udp; /* 8 bytes */ lisp_gpe_header_t lisp; /* 8 bytes */ }) ip6_udp_lisp_gpe_header_t; -/* *INDENT-ON* */ #define foreach_lisp_gpe_ip_input_next \ _(DROP, "error-drop") \ diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe_adjacency.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_adjacency.c index 7c857b92575..562b3b5eafb 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe_adjacency.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_adjacency.c @@ -557,7 +557,6 @@ lisp_gpe_adjacency_show (vlib_main_t * vm, } else { - /* *INDENT-OFF* */ pool_foreach (ladj, lisp_adj_pool) { vlib_cli_output (vm, "[%d] %U\n", @@ -565,19 +564,16 @@ lisp_gpe_adjacency_show (vlib_main_t * vm, format_lisp_gpe_adjacency, ladj, LISP_GPE_ADJ_FORMAT_FLAG_NONE); } - /* *INDENT-ON* */ } return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_lisp_gpe_tunnel_command, static) = { .path = "show gpe adjacency", .function = lisp_gpe_adjacency_show, }; -/* *INDENT-ON* */ #define LISP_ADJ_NBR_DEFAULT_HASH_NUM_BUCKETS (256) #define LISP_ADJ_NBR_DEFAULT_HASH_MEMORY_SIZE (1<<20) diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe_api.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_api.c index df90ef54403..f77a6f4059f 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe_api.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_api.c @@ -212,7 +212,6 @@ vl_api_gpe_fwd_entry_vnis_get_t_handler (vl_api_gpe_fwd_entry_vnis_get_t * mp) u32 *vnis = vnet_lisp_gpe_get_fwd_entry_vnis (); u32 size = hash_elts (vnis) * sizeof (u32); - /* *INDENT-OFF* */ REPLY_MACRO4 (VL_API_GPE_FWD_ENTRY_VNIS_GET_REPLY, size, { rmp->count = clib_host_to_net_u32 (hash_elts (vnis)); @@ -221,7 +220,6 @@ vl_api_gpe_fwd_entry_vnis_get_t_handler (vl_api_gpe_fwd_entry_vnis_get_t * mp) rmp->vnis[i++] = clib_host_to_net_u32 (p->key); })); }); - /* *INDENT-ON* */ hash_free (vnis); } @@ -239,14 +237,12 @@ vl_api_gpe_fwd_entries_get_t_handler (vl_api_gpe_fwd_entries_get_t * mp) e = vnet_lisp_gpe_fwd_entries_get_by_vni (mp->vni); size = vec_len (e) * sizeof (vl_api_gpe_fwd_entry_t); - /* *INDENT-OFF* */ REPLY_MACRO4 (VL_API_GPE_FWD_ENTRIES_GET_REPLY, size, { rmp->count = vec_len (e); gpe_fwd_entries_copy (rmp->entries, e); gpe_fwd_entries_get_reply_t_host_to_net (rmp); }); - /* *INDENT-ON* */ vec_free (e); } @@ -294,12 +290,10 @@ vl_api_gpe_add_del_fwd_entry_t_handler (vl_api_gpe_add_del_fwd_entry_t * mp) rv = vnet_lisp_gpe_add_del_fwd_entry (a, 0); vec_free (pairs); send_reply: - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_GPE_ADD_DEL_FWD_ENTRY_REPLY, { rmp->fwd_entry_index = clib_host_to_net_u32 (a->fwd_entry_index); }); - /* *INDENT-ON* */ } static void @@ -365,12 +359,10 @@ vl_api_gpe_get_encap_mode_t_handler (vl_api_gpe_get_encap_mode_t * mp) vl_api_gpe_get_encap_mode_reply_t *rmp; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_GPE_GET_ENCAP_MODE_REPLY, ({ rmp->encap_mode = vnet_gpe_get_encap_mode (); })); - /* *INDENT-ON* */ } static void @@ -464,7 +456,6 @@ vl_api_gpe_native_fwd_rpaths_get_t_handler (vl_api_gpe_native_fwd_rpaths_get_t size = vec_len (lgm->native_fwd_rpath[rpath_index]) * sizeof (vl_api_gpe_native_fwd_rpath_t); - /* *INDENT-OFF* */ REPLY_MACRO4 (VL_API_GPE_NATIVE_FWD_RPATHS_GET_REPLY, size, { rmp->count = vec_len (lgm->native_fwd_rpath[rpath_index]); @@ -472,7 +463,6 @@ vl_api_gpe_native_fwd_rpaths_get_t_handler (vl_api_gpe_native_fwd_rpaths_get_t lgm->native_fwd_rpath[rpath_index]); gpe_native_fwd_rpaths_get_reply_t_host_to_net (rmp); }); - /* *INDENT-ON* */ } /* diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe_fwd_entry.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_fwd_entry.c index 5f196fb22e3..d0d86d58391 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe_fwd_entry.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_fwd_entry.c @@ -1356,7 +1356,6 @@ vnet_lisp_gpe_fwd_entry_flush (void) lisp_gpe_main_t *lgm = &lisp_gpe_main; lisp_gpe_fwd_entry_t *lfe; - /* *INDENT-OFF* */ pool_foreach (lfe, lgm->lisp_fwd_entry_pool) { switch (fid_addr_type(&lfe->key->rmt)) @@ -1372,7 +1371,6 @@ vnet_lisp_gpe_fwd_entry_flush (void) break; } } - /* *INDENT-ON* */ } static u8 * @@ -1476,7 +1474,6 @@ lisp_gpe_fwd_entry_show (vlib_main_t * vm, return (NULL); } - /* *INDENT-OFF* */ pool_foreach (lfe, lgm->lisp_fwd_entry_pool) { if ((vni == ~0) || @@ -1484,18 +1481,15 @@ lisp_gpe_fwd_entry_show (vlib_main_t * vm, vlib_cli_output (vm, "%U", format_lisp_gpe_fwd_entry, lfe, LISP_GPE_FWD_ENTRY_FORMAT_NONE); } - /* *INDENT-ON* */ return (NULL); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_gpe_fwd_entry_show_command, static) = { .path = "show gpe entry", .short_help = "show gpe entry vni <vni> vrf <vrf> [leid <leid>] reid <reid>", .function = lisp_gpe_fwd_entry_show, }; -/* *INDENT-ON* */ clib_error_t * lisp_gpe_fwd_entry_init (vlib_main_t * vm) @@ -1521,12 +1515,10 @@ vnet_lisp_gpe_get_fwd_entry_vnis (void) lisp_gpe_fwd_entry_t *lfe; u32 *vnis = 0; - /* *INDENT-OFF* */ pool_foreach (lfe, lgm->lisp_fwd_entry_pool) { hash_set (vnis, lfe->key->vni, 0); } - /* *INDENT-ON* */ return vnis; } @@ -1538,7 +1530,6 @@ vnet_lisp_gpe_fwd_entries_get_by_vni (u32 vni) lisp_gpe_fwd_entry_t *lfe; lisp_api_gpe_fwd_entry_t *entries = 0, e; - /* *INDENT-OFF* */ pool_foreach (lfe, lgm->lisp_fwd_entry_pool) { if (lfe->key->vni == vni) @@ -1554,7 +1545,6 @@ vnet_lisp_gpe_fwd_entries_get_by_vni (u32 vni) vec_add1 (entries, e); } } - /* *INDENT-ON* */ return entries; } diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe_sub_interface.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_sub_interface.c index c316f6c9825..4ba46c8240f 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe_sub_interface.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_sub_interface.c @@ -243,23 +243,19 @@ lisp_gpe_sub_interface_show (vlib_main_t * vm, vlib_cli_output (vm, "%-16s%=8s%=15s%s", "Name", "VNI", "sw_if_index", "local RLOC"); - /* *INDENT-OFF* */ pool_foreach (l3s, lisp_gpe_sub_interface_pool) { vlib_cli_output (vm, "%U", format_lisp_gpe_sub_interface, l3s); } - /* *INDENT-ON* */ return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_gpe_sub_interface_command) = { .path = "show gpe sub-interface", .short_help = "show gpe sub-interface", .function = lisp_gpe_sub_interface_show, }; -/* *INDENT-ON* */ static clib_error_t * lisp_gpe_sub_interface_module_init (vlib_main_t * vm) diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe_tenant.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_tenant.c index b6173b273c0..450c611c5f7 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe_tenant.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_tenant.c @@ -262,13 +262,11 @@ lisp_gpe_tenant_flush (void) { lisp_gpe_tenant_t *lt; - /* *INDENT-OFF* */ pool_foreach (lt, lisp_gpe_tenant_pool) { lisp_gpe_tenant_l2_iface_unlock(lt->lt_vni); lisp_gpe_tenant_l3_iface_unlock(lt->lt_vni); } - /* *INDENT-ON* */ } /** @@ -305,23 +303,19 @@ lisp_gpe_tenant_show (vlib_main_t * vm, { lisp_gpe_tenant_t *lt; - /* *INDENT-OFF* */ pool_foreach (lt, lisp_gpe_tenant_pool) { vlib_cli_output (vm, "%U", format_lisp_gpe_tenant, lt); } - /* *INDENT-ON* */ return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_gpe_tenant_command) = { .path = "show gpe tenant", .short_help = "show gpe tenant", .function = lisp_gpe_tenant_show, }; -/* *INDENT-ON* */ /* diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe_test.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_test.c index 2f1a4187551..10167b14975 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe_test.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_test.c @@ -256,7 +256,6 @@ end: } -/* *INDENT-OFF* */ /** Used for parsing LISP eids */ typedef CLIB_PACKED(struct{ union { @@ -267,7 +266,6 @@ typedef CLIB_PACKED(struct{ u32 len; /**< prefix length if IP */ u8 type; /**< type of eid */ }) lisp_eid_vat_t; -/* *INDENT-ON* */ static uword unformat_lisp_eid_vat (unformat_input_t * input, va_list * args) diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe_tunnel.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_tunnel.c index 14ee095d2de..8dca55c4315 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe_tunnel.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_tunnel.c @@ -253,24 +253,20 @@ show_lisp_gpe_tunnel_command_fn (vlib_main_t * vm, } else { - /* *INDENT-OFF* */ pool_foreach (lgt, lisp_gpe_tunnel_pool) { vlib_cli_output (vm, "%U", format_lisp_gpe_tunnel, lgt); } - /* *INDENT-ON* */ } return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_lisp_gpe_tunnel_command, static) = { .path = "show gpe tunnel", .function = show_lisp_gpe_tunnel_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_gpe_tunnel_module_init (vlib_main_t * vm) diff --git a/src/plugins/lisp/test/lisp_cp_test.c b/src/plugins/lisp/test/lisp_cp_test.c index 228ff32d010..d1908566f8e 100644 --- a/src/plugins/lisp/test/lisp_cp_test.c +++ b/src/plugins/lisp/test/lisp_cp_test.c @@ -99,7 +99,6 @@ test_lisp_msg_push_ecm () /* clear ip checksum */ clib_memset ((u8 *) ih + 10, 0, 2); - /* *INDENT-OFF* */ u8 expected_ip4_hdr[] = { 0x45, /* version; IHL */ 0x00, /* services */ @@ -112,7 +111,6 @@ test_lisp_msg_push_ecm () 0xd4, 0xc3, 0xb2, 0xa1, /* src IP */ 0x63, 0x72, 0x81, 0x90, /* dst IP */ }; - /* *INDENT-ON* */ _assert (0 == memcmp (ih, expected_ip4_hdr, sizeof (expected_ip4_hdr))); @@ -120,14 +118,12 @@ test_lisp_msg_push_ecm () /* clear udp checksum */ clib_memset ((u8 *) uh + 6, 0, 2); - /* *INDENT-OFF* */ u8 expected_udp_hdr[] = { 0x00, 0x15, /* src port */ 0x00, 0x14, /* dst port */ 0x03, 0x8c, /* length */ 0x00, 0x00, /* checksum */ }; - /* *INDENT-ON* */ _assert (0 == memcmp (uh, expected_udp_hdr, sizeof (expected_udp_hdr))); @@ -149,7 +145,6 @@ test_lisp_msg_parse_mapping_record () b = clib_mem_alloc (buff_len); clib_memset ((u8 *) b, 0, buff_len); - /* *INDENT-OFF* */ u8 map_reply_records[] = { /* 1. record */ 0x01, 0x02, 0x03, 0x04, /* record TTL */ @@ -167,7 +162,6 @@ test_lisp_msg_parse_mapping_record () 0x00, 0x01, /* Loc-AFI */ 0xaa, 0xbb, 0xcc, 0xdd, /* Loator */ }; - /* *INDENT-ON* */ b->current_length = buff_len; clib_memcpy (b->data, map_reply_records, sizeof (map_reply_records)); @@ -322,7 +316,6 @@ test_lisp_msg_put_mreq_with_lcaf () /* clear Nonce to simplify comparison */ clib_memset ((u8 *) h + 4, 0, 8); - /* *INDENT-OFF* */ u8 expected_data[] = { 0x10, 0x40, 0x00, 0x01, /* type; flags; IRC; REC count */ @@ -349,7 +342,6 @@ test_lisp_msg_put_mreq_with_lcaf () 0x00, 0x01, /* EID-prefix-AFI */ 0xf0, 0xde, 0xbc, 0x9a, /* EID-prefix */ }; - /* *INDENT-ON* */ _assert (0 == memcmp (expected_data, (u8 *) h, sizeof (expected_data))); done: @@ -377,7 +369,6 @@ test_lisp_msg_put_mreq () print_map_request (h); - /* *INDENT-OFF* */ u8 expected_data[50] = { 0x10, 0x40, 0x01, 0x01, /* type; flags; IRC; REC count */ 0x00, 0x00, 0x00, 0x00, @@ -400,7 +391,6 @@ test_lisp_msg_put_mreq () 0x00, 0x01, /* EID-prefix-AFI */ 0xf0, 0xde, 0xbc, 0x9a, /* EID-prefix */ }; - /* *INDENT-ON* */ _assert (0 == memcmp (expected_data, (u8 *) h, sizeof (expected_data))); @@ -415,7 +405,6 @@ build_test_map_records () { mapping_t *records = 0; - /* *INDENT-OFF* */ mapping_t r = { .ttl = MAP_REGISTER_DEFAULT_TTL, .eid = { @@ -439,7 +428,6 @@ build_test_map_records () } } }; - /* *INDENT-ON* */ vec_add1 (r.locators, loc); vec_add1 (records, r); @@ -482,7 +470,6 @@ test_lisp_map_register () /* clear authentication data */ clib_memset ((u8 *) b->data + 16, 0, 20); - /* *INDENT-OFF* */ u8 expected_data[] = { 0x30, 0x00, 0x01, 0x01, /* type; rsvd; want notify; REC count */ 0x00, 0x00, 0x00, 0x00, @@ -509,7 +496,6 @@ test_lisp_map_register () 0x00, 0x04, 0x00, 0x01, /* flags, AFI = ipv4 */ 0x66, 0x77, 0x88, 0x99, /* ipv4 locator address */ }; - /* *INDENT-ON* */ _assert (0 == memcmp (expected_data, b->data, sizeof (expected_data))); done: @@ -537,20 +523,17 @@ test_lisp_parse_map_reply () { clib_error_t *error = 0; - /* *INDENT-OFF* */ u8 map_reply_data[] = { 0x00, 0x00, 0x00, 0x01, /* type; rsvd; mapping count */ 0x00, 0x00, 0x00, 0x00, }; - /* *INDENT-ON* */ vlib_buffer_t *b = create_buffer (map_reply_data, sizeof (map_reply_data)); map_records_arg_t *mrecs = parse_map_reply (b); _assert (0 == mrecs); clib_mem_free (b); - /* *INDENT-OFF* */ u8 map_reply_data2[] = { 0x00, 0x00, 0x00, 0x01, /* type; rsvd */ @@ -561,7 +544,6 @@ test_lisp_parse_map_reply () 0x01, 0x02, 0x03, 0x04, /* record TTL */ 0x01, /* locator count */ }; - /* *INDENT-ON* */ b = create_buffer (map_reply_data2, sizeof (map_reply_data2)); mrecs = parse_map_reply (b); @@ -585,7 +567,6 @@ test_lisp_parse_lcaf () b = clib_mem_alloc (buff_len); clib_memset ((u8 *) b, 0, buff_len); - /* *INDENT-OFF* */ u8 map_reply_records[] = { /* 1. record */ @@ -644,7 +625,6 @@ test_lisp_parse_lcaf () 0x00, 0x01, /* Loc-AFI */ 0xaa, 0xbb, 0xcc, 0xdd, /* Loator */ }; - /* *INDENT-ON* */ b->current_length = buff_len; memcpy (b->data, map_reply_records, sizeof (map_reply_records)); @@ -785,13 +765,11 @@ test_gid_parse_ip_pref () gid_address_t _gid_addr, *gid_addr = &_gid_addr; gid_address_t _gid_addr_copy, *copy = &_gid_addr_copy; - /* *INDENT-OFF* */ u8 data[] = { 0x00, 0x01, /* AFI = IPv4 */ 0x10, 0xbb, 0xcc, 0xdd, /* ipv4 address */ }; - /* *INDENT-ON* */ u32 len = gid_address_parse (data, gid_addr); _assert (6 == len); @@ -808,14 +786,12 @@ test_gid_parse_mac () gid_address_t _gid, *gid = &_gid; gid_address_t _gid_copy, *gid_copy = &_gid_copy; - /* *INDENT-OFF* */ u8 data[] = { 0x40, 0x05, /* AFI = MAC address */ 0x10, 0xbb, 0xcc, 0xdd, /* MAC */ 0x77, 0x99, }; - /* *INDENT-ON* */ u32 len = gid_address_parse (data, gid); _assert (8 == len); @@ -843,7 +819,6 @@ test_gid_write_nsh (void) u16 len = gid_address_put (b, &g); - /* *INDENT-OFF* */ u8 expected[] = { 0x40, 0x03, 0x00, 0x00, /* AFI = LCAF*/ @@ -852,7 +827,6 @@ test_gid_write_nsh (void) /* Service Path ID, Service index */ 0x11, 0x22, 0x33, 0x42, /* SPI, SI */ }; - /* *INDENT-ON* */ _assert (sizeof (expected) == len); _assert (0 == memcmp (expected, b, len)); @@ -871,7 +845,6 @@ test_gid_parse_nsh () clib_memset (gid_addr, 0, sizeof (gid_addr[0])); clib_memset (copy, 0, sizeof (copy[0])); - /* *INDENT-OFF* */ u8 data[] = { 0x40, 0x03, 0x00, 0x00, /* AFI = LCAF*/ @@ -880,7 +853,6 @@ test_gid_parse_nsh () /* Service Path ID, Service index */ 0x55, 0x99, 0x42, 0x09, /* SPI, SI */ }; - /* *INDENT-ON* */ u32 len = gid_address_parse (data, gid_addr); _assert (sizeof (data) == len); @@ -907,7 +879,6 @@ test_gid_parse_lcaf () clib_memset (gid_addr, 0, sizeof (gid_addr[0])); clib_memset (gid_addr_copy, 0, sizeof (gid_addr_copy[0])); - /* *INDENT-OFF* */ u8 data[] = { 0x40, 0x03, /* AFI = LCAF*/ @@ -922,7 +893,6 @@ test_gid_parse_lcaf () 0x00, 0x01, /* AFI = ipv4 */ 0x10, 0xbb, 0xcc, 0xdd, /* ipv4 address */ }; - /* *INDENT-ON* */ u32 len = gid_address_parse (data, gid_addr); _assert (18 == len); @@ -951,7 +921,6 @@ test_gid_parse_lcaf_complex () clib_memset (gid_addr, 0, sizeof (gid_addr[0])); clib_memset (gid_addr_copy, 0, sizeof (gid_addr_copy[0])); - /* *INDENT-OFF* */ u8 data[] = { 0x40, 0x03, /* AFI = LCAF */ @@ -988,7 +957,6 @@ test_gid_parse_lcaf_complex () 0x10, 0xbb, 0xcc, 0xdd, 0x10, 0xbb, 0xcc, 0xdd, /* ipv6 address */ }; - /* *INDENT-ON* */ u32 len = gid_address_parse (data, gid_addr); _assert (54 == len); @@ -1056,7 +1024,6 @@ test_write_mac_in_lcaf (void) u16 len = gid_address_put (b, &g); - /* *INDENT-OFF* */ u8 expected[] = { 0x40, 0x03, /* AFI = LCAF */ @@ -1071,7 +1038,6 @@ test_write_mac_in_lcaf (void) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 /* MAC */ }; - /* *INDENT-ON* */ _assert (sizeof (expected) == len); _assert (0 == memcmp (expected, b, len)); @@ -1096,14 +1062,12 @@ test_mac_address_write (void) u16 len = gid_address_put (b, &g); _assert (8 == len); - /* *INDENT-OFF* */ u8 expected[] = { 0x40, 0x05, /* AFI = MAC */ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 /* MAC */ }; - /* *INDENT-ON* */ _assert (0 == memcmp (expected, b, len)); done: @@ -1118,7 +1082,6 @@ test_src_dst_with_vni_serdes (void) u8 *b = clib_mem_alloc (500); clib_memset (b, 0, 500); - /* *INDENT-OFF* */ fid_address_t src = { .type = FID_ADDR_IP_PREF, @@ -1161,7 +1124,6 @@ test_src_dst_with_vni_serdes (void) .vni_mask = 0x9 }; - /* *INDENT-ON* */ u16 size_to_put = gid_address_size_to_put (&g); _assert (36 == size_to_put); @@ -1170,7 +1132,6 @@ test_src_dst_with_vni_serdes (void) u16 write_len = gid_address_put (b, &g); _assert (size_to_put == write_len); - /* *INDENT-OFF* */ u8 expected_data[] = { 0x40, 0x03, 0x00, 0x00, /* AFI = LCAF, reserved1, flags */ @@ -1187,7 +1148,6 @@ test_src_dst_with_vni_serdes (void) 0x00, 0x01, /* AFI = ip4 */ 0x09, 0x08, 0x00, 0x00, /* destination */ }; - /* *INDENT-ON* */ _assert (0 == memcmp (expected_data, b, sizeof (expected_data))); @@ -1205,7 +1165,6 @@ test_src_dst_deser_bad_afi (void) { clib_error_t *error = 0; - /* *INDENT-OFF* */ u8 expected_data[] = { 0x40, 0x03, 0x00, 0x00, /* AFI = LCAF, reserved1, flags */ @@ -1220,7 +1179,6 @@ test_src_dst_deser_bad_afi (void) 0x10, 0x21, 0x32, 0x43, 0x54, 0x65, /* destination */ }; - /* *INDENT-ON* */ gid_address_t p; _assert (~0 == gid_address_parse (expected_data, &p)); @@ -1265,7 +1223,6 @@ test_src_dst_serdes (void) u16 write_len = gid_address_put (b, &g); _assert (size_to_put == write_len); - /* *INDENT-OFF* */ u8 expected_data[] = { 0x40, 0x03, 0x00, 0x00, /* AFI = LCAF, reserved1, flags */ @@ -1280,7 +1237,6 @@ test_src_dst_serdes (void) 0x10, 0x21, 0x32, 0x43, 0x54, 0x65, /* destination */ }; - /* *INDENT-ON* */ _assert (0 == memcmp (expected_data, b, sizeof (expected_data))); @@ -1320,7 +1276,6 @@ test_gid_address_write (void) u16 write_len = gid_address_put (b, &g); _assert (18 == write_len); - /* *INDENT-OFF* */ u8 expected_gid_data[] = { 0x40, 0x03, /* AFI = LCAF */ @@ -1334,7 +1289,6 @@ test_gid_address_write (void) 0x00, 0x01, /* AFI = IPv4 */ 0xdd, 0xcc, 0xbb, 0xaa, /* ipv4 addr */ }; - /* *INDENT-ON* */ _assert (0 == memcmp (expected_gid_data, b, sizeof (expected_gid_data))); done: @@ -1413,25 +1367,21 @@ done: return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_cp_command, static) = { .path = "test lisp cp", .short_help = "lisp cp internal unit tests", .function = lisp_cp_test, }; -/* *INDENT-ON* */ #include <vlib/unix/plugin.h> #include <vpp/app/version.h> -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Test Locator ID Separation Protocol (LISP)", .default_disabled = 1, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/lldp/lldp_api.c b/src/plugins/lldp/lldp_api.c index 6d3f6d7e761..bb5d1cbb5e8 100644 --- a/src/plugins/lldp/lldp_api.c +++ b/src/plugins/lldp/lldp_api.c @@ -178,12 +178,10 @@ VLIB_API_INIT_FUNCTION (lldp_api_hookup); #include <vlib/unix/plugin.h> #include <vpp/app/version.h> -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Link Layer Discovery Protocol (LLDP)", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/lldp/lldp_cli.c b/src/plugins/lldp/lldp_cli.c index 317595ff6a5..1ed3efa4251 100644 --- a/src/plugins/lldp/lldp_cli.c +++ b/src/plugins/lldp/lldp_cli.c @@ -298,7 +298,6 @@ out: return ret; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND(set_interface_lldp_cmd, static) = { .path = "set interface lldp", .short_help = "set interface lldp <interface> | sw_if_index <idx>" @@ -313,7 +312,6 @@ VLIB_CLI_COMMAND(set_lldp_cmd, static) = { "[tx-interval <value>]", .function = lldp_cfg_cmd, }; -/* *INDENT-ON* */ static const char * lldp_chassis_id_subtype_str (lldp_chassis_id_subtype_t t) @@ -580,7 +578,6 @@ format_lldp_intfs_detail (u8 * s, vlib_main_t * vm, const lldp_main_t * lm) s = format (s, "\nLLDP-enabled interface table:\n"); f64 now = vlib_time_now (vm); - /* *INDENT-OFF* */ pool_foreach ( n, lm->intfs) { hw = vnet_get_hw_interface(vnm, n->hw_if_index); @@ -640,7 +637,6 @@ format_lldp_intfs_detail (u8 * s, vlib_main_t * vm, const lldp_main_t * lm) now, format_time_ago, n->last_heard, now); } } - /* *INDENT-ON* */ return s; } @@ -663,7 +659,6 @@ format_lldp_intfs (u8 * s, va_list * va) "Peer chassis ID", "Remote port ID", "Last heard", "Last sent", "Status"); - /* *INDENT-OFF* */ pool_foreach ( n, lm->intfs) { const vnet_hw_interface_t *hw = @@ -689,7 +684,6 @@ format_lldp_intfs (u8 * s, va_list * va) format_time_ago, n->last_sent, now, "inactive"); } } - /* *INDENT-ON* */ return s; } @@ -710,13 +704,11 @@ show_lldp (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND(show_lldp_command, static) = { .path = "show lldp", .short_help = "show lldp [detail]", .function = show_lldp, }; -/* *INDENT-ON* */ /* * packet trace format function, very similar to diff --git a/src/plugins/lldp/lldp_node.c b/src/plugins/lldp/lldp_node.c index d4b6d529d9b..dbbb5d46402 100644 --- a/src/plugins/lldp/lldp_node.c +++ b/src/plugins/lldp/lldp_node.c @@ -102,7 +102,6 @@ lldp_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, /* * lldp input graph node declaration */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE(lldp_input_node, static) = { .function = lldp_node_fn, .name = "lldp-input", @@ -120,7 +119,6 @@ VLIB_REGISTER_NODE(lldp_input_node, static) = { [LLDP_INPUT_NEXT_NORMAL] = "error-drop", }, }; -/* *INDENT-ON* */ /* * lldp process node function @@ -230,13 +228,11 @@ lldp_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) /* * lldp process node declaration */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE(lldp_process_node, static) = { .function = lldp_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "lldp-process", }; -/* *INDENT-ON* */ void lldp_schedule_intf (lldp_main_t * lm, lldp_intf_t * n) diff --git a/src/plugins/lldp/lldp_protocol.h b/src/plugins/lldp/lldp_protocol.h index e641b26e20d..c4219162dfe 100644 --- a/src/plugins/lldp/lldp_protocol.h +++ b/src/plugins/lldp/lldp_protocol.h @@ -56,12 +56,10 @@ struct lldp_tlv_head u8 byte2; /* contains the lower bits of length */ }; -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { struct lldp_tlv_head head; u8 v[0]; }) lldp_tlv_t; -/* *INDENT-ON* */ lldp_tlv_code_t lldp_tlv_get_code (const lldp_tlv_t * tlv); void lldp_tlv_set_code (lldp_tlv_t * tlv, lldp_tlv_code_t code); @@ -89,13 +87,11 @@ typedef enum #undef F } lldp_chassis_id_subtype_t; -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { struct lldp_tlv_head head; u8 subtype; u8 id[0]; }) lldp_chassis_id_tlv_t; -/* *INDENT-ON* */ #define foreach_port_id_subtype(F) \ F (0, reserved, "Reserved") \ @@ -118,7 +114,6 @@ typedef enum #undef F } lldp_port_id_subtype_t; -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { struct lldp_tlv_head head; u8 subtype; @@ -129,7 +124,6 @@ typedef CLIB_PACKED (struct { struct lldp_tlv_head head; u16 ttl; }) lldp_ttl_tlv_t; -/* *INDENT-ON* */ #endif /* __included_lldp_protocol_h__ */ diff --git a/src/plugins/mactime/mactime.c b/src/plugins/mactime/mactime.c index ffb41c2d8c7..933e44ea5c1 100644 --- a/src/plugins/mactime/mactime.c +++ b/src/plugins/mactime/mactime.c @@ -140,7 +140,6 @@ mactime_enable_disable_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (mactime_enable_disable_command, static) = { .path = "mactime enable-disable", @@ -148,7 +147,6 @@ VLIB_CLI_COMMAND (mactime_enable_disable_command, static) = "mactime enable-disable <interface-name> [disable]", .function = mactime_enable_disable_command_fn, }; -/* *INDENT-ON* */ /** Enable / disable time-base src mac filtration on an interface @@ -193,7 +191,6 @@ vl_api_mactime_dump_t_handler (vl_api_mactime_dump_t * mp) goto send_reply; } - /* *INDENT-OFF* */ pool_foreach (dev, mm->devices) { message_size = sizeof(*ep) + vec_len(dev->device_name) + @@ -230,15 +227,12 @@ vl_api_mactime_dump_t_handler (vl_api_mactime_dump_t * mp) ep->device_name [ARRAY_LEN(ep->device_name) -1] = 0; vl_api_send_msg (rp, (u8 *)ep); } - /* *INDENT-OFF* */ send_reply: - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_MACTIME_DUMP_REPLY, ({ rmp->table_epoch = clib_host_to_net_u32 (mm->device_table_epoch); })); - /* *INDENT-ON* */ } /** Create a lookup table entry for the indicated mac address @@ -428,12 +422,10 @@ mactime_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (mactime_init) = { .runs_after = VLIB_INITS("ip_neighbor_init"), }; -/* *INDENT-ON* */ static clib_error_t * mactime_config (vlib_main_t * vm, unformat_input_t * input) @@ -461,30 +453,24 @@ mactime_config (vlib_main_t * vm, unformat_input_t * input) VLIB_CONFIG_FUNCTION (mactime_config, "mactime"); -/* *INDENT-OFF* */ VNET_FEATURE_INIT (mactime, static) = { .arc_name = "device-input", .node_name = "mactime", .runs_before = VNET_FEATURES ("ethernet-input"), }; -/* *INDENT-ON */ -/* *INDENT-OFF* */ VNET_FEATURE_INIT (mactime_tx, static) = { .arc_name = "interface-output", .node_name = "mactime-tx", .runs_before = VNET_FEATURES ("interface-output-arc-end"), }; -/* *INDENT-ON */ -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Time-based MAC Source Address Filter", }; -/* *INDENT-ON* */ u8 * format_bytes_with_width (u8 * s, va_list * va) @@ -575,12 +561,10 @@ show_mactime_command_fn (vlib_main_t * vm, if (verbose) vlib_cli_output (vm, "Time now: %U", format_clib_timebase_time, now); - /* *INDENT-OFF* */ pool_foreach (dp, mm->devices) { vec_add1 (pool_indices, dp - mm->devices); } - /* *INDENT-ON* */ vlib_cli_output (vm, "%-15s %18s %14s %10s %11s %13s", "Device Name", "Addresses", "Status", @@ -692,14 +676,12 @@ show_mactime_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_mactime_command, static) = { .path = "show mactime", .short_help = "show mactime [verbose]", .function = show_mactime_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * clear_mactime_command_fn (vlib_main_t * vm, @@ -718,14 +700,12 @@ clear_mactime_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (clear_mactime_command, static) = { .path = "clear mactime", .short_help = "clear mactime counters", .function = clear_mactime_command_fn, }; -/* *INDENT-ON* */ diff --git a/src/plugins/mactime/mactime_test.c b/src/plugins/mactime/mactime_test.c index 67655ccefad..5f31dca7012 100644 --- a/src/plugins/mactime/mactime_test.c +++ b/src/plugins/mactime/mactime_test.c @@ -281,12 +281,10 @@ api_mactime_dump (vat_main_t * vam) W (ret); fformat (vam->ofp, "%U", format_device, 0 /* header */ , 0 /* verbose */ ); - /* *INDENT-OFF* */ pool_foreach (dev, tm->devices) { fformat (vam->ofp, "%U", format_device, dev, verbose); } - /* *INDENT-ON* */ return ret; } diff --git a/src/plugins/mactime/mactime_top.c b/src/plugins/mactime/mactime_top.c index 60c3e5cca65..1517ec43e17 100644 --- a/src/plugins/mactime/mactime_top.c +++ b/src/plugins/mactime/mactime_top.c @@ -191,12 +191,10 @@ scrape_stats_segment (mt_main_t * mm) int i, j; vec_reset_length (pool_indices); - /* *INDENT-OFF* */ pool_foreach (dev, mm->devices) { vec_add1 (pool_indices, dev->pool_index); } - /* *INDENT-ON* */ /* Nothing to do... */ if (vec_len (pool_indices) == 0) @@ -440,12 +438,10 @@ print_device_table (mt_main_t * mm) mactime_device_t *dev; fformat (stdout, "%U", format_device, NULL /* header */, 0 /* verbose */); - /* *INDENT-OFF* */ pool_foreach (dev, mm->devices) { fformat (stdout, "%U", format_device, dev, 0 /* verbose */); } - /* *INDENT-ON* */ } int diff --git a/src/plugins/mactime/node.c b/src/plugins/mactime/node.c index 465cee380b1..fad487e666e 100644 --- a/src/plugins/mactime/node.c +++ b/src/plugins/mactime/node.c @@ -349,7 +349,6 @@ mactime_node_fn (vlib_main_t * vm, return mactime_node_inline (vm, node, frame, 0 /* is_tx */ ); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (mactime_node) = { .function = mactime_node_fn, @@ -370,7 +369,6 @@ VLIB_REGISTER_NODE (mactime_node) = [MACTIME_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ static uword mactime_tx_node_fn (vlib_main_t * vm, @@ -379,7 +377,6 @@ mactime_tx_node_fn (vlib_main_t * vm, return mactime_node_inline (vm, node, frame, 1 /* is_tx */ ); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (mactime_tx_node) = { .function = mactime_tx_node_fn, @@ -400,7 +397,6 @@ VLIB_REGISTER_NODE (mactime_tx_node) = [MACTIME_NEXT_ETHERNET_INPUT] = "ethernet-input", /* notused */ }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/map/ip4_map.c b/src/plugins/map/ip4_map.c index 710bd1003b4..652808e6d37 100644 --- a/src/plugins/map/ip4_map.c +++ b/src/plugins/map/ip4_map.c @@ -326,7 +326,6 @@ ip4_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) return frame->n_vectors; } -/* *INDENT-OFF* */ VNET_FEATURE_INIT (ip4_map_feature, static) = { .arc_name = "ip4-unicast", @@ -355,7 +354,6 @@ VLIB_REGISTER_NODE(ip4_map_node) = { [IP4_MAP_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/map/ip4_map_t.c b/src/plugins/map/ip4_map_t.c index 8ae76f331f6..fe29af458a2 100644 --- a/src/plugins/map/ip4_map_t.c +++ b/src/plugins/map/ip4_map_t.c @@ -56,7 +56,6 @@ typedef enum //This is used to pass information within the buffer data. //Buffer structure being too small to contain big structures like this. -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { ip6_address_t daddr; ip6_address_t saddr; @@ -64,7 +63,6 @@ typedef CLIB_PACKED (struct { //sizeof(ip6) + sizeof(ip_frag) - sizeof(ip4) u8 unused[28]; }) ip4_mapt_pseudo_header_t; -/* *INDENT-ON* */ typedef struct { @@ -684,7 +682,6 @@ ip4_map_t (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) return frame->n_vectors; } -/* *INDENT-OFF* */ VNET_FEATURE_INIT (ip4_map_t_feature, static) = { .arc_name = "ip4-unicast", .node_name = "ip4-map-t", @@ -710,9 +707,7 @@ VLIB_REGISTER_NODE(ip4_map_t_fragmented_node) = { [IP4_MAPT_FRAGMENTED_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE(ip4_map_t_icmp_node) = { .function = ip4_map_t_icmp, .name = "ip4-map-t-icmp", @@ -731,9 +726,7 @@ VLIB_REGISTER_NODE(ip4_map_t_icmp_node) = { [IP4_MAPT_ICMP_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE(ip4_map_t_tcp_udp_node) = { .function = ip4_map_t_tcp_udp, .name = "ip4-map-t-tcp-udp", @@ -752,9 +745,7 @@ VLIB_REGISTER_NODE(ip4_map_t_tcp_udp_node) = { [IP4_MAPT_TCP_UDP_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE(ip4_map_t_node) = { .function = ip4_map_t, .name = "ip4-map-t", @@ -774,7 +765,6 @@ VLIB_REGISTER_NODE(ip4_map_t_node) = { [IP4_MAPT_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/map/ip6_map.c b/src/plugins/map/ip6_map.c index 1193dda0a80..3d9b21dfcd9 100644 --- a/src/plugins/map/ip6_map.c +++ b/src/plugins/map/ip6_map.c @@ -803,7 +803,6 @@ ip6_map_icmp_relay (vlib_main_t * vm, } -/* *INDENT-OFF* */ VNET_FEATURE_INIT (ip6_map_feature, static) = { .arc_name = "ip6-unicast", @@ -836,9 +835,7 @@ VLIB_REGISTER_NODE(ip6_map_node) = { [IP6_MAP_NEXT_ICMP] = "ip6-icmp-error", }, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE(ip6_map_post_ip4_reass_node) = { .function = ip6_map_post_ip4_reass, .name = "ip6-map-post-ip4-reass", @@ -854,9 +851,7 @@ VLIB_REGISTER_NODE(ip6_map_post_ip4_reass_node) = { [IP6_MAP_POST_IP4_REASS_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE(ip6_map_icmp_relay_node, static) = { .function = ip6_map_icmp_relay, .name = "ip6-map-icmp-relay", @@ -871,7 +866,6 @@ VLIB_REGISTER_NODE(ip6_map_icmp_relay_node, static) = { [IP6_ICMP_RELAY_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ clib_error_t * ip6_map_init (vlib_main_t * vm) diff --git a/src/plugins/map/ip6_map_t.c b/src/plugins/map/ip6_map_t.c index 861c049b0f4..6bfc8e0f952 100644 --- a/src/plugins/map/ip6_map_t.c +++ b/src/plugins/map/ip6_map_t.c @@ -687,7 +687,6 @@ ip6_map_t (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE(ip6_map_t_fragmented_node) = { .function = ip6_map_t_fragmented, .name = "ip6-map-t-fragmented", @@ -707,9 +706,7 @@ VLIB_REGISTER_NODE(ip6_map_t_fragmented_node) = { [IP6_MAPT_FRAGMENTED_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE(ip6_map_t_icmp_node) = { .function = ip6_map_t_icmp, .name = "ip6-map-t-icmp", @@ -729,9 +726,7 @@ VLIB_REGISTER_NODE(ip6_map_t_icmp_node) = { [IP6_MAPT_ICMP_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE(ip6_map_t_tcp_udp_node) = { .function = ip6_map_t_tcp_udp, .name = "ip6-map-t-tcp-udp", @@ -751,9 +746,7 @@ VLIB_REGISTER_NODE(ip6_map_t_tcp_udp_node) = { [IP6_MAPT_TCP_UDP_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VNET_FEATURE_INIT (ip6_map_t_feature, static) = { .arc_name = "ip6-unicast", .node_name = "ip6-map-t", @@ -781,7 +774,6 @@ VLIB_REGISTER_NODE(ip6_map_t_node) = { [IP6_MAPT_NEXT_ICMP] = "ip6-icmp-error", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/map/map.c b/src/plugins/map/map.c index 7ae14828d20..6c9668dde51 100644 --- a/src/plugins/map/map.c +++ b/src/plugins/map/map.c @@ -979,10 +979,8 @@ show_map_domain_command_fn (vlib_main_t * vm, unformat_input_t * input, /* Get a line of input. */ if (!unformat_user (input, unformat_line_input, line_input)) { - /* *INDENT-OFF* */ pool_foreach (d, mm->domains) {vlib_cli_output(vm, "%U", format_map_domain, d, counters);} - /* *INDENT-ON* */ return 0; } @@ -1008,10 +1006,8 @@ show_map_domain_command_fn (vlib_main_t * vm, unformat_input_t * input, if (map_domain_index == ~0) { - /* *INDENT-OFF* */ pool_foreach (d, mm->domains) {vlib_cli_output(vm, "%U", format_map_domain, d, counters);} - /* *INDENT-ON* */ } else { @@ -1062,7 +1058,6 @@ show_map_stats_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } - /* *INDENT-OFF* */ pool_foreach (d, mm->domains) { if (d->rules) { rulecount+= 0x1 << d->psid_length; @@ -1071,7 +1066,6 @@ show_map_stats_command_fn (vlib_main_t * vm, unformat_input_t * input, domains += sizeof(*d); domaincount++; } - /* *INDENT-ON* */ vlib_cli_output (vm, "MAP domains structure: %d\n", sizeof (map_domain_t)); vlib_cli_output (vm, "MAP domains: %d (%d bytes)\n", domaincount, domains); @@ -1255,7 +1249,6 @@ done: } -/* *INDENT-OFF* */ /*? * Set or copy the IP TOS/Traffic Class field @@ -1469,7 +1462,6 @@ VLIB_PLUGIN_REGISTER() = { .description = "Mapping of Address and Port (MAP)", }; -/* *INDENT-ON* */ /* * map_init diff --git a/src/plugins/map/map_api.c b/src/plugins/map/map_api.c index f81216dddbd..1dbff4ca0d1 100644 --- a/src/plugins/map/map_api.c +++ b/src/plugins/map/map_api.c @@ -50,13 +50,11 @@ vl_api_map_add_domain_t_handler (vl_api_map_add_domain_t * mp) mp->ip6_src.len, mp->ea_bits_len, mp->psid_offset, mp->psid_length, &index, mp->mtu, flags, mp->tag); - /* *INDENT-OFF* */ REPLY_MACRO2_END(VL_API_MAP_ADD_DOMAIN_REPLY, ({ rmp->index = index; })); - /* *INDENT-ON* */ } static void @@ -98,7 +96,6 @@ send_domain_details (u32 map_domain_index, vl_api_registration_t * rp, vec_elt_at_index (mm->domain_extras, map_domain_index); int tag_len = clib_min (ARRAY_LEN (rmp->tag), vec_len (de->tag) + 1); - /* *INDENT-OFF* */ REPLY_MACRO_DETAILS4(VL_API_MAP_DOMAIN_DETAILS, rp, context, ({ rmp->domain_index = htonl (map_domain_index); @@ -119,7 +116,6 @@ send_domain_details (u32 map_domain_index, vl_api_registration_t * rp, memcpy (rmp->tag, de->tag, tag_len - 1); rmp->tag[tag_len - 1] = '\0'; })); - /* *INDENT-ON* */ } static void @@ -136,12 +132,10 @@ vl_api_map_domain_dump_t_handler (vl_api_map_domain_dump_t * mp) if (!reg) return; - /* *INDENT-OFF* */ pool_foreach_index (i, mm->domains) { send_domain_details(i, reg, mp->context); } - /* *INDENT-ON* */ } static void @@ -152,12 +146,10 @@ vl_api_map_domains_get_t_handler (vl_api_map_domains_get_t * mp) i32 rv = 0; - /* *INDENT-OFF* */ REPLY_AND_DETAILS_MACRO (VL_API_MAP_DOMAINS_GET_REPLY, mm->domains, ({ send_domain_details (cursor, rp, mp->context); })); - /* *INDENT-ON* */ } static void diff --git a/src/plugins/marvell/plugin.c b/src/plugins/marvell/plugin.c index fe673092a5e..ed90776ba95 100644 --- a/src/plugins/marvell/plugin.c +++ b/src/plugins/marvell/plugin.c @@ -19,12 +19,10 @@ #include <vnet/plugin/plugin.h> #include <vpp/app/version.h> -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Marvell PP2 Device Driver", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/marvell/pp2/cli.c b/src/plugins/marvell/pp2/cli.c index 28ef35b2b24..f4ecb1873c9 100644 --- a/src/plugins/marvell/pp2/cli.c +++ b/src/plugins/marvell/pp2/cli.c @@ -59,13 +59,11 @@ mrvl_pp2_create_command_fn (vlib_main_t * vm, unformat_input_t * input, return args.error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (mrvl_pp2_create_command, static) = { .path = "create interface marvell pp2", .short_help = "create interface marvell pp2 [name <ifname>] [rx-queue-size slots] [tx-queue-size slots]", .function = mrvl_pp2_create_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * mrvl_pp2_delete_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -110,14 +108,12 @@ mrvl_pp2_delete_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (mrvl_pp2_delete_command, static) = { .path = "delete interface marvell pp2", .short_help = "delete interface marvell pp2 " "{<interface> | sw_if_index <sw_idx>}", .function = mrvl_pp2_delete_command_fn, }; -/* *INDENT-ON* */ clib_error_t * mrvl_pp2_cli_init (vlib_main_t * vm) diff --git a/src/plugins/marvell/pp2/input.c b/src/plugins/marvell/pp2/input.c index 106148db023..2545f91becb 100644 --- a/src/plugins/marvell/pp2/input.c +++ b/src/plugins/marvell/pp2/input.c @@ -369,7 +369,6 @@ mrvl_pp2_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node, return n_rx; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (mrvl_pp2_input_node) = { .function = mrvl_pp2_input_fn, .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED, @@ -382,7 +381,6 @@ VLIB_REGISTER_NODE (mrvl_pp2_input_node) = { .error_strings = mrvl_pp2_input_error_strings, }; -/* *INDENT-ON* */ /* diff --git a/src/plugins/marvell/pp2/pp2.c b/src/plugins/marvell/pp2/pp2.c index 7aaa3676eab..030ab9b4496 100644 --- a/src/plugins/marvell/pp2/pp2.c +++ b/src/plugins/marvell/pp2/pp2.c @@ -129,7 +129,6 @@ mrvl_pp2_delete_if (mrvl_pp2_if_t * ppif) pp2_ppio_deinit (ppif->ppio); } - /* *INDENT-OFF* */ /* free buffers hanging in the tx ring */ vec_foreach (outq, ppif->outqs) { @@ -162,7 +161,6 @@ mrvl_pp2_delete_if (mrvl_pp2_if_t * ppif) pp2_bpool_deinit (inq->bpool); } vec_free (ppif->inqs); - /* *INDENT-ON* */ pool_put (ppm->interfaces, ppif); @@ -375,7 +373,6 @@ static char *mrvl_pp2_tx_func_error_strings[] = { #undef _ }; -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (mrvl_pp2_device_class,) = { .name = "Marvell PPv2 interface", @@ -388,7 +385,6 @@ VNET_DEVICE_CLASS (mrvl_pp2_device_class,) = .clear_counters = mrvl_pp2_clear_interface_counters, .rx_redirect_to_node = mrvl_pp2_set_interface_next_node, }; -/* *INDENT-ON* */ static clib_error_t * mrvl_pp2_init (vlib_main_t * vm) diff --git a/src/plugins/mdata/mdata.c b/src/plugins/mdata/mdata.c index d90c20d9e9c..c45b1e38910 100644 --- a/src/plugins/mdata/mdata.c +++ b/src/plugins/mdata/mdata.c @@ -214,14 +214,12 @@ mdata_enable_disable_command_fn (vlib_main_t * vm, * @cliexend ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (mdata_enable_disable_command, static) = { .path = "buffer metadata tracking", .short_help = "buffer metadata tracking [on][off]", .function = mdata_enable_disable_command_fn, }; -/* *INDENT-ON* */ /* API message handler */ static void vl_api_mdata_enable_disable_t_handler @@ -256,13 +254,11 @@ mdata_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (mdata_init); -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Buffer metadata change tracker." }; -/* *INDENT-ON* */ #define foreach_primary_metadata_field \ @@ -478,14 +474,12 @@ show_metadata_command_fn (vlib_main_t * vm, * @cliexend ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_metadata_command, static) = { .path = "show buffer metadata", .short_help = "show buffer metadata", .function = show_metadata_command_fn, }; -/* *INDENT-OFF* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/memif/cli.c b/src/plugins/memif/cli.c index 309cd8e49d7..c2ed63747fa 100644 --- a/src/plugins/memif/cli.c +++ b/src/plugins/memif/cli.c @@ -80,13 +80,11 @@ memif_socket_filename_create_command_fn (vlib_main_t * vm, return err; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (memif_socket_filename_create_command, static) = { .path = "create memif socket", .short_help = "create memif socket [id <id>] [filename <path>]", .function = memif_socket_filename_create_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * memif_socket_filename_delete_command_fn (vlib_main_t * vm, @@ -124,13 +122,11 @@ memif_socket_filename_delete_command_fn (vlib_main_t * vm, return memif_socket_filename_add_del (0, socket_id, 0); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (memif_socket_filename_delete_command, static) = { .path = "delete memif socket", .short_help = "delete memif socket [id <id>]", .function = memif_socket_filename_delete_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * memif_create_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -211,7 +207,6 @@ memif_create_command_fn (vlib_main_t * vm, unformat_input_t * input, return err; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (memif_create_command, static) = { .path = "create interface memif", .short_help = "create interface memif [id <id>] [socket-id <socket-id>] " @@ -221,7 +216,6 @@ VLIB_CLI_COMMAND (memif_create_command, static) = { "[mode ip] [secret <string>]", .function = memif_create_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * memif_delete_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -268,13 +262,11 @@ memif_delete_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (memif_delete_command, static) = { .path = "delete interface memif", .short_help = "delete interface memif {<interface> | sw_if_index <sw_idx>}", .function = memif_delete_command_fn, }; -/* *INDENT-ON* */ static u8 * format_memif_if_flags (u8 * s, va_list * args) @@ -396,7 +388,6 @@ memif_show_command_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_output (vm, "sockets\n"); vlib_cli_output (vm, " %-3s %-11s %s\n", "id", "listener", "filename"); - /* *INDENT-OFF* */ hash_foreach (sock_id, msf_idx, mm->socket_file_index_by_sock_id, ({ memif_socket_file_t *msf; @@ -412,17 +403,14 @@ memif_show_command_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_output(vm, " %-3u %-11v %s\n", sock_id, s, filename); vec_reset_length (s); })); - /* *INDENT-ON* */ vec_free (s); vlib_cli_output (vm, "\n"); if (vec_len (hw_if_indices) == 0) { - /* *INDENT-OFF* */ pool_foreach (mif, mm->interfaces) vec_add1 (hw_if_indices, mif->hw_if_index); - /* *INDENT-ON* */ } for (hw_if_index = 0; hw_if_index < vec_len (hw_if_indices); hw_if_index++) @@ -457,7 +445,6 @@ memif_show_command_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_output (vm, " remote-disc-reason \"%s\"", mif->remote_disc_string); - /* *INDENT-OFF* */ vec_foreach_index (i, mif->regions) { mr = vec_elt_at_index (mif->regions, i); @@ -478,20 +465,17 @@ memif_show_command_fn (vlib_main_t * vm, unformat_input_t * input, if (show_descr) vlib_cli_output (vm, " %U", format_memif_descriptor, mif, mq); } - /* *INDENT-ON* */ } done: vec_free (hw_if_indices); return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (memif_show_command, static) = { .path = "show memif", .short_help = "show memif [<interface>] [descriptors]", .function = memif_show_command_fn, }; -/* *INDENT-ON* */ clib_error_t * memif_cli_init (vlib_main_t * vm) diff --git a/src/plugins/memif/device.c b/src/plugins/memif/device.c index a7b6a98011a..017a001168b 100644 --- a/src/plugins/memif/device.c +++ b/src/plugins/memif/device.c @@ -741,7 +741,6 @@ memif_interface_rx_mode_change (vnet_main_t * vnm, u32 hw_if_index, u32 qid, return 0; } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (memif_device_class) = { .name = "memif", .format_device_name = format_memif_device_name, @@ -755,7 +754,6 @@ VNET_DEVICE_CLASS (memif_device_class) = { .rx_mode_change_function = memif_interface_rx_mode_change, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/memif/memif.c b/src/plugins/memif/memif.c index 5440c5909d4..7e3dd44db2c 100644 --- a/src/plugins/memif/memif.c +++ b/src/plugins/memif/memif.c @@ -148,7 +148,6 @@ memif_disconnect (memif_if_t * mif, clib_error_t * err) vlib_worker_thread_barrier_sync (vm); } - /* *INDENT-OFF* */ vec_foreach_index (i, mif->rx_queues) { mq = vec_elt_at_index (mif->rx_queues, i); @@ -163,7 +162,6 @@ memif_disconnect (memif_if_t * mif, clib_error_t * err) } vnet_hw_if_unregister_all_rx_queues (vnm, mif->hw_if_index); - /* *INDENT-OFF* */ vec_foreach_index (i, mif->tx_queues) { mq = vec_elt_at_index (mif->tx_queues, i); @@ -200,7 +198,6 @@ memif_disconnect (memif_if_t * mif, clib_error_t * err) if (mr->fd > -1) close (mr->fd); } - /* *INDENT-ON* */ vec_free (mif->regions); vec_free (mif->remote_name); vec_free (mif->remote_if_name); @@ -265,7 +262,6 @@ memif_connect (memif_if_t * mif) vec_free (mif->local_disc_string); vec_free (mif->remote_disc_string); - /* *INDENT-OFF* */ vec_foreach (mr, mif->regions) { if (mr->shm) @@ -284,7 +280,6 @@ memif_connect (memif_if_t * mif) goto error; } } - /* *INDENT-ON* */ template.read_function = memif_int_fd_read_ready; template.write_function = memif_int_fd_write_ready; @@ -296,7 +291,6 @@ memif_connect (memif_if_t * mif) if (with_barrier) vlib_worker_thread_barrier_sync (vm); - /* *INDENT-OFF* */ vec_foreach_index (i, mif->tx_queues) { memif_queue_t *mq = vec_elt_at_index (mif->tx_queues, i); @@ -434,7 +428,6 @@ memif_connect (memif_if_t * mif) vnet_hw_if_rx_queue_set_int_pending (vnm, qi); } } - /* *INDENT-ON* */ if (1 << max_log2_ring_sz > vec_len (mm->per_thread_data[0].desc_data)) { @@ -534,7 +527,6 @@ memif_init_regions_and_queues (memif_if_t * mif) if (mif->flags & MEMIF_IF_FLAG_ZERO_COPY) { vlib_buffer_pool_t *bp; - /* *INDENT-OFF* */ vec_foreach (bp, vm->buffer_main->buffer_pools) { vlib_physmem_map_t *pm; @@ -545,7 +537,6 @@ memif_init_regions_and_queues (memif_if_t * mif) r->shm = pm->base; r->is_external = 1; } - /* *INDENT-ON* */ } for (i = 0; i < mif->run.num_s2m_rings; i++) @@ -590,7 +581,6 @@ memif_init_regions_and_queues (memif_if_t * mif) vec_validate_aligned (mif->tx_queues, mif->run.num_s2m_rings - 1, CLIB_CACHE_LINE_BYTES); - /* *INDENT-OFF* */ vec_foreach_index (i, mif->tx_queues) { memif_queue_t *mq = vec_elt_at_index (mif->tx_queues, i); @@ -611,13 +601,11 @@ memif_init_regions_and_queues (memif_if_t * mif) vec_validate_aligned (mq->buffers, 1 << mq->log2_ring_size, CLIB_CACHE_LINE_BYTES); } - /* *INDENT-ON* */ ASSERT (mif->rx_queues == 0); vec_validate_aligned (mif->rx_queues, mif->run.num_m2s_rings - 1, CLIB_CACHE_LINE_BYTES); - /* *INDENT-OFF* */ vec_foreach_index (i, mif->rx_queues) { memif_queue_t *mq = vec_elt_at_index (mif->rx_queues, i); @@ -637,7 +625,6 @@ memif_init_regions_and_queues (memif_if_t * mif) vec_validate_aligned (mq->buffers, 1 << mq->log2_ring_size, CLIB_CACHE_LINE_BYTES); } - /* *INDENT-ON* */ return 0; @@ -688,7 +675,6 @@ memif_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) } last_run_duration = start_time = vlib_time_now (vm); - /* *INDENT-OFF* */ pool_foreach (mif, mm->interfaces) { memif_socket_file_t * msf = vec_elt_at_index (mm->socket_files, mif->socket_file_index); @@ -741,7 +727,6 @@ memif_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) } } } - /* *INDENT-ON* */ last_run_duration = vlib_time_now (vm) - last_run_duration; } return 0; @@ -934,10 +919,8 @@ memif_delete_if (vlib_main_t *vm, memif_if_t *mif) if (msf->is_listener) { int i; - /* *INDENT-OFF* */ vec_foreach_index (i, msf->pending_clients) memif_socket_close (msf->pending_clients + i); - /* *INDENT-ON* */ memif_socket_close (&msf->sock); vec_free (msf->pending_clients); } @@ -966,13 +949,11 @@ memif_delete_if (vlib_main_t *vm, memif_if_t *mif) return 0; } -/* *INDENT-OFF* */ VNET_HW_INTERFACE_CLASS (memif_ip_hw_if_class, static) = { .name = "memif-ip", .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P, .tx_hash_fn_type = VNET_HASH_FN_TYPE_IP, }; -/* *INDENT-ON* */ static void memif_prepare_dma_args (vlib_dma_config_t *args) @@ -1245,12 +1226,10 @@ memif_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (memif_init); -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Packet Memory Interface (memif) -- Experimental", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/memif/memif_api.c b/src/plugins/memif/memif_api.c index 16d3686d3d4..16a52ffc0dc 100644 --- a/src/plugins/memif/memif_api.c +++ b/src/plugins/memif/memif_api.c @@ -195,12 +195,10 @@ vl_api_memif_create_t_handler (vl_api_memif_create_t * mp) vec_free (args.secret); reply: - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_MEMIF_CREATE_REPLY, ({ rmp->sw_if_index = htonl (args.sw_if_index); })); - /* *INDENT-ON* */ } /** @@ -397,7 +395,6 @@ vl_api_memif_dump_t_handler (vl_api_memif_dump_t * mp) if (!reg) return; - /* *INDENT-OFF* */ pool_foreach (mif, mm->interfaces) { swif = vnet_get_sw_interface (vnm, mif->sw_if_index); @@ -409,7 +406,6 @@ vl_api_memif_dump_t_handler (vl_api_memif_dump_t * mp) send_memif_details (reg, mif, swif, if_name, mp->context); vec_set_len (if_name, 0); } - /* *INDENT-ON* */ vec_free (if_name); } @@ -453,7 +449,6 @@ void if (!reg) return; - /* *INDENT-OFF* */ hash_foreach (sock_id, msf_idx, mm->socket_file_index_by_sock_id, ({ memif_socket_file_t *msf; @@ -463,7 +458,6 @@ void filename = msf->filename; send_memif_socket_filename_details(reg, sock_id, filename, mp->context); })); - /* *INDENT-ON* */ } /* Set up the API message handling tables */ diff --git a/src/plugins/memif/node.c b/src/plugins/memif/node.c index 1c678397ad7..70933f4aa9d 100644 --- a/src/plugins/memif/node.c +++ b/src/plugins/memif/node.c @@ -1359,7 +1359,6 @@ VLIB_NODE_FN (memif_input_node) (vlib_main_t * vm, return n_rx; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (memif_input_node) = { .name = "memif-input", .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED, @@ -1371,7 +1370,6 @@ VLIB_REGISTER_NODE (memif_input_node) = { .error_counters = memif_input_error_counters, }; -/* *INDENT-ON* */ /* diff --git a/src/plugins/memif/socket.c b/src/plugins/memif/socket.c index adf13c0f7db..001f26f13ef 100644 --- a/src/plugins/memif/socket.c +++ b/src/plugins/memif/socket.c @@ -445,14 +445,12 @@ memif_msg_receive (memif_if_t ** mifp, clib_socket_t * sock, clib_file_t * uf) if ((err = memif_init_regions_and_queues (mif))) goto error; memif_msg_enq_init (mif); - /* *INDENT-OFF* */ vec_foreach_index (i, mif->regions) memif_msg_enq_add_region (mif, i); vec_foreach_index (i, mif->tx_queues) memif_msg_enq_add_ring (mif, i, MEMIF_RING_S2M); vec_foreach_index (i, mif->rx_queues) memif_msg_enq_add_ring (mif, i, MEMIF_RING_M2S); - /* *INDENT-ON* */ memif_msg_enq_connect (mif); break; diff --git a/src/plugins/nat/det44/det44.c b/src/plugins/nat/det44/det44.c index a8aea28d948..f251bc9c608 100644 --- a/src/plugins/nat/det44/det44.c +++ b/src/plugins/nat/det44/det44.c @@ -29,7 +29,6 @@ det44_main_t det44_main; -/* *INDENT-OFF* */ VNET_FEATURE_INIT (ip4_det44_in2out, static) = { .arc_name = "ip4-unicast", .node_name = "det44-in2out", @@ -47,7 +46,6 @@ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Deterministic NAT (CGN)", }; -/* *INDENT-ON* */ void det44_add_del_addr_to_fib (ip4_address_t * addr, u8 p_len, u32 sw_if_index, @@ -150,14 +148,12 @@ snat_det_add_map (ip4_address_t * in_addr, u8 in_plen, } /* Add/del external address range to FIB */ - /* *INDENT-OFF* */ pool_foreach (i, dm->interfaces) { if (det44_interface_is_inside(i)) continue; det44_add_del_addr_to_fib(out_addr, out_plen, i->sw_if_index, is_add); goto out; } - /* *INDENT-ON* */ out: return 0; } @@ -203,7 +199,6 @@ det44_interface_add_del (u32 sw_if_index, u8 is_inside, int is_del) // rather make a structure and when enable call is used // then register nodes - /* *INDENT-OFF* */ pool_foreach (tmp, dm->interfaces) { if (tmp->sw_if_index == sw_if_index) { @@ -211,7 +206,6 @@ det44_interface_add_del (u32 sw_if_index, u8 is_inside, int is_del) goto out; } } - /* *INDENT-ON* */ out: feature_name = is_inside ? "det44-in2out" : "det44-out2in"; @@ -270,7 +264,6 @@ out: // add/del outside interface fib to registry u8 found = 0; det44_fib_t *outside_fib; - /* *INDENT-OFF* */ vec_foreach (outside_fib, dm->outside_fibs) { if (outside_fib->fib_index == fib_index) @@ -292,7 +285,6 @@ out: break; } } - /* *INDENT-ON* */ if (!is_del && !found) { vec_add2 (dm->outside_fibs, outside_fib, 1); @@ -301,12 +293,10 @@ out: } // add/del outside address to FIB snat_det_map_t *mp; - /* *INDENT-OFF* */ pool_foreach (mp, dm->det_maps) { det44_add_del_addr_to_fib(&mp->out_addr, mp->out_plen, sw_if_index, !is_del); } - /* *INDENT-ON* */ } return 0; } @@ -441,12 +431,10 @@ det44_plugin_disable () } vec_free (interfaces); - /* *INDENT-OFF* */ pool_foreach (mp, dm->det_maps) { vec_free (mp->sessions); } - /* *INDENT-ON* */ det44_reset_timeouts (); @@ -479,7 +467,6 @@ det44_update_outside_fib (ip4_main_t * im, if (!vec_len (dm->outside_fibs)) return; - /* *INDENT-OFF* */ pool_foreach (i, dm->interfaces) { if (i->sw_if_index == sw_if_index) @@ -489,7 +476,6 @@ det44_update_outside_fib (ip4_main_t * im, match = 1; } } - /* *INDENT-ON* */ if (!match) return; diff --git a/src/plugins/nat/det44/det44.h b/src/plugins/nat/det44/det44.h index 7d290f4a956..e576bfb65e8 100644 --- a/src/plugins/nat/det44/det44.h +++ b/src/plugins/nat/det44/det44.h @@ -279,13 +279,11 @@ snat_det_map_by_user (ip4_address_t * user_addr) { det44_main_t *dm = &det44_main; snat_det_map_t *mp; - /* *INDENT-OFF* */ pool_foreach (mp, dm->det_maps) { if (is_addr_in_net(user_addr, &mp->in_addr, mp->in_plen)) return mp; } - /* *INDENT-ON* */ return 0; } @@ -294,13 +292,11 @@ snat_det_map_by_out (ip4_address_t * out_addr) { det44_main_t *dm = &det44_main; snat_det_map_t *mp; - /* *INDENT-OFF* */ pool_foreach (mp, dm->det_maps) { if (is_addr_in_net(out_addr, &mp->out_addr, mp->out_plen)) return mp; } - /* *INDENT-ON* */ return 0; } diff --git a/src/plugins/nat/det44/det44_api.c b/src/plugins/nat/det44/det44_api.c index 1486180aa99..c7e17dfd147 100644 --- a/src/plugins/nat/det44/det44_api.c +++ b/src/plugins/nat/det44/det44_api.c @@ -67,14 +67,12 @@ vl_api_det44_forward_t_handler (vl_api_det44_forward_t * mp) hi_port = lo_port + m->ports_per_host - 1; send_reply: - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_DET44_FORWARD_REPLY, ({ rmp->out_port_lo = ntohs (lo_port); rmp->out_port_hi = ntohs (hi_port); clib_memcpy (rmp->out_addr, &out_addr, 4); })) - /* *INDENT-ON* */ } static void @@ -98,12 +96,10 @@ vl_api_det44_reverse_t_handler (vl_api_det44_reverse_t * mp) snat_det_reverse (m, &out_addr, htons (mp->out_port), &in_addr); send_reply: - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_DET44_REVERSE_REPLY, ({ clib_memcpy (rmp->in_addr, &in_addr, 4); })) - /* *INDENT-ON* */ } static void @@ -139,10 +135,8 @@ vl_api_det44_map_dump_t_handler (vl_api_det44_map_dump_t * mp) if (!reg) return; - /* *INDENT-OFF* */ vec_foreach(m, dm->det_maps) sent_det44_map_details(m, reg, mp->context); - /* *INDENT-ON* */ } static void @@ -328,12 +322,10 @@ vl_api_det44_interface_dump_t_handler (vl_api_det44_interface_dump_t * mp) if (!reg) return; - /* *INDENT-OFF* */ pool_foreach (i, dm->interfaces) { det44_send_interface_details(i, reg, mp->context); } - /* *INDENT-ON* */ } static void @@ -359,7 +351,6 @@ vl_api_det44_get_timeouts_t_handler (vl_api_det44_get_timeouts_t * mp) nat_timeouts_t timeouts; int rv = 0; timeouts = det44_get_timeouts (); - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_DET44_GET_TIMEOUTS_REPLY, ({ rmp->udp = htonl (timeouts.udp); @@ -367,7 +358,6 @@ vl_api_det44_get_timeouts_t_handler (vl_api_det44_get_timeouts_t * mp) rmp->tcp_transitory = htonl (timeouts.tcp.transitory); rmp->icmp = htonl (timeouts.icmp); })) - /* *INDENT-ON* */ } /* @@ -412,14 +402,12 @@ vl_api_nat_det_forward_t_handler (vl_api_nat_det_forward_t * mp) hi_port = lo_port + m->ports_per_host - 1; send_reply: - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_NAT_DET_FORWARD_REPLY, ({ rmp->out_port_lo = ntohs (lo_port); rmp->out_port_hi = ntohs (hi_port); clib_memcpy (rmp->out_addr, &out_addr, 4); })) - /* *INDENT-ON* */ } static void @@ -443,12 +431,10 @@ vl_api_nat_det_reverse_t_handler (vl_api_nat_det_reverse_t * mp) snat_det_reverse (m, &out_addr, htons (mp->out_port), &in_addr); send_reply: - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_NAT_DET_REVERSE_REPLY, ({ clib_memcpy (rmp->in_addr, &in_addr, 4); })) - /* *INDENT-ON* */ } static void @@ -484,10 +470,8 @@ vl_api_nat_det_map_dump_t_handler (vl_api_nat_det_map_dump_t * mp) if (!reg) return; - /* *INDENT-OFF* */ vec_foreach(m, dm->det_maps) sent_nat_det_map_details(m, reg, mp->context); - /* *INDENT-ON* */ } static void diff --git a/src/plugins/nat/det44/det44_in2out.c b/src/plugins/nat/det44/det44_in2out.c index 5fe4a9a0658..3f5e05a064c 100644 --- a/src/plugins/nat/det44/det44_in2out.c +++ b/src/plugins/nat/det44/det44_in2out.c @@ -1011,7 +1011,6 @@ VLIB_NODE_FN (det44_in2out_node) (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (det44_in2out_node) = { .name = "det44-in2out", .vector_size = sizeof (u32), @@ -1028,7 +1027,6 @@ VLIB_REGISTER_NODE (det44_in2out_node) = { [DET44_IN2OUT_NEXT_ICMP_ERROR] = "ip4-icmp-error", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nat/det44/det44_inlines.h b/src/plugins/nat/det44/det44_inlines.h index aeb55b385d3..e5e70bbaebc 100644 --- a/src/plugins/nat/det44/det44_inlines.h +++ b/src/plugins/nat/det44/det44_inlines.h @@ -91,7 +91,6 @@ det44_translate (vlib_node_runtime_t * node, u32 sw_if_index0, if (sw_if_index == ~0) { // TODO: go over use cases - /* *INDENT-OFF* */ vec_foreach (outside_fib, dm->outside_fibs) { fei = fib_table_lookup (outside_fib->fib_index, &pfx); @@ -102,18 +101,15 @@ det44_translate (vlib_node_runtime_t * node, u32 sw_if_index0, break; } } - /* *INDENT-ON* */ } if (sw_if_index != ~0) { det44_interface_t *i; - /* *INDENT-OFF* */ pool_foreach (i, dm->interfaces) { /* NAT packet aimed at outside interface */ if ((det44_interface_is_outside (i)) && (sw_if_index == i->sw_if_index)) return 0; } - /* *INDENT-ON* */ } } return 1; diff --git a/src/plugins/nat/det44/det44_out2in.c b/src/plugins/nat/det44/det44_out2in.c index 4871e752db0..ab6acd4f8e9 100644 --- a/src/plugins/nat/det44/det44_out2in.c +++ b/src/plugins/nat/det44/det44_out2in.c @@ -818,7 +818,6 @@ VLIB_NODE_FN (det44_out2in_node) (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (det44_out2in_node) = { .name = "det44-out2in", .vector_size = sizeof (u32), @@ -835,7 +834,6 @@ VLIB_REGISTER_NODE (det44_out2in_node) = { [DET44_OUT2IN_NEXT_ICMP_ERROR] = "ip4-icmp-error", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nat/dslite/dslite.c b/src/plugins/nat/dslite/dslite.c index 4fe4422df13..a2654b5a44b 100644 --- a/src/plugins/nat/dslite/dslite.c +++ b/src/plugins/nat/dslite/dslite.c @@ -101,7 +101,6 @@ dslite_init_datastructures (void) u32 b4_buckets = 128; u32 b4_memory_size = 64 << 20; - /* *INDENT-OFF* */ vec_foreach (td, dm->per_thread_data) { clib_bihash_init_24_8 (&td->in2out, "dslite in2out", translation_buckets, @@ -112,7 +111,6 @@ dslite_init_datastructures (void) clib_bihash_init_16_8 (&td->b4_hash, "dslite b4s", b4_buckets, b4_memory_size); } - /* *INDENT-ON* */ dm->is_enabled = 1; } @@ -281,13 +279,11 @@ format_dslite_ce_trace (u8 * s, va_list * args) VLIB_INIT_FUNCTION (dslite_init); -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Dual-Stack Lite", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nat/dslite/dslite.h b/src/plugins/nat/dslite/dslite.h index 3c798bf54fe..f05670c9bf5 100644 --- a/src/plugins/nat/dslite/dslite.h +++ b/src/plugins/nat/dslite/dslite.h @@ -61,7 +61,6 @@ typedef struct }; } dslite_session_key_t; -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { nat_session_key_t out2in; @@ -72,7 +71,6 @@ typedef CLIB_PACKED (struct u64 total_bytes; u32 total_pkts; }) dslite_session_t; -/* *INDENT-ON* */ typedef struct { diff --git a/src/plugins/nat/dslite/dslite_api.c b/src/plugins/nat/dslite/dslite_api.c index 420e8212ad9..4bb53c37660 100644 --- a/src/plugins/nat/dslite/dslite_api.c +++ b/src/plugins/nat/dslite/dslite_api.c @@ -53,13 +53,11 @@ vl_api_dslite_get_aftr_addr_t_handler (vl_api_dslite_get_aftr_addr_t * mp) dslite_main_t *dm = &dslite_main; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_DSLITE_GET_AFTR_ADDR_REPLY, ({ memcpy (rmp->ip4_addr, &dm->aftr_ip4_addr.as_u8, 4); memcpy (rmp->ip6_addr, &dm->aftr_ip6_addr.as_u8, 16); })) - /* *INDENT-ON* */ } static void @@ -88,13 +86,11 @@ vl_api_dslite_get_b4_addr_t_handler (vl_api_dslite_get_b4_addr_t * mp) dslite_main_t *dm = &dslite_main; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_DSLITE_GET_B4_ADDR_REPLY, ({ memcpy (rmp->ip4_addr, &dm->b4_ip4_addr.as_u8, 4); memcpy (rmp->ip6_addr, &dm->b4_ip6_addr.as_u8, 16); })) - /* *INDENT-ON* */ } static void @@ -154,12 +150,10 @@ vl_api_dslite_address_dump_t_handler (vl_api_dslite_address_dump_t * mp) if (!reg) return; - /* *INDENT-OFF* */ vec_foreach (a, dm->pool.pool_addr) { send_dslite_address_details (a, reg, mp->context); } - /* *INDENT-ON* */ } /* API definitions */ diff --git a/src/plugins/nat/dslite/dslite_ce_decap.c b/src/plugins/nat/dslite/dslite_ce_decap.c index f36a87f8bc1..b5bdafc0e26 100644 --- a/src/plugins/nat/dslite/dslite_ce_decap.c +++ b/src/plugins/nat/dslite/dslite_ce_decap.c @@ -114,7 +114,6 @@ VLIB_NODE_FN (dslite_ce_decap_node) (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dslite_ce_decap_node) = { .name = "dslite-ce-decap", .vector_size = sizeof (u32), @@ -130,7 +129,6 @@ VLIB_REGISTER_NODE (dslite_ce_decap_node) = { [DSLITE_IN2OUT_NEXT_IP6_ICMP] = "ip6-icmp-input", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nat/dslite/dslite_ce_encap.c b/src/plugins/nat/dslite/dslite_ce_encap.c index d8d0e400919..19596efd32d 100644 --- a/src/plugins/nat/dslite/dslite_ce_encap.c +++ b/src/plugins/nat/dslite/dslite_ce_encap.c @@ -107,7 +107,6 @@ VLIB_NODE_FN (dslite_ce_encap_node) (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dslite_ce_encap_node) = { .name = "dslite-ce-encap", .vector_size = sizeof (u32), @@ -122,7 +121,6 @@ VLIB_REGISTER_NODE (dslite_ce_encap_node) = { [DSLITE_CE_ENCAP_NEXT_IP6_LOOKUP] = "ip6-lookup", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nat/dslite/dslite_cli.c b/src/plugins/nat/dslite/dslite_cli.c index 193cb3fe248..8ed9deb2a2d 100644 --- a/src/plugins/nat/dslite/dslite_cli.c +++ b/src/plugins/nat/dslite/dslite_cli.c @@ -95,12 +95,10 @@ dslite_show_pool_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "DS-Lite pool:"); - /* *INDENT-OFF* */ vec_foreach (a, dm->pool.pool_addr) { vlib_cli_output (vm, "%U", format_ip4_address, &a->addr); } - /* *INDENT-ON* */ return 0; } @@ -267,7 +265,6 @@ dslite_show_sessions_command_fn (vlib_main_t * vm, dslite_per_thread_data_t *td; dslite_b4_t *b4; - /* *INDENT-OFF* */ vec_foreach (td, dm->per_thread_data) { pool_foreach (b4, td->b4s) @@ -275,12 +272,10 @@ dslite_show_sessions_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%U", format_dslite_b4, td, b4); } } - /* *INDENT-ON* */ return 0; } -/* *INDENT-OFF* */ /*? * @cliexpar @@ -394,7 +389,6 @@ VLIB_CLI_COMMAND (dslite_show_sessions, static) = { .function = dslite_show_sessions_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nat/dslite/dslite_in2out.c b/src/plugins/nat/dslite/dslite_in2out.c index 409c59c218c..522c3cf4123 100644 --- a/src/plugins/nat/dslite/dslite_in2out.c +++ b/src/plugins/nat/dslite/dslite_in2out.c @@ -460,7 +460,6 @@ VLIB_NODE_FN (dslite_in2out_node) (vlib_main_t * vm, return dslite_in2out_node_fn_inline (vm, node, frame, 0); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dslite_in2out_node) = { .name = "dslite-in2out", .vector_size = sizeof (u32), @@ -477,7 +476,6 @@ VLIB_REGISTER_NODE (dslite_in2out_node) = { [DSLITE_IN2OUT_NEXT_SLOWPATH] = "dslite-in2out-slowpath", }, }; -/* *INDENT-ON* */ VLIB_NODE_FN (dslite_in2out_slowpath_node) (vlib_main_t * vm, vlib_node_runtime_t * node, @@ -486,7 +484,6 @@ VLIB_NODE_FN (dslite_in2out_slowpath_node) (vlib_main_t * vm, return dslite_in2out_node_fn_inline (vm, node, frame, 1); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dslite_in2out_slowpath_node) = { .name = "dslite-in2out-slowpath", .vector_size = sizeof (u32), @@ -503,7 +500,6 @@ VLIB_REGISTER_NODE (dslite_in2out_slowpath_node) = { [DSLITE_IN2OUT_NEXT_SLOWPATH] = "dslite-in2out-slowpath", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nat/dslite/dslite_out2in.c b/src/plugins/nat/dslite/dslite_out2in.c index c2fa767bd7d..531bbb468bb 100644 --- a/src/plugins/nat/dslite/dslite_out2in.c +++ b/src/plugins/nat/dslite/dslite_out2in.c @@ -266,7 +266,6 @@ VLIB_NODE_FN (dslite_out2in_node) (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (dslite_out2in_node) = { .name = "dslite-out2in", .vector_size = sizeof (u32), @@ -282,7 +281,6 @@ VLIB_REGISTER_NODE (dslite_out2in_node) = { [DSLITE_OUT2IN_NEXT_IP6_LOOKUP] = "ip6-lookup", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nat/lib/alloc.h b/src/plugins/nat/lib/alloc.h index 0c302bf4cfb..882809e829c 100644 --- a/src/plugins/nat/lib/alloc.h +++ b/src/plugins/nat/lib/alloc.h @@ -42,14 +42,12 @@ struct nat_ip4_pool_addr_s { ip4_address_t addr; u32 fib_index; -/* *INDENT-OFF* */ #define _(N, i, n, s) \ u16 busy_##n##_ports; \ u16 * busy_##n##_ports_per_thread; \ uword * busy_##n##_port_bitmap; foreach_nat_protocol #undef _ -/* *INDENT-ON* */ }; struct nat_ip4_addr_port_s diff --git a/src/plugins/nat/lib/ipfix_logging.c b/src/plugins/nat/lib/ipfix_logging.c index 5f40db8d81c..593fa09f7e2 100644 --- a/src/plugins/nat/lib/ipfix_logging.c +++ b/src/plugins/nat/lib/ipfix_logging.c @@ -1630,11 +1630,9 @@ ipfix_flush_process (vlib_main_t *vm, return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat_ipfix_flush_node) = { .function = ipfix_flush_process, .name = "nat-ipfix-flush", .type = VLIB_NODE_TYPE_INPUT, .state = VLIB_NODE_STATE_INTERRUPT, }; -/* *INDENT-ON* */ diff --git a/src/plugins/nat/nat44-ei/nat44_ei_ha.c b/src/plugins/nat/nat44-ei/nat44_ei_ha.c index 39bce255bd6..9546a595cc2 100644 --- a/src/plugins/nat/nat44-ei/nat44_ei_ha.c +++ b/src/plugins/nat/nat44-ei/nat44_ei_ha.c @@ -926,14 +926,12 @@ nat_ha_worker_fn (vlib_main_t * vm, vlib_node_runtime_t * rt, return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat_ha_worker_node) = { .function = nat_ha_worker_fn, .type = VLIB_NODE_TYPE_INPUT, .state = VLIB_NODE_STATE_INTERRUPT, .name = "nat44-ei-ha-worker", }; -/* *INDENT-ON* */ /* periodically send interrupt to each thread */ static uword @@ -969,13 +967,11 @@ nat_ha_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat_ha_process_node) = { .function = nat_ha_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "nat44-ei-ha-process", }; -/* *INDENT-ON* */ void nat_ha_get_resync_status (u8 * in_resync, u32 * resync_ack_missed) @@ -1166,7 +1162,6 @@ nat_ha_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat_ha_node) = { .function = nat_ha_node_fn, .name = "nat44-ei-ha", @@ -1181,7 +1176,6 @@ VLIB_REGISTER_NODE (nat_ha_node) = { [NAT_HA_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ typedef struct { @@ -1286,7 +1280,6 @@ nat_ha_resync (u32 client_index, u32 pid, return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat_ha_handoff_node) = { .function = nat_ha_handoff_node_fn, .name = "nat44-ei-ha-handoff", @@ -1300,7 +1293,6 @@ VLIB_REGISTER_NODE (nat_ha_handoff_node) = { [0] = "error-drop", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nat/nat64/nat64.c b/src/plugins/nat/nat64/nat64.c index 79e9da03a1e..950eea60e5e 100644 --- a/src/plugins/nat/nat64/nat64.c +++ b/src/plugins/nat/nat64/nat64.c @@ -26,7 +26,6 @@ nat64_main_t nat64_main; -/* *INDENT-OFF* */ /* Hook up input features */ VNET_FEATURE_INIT (nat64_in2out, static) = { .arc_name = "ip6-unicast", @@ -62,7 +61,6 @@ static u8 well_known_prefix[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -/* *INDENT-ON* */ #define nat_elog_str(_str) \ do \ @@ -171,14 +169,12 @@ nat64_get_worker_out2in (vlib_buffer_t * b, ip4_header_t * ip) clib_memset (&daddr, 0, sizeof (daddr)); daddr.ip4.as_u32 = ip->dst_address.as_u32; - /* *INDENT-OFF* */ vec_foreach (db, nm->db) { bibe = nat64_db_bib_entry_find (db, &daddr, 0, ip->protocol, 0, 0); if (bibe) return (u32) (db - nm->db); } - /* *INDENT-ON* */ return vlib_get_thread_index (); } @@ -296,12 +292,10 @@ nat64_init (vlib_main_t * vm) for (i = 0; i < nm->num_workers; i++) bitmap = clib_bitmap_set (bitmap, i, 1); - /* *INDENT-OFF* */ clib_bitmap_foreach (i, bitmap) { vec_add1(nm->workers, i); } - /* *INDENT-ON* */ clib_bitmap_free (bitmap); @@ -337,7 +331,6 @@ nat64_init_hash (nat64_config_t c) vec_validate (nm->db, tm->n_vlib_mains - 1); - /* *INDENT-OFF* */ vec_foreach (db, nm->db) { if (nat64_db_init (db, c, nat64_free_out_addr_and_port)) @@ -346,7 +339,6 @@ nat64_init_hash (nat64_config_t c) rv = 1; } } - /* *INDENT-ON* */ return rv; } @@ -358,7 +350,6 @@ nat64_free_hash () nat64_db_t *db; int rv = 0; - /* *INDENT-OFF* */ vec_foreach (db, nm->db) { if (nat64_db_free (db)) @@ -367,7 +358,6 @@ nat64_free_hash () rv = 1; } } - /* *INDENT-ON* */ vec_free (nm->db); @@ -422,7 +412,6 @@ nat64_add_del_pool_addr (u32 thread_index, if (a->fib_index != ~0) fib_table_unlock (a->fib_index, FIB_PROTOCOL_IP6, nm->fib_src_hi); /* Delete sessions using address */ - /* *INDENT-OFF* */ vec_foreach (db, nm->db) { nat64_db_free_out_addr (thread_index, db, &a->addr); @@ -431,12 +420,10 @@ nat64_add_del_pool_addr (u32 thread_index, vlib_set_simple_counter (&nm->total_sessions, db - nm->db, 0, db->st.st_entries_num); } - /* *INDENT-ON* */ vec_del1 (nm->addr_pool, i); } /* Add/del external address to FIB */ - /* *INDENT-OFF* */ pool_foreach (interface, nm->interfaces) { if (nat64_interface_is_inside(interface)) @@ -445,7 +432,6 @@ nat64_add_del_pool_addr (u32 thread_index, nat64_add_del_addr_to_fib (addr, 32, interface->sw_if_index, is_add); break; } - /* *INDENT-ON* */ return 0; } @@ -456,13 +442,11 @@ nat64_pool_addr_walk (nat64_pool_addr_walk_fn_t fn, void *ctx) nat64_main_t *nm = &nat64_main; nat64_address_t *a = 0; - /* *INDENT-OFF* */ vec_foreach (a, nm->addr_pool) { if (fn (a, ctx)) break; }; - /* *INDENT-ON* */ } int @@ -560,7 +544,6 @@ nat64_interface_add_del (u32 sw_if_index, u8 is_inside, u8 is_add) // TODO: is enabled ? we can't signal if it is not /* Check if interface already exists */ - /* *INDENT-OFF* */ pool_foreach (i, nm->interfaces) { if (i->sw_if_index == sw_if_index) @@ -569,7 +552,6 @@ nat64_interface_add_del (u32 sw_if_index, u8 is_inside, u8 is_add) break; } } - /* *INDENT-ON* */ if (is_add) { @@ -610,10 +592,8 @@ nat64_interface_add_del (u32 sw_if_index, u8 is_inside, u8 is_add) if (!is_inside) { - /* *INDENT-OFF* */ vec_foreach (ap, nm->addr_pool) nat64_add_del_addr_to_fib (&ap->addr, 32, sw_if_index, is_add); - /* *INDENT-ON* */ } if (nm->num_workers > 1) @@ -655,13 +635,11 @@ nat64_interfaces_walk (nat64_interface_walk_fn_t fn, void *ctx) nat64_main_t *nm = &nat64_main; nat64_interface_t *i = 0; - /* *INDENT-OFF* */ pool_foreach (i, nm->interfaces) { if (fn (i, ctx)) break; } - /* *INDENT-ON* */ } // TODO: plugin independent @@ -836,7 +814,6 @@ nat64_static_bib_worker_fn (vlib_main_t * vm, vlib_node_runtime_t * rt, nat64_db_bib_entry_t *bibe; ip46_address_t addr; - /* *INDENT-OFF* */ pool_foreach (static_bib, nm->static_bibs) { if ((static_bib->thread_index != thread_index) || (static_bib->done)) @@ -873,21 +850,18 @@ nat64_static_bib_worker_fn (vlib_main_t * vm, vlib_node_runtime_t * rt, static_bib->done = 1; } - /* *INDENT-ON* */ return 0; } static vlib_node_registration_t nat64_static_bib_worker_node; -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat64_static_bib_worker_node, static) = { .function = nat64_static_bib_worker_fn, .type = VLIB_NODE_TYPE_INPUT, .state = VLIB_NODE_STATE_INTERRUPT, .name = "nat64-static-bib-worker", }; -/* *INDENT-ON* */ int nat64_add_del_static_bib_entry (ip6_address_t * in_addr, @@ -991,7 +965,6 @@ nat64_add_del_static_bib_entry (ip6_address_t * in_addr, if (nm->num_workers) { - /* *INDENT-OFF* */ pool_foreach (static_bib, nm->static_bibs) { if (static_bib->done) @@ -999,7 +972,6 @@ nat64_add_del_static_bib_entry (ip6_address_t * in_addr, } vec_foreach (index, to_be_free) pool_put_index (nm->static_bibs, index[0]); - /* *INDENT-ON* */ vec_free (to_be_free); pool_get (nm->static_bibs, static_bib); static_bib->in_addr.as_u64[0] = in_addr->as_u64[0]; @@ -1272,13 +1244,11 @@ nat64_prefix_walk (nat64_prefix_walk_fn_t fn, void *ctx) nat64_main_t *nm = &nat64_main; nat64_prefix_t *p = 0; - /* *INDENT-OFF* */ vec_foreach (p, nm->pref64) { if (fn (p, ctx)) break; }; - /* *INDENT-ON* */ } void @@ -1287,7 +1257,6 @@ nat64_compose_ip6 (ip6_address_t * ip6, ip4_address_t * ip4, u32 fib_index) nat64_main_t *nm = &nat64_main; nat64_prefix_t *p, *gp = 0, *prefix = 0; - /* *INDENT-OFF* */ vec_foreach (p, nm->pref64) { if (p->fib_index == fib_index) @@ -1299,7 +1268,6 @@ nat64_compose_ip6 (ip6_address_t * ip6, ip4_address_t * ip4, u32 fib_index) if (p->fib_index == 0) gp = p; }; - /* *INDENT-ON* */ if (!prefix) prefix = gp; @@ -1358,7 +1326,6 @@ nat64_extract_ip4 (ip6_address_t * ip6, ip4_address_t * ip4, u32 fib_index) nat64_prefix_t *p, *gp = 0; u8 plen = 0; - /* *INDENT-OFF* */ vec_foreach (p, nm->pref64) { if (p->fib_index == fib_index) @@ -1370,7 +1337,6 @@ nat64_extract_ip4 (ip6_address_t * ip6, ip4_address_t * ip4, u32 fib_index) if (p->vrf_id == 0) gp = p; }; - /* *INDENT-ON* */ if (!plen) { @@ -1445,14 +1411,12 @@ nat64_expire_worker_walk_fn (vlib_main_t * vm, vlib_node_runtime_t * rt, return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat64_expire_worker_walk_node, static) = { .function = nat64_expire_worker_walk_fn, .type = VLIB_NODE_TYPE_INPUT, .state = VLIB_NODE_STATE_INTERRUPT, .name = "nat64-expire-worker-walk", }; -/* *INDENT-ON* */ /** * @brief Centralized process to drive per worker expire walk. @@ -1580,12 +1544,10 @@ nat64_plugin_disable () } nm->enabled = 0; - /* *INDENT-OFF* */ pool_foreach (i, nm->interfaces) { vec_add1 (interfaces, *i); } - /* *INDENT-ON* */ vec_foreach (i, interfaces) { rv = nat64_interface_add_del (i->sw_if_index, i->flags, 0); diff --git a/src/plugins/nat/nat64/nat64.h b/src/plugins/nat/nat64/nat64.h index 1180f9df778..9eb8d915390 100644 --- a/src/plugins/nat/nat64/nat64.h +++ b/src/plugins/nat/nat64/nat64.h @@ -93,14 +93,12 @@ typedef struct { ip4_address_t addr; u32 fib_index; -/* *INDENT-OFF* */ #define _(N, i, n, s) \ u16 busy_##n##_ports; \ u16 * busy_##n##_ports_per_thread; \ u32 busy_##n##_port_refcounts[65535]; foreach_nat_protocol #undef _ -/* *INDENT-ON* */ } nat64_address_t; typedef struct diff --git a/src/plugins/nat/nat64/nat64_api.c b/src/plugins/nat/nat64/nat64_api.c index e64b6434fd2..87cca01b59b 100644 --- a/src/plugins/nat/nat64/nat64_api.c +++ b/src/plugins/nat/nat64/nat64_api.c @@ -69,7 +69,6 @@ vl_api_nat64_get_timeouts_t_handler (vl_api_nat64_get_timeouts_t * mp) vl_api_nat64_get_timeouts_reply_t *rmp; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_NAT64_GET_TIMEOUTS_REPLY, ({ rmp->udp = htonl (nm->udp_timeout); @@ -77,7 +76,6 @@ vl_api_nat64_get_timeouts_t_handler (vl_api_nat64_get_timeouts_t * mp) rmp->tcp_transitory = htonl (nm->tcp_trans_timeout); rmp->icmp = htonl (nm->icmp_timeout); })) - /* *INDENT-ON* */ } static void @@ -298,10 +296,8 @@ vl_api_nat64_bib_dump_t_handler (vl_api_nat64_bib_dump_t * mp) .context = mp->context, }; - /* *INDENT-OFF* */ vec_foreach (db, nm->db) nat64_db_bib_walk (db, mp->proto, nat64_api_bib_walk, &ctx); - /* *INDENT-ON* */ } static int @@ -356,13 +352,11 @@ vl_api_nat64_st_dump_t_handler (vl_api_nat64_st_dump_t * mp) .context = mp->context, }; - /* *INDENT-OFF* */ vec_foreach (db, nm->db) { ctx.db = db; nat64_db_st_walk (db, mp->proto, nat64_api_st_walk, &ctx); } - /* *INDENT-ON* */ } static void diff --git a/src/plugins/nat/nat64/nat64_cli.c b/src/plugins/nat/nat64/nat64_cli.c index 3af715c2457..2cef71080f9 100644 --- a/src/plugins/nat/nat64/nat64_cli.c +++ b/src/plugins/nat/nat64/nat64_cli.c @@ -484,10 +484,8 @@ nat64_show_bib_command_fn (vlib_main_t * vm, else vlib_cli_output (vm, "NAT64 %U BIB entries:", format_nat_protocol, proto); - /* *INDENT-OFF* */ vec_foreach (db, nm->db) nat64_db_bib_walk (db, p, nat64_cli_bib_walk, vm); - /* *INDENT-ON* */ done: unformat_free (line_input); @@ -586,13 +584,11 @@ nat64_show_st_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "NAT64 sessions:"); else vlib_cli_output (vm, "NAT64 %U sessions:", format_nat_protocol, proto); - /* *INDENT-OFF* */ vec_foreach (db, nm->db) { ctx.db = db; nat64_db_st_walk (db, p, nat64_cli_st_walk, &ctx); } - /* *INDENT-ON* */ done: unformat_free (line_input); @@ -775,7 +771,6 @@ done: return error; } -/* *INDENT-OFF* */ /*? * @cliexpar * @cliexstart{nat64 plugin} @@ -983,7 +978,6 @@ VLIB_CLI_COMMAND (nat64_add_interface_address_command, static) = { .short_help = "nat64 add interface address <interface> [del]", .function = nat64_add_interface_address_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nat/nat64/nat64_db.c b/src/plugins/nat/nat64/nat64_db.c index 24f7f571c01..e4e9febcb12 100644 --- a/src/plugins/nat/nat64/nat64_db.c +++ b/src/plugins/nat/nat64/nat64_db.c @@ -54,13 +54,11 @@ nat64_db_free (nat64_db_t * db) clib_bihash_free_48_8 (&db->st.in2out); clib_bihash_free_48_8 (&db->st.out2in); -/* *INDENT-OFF* */ #define _(N, i, n, s) \ pool_free (db->bib._##n##_bib); \ pool_free (db->st._##n##_st); foreach_nat_protocol #undef _ -/* *INDENT-ON* */ pool_free (db->bib._unk_proto_bib); pool_free (db->st._unk_proto_st); @@ -89,7 +87,6 @@ nat64_db_bib_entry_create (u32 thread_index, nat64_db_t * db, /* create pool entry */ switch (ip_proto_to_nat_proto (proto)) { -/* *INDENT-OFF* */ #define _(N, i, n, s) \ case NAT_PROTOCOL_##N: \ pool_get (db->bib._##n##_bib, bibe); \ @@ -97,7 +94,6 @@ nat64_db_bib_entry_create (u32 thread_index, nat64_db_t * db, break; foreach_nat_protocol #undef _ -/* *INDENT-ON* */ default: pool_get (db->bib._unk_proto_bib, bibe); kv.value = bibe - db->bib._unk_proto_bib; @@ -155,7 +151,6 @@ nat64_db_bib_entry_free (u32 thread_index, nat64_db_t * db, switch (ip_proto_to_nat_proto (bibe->proto)) { -/* *INDENT-OFF* */ #define _(N, i, n, s) \ case NAT_PROTOCOL_##N: \ bib = db->bib._##n##_bib; \ @@ -163,7 +158,6 @@ nat64_db_bib_entry_free (u32 thread_index, nat64_db_t * db, break; foreach_nat_protocol #undef _ -/* *INDENT-ON* */ default: bib = db->bib._unk_proto_bib; st = db->st._unk_proto_st; @@ -232,14 +226,12 @@ nat64_db_bib_entry_find (nat64_db_t * db, ip46_address_t * addr, u16 port, switch (ip_proto_to_nat_proto (proto)) { -/* *INDENT-OFF* */ #define _(N, i, n, s) \ case NAT_PROTOCOL_##N: \ bib = db->bib._##n##_bib; \ break; foreach_nat_protocol #undef _ -/* *INDENT-ON* */ default: bib = db->bib._unk_proto_bib; break; @@ -271,7 +263,6 @@ nat64_db_bib_walk (nat64_db_t * db, u8 proto, if (proto == 255) { - /* *INDENT-OFF* */ #define _(N, i, n, s) \ bib = db->bib._##n##_bib; \ pool_foreach (bibe, bib) { \ @@ -285,32 +276,27 @@ nat64_db_bib_walk (nat64_db_t * db, u8 proto, if (fn (bibe, ctx)) return; } - /* *INDENT-ON* */ } else { switch (ip_proto_to_nat_proto (proto)) { - /* *INDENT-OFF* */ #define _(N, i, n, s) \ case NAT_PROTOCOL_##N: \ bib = db->bib._##n##_bib; \ break; foreach_nat_protocol #undef _ - /* *INDENT-ON* */ default: bib = db->bib._unk_proto_bib; break; } - /* *INDENT-OFF* */ pool_foreach (bibe, bib) { if (fn (bibe, ctx)) return; } - /* *INDENT-ON* */ } } @@ -321,14 +307,12 @@ nat64_db_bib_entry_by_index (nat64_db_t * db, u8 proto, u32 bibe_index) switch (ip_proto_to_nat_proto (proto)) { -/* *INDENT-OFF* */ #define _(N, i, n, s) \ case NAT_PROTOCOL_##N: \ bib = db->bib._##n##_bib; \ break; foreach_nat_protocol #undef _ -/* *INDENT-ON* */ default: bib = db->bib._unk_proto_bib; break; @@ -345,7 +329,6 @@ nat64_db_st_walk (nat64_db_t * db, u8 proto, if (proto == 255) { - /* *INDENT-OFF* */ #define _(N, i, n, s) \ st = db->st._##n##_st; \ pool_foreach (ste, st) { \ @@ -359,32 +342,27 @@ nat64_db_st_walk (nat64_db_t * db, u8 proto, if (fn (ste, ctx)) return; } - /* *INDENT-ON* */ } else { switch (ip_proto_to_nat_proto (proto)) { - /* *INDENT-OFF* */ #define _(N, i, n, s) \ case NAT_PROTOCOL_##N: \ st = db->st._##n##_st; \ break; foreach_nat_protocol #undef _ - /* *INDENT-ON* */ default: st = db->st._unk_proto_st; break; } - /* *INDENT-OFF* */ pool_foreach (ste, st) { if (fn (ste, ctx)) return; } - /* *INDENT-ON* */ } } @@ -408,7 +386,6 @@ nat64_db_st_entry_create (u32 thread_index, nat64_db_t * db, /* create pool entry */ switch (ip_proto_to_nat_proto (bibe->proto)) { -/* *INDENT-OFF* */ #define _(N, i, n, s) \ case NAT_PROTOCOL_##N: \ pool_get (db->st._##n##_st, ste); \ @@ -417,7 +394,6 @@ nat64_db_st_entry_create (u32 thread_index, nat64_db_t * db, break; foreach_nat_protocol #undef _ -/* *INDENT-ON* */ default: pool_get (db->st._unk_proto_st, ste); kv.value = ste - db->st._unk_proto_st; @@ -494,7 +470,6 @@ nat64_db_st_entry_free (u32 thread_index, switch (ip_proto_to_nat_proto (ste->proto)) { -/* *INDENT-OFF* */ #define _(N, i, n, s) \ case NAT_PROTOCOL_##N: \ st = db->st._##n##_st; \ @@ -502,7 +477,6 @@ nat64_db_st_entry_free (u32 thread_index, break; foreach_nat_protocol #undef _ -/* *INDENT-ON* */ default: st = db->st._unk_proto_st; bib = db->bib._unk_proto_bib; @@ -579,14 +553,12 @@ nat64_db_st_entry_find (nat64_db_t * db, ip46_address_t * l_addr, switch (ip_proto_to_nat_proto (proto)) { -/* *INDENT-OFF* */ #define _(N, i, n, s) \ case NAT_PROTOCOL_##N: \ st = db->st._##n##_st; \ break; foreach_nat_protocol #undef _ -/* *INDENT-ON* */ default: st = db->st._unk_proto_st; break; @@ -622,14 +594,12 @@ nat64_db_st_entry_get_index (nat64_db_t * db, nat64_db_st_entry_t * ste) switch (ip_proto_to_nat_proto (ste->proto)) { -/* *INDENT-OFF* */ #define _(N, i, n, s) \ case NAT_PROTOCOL_##N: \ st = db->st._##n##_st; \ break; foreach_nat_protocol #undef _ -/* *INDENT-ON* */ default: st = db->st._unk_proto_st; return (u32) ~ 0; @@ -645,14 +615,12 @@ nat64_db_st_entry_by_index (nat64_db_t * db, u8 proto, u32 ste_index) switch (ip_proto_to_nat_proto (proto)) { -/* *INDENT-OFF* */ #define _(N, i, n, s) \ case NAT_PROTOCOL_##N: \ st = db->st._##n##_st; \ break; foreach_nat_protocol #undef _ -/* *INDENT-ON* */ default: st = db->st._unk_proto_st; break; @@ -667,7 +635,6 @@ nad64_db_st_free_expired (u32 thread_index, nat64_db_t * db, u32 now) u32 *ste_to_be_free = 0, *ste_index; nat64_db_st_entry_t *st, *ste; -/* *INDENT-OFF* */ #define _(N, i, n, s) \ st = db->st._##n##_st; \ pool_foreach (ste, st) {\ @@ -692,7 +659,6 @@ nad64_db_st_free_expired (u32 thread_index, nat64_db_t * db, u32 now) nat64_db_st_entry_free (thread_index, db, pool_elt_at_index(st, ste_index[0])); vec_free (ste_to_be_free); -/* *INDENT-ON* */ } void @@ -704,7 +670,6 @@ nat64_db_free_out_addr (u32 thread_index, nat64_db_bib_entry_t *bibe; db->addr_free = 1; -/* *INDENT-OFF* */ #define _(N, i, n, s) \ st = db->st._##n##_st; \ pool_foreach (ste, st) { \ @@ -730,7 +695,6 @@ nat64_db_free_out_addr (u32 thread_index, pool_elt_at_index(st, ste_index[0])); vec_free (ste_to_be_free); db->addr_free = 0; -/* *INDENT-ON* */ } /* diff --git a/src/plugins/nat/nat64/nat64_db.h b/src/plugins/nat/nat64/nat64_db.h index c34b671999a..a7d433fb8ea 100644 --- a/src/plugins/nat/nat64/nat64_db.h +++ b/src/plugins/nat/nat64/nat64_db.h @@ -47,7 +47,6 @@ typedef struct }; } nat64_db_bib_entry_key_t; -/* *INDENT-OFF* */ typedef CLIB_PACKED(struct { ip6_address_t in_addr; @@ -59,17 +58,14 @@ typedef CLIB_PACKED(struct u8 proto; u8 is_static; }) nat64_db_bib_entry_t; -/* *INDENT-ON* */ typedef struct { /* BIBs */ -/* *INDENT-OFF* */ #define _(N, i, n, s) \ nat64_db_bib_entry_t *_##n##_bib; foreach_nat_protocol #undef _ -/* *INDENT-ON* */ nat64_db_bib_entry_t *_unk_proto_bib; /* BIB lookup */ @@ -98,7 +94,6 @@ typedef struct }; } nat64_db_st_entry_key_t; -/* *INDENT-OFF* */ typedef CLIB_PACKED(struct { ip6_address_t in_r_addr; @@ -109,17 +104,14 @@ typedef CLIB_PACKED(struct u8 proto; u8 tcp_state; }) nat64_db_st_entry_t; -/* *INDENT-ON* */ typedef struct { /* session tables */ -/* *INDENT-OFF* */ #define _(N, i, n, s) \ nat64_db_st_entry_t *_##n##_st; foreach_nat_protocol #undef _ -/* *INDENT-ON* */ nat64_db_st_entry_t *_unk_proto_st; /* session lookup */ diff --git a/src/plugins/nat/nat64/nat64_in2out.c b/src/plugins/nat/nat64/nat64_in2out.c index 52d3c7f0a3b..63eab72a7fb 100644 --- a/src/plugins/nat/nat64/nat64_in2out.c +++ b/src/plugins/nat/nat64/nat64_in2out.c @@ -86,14 +86,12 @@ nat64_not_translate (u32 sw_if_index, ip6_address_t ip6_addr) ip_lookup_main_t *lm6 = &im6->lookup_main; ip_interface_address_t *ia = 0; - /* *INDENT-OFF* */ foreach_ip_interface_address (lm6, ia, sw_if_index, 0, ({ addr = ip_interface_address_get_address (lm6, ia); if (0 == ip6_address_compare (addr, &ip6_addr)) return 1; })); - /* *INDENT-ON* */ return 0; } @@ -744,7 +742,6 @@ nat64_in2out_tcp_udp_hairpinning (vlib_main_t * vm, vlib_buffer_t * b, daddr.ip4.as_u32 = ste->out_r_addr.as_u32; bibe = 0; - /* *INDENT-OFF* */ vec_foreach (db, nm->db) { bibe = nat64_db_bib_entry_find (db, &daddr, dport, proto, 0, 0); @@ -752,7 +749,6 @@ nat64_in2out_tcp_udp_hairpinning (vlib_main_t * vm, vlib_buffer_t * b, if (bibe) break; } - /* *INDENT-ON* */ if (!bibe) return -1; @@ -851,7 +847,6 @@ nat64_in2out_icmp_hairpinning (vlib_main_t * vm, vlib_buffer_t * b, daddr.ip4.as_u32 = bibe->out_addr.as_u32; ste = 0; - /* *INDENT-OFF* */ vec_foreach (db, nm->db) { ste = nat64_db_st_entry_find (db, &saddr, &daddr, sport, dport, proto, @@ -860,7 +855,6 @@ nat64_in2out_icmp_hairpinning (vlib_main_t * vm, vlib_buffer_t * b, if (ste) break; } - /* *INDENT-ON* */ if (!ste) return -1; @@ -1006,7 +1000,6 @@ nat64_in2out_unk_proto_hairpinning (vlib_main_t * vm, vlib_buffer_t * b, daddr.ip4.as_u32 = ste->out_r_addr.as_u32; bibe = 0; - /* *INDENT-OFF* */ vec_foreach (db, nm->db) { bibe = nat64_db_bib_entry_find (db, &daddr, 0, proto, 0, 0); @@ -1014,7 +1007,6 @@ nat64_in2out_unk_proto_hairpinning (vlib_main_t * vm, vlib_buffer_t * b, if (bibe) break; } - /* *INDENT-ON* */ if (!bibe) return -1; @@ -1226,7 +1218,6 @@ VLIB_NODE_FN (nat64_in2out_node) (vlib_main_t * vm, return nat64_in2out_node_fn_inline (vm, node, frame, 0); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat64_in2out_node) = { .name = "nat64-in2out", .vector_size = sizeof (u32), @@ -1243,7 +1234,6 @@ VLIB_REGISTER_NODE (nat64_in2out_node) = { [NAT64_IN2OUT_NEXT_SLOWPATH] = "nat64-in2out-slowpath", }, }; -/* *INDENT-ON* */ VLIB_NODE_FN (nat64_in2out_slowpath_node) (vlib_main_t * vm, vlib_node_runtime_t * node, @@ -1252,7 +1242,6 @@ VLIB_NODE_FN (nat64_in2out_slowpath_node) (vlib_main_t * vm, return nat64_in2out_node_fn_inline (vm, node, frame, 1); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat64_in2out_slowpath_node) = { .name = "nat64-in2out-slowpath", .vector_size = sizeof (u32), @@ -1269,7 +1258,6 @@ VLIB_REGISTER_NODE (nat64_in2out_slowpath_node) = { [NAT64_IN2OUT_NEXT_SLOWPATH] = "nat64-in2out-slowpath", }, }; -/* *INDENT-ON* */ typedef struct nat64_in2out_frag_set_ctx_t_ { @@ -1384,7 +1372,6 @@ VLIB_NODE_FN (nat64_in2out_handoff_node) (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat64_in2out_handoff_node) = { .name = "nat64-in2out-handoff", .vector_size = sizeof (u32), @@ -1399,7 +1386,6 @@ VLIB_REGISTER_NODE (nat64_in2out_handoff_node) = { [0] = "error-drop", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nat/nat64/nat64_out2in.c b/src/plugins/nat/nat64/nat64_out2in.c index 7cc2d3d3b70..a8faead4470 100644 --- a/src/plugins/nat/nat64/nat64_out2in.c +++ b/src/plugins/nat/nat64/nat64_out2in.c @@ -639,7 +639,6 @@ VLIB_NODE_FN (nat64_out2in_node) (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat64_out2in_node) = { .name = "nat64-out2in", .vector_size = sizeof (u32), @@ -655,7 +654,6 @@ VLIB_REGISTER_NODE (nat64_out2in_node) = { [NAT64_OUT2IN_NEXT_IP4_LOOKUP] = "ip4-lookup", }, }; -/* *INDENT-ON* */ typedef struct nat64_out2in_frag_set_ctx_t_ { @@ -769,7 +767,6 @@ VLIB_NODE_FN (nat64_out2in_handoff_node) (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat64_out2in_handoff_node) = { .name = "nat64-out2in-handoff", .vector_size = sizeof (u32), @@ -784,7 +781,6 @@ VLIB_REGISTER_NODE (nat64_out2in_handoff_node) = { [0] = "error-drop", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nat/nat66/nat66_in2out.c b/src/plugins/nat/nat66/nat66_in2out.c index 356100f89ef..aa2229e1997 100644 --- a/src/plugins/nat/nat66/nat66_in2out.c +++ b/src/plugins/nat/nat66/nat66_in2out.c @@ -94,14 +94,12 @@ nat66_not_translate (u32 rx_fib_index, ip6_address_t ip6_addr) sw_if_index = fib_entry_get_resolving_interface (fei); } - /* *INDENT-OFF* */ pool_foreach (i, nm->interfaces) { /* NAT packet aimed at outside interface */ if (nat66_interface_is_outside (i) && sw_if_index == i->sw_if_index) return 0; } - /* *INDENT-ON* */ return 1; } @@ -235,7 +233,6 @@ VLIB_NODE_FN (nat66_in2out_node) (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat66_in2out_node) = { .name = "nat66-in2out", .vector_size = sizeof (u32), @@ -250,7 +247,6 @@ VLIB_REGISTER_NODE (nat66_in2out_node) = { [NAT66_IN2OUT_NEXT_IP6_LOOKUP] = "ip6-lookup", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nat/nat66/nat66_out2in.c b/src/plugins/nat/nat66/nat66_out2in.c index 9d44b4880eb..820e0c79033 100644 --- a/src/plugins/nat/nat66/nat66_out2in.c +++ b/src/plugins/nat/nat66/nat66_out2in.c @@ -193,7 +193,6 @@ VLIB_NODE_FN (nat66_out2in_node) (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat66_out2in_node) = { .name = "nat66-out2in", .vector_size = sizeof (u32), @@ -208,7 +207,6 @@ VLIB_REGISTER_NODE (nat66_out2in_node) = { [NAT66_OUT2IN_NEXT_IP6_LOOKUP] = "ip6-lookup", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_export.c b/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_export.c index cb2bb2107c9..d2b59ababa9 100644 --- a/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_export.c +++ b/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_export.c @@ -136,14 +136,12 @@ set_nsh_md2_ioam_export_ipfix_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_nsh_md2_ioam_ipfix_command, static) = { .path = "set nsh-md2-ioam export ipfix", .short_help = "set nsh-md2-ioam export ipfix collector <ip4-address> src <ip4-address>", .function = set_nsh_md2_ioam_export_ipfix_command_fn, }; -/* *INDENT-ON* */ #define IPFIX_NSH_MD2_IOAM_EXPORT_ID 274 // TODO: Move this to ioam/ioam_export.h diff --git a/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_export_thread.c b/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_export_thread.c index 54dc01bc021..40ff8c087dd 100644 --- a/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_export_thread.c +++ b/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_export_thread.c @@ -33,14 +33,12 @@ nsh_md2_ioam_export_process (vlib_main_t * vm, } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (nsh_md2_ioam_export_process_node, static) = { .function = nsh_md2_ioam_export_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "nsh-md2-ioam-export-process", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_node.c b/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_node.c index 06874f64a73..b3bf8c59b96 100644 --- a/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_node.c +++ b/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_node.c @@ -129,7 +129,6 @@ nsh_md2_ioam_export_node_fn (vlib_main_t * vm, /* * Node for iOAM export */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (nsh_md2_ioam_export_node) = { .function = nsh_md2_ioam_export_node_fn, @@ -144,7 +143,6 @@ VLIB_REGISTER_NODE (nsh_md2_ioam_export_node) = .next_nodes = {[EXPORT_NEXT_NSH_MD2_IOAM_INPUT] = "nsh-pop"}, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nsh/nsh-md2-ioam/md2_ioam_transit.c b/src/plugins/nsh/nsh-md2-ioam/md2_ioam_transit.c index 876e00324e3..6c372a5bd4e 100644 --- a/src/plugins/nsh/nsh-md2-ioam/md2_ioam_transit.c +++ b/src/plugins/nsh/nsh-md2-ioam/md2_ioam_transit.c @@ -53,13 +53,11 @@ typedef enum } nsh_md2_ioam_encap_transit_next_t; -/* *INDENT-OFF* */ VNET_FEATURE_INIT (nsh_md2_ioam_encap_transit, static) = { .arc_name = "ip4-output", .node_name = "nsh-md2-ioam-encap-transit", }; -/* *INDENT-ON* */ static uword @@ -162,7 +160,6 @@ nsh_md2_ioam_encap_transit (vlib_main_t * vm, } extern u8 *format_nsh_node_map_trace (u8 * s, va_list * args); -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (nsh_md2_ioam_encap_transit_node) = { .function = nsh_md2_ioam_encap_transit, .name = "nsh-md2-ioam-encap-transit", @@ -181,7 +178,6 @@ VLIB_REGISTER_NODE (nsh_md2_ioam_encap_transit_node) = { }, }; -/* *INDENT-ON* */ /* diff --git a/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam.c b/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam.c index b401530c875..2aac6760546 100644 --- a/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam.c +++ b/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam.c @@ -449,7 +449,6 @@ static clib_error_t *nsh_md2_ioam_set_transit_rewrite_command_fn return rv; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (nsh_md2_ioam_set_transit_rewrite_cmd, static) = { .path = "set nsh-md2-ioam-transit", .short_help = "set nsh-ioam-lisp-gpe-transit dst-ip <dst_ip> [outer-fib-index <outer_fib_index>] [disable]", diff --git a/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam_trace.c b/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam_trace.c index aad3cffb1db..2c553b39e45 100644 --- a/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam_trace.c +++ b/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam_trace.c @@ -38,7 +38,6 @@ typedef union } time_u64_t; -/* *INDENT-OFF* */ typedef CLIB_PACKED(struct { u16 class; u8 type; @@ -48,7 +47,6 @@ typedef CLIB_PACKED(struct { u8 reserve; u32 elts[0]; /* Variable type. So keep it generic */ }) nsh_md2_ioam_trace_option_t; -/* *INDENT-ON* */ #define foreach_nsh_md2_ioam_trace_stats \ @@ -333,13 +331,11 @@ nsh_md2_ioam_show_ioam_trace_cmd_fn (vlib_main_t * vm, } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (nsh_md2_ioam_show_ioam_trace_cmd, static) = { .path = "show ioam nsh-lisp-gpe trace", .short_help = "iOAM trace statistics", .function = nsh_md2_ioam_show_ioam_trace_cmd_fn, }; -/* *INDENT-ON* */ int @@ -376,12 +372,10 @@ nsh_md2_ioam_trace_init (vlib_main_t * vm) return (0); } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (nsh_md2_ioam_trace_init) = { .runs_after = VLIB_INITS ("nsh_init", "nsh_md2_ioam_init"), }; -/* *INDENT-ON* */ int nsh_md2_ioam_trace_profile_cleanup (void) diff --git a/src/plugins/nsh/nsh.c b/src/plugins/nsh/nsh.c index de7bdcebfca..a2c24e27b26 100644 --- a/src/plugins/nsh/nsh.c +++ b/src/plugins/nsh/nsh.c @@ -164,14 +164,12 @@ format_nsh_tunnel_with_length (u8 * s, va_list * args) return s; } -/* *INDENT-OFF* */ VNET_HW_INTERFACE_CLASS (nsh_hw_class) = { .name = "NSH", .format_header = format_nsh_tunnel_with_length, .build_rewrite = default_build_rewrite, .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P, }; -/* *INDENT-ON* */ void nsh_md2_set_next_ioam_export_override (uword next) @@ -284,12 +282,10 @@ nsh_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (nsh_init); -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Network Service Header (NSH)", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nsh/nsh_api.c b/src/plugins/nsh/nsh_api.c index da6650dac7c..c7a686c8b83 100644 --- a/src/plugins/nsh/nsh_api.c +++ b/src/plugins/nsh/nsh_api.c @@ -64,13 +64,11 @@ format_nsh_name (u8 * s, va_list * args) return format (s, "nsh_tunnel%d", dev_instance); } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (nsh_device_class, static) = { .name = "NSH", .format_device_name = format_nsh_name, .admin_up_down_function = nsh_interface_admin_up_down, }; -/* *INDENT-ON* */ static void send_nsh_entry_details (nsh_entry_t * t, vl_api_registration_t * rp, u32 context) diff --git a/src/plugins/nsh/nsh_cli.c b/src/plugins/nsh/nsh_cli.c index 7bcaf1c51ad..4288a9654c5 100644 --- a/src/plugins/nsh/nsh_cli.c +++ b/src/plugins/nsh/nsh_cli.c @@ -140,7 +140,6 @@ nsh_get_adj_by_sw_if_index (u32 sw_if_index) { adj_index_t ai = ~0; - /* *INDENT-OFF* */ pool_foreach_index (ai, adj_pool) { if (sw_if_index == adj_get_sw_if_index(ai)) @@ -148,7 +147,6 @@ nsh_get_adj_by_sw_if_index (u32 sw_if_index) return ai; } } - /* *INDENT-ON* */ return ~0; } @@ -290,7 +288,6 @@ nsh_add_del_map_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (create_nsh_map_command, static) = { .path = "create nsh map", .short_help = @@ -299,7 +296,6 @@ VLIB_CLI_COMMAND (create_nsh_map_command, static) = { " encap-vxlan4-intf <nn> | encap-vxlan6-intf <nn>| encap-eth-intf <nn> | encap-none]\n", .function = nsh_add_del_map_command_fn, }; -/* *INDENT-ON* */ /** * CLI command for showing the mapping between NSH entries @@ -322,12 +318,10 @@ show_nsh_map_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_nsh_map_command, static) = { .path = "show nsh map", .function = show_nsh_map_command_fn, }; -/* *INDENT-ON* */ /** * CLI command for adding NSH entry @@ -494,7 +488,6 @@ nsh_add_del_entry_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (create_nsh_entry_command, static) = { .path = "create nsh entry", .short_help = @@ -502,7 +495,6 @@ VLIB_CLI_COMMAND (create_nsh_entry_command, static) = { " [c1 <nn> c2 <nn> c3 <nn> c4 <nn>] [tlv-ioam-trace] [del]\n", .function = nsh_add_del_entry_command_fn, }; -/* *INDENT-ON* */ /* format from network order */ u8 * @@ -621,12 +613,10 @@ show_nsh_entry_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_nsh_entry_command, static) = { .path = "show nsh entry", .function = show_nsh_entry_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nsh/nsh_node.c b/src/plugins/nsh/nsh_node.c index a467d2c34c2..5c084985948 100644 --- a/src/plugins/nsh/nsh_node.c +++ b/src/plugins/nsh/nsh_node.c @@ -906,7 +906,6 @@ static char *nsh_node_error_strings[] = { #undef _ }; -/* *INDENT-OFF* */ /* register nsh-input node */ VLIB_REGISTER_NODE (nsh_input_node) = { @@ -978,7 +977,6 @@ VLIB_REGISTER_NODE (nsh_aware_vnf_proxy_node) = #undef _ }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nsh/nsh_output.c b/src/plugins/nsh/nsh_output.c index 3a3da02f764..9b7014a0ed0 100644 --- a/src/plugins/nsh/nsh_output.c +++ b/src/plugins/nsh/nsh_output.c @@ -366,7 +366,6 @@ VNET_FEATURE_INIT (nsh_interface_output, static) = { }; /* Built-in ip4 tx feature path definition */ -/* *INDENT-OFF* */ VNET_FEATURE_ARC_INIT (nsh_eth_output, static) = { .arc_name = "nsh-eth-output", @@ -379,7 +378,6 @@ VNET_FEATURE_INIT (nsh_eth_tx_drop, static) = .node_name = "error-drop", .runs_before = 0, /* not before any other features */ }; -/* *INDENT-ON* */ /** * @brief Next index values from the NSH incomplete adj node */ diff --git a/src/plugins/nsim/node.c b/src/plugins/nsim/node.c index 159db4a1cc7..a8ba909ab07 100644 --- a/src/plugins/nsim/node.c +++ b/src/plugins/nsim/node.c @@ -299,7 +299,6 @@ VLIB_NODE_FN (nsim_node) (vlib_main_t * vm, vlib_node_runtime_t * node, 0 /* is_trace */ , 1 /* is_cross_connect */ ); } -/* *INDENT-OFF* */ #ifndef CLIB_MARCH_VARIANT VLIB_REGISTER_NODE (nsim_node) = { @@ -319,7 +318,6 @@ VLIB_REGISTER_NODE (nsim_node) = }, }; #endif /* CLIB_MARCH_VARIANT */ -/* *INDENT-ON* */ VLIB_NODE_FN (nsim_feature_node) (vlib_main_t * vm, vlib_node_runtime_t * node, @@ -333,7 +331,6 @@ VLIB_NODE_FN (nsim_feature_node) (vlib_main_t * vm, 0 /* is_trace */ , 0 /* is_cross_connect */ ); } -/* *INDENT-OFF* */ #ifndef CLIB_MARCH_VARIANT VLIB_REGISTER_NODE (nsim_feature_node) = { @@ -353,7 +350,6 @@ VLIB_REGISTER_NODE (nsim_feature_node) = }, }; #endif /* CLIB_MARCH_VARIANT */ -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nsim/nsim.c b/src/plugins/nsim/nsim.c index 45b5e11a902..1c5b26bbaaa 100644 --- a/src/plugins/nsim/nsim.c +++ b/src/plugins/nsim/nsim.c @@ -334,7 +334,6 @@ VLIB_CONFIG_FUNCTION (nsim_config, "nsim"); * @cliend * @cliexcmd{nsim enable-disable <intfc> <intfc> [disable]} ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (nsim_enable_disable_command, static) = { .path = "nsim cross-connect enable-disable", @@ -343,7 +342,6 @@ VLIB_CLI_COMMAND (nsim_enable_disable_command, static) = "<interface-name-2> [disable]", .function = nsim_cross_connect_enable_disable_command_fn, }; -/* *INDENT-ON* */ /* API message handler */ static void vl_api_nsim_cross_connect_enable_disable_t_handler @@ -523,7 +521,6 @@ nsim_output_feature_enable_disable_command_fn (vlib_main_t * vm, * @cliend * @cliexcmd{nsim output-feature enable-disable <intfc> [disable]} ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (nsim_output_feature_enable_disable_command, static) = { .path = "nsim output-feature enable-disable", @@ -531,7 +528,6 @@ VLIB_CLI_COMMAND (nsim_output_feature_enable_disable_command, static) = "nsim output-feature enable-disable <interface-name> [disable]", .function = nsim_output_feature_enable_disable_command_fn, }; -/* *INDENT-ON* */ #include <nsim/nsim.api.c> static clib_error_t * @@ -550,30 +546,24 @@ nsim_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (nsim_init); -/* *INDENT-OFF* */ VNET_FEATURE_INIT (nsim, static) = { .arc_name = "device-input", .node_name = "nsim", .runs_before = VNET_FEATURES ("ethernet-input"), }; -/* *INDENT-ON */ -/* *INDENT-OFF* */ VNET_FEATURE_INIT (nsim_feature, static) = { .arc_name = "interface-output", .node_name = "nsim-output-feature", .runs_before = VNET_FEATURES ("interface-output-arc-end"), }; -/* *INDENT-ON */ -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Network Delay Simulator", }; -/* *INDENT-ON* */ static uword unformat_delay (unformat_input_t * input, va_list * args) @@ -797,7 +787,6 @@ set_nsim_command_fn (vlib_main_t * vm, * @cliend * @cliexcmd{set nsim delay <nn> bandwidth <bb> packet-size <nn>} ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_nsim_command, static) = { .path = "set nsim", @@ -805,7 +794,6 @@ VLIB_CLI_COMMAND (set_nsim_command, static) = " [packets-per-drop <nn>][drop-fraction <f64: 0.0 - 1.0>]", .function = set_nsim_command_fn, }; -/* *INDENT-ON*/ static clib_error_t * @@ -842,14 +830,12 @@ show_nsim_command_fn (vlib_main_t * vm, * @cliexcmd{show nsim} ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_nsim_command, static) = { .path = "show nsim", .short_help = "Display network delay simulator configuration", .function = show_nsim_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/nsim/nsim_input.c b/src/plugins/nsim/nsim_input.c index 65a7ae11251..889d9c9841f 100644 --- a/src/plugins/nsim/nsim_input.c +++ b/src/plugins/nsim/nsim_input.c @@ -126,7 +126,6 @@ VLIB_NODE_FN (nsim_input_node) (vlib_main_t * vm, vlib_node_runtime_t * node, } -/* *INDENT-OFF* */ #ifndef CLIB_MARCH_VARIANT VLIB_REGISTER_NODE (nsim_input_node) = { @@ -142,7 +141,6 @@ VLIB_REGISTER_NODE (nsim_input_node) = .error_strings = nsim_tx_error_strings, }; #endif /* CLIB_MARCH_VARIANT */ -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/oddbuf/node.c b/src/plugins/oddbuf/node.c index a1de52a7e8c..6652baaaec5 100644 --- a/src/plugins/oddbuf/node.c +++ b/src/plugins/oddbuf/node.c @@ -183,7 +183,6 @@ VLIB_NODE_FN (oddbuf_node) (vlib_main_t * vm, vlib_node_runtime_t * node, 0 /* is_trace */ ); } -/* *INDENT-OFF* */ #ifndef CLIB_MARCH_VARIANT VLIB_REGISTER_NODE (oddbuf_node) = { @@ -203,7 +202,6 @@ VLIB_REGISTER_NODE (oddbuf_node) = }, }; #endif /* CLIB_MARCH_VARIANT */ -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/oddbuf/oddbuf.c b/src/plugins/oddbuf/oddbuf.c index 8277836aeb8..44cdd11eaae 100644 --- a/src/plugins/oddbuf/oddbuf.c +++ b/src/plugins/oddbuf/oddbuf.c @@ -106,7 +106,6 @@ oddbuf_enable_disable_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (oddbuf_enable_disable_command, static) = { .path = "oddbuf enable-disable", @@ -114,7 +113,6 @@ VLIB_CLI_COMMAND (oddbuf_enable_disable_command, static) = "oddbuf enable-disable <interface-name> [disable]", .function = oddbuf_enable_disable_command_fn, }; -/* *INDENT-ON* */ /* API message handler */ static void vl_api_oddbuf_enable_disable_t_handler @@ -157,23 +155,19 @@ oddbuf_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (oddbuf_init); -/* *INDENT-OFF* */ VNET_FEATURE_INIT (oddbuf, static) = { .arc_name = "device-input", .node_name = "oddbuf", .runs_before = VNET_FEATURES ("ethernet-input"), }; -/* *INDENT-ON */ -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Awkward chained buffer geometry generator", .default_disabled = 1, }; -/* *INDENT-ON* */ static clib_error_t * @@ -205,7 +199,6 @@ oddbuf_config_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (oddbuf_config_command, static) = { .path = "oddbuf configure", @@ -213,7 +206,6 @@ VLIB_CLI_COMMAND (oddbuf_config_command, static) = "oddbuf configure n_to_copy <nn> offset <nn> first_offset <nn>", .function = oddbuf_config_command_fn, }; -/* *INDENT-ON* */ diff --git a/src/plugins/ping/ping.c b/src/plugins/ping/ping.c index ca2fc1fa055..40e4495aaf2 100644 --- a/src/plugins/ping/ping.c +++ b/src/plugins/ping/ping.c @@ -275,7 +275,6 @@ ip6_icmp_echo_reply_node_fn (vlib_main_t * vm, 1 /* is_ip6 */ ); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (ip6_icmp_echo_reply_node, static) = { .function = ip6_icmp_echo_reply_node_fn, @@ -301,7 +300,6 @@ VLIB_REGISTER_NODE (ip4_icmp_echo_reply_node, static) = [ICMP46_ECHO_REPLY_NEXT_PUNT] = "ip4-punt", }, }; -/* *INDENT-ON* */ static uword ip4_icmp_echo_request (vlib_main_t * vm, @@ -496,7 +494,6 @@ format_icmp_input_trace (u8 * s, va_list * va) return s; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (ip4_icmp_echo_request_node,static) = { .function = ip4_icmp_echo_request, .name = "ip4-icmp-echo-request", @@ -510,7 +507,6 @@ VLIB_REGISTER_NODE (ip4_icmp_echo_request_node,static) = { [0] = "ip4-load-balance", }, }; -/* *INDENT-ON* */ typedef enum { @@ -1580,7 +1576,6 @@ done: * @cliexend * @endparblock ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (ping_command, static) = { .path = "ping", @@ -1591,7 +1586,6 @@ VLIB_CLI_COMMAND (ping_command, static) = " [burst <count:1>] [verbose]", .is_mp_safe = 1, }; -/* *INDENT-ON* */ static clib_error_t * ping_cli_init (vlib_main_t * vm) @@ -1619,12 +1613,10 @@ ping_cli_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (ping_cli_init); -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Ping (ping)", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/ping/ping.h b/src/plugins/ping/ping.h index e789300acd6..fdccd07b57d 100644 --- a/src/plugins/ping/ping.h +++ b/src/plugins/ping/ping.h @@ -72,7 +72,6 @@ extern ping_main_t ping_main; #define PING_CLI_UNKNOWN_NODE (~0) -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { u16 id; @@ -81,7 +80,6 @@ typedef CLIB_PACKED (struct { u8 data[0]; }) icmp46_echo_request_t; -/* *INDENT-ON* */ typedef enum diff --git a/src/plugins/pppoe/pppoe.c b/src/plugins/pppoe/pppoe.c index 97adc2bd082..0d5f9c1aeac 100644 --- a/src/plugins/pppoe/pppoe.c +++ b/src/plugins/pppoe/pppoe.c @@ -77,13 +77,11 @@ pppoe_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags) return /* no error */ 0; } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (pppoe_device_class,static) = { .name = "PPPoE", .format_device_name = format_pppoe_name, .admin_up_down_function = pppoe_interface_admin_up_down, }; -/* *INDENT-ON* */ static u8 * format_pppoe_header_with_length (u8 * s, va_list * args) @@ -256,7 +254,6 @@ pppoe_update_adj (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai) dpo_reset (&dpo); } -/* *INDENT-OFF* */ VNET_HW_INTERFACE_CLASS (pppoe_hw_class) = { .name = "PPPoE", @@ -265,7 +262,6 @@ VNET_HW_INTERFACE_CLASS (pppoe_hw_class) = .update_adjacency = pppoe_update_adj, .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P, }; -/* *INDENT-ON* */ #define foreach_copy_field \ _(session_id) \ @@ -613,7 +609,6 @@ done: * @cliexcmd{create pppoe session client-ip 10.0.3.1 session-id 13 * client-mac 00:01:02:03:04:05 del } ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (create_pppoe_session_command, static) = { .path = "create pppoe session", .short_help = @@ -621,9 +616,7 @@ VLIB_CLI_COMMAND (create_pppoe_session_command, static) = { " client-mac <client-mac> [decap-vrf-id <nn>] [del]", .function = pppoe_add_del_session_command_fn, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ static clib_error_t * show_pppoe_session_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -642,7 +635,6 @@ show_pppoe_session_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-ON* */ /*? * Display all the PPPoE Session entries. @@ -654,13 +646,11 @@ show_pppoe_session_command_fn (vlib_main_t * vm, * local-mac a0:b0:c0:d0:e0:f0 client-mac 00:01:02:03:04:05 * @cliexend ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_pppoe_session_command, static) = { .path = "show pppoe session", .short_help = "show pppoe session", .function = show_pppoe_session_command_fn, }; -/* *INDENT-ON* */ typedef struct pppoe_show_walk_ctx_t_ { @@ -737,13 +727,11 @@ show_pppoe_fib_command_fn (vlib_main_t * vm, * 52:54:00:53:18:55 2 GigabitEthernet0/8/1 3 1 * @cliexend ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_pppoe_fib_command, static) = { .path = "show pppoe fib", .short_help = "show pppoe fib", .function = show_pppoe_fib_command_fn, }; -/* *INDENT-ON* */ clib_error_t * pppoe_init (vlib_main_t * vm) @@ -775,12 +763,10 @@ pppoe_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (pppoe_init); -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "PPP over Ethernet (PPPoE)", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/pppoe/pppoe.h b/src/plugins/pppoe/pppoe.h index a72b7349328..444de42f4a5 100644 --- a/src/plugins/pppoe/pppoe.h +++ b/src/plugins/pppoe/pppoe.h @@ -106,7 +106,6 @@ extern char *pppoe_error_strings[]; #define PPPOE_NUM_BUCKETS (64 * 1024) #define PPPOE_MEMORY_SIZE (8<<20) -/* *INDENT-OFF* */ /* * The PPPoE key is the mac address and session ID */ @@ -127,9 +126,7 @@ typedef struct u64 raw; }; } pppoe_entry_key_t; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ /* * The PPPoE entry results */ @@ -147,7 +144,6 @@ typedef struct u64 raw; }; } pppoe_entry_result_t; -/* *INDENT-ON* */ typedef struct { diff --git a/src/plugins/pppoe/pppoe_api.c b/src/plugins/pppoe/pppoe_api.c index 6705fb6acea..c7099a3491f 100644 --- a/src/plugins/pppoe/pppoe_api.c +++ b/src/plugins/pppoe/pppoe_api.c @@ -64,12 +64,10 @@ static void vl_api_pppoe_add_del_session_t_handler rv = vnet_pppoe_add_del_session (&a, &sw_if_index); out: - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_PPPOE_ADD_DEL_SESSION_REPLY, ({ rmp->sw_if_index = ntohl (sw_if_index); })); - /* *INDENT-ON* */ } static void send_pppoe_session_details @@ -120,12 +118,10 @@ vl_api_pppoe_session_dump_t_handler (vl_api_pppoe_session_dump_t * mp) if (~0 == sw_if_index) { - /* *INDENT-OFF* */ pool_foreach (t, pem->sessions) { send_pppoe_session_details(t, reg, mp->context); } - /* *INDENT-ON* */ } else { @@ -148,9 +144,7 @@ vl_api_pppoe_add_del_cp_t_handler (vl_api_pppoe_add_del_cp_t * mp) rv = pppoe_add_del_cp (ntohl (mp->sw_if_index), mp->is_add); - /* *INDENT-OFF* */ REPLY_MACRO(VL_API_PPPOE_ADD_DEL_CP_REPLY); - /* *INDENT-ON* */ } #include <pppoe/pppoe.api.c> diff --git a/src/plugins/pppoe/pppoe_cp.c b/src/plugins/pppoe/pppoe_cp.c index 6c6ba249fcc..82891d5b654 100644 --- a/src/plugins/pppoe/pppoe_cp.c +++ b/src/plugins/pppoe/pppoe_cp.c @@ -97,14 +97,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (create_pppoe_cp_cmd, static) = { .path = "create pppoe cp", .short_help = "create pppoe cp-if-index <intfc> [del]", .function = pppoe_add_del_cp_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/pppoe/pppoe_decap.c b/src/plugins/pppoe/pppoe_decap.c index a1c37f6794f..7c456a7a9cc 100644 --- a/src/plugins/pppoe/pppoe_decap.c +++ b/src/plugins/pppoe/pppoe_decap.c @@ -494,11 +494,9 @@ VLIB_REGISTER_NODE (pppoe_input_node) = { .format_trace = format_pppoe_rx_trace, }; -/* *INDENT-OFF* */ VNET_FEATURE_INIT (pppoe_input_node, static) = { .arc_name = "device-input", .node_name = "pppoe-input", .runs_before = VNET_FEATURES ("ethernet-input"), }; -/* *INDENT-ON */ diff --git a/src/plugins/quic/quic.c b/src/plugins/quic/quic.c index 88e3277a160..60d4ac21c19 100644 --- a/src/plugins/quic/quic.c +++ b/src/plugins/quic/quic.c @@ -106,7 +106,6 @@ quic_app_cert_key_pair_delete_callback (app_cert_key_pair_t * ckpair) for (i = 0; i < num_threads; i++) { - /* *INDENT-OFF* */ pool_foreach (crctx, qm->wrk_ctx[i].crypto_ctx_pool) { if (crctx->ckpair_index == ckpair->cert_key_index) { @@ -114,7 +113,6 @@ quic_app_cert_key_pair_delete_callback (app_cert_key_pair_t * ckpair) clib_bihash_add_del_24_8 (&qm->wrk_ctx[i].crypto_context_hash, &kv, 0 /* is_add */ ); } } - /* *INDENT-ON* */ } return 0; } @@ -154,11 +152,9 @@ quic_list_crypto_context_command_fn (vlib_main_t * vm, int i, num_threads = 1 /* main thread */ + vtm->n_threads; for (i = 0; i < num_threads; i++) { - /* *INDENT-OFF* */ pool_foreach (crctx, qm->wrk_ctx[i].crypto_ctx_pool) { vlib_cli_output (vm, "[%d][Q]%U", i, format_crypto_context, crctx); } - /* *INDENT-ON* */ } return 0; } @@ -2428,7 +2424,6 @@ quic_get_transport_endpoint (u32 ctx_index, u32 thread_index, quic_common_get_transport_endpoint (ctx, tep, is_lcl); } -/* *INDENT-OFF* */ static session_cb_vft_t quic_app_cb_vft = { .session_accept_callback = quic_udp_session_accepted_callback, .session_disconnect_callback = quic_udp_session_disconnect_callback, @@ -2464,7 +2459,6 @@ static const transport_proto_vft_t quic_proto = { .service_type = TRANSPORT_SERVICE_APP, }, }; -/* *INDENT-ON* */ static quicly_stream_open_t on_stream_open = { quic_on_stream_open }; static quicly_closed_by_remote_t on_closed_by_remote = { @@ -2704,7 +2698,6 @@ quic_show_aggregated_stats (vlib_main_t * vm) clib_memset (&agg_stats, 0, sizeof (agg_stats)); for (i = 0; i < num_workers + 1; i++) { - /* *INDENT-OFF* */ pool_foreach (ctx, qm->ctx_pool[i]) { if (quic_ctx_is_conn (ctx) && ctx->conn) @@ -2724,7 +2717,6 @@ quic_show_aggregated_stats (vlib_main_t * vm) else if (quic_ctx_is_stream (ctx)) nstream++; } - /* *INDENT-ON* */ } vlib_cli_output (vm, "-------- Connections --------"); vlib_cli_output (vm, "Current: %u", nconn); @@ -2899,7 +2891,6 @@ quic_show_connections_command_fn (vlib_main_t * vm, for (int i = 0; i < num_workers + 1; i++) { - /* *INDENT-OFF* */ pool_foreach (ctx, qm->ctx_pool[i]) { if (quic_ctx_is_stream (ctx) && show_stream) @@ -2909,7 +2900,6 @@ quic_show_connections_command_fn (vlib_main_t * vm, else if (quic_ctx_is_conn (ctx) && show_conn) vlib_cli_output (vm, "%U", quic_format_connection_ctx, ctx); } - /* *INDENT-ON* */ } done: @@ -2917,7 +2907,6 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (quic_plugin_crypto_command, static) = { .path = "quic set crypto api", .short_help = "quic set crypto api [picotls|vpp]", @@ -2958,7 +2947,6 @@ VLIB_PLUGIN_REGISTER () = .description = "Quic transport protocol", .default_disabled = 1, }; -/* *INDENT-ON* */ static clib_error_t * quic_config_fn (vlib_main_t * vm, unformat_input_t * input) @@ -3014,7 +3002,6 @@ quic_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (quic_input_node) = { .function = quic_node_fn, @@ -3024,7 +3011,6 @@ VLIB_REGISTER_NODE (quic_input_node) = .n_errors = ARRAY_LEN (quic_error_strings), .error_strings = quic_error_strings, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/rdma/api.c b/src/plugins/rdma/api.c index b4695cf3a7a..3fb17ff6ee0 100644 --- a/src/plugins/rdma/api.c +++ b/src/plugins/rdma/api.c @@ -162,10 +162,8 @@ vl_api_rdma_create_v2_t_handler (vl_api_rdma_create_v2_t * mp) rdma_create_if (vm, &args); rv = args.rv; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_RDMA_CREATE_V2_REPLY, ({ rmp->sw_if_index = ntohl (args.sw_if_index); })); - /* *INDENT-ON* */ } static void @@ -192,10 +190,8 @@ vl_api_rdma_create_t_handler (vl_api_rdma_create_t * mp) rdma_create_if (vm, &args); rv = args.rv; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_RDMA_CREATE_REPLY, ({ rmp->sw_if_index = ntohl (args.sw_if_index); })); - /* *INDENT-ON* */ } static void diff --git a/src/plugins/rdma/cli.c b/src/plugins/rdma/cli.c index 0edc83a05ce..bcedd625220 100644 --- a/src/plugins/rdma/cli.c +++ b/src/plugins/rdma/cli.c @@ -44,7 +44,6 @@ rdma_create_command_fn (vlib_main_t * vm, unformat_input_t * input, return args.error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (rdma_create_command, static) = { .path = "create interface rdma", .short_help = "create interface rdma <host-if ifname> [name <name>]" @@ -54,7 +53,6 @@ VLIB_CLI_COMMAND (rdma_create_command, static) = { " [max-pktlen <size>]", .function = rdma_create_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * rdma_delete_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -99,14 +97,12 @@ rdma_delete_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (rdma_delete_command, static) = { .path = "delete interface rdma", .short_help = "delete interface rdma " "{<interface> | sw_if_index <sw_idx>}", .function = rdma_delete_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * test_rdma_dump_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -162,13 +158,11 @@ test_rdma_dump_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_rdma_mlx5dv_dump_command, static) = { .path = "test rdma dump", .short_help = "test rdma dump {<interface> | sw_if_index <sw_idx>}", .function = test_rdma_dump_command_fn, }; -/* *INDENT-ON* */ clib_error_t * rdma_cli_init (vlib_main_t * vm) diff --git a/src/plugins/rdma/input.c b/src/plugins/rdma/input.c index 8d2f447a73d..a7d41a1684d 100644 --- a/src/plugins/rdma/input.c +++ b/src/plugins/rdma/input.c @@ -228,7 +228,6 @@ rdma_device_input_refill (vlib_main_t * vm, rdma_device_t * rd, about what RDMA core does (CYCLIC_RQ or LINKED_LIST_RQ). In cyclic mode, the SRQ header is ignored anyways... */ -/* *INDENT-OFF* */ if (is_striding && !(current_data_seg & (wqe_sz - 1))) *(mlx5dv_wqe_srq_next_t *) wqe = (mlx5dv_wqe_srq_next_t) { @@ -237,7 +236,6 @@ rdma_device_input_refill (vlib_main_t * vm, rdma_device_t * rd, .signature = 0, .rsvd1 = {0} }; -/* *INDENT-ON* */ /* TODO: when log_skip_wqe > 2, hw_prefetcher doesn't work, lots of LLC store misses occur for wqes, to be fixed... */ @@ -1073,7 +1071,6 @@ VLIB_NODE_FN (rdma_input_node) (vlib_main_t * vm, return n_rx; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (rdma_input_node) = { .name = "rdma-input", .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED, @@ -1085,7 +1082,6 @@ VLIB_REGISTER_NODE (rdma_input_node) = { .error_strings = rdma_input_error_strings, }; -/* *INDENT-ON* */ /* diff --git a/src/plugins/rdma/plugin.c b/src/plugins/rdma/plugin.c index b0dddee42b6..0d2cccc96f8 100644 --- a/src/plugins/rdma/plugin.c +++ b/src/plugins/rdma/plugin.c @@ -19,12 +19,10 @@ #include <vnet/plugin/plugin.h> #include <vpp/app/version.h> -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "RDMA IBverbs Device Driver", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/srv6-ad/ad.c b/src/plugins/srv6-ad/ad.c index 387df614e7f..fc8527d0f82 100644 --- a/src/plugins/srv6-ad/ad.c +++ b/src/plugins/srv6-ad/ad.c @@ -447,7 +447,6 @@ srv6_ad_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VNET_FEATURE_INIT (srv6_ad2_rewrite, static) = { .arc_name = "device-input", @@ -475,7 +474,6 @@ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Dynamic Segment Routing for IPv6 (SRv6) Proxy", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/srv6-ad/node.c b/src/plugins/srv6-ad/node.c index f04d4ac2114..2b1d56b6570 100644 --- a/src/plugins/srv6-ad/node.c +++ b/src/plugins/srv6-ad/node.c @@ -271,7 +271,6 @@ srv6_ad_localsid_fn (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (srv6_ad_localsid_node) = { .function = srv6_ad_localsid_fn, .name = "srv6-ad-localsid", @@ -286,7 +285,6 @@ VLIB_REGISTER_NODE (srv6_ad_localsid_node) = { [SRV6_AD_LOCALSID_NEXT_ERROR] = "error-drop", }, }; -/* *INDENT-ON* */ /******************************* Rewriting node *******************************/ @@ -407,7 +405,6 @@ srv6_ad2_rewrite_fn (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (srv6_ad2_rewrite_node) = { .function = srv6_ad2_rewrite_fn, .name = "srv6-ad2-rewrite", @@ -422,7 +419,6 @@ VLIB_REGISTER_NODE (srv6_ad2_rewrite_node) = { [SRV6_AD_REWRITE_NEXT_ERROR] = "error-drop", }, }; -/* *INDENT-ON* */ /** @@ -550,7 +546,6 @@ srv6_ad4_rewrite_fn (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (srv6_ad4_rewrite_node) = { .function = srv6_ad4_rewrite_fn, .name = "srv6-ad4-rewrite", @@ -565,7 +560,6 @@ VLIB_REGISTER_NODE (srv6_ad4_rewrite_node) = { [SRV6_AD_REWRITE_NEXT_ERROR] = "error-drop", }, }; -/* *INDENT-ON* */ /** @@ -688,7 +682,6 @@ srv6_ad6_rewrite_fn (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (srv6_ad6_rewrite_node) = { .function = srv6_ad6_rewrite_fn, .name = "srv6-ad6-rewrite", @@ -703,7 +696,6 @@ VLIB_REGISTER_NODE (srv6_ad6_rewrite_node) = { [SRV6_AD_REWRITE_NEXT_ERROR] = "error-drop", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/srv6-am/am.c b/src/plugins/srv6-am/am.c index bcc483e292b..f308b5167d9 100644 --- a/src/plugins/srv6-am/am.c +++ b/src/plugins/srv6-am/am.c @@ -226,7 +226,6 @@ srv6_am_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VNET_FEATURE_INIT (srv6_am_rewrite, static) = { .arc_name = "ip6-unicast", @@ -240,7 +239,6 @@ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Masquerading Segment Routing for IPv6 (SRv6) Proxy", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/srv6-am/node.c b/src/plugins/srv6-am/node.c index dd2b1c4d542..beef6a30910 100644 --- a/src/plugins/srv6-am/node.c +++ b/src/plugins/srv6-am/node.c @@ -210,7 +210,6 @@ srv6_am_localsid_fn (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (srv6_am_localsid_node) = { .function = srv6_am_localsid_fn, .name = "srv6-am-localsid", @@ -223,7 +222,6 @@ VLIB_REGISTER_NODE (srv6_am_localsid_node) = { [SRV6_AM_LOCALSID_NEXT_ERROR] = "error-drop", }, }; -/* *INDENT-ON* */ /******************************* Rewriting node *******************************/ @@ -326,7 +324,6 @@ srv6_am_rewrite_fn (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (srv6_am_rewrite_node) = { .function = srv6_am_rewrite_fn, .name = "srv6-am-rewrite", @@ -341,7 +338,6 @@ VLIB_REGISTER_NODE (srv6_am_rewrite_node) = { [SRV6_AM_REWRITE_NEXT_ERROR] = "error-drop", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/srv6-as/as.c b/src/plugins/srv6-as/as.c index 2d9b831075b..bdf17527ae8 100644 --- a/src/plugins/srv6-as/as.c +++ b/src/plugins/srv6-as/as.c @@ -557,7 +557,6 @@ srv6_as_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VNET_FEATURE_INIT (srv6_as2_rewrite, static) = { .arc_name = "device-input", @@ -585,7 +584,6 @@ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Static Segment Routing for IPv6 (SRv6) Proxy", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/srv6-as/node.c b/src/plugins/srv6-as/node.c index 4beb8dfd7ac..e81881982af 100644 --- a/src/plugins/srv6-as/node.c +++ b/src/plugins/srv6-as/node.c @@ -234,7 +234,6 @@ srv6_as_localsid_fn (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (srv6_as_localsid_node) = { .function = srv6_as_localsid_fn, .name = "srv6-as-localsid", @@ -249,7 +248,6 @@ VLIB_REGISTER_NODE (srv6_as_localsid_node) = { [SRV6_AS_LOCALSID_NEXT_ERROR] = "error-drop", }, }; -/* *INDENT-ON* */ /******************************* Rewriting node *******************************/ @@ -370,7 +368,6 @@ srv6_as2_rewrite_fn (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (srv6_as2_rewrite_node) = { .function = srv6_as2_rewrite_fn, .name = "srv6-as2-rewrite", @@ -385,7 +382,6 @@ VLIB_REGISTER_NODE (srv6_as2_rewrite_node) = { [SRV6_AS_REWRITE_NEXT_ERROR] = "error-drop", }, }; -/* *INDENT-ON* */ /** @@ -514,7 +510,6 @@ srv6_as4_rewrite_fn (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (srv6_as4_rewrite_node) = { .function = srv6_as4_rewrite_fn, .name = "srv6-as4-rewrite", @@ -529,7 +524,6 @@ VLIB_REGISTER_NODE (srv6_as4_rewrite_node) = { [SRV6_AS_REWRITE_NEXT_ERROR] = "error-drop", }, }; -/* *INDENT-ON* */ /** @@ -653,7 +647,6 @@ srv6_as6_rewrite_fn (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (srv6_as6_rewrite_node) = { .function = srv6_as6_rewrite_fn, .name = "srv6-as6-rewrite", @@ -668,7 +661,6 @@ VLIB_REGISTER_NODE (srv6_as6_rewrite_node) = { [SRV6_AS_REWRITE_NEXT_ERROR] = "error-drop", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/srv6-mobile/gtp4_d.c b/src/plugins/srv6-mobile/gtp4_d.c index d5a5a6a567a..f519b4840cc 100644 --- a/src/plugins/srv6-mobile/gtp4_d.c +++ b/src/plugins/srv6-mobile/gtp4_d.c @@ -260,7 +260,6 @@ srv6_t_m_gtp4_d_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VNET_FEATURE_INIT (srv6_t_m_gtp4_d, static) = { .arc_name = "ip4-unicast", @@ -269,7 +268,6 @@ VNET_FEATURE_INIT (srv6_t_m_gtp4_d, static) = }; VLIB_INIT_FUNCTION (srv6_t_m_gtp4_d_init); -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/srv6-mobile/gtp4_dt.c b/src/plugins/srv6-mobile/gtp4_dt.c index c4752b77557..10cea640036 100644 --- a/src/plugins/srv6-mobile/gtp4_dt.c +++ b/src/plugins/srv6-mobile/gtp4_dt.c @@ -193,7 +193,6 @@ srv6_t_m_gtp4_dt_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VNET_FEATURE_INIT (srv6_t_m_gtp4_dt, static) = { .arc_name = "ip4-unicast", @@ -202,7 +201,6 @@ VNET_FEATURE_INIT (srv6_t_m_gtp4_dt, static) = }; VLIB_INIT_FUNCTION (srv6_t_m_gtp4_dt_init); -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/srv6-mobile/gtp4_e.c b/src/plugins/srv6-mobile/gtp4_e.c index 828f924464d..52f1615aa85 100644 --- a/src/plugins/srv6-mobile/gtp4_e.c +++ b/src/plugins/srv6-mobile/gtp4_e.c @@ -203,7 +203,6 @@ srv6_end_m_gtp4_e_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VNET_FEATURE_INIT (srv6_end_m_gtp4_e, static) = { .arc_name = "ip6-unicast", @@ -217,7 +216,6 @@ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "SRv6 GTP Endpoint Functions", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/srv6-mobile/gtp6_d.c b/src/plugins/srv6-mobile/gtp6_d.c index 1f5b9ac0d0f..ef831ba750c 100644 --- a/src/plugins/srv6-mobile/gtp6_d.c +++ b/src/plugins/srv6-mobile/gtp6_d.c @@ -260,7 +260,6 @@ srv6_end_m_gtp6_d_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VNET_FEATURE_INIT (srv6_end_m_gtp6_d, static) = { .arc_name = "ip6-unicast", @@ -269,7 +268,6 @@ VNET_FEATURE_INIT (srv6_end_m_gtp6_d, static) = }; VLIB_INIT_FUNCTION (srv6_end_m_gtp6_d_init); -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/srv6-mobile/gtp6_d_di.c b/src/plugins/srv6-mobile/gtp6_d_di.c index 80c0dbcec7c..94bc684161d 100644 --- a/src/plugins/srv6-mobile/gtp6_d_di.c +++ b/src/plugins/srv6-mobile/gtp6_d_di.c @@ -206,7 +206,6 @@ srv6_end_m_gtp6_d_di_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VNET_FEATURE_INIT (srv6_end_m_gtp6_d_di, static) = { .arc_name = "ip6-unicast", @@ -215,7 +214,6 @@ VNET_FEATURE_INIT (srv6_end_m_gtp6_d_di, static) = }; VLIB_INIT_FUNCTION (srv6_end_m_gtp6_d_di_init); -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/srv6-mobile/gtp6_dt.c b/src/plugins/srv6-mobile/gtp6_dt.c index 5fc0918621d..c4d4175e321 100644 --- a/src/plugins/srv6-mobile/gtp6_dt.c +++ b/src/plugins/srv6-mobile/gtp6_dt.c @@ -185,7 +185,6 @@ srv6_end_m_gtp6_dt_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VNET_FEATURE_INIT (srv6_end_m_gtp6_dt, static) = { .arc_name = "ip6-unicast", @@ -194,7 +193,6 @@ VNET_FEATURE_INIT (srv6_end_m_gtp6_dt, static) = }; VLIB_INIT_FUNCTION (srv6_end_m_gtp6_dt_init); -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/srv6-mobile/gtp6_e.c b/src/plugins/srv6-mobile/gtp6_e.c index 49b1bd1a6d9..dd3a889928b 100644 --- a/src/plugins/srv6-mobile/gtp6_e.c +++ b/src/plugins/srv6-mobile/gtp6_e.c @@ -168,7 +168,6 @@ srv6_end_m_gtp6_e_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VNET_FEATURE_INIT (srv6_end_m_gtp6_e, static) = { .arc_name = "ip6-unicast", @@ -177,7 +176,6 @@ VNET_FEATURE_INIT (srv6_end_m_gtp6_e, static) = }; VLIB_INIT_FUNCTION (srv6_end_m_gtp6_e_init); -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/srv6-mobile/mobile.h b/src/plugins/srv6-mobile/mobile.h index 921abc90db2..a305a25b811 100644 --- a/src/plugins/srv6-mobile/mobile.h +++ b/src/plugins/srv6-mobile/mobile.h @@ -93,24 +93,19 @@ typedef enum mobile_localsid_function_list SRV6_MOBILE_LOCALSID_END_M_GTP6_D_DT46, } mobile_localsid_function_list_t; -/* *INDENT-OFF* */ typedef struct { u8 type; u8 restart_counter; } __attribute__ ((packed)) gtpu_recovery_ie; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ typedef struct { u16 seq; u8 npdu_num; u8 nextexthdr; } __attribute__ ((packed)) gtpu_exthdr_t; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ typedef struct { u8 ver_flags; @@ -119,7 +114,6 @@ typedef struct u32 teid; gtpu_exthdr_t ext[0]; } __attribute__ ((packed)) gtpu_header_t; -/* *INDENT-ON* */ #define GTPU_TYPE_ECHO_REQUEST 1 #define GTPU_TYPE_ECHO_REPLY 2 @@ -127,7 +121,6 @@ typedef struct #define GTPU_TYPE_END_MARKER 254 #define GTPU_TYPE_GTPU 255 -/* *INDENT-OFF* */ typedef struct { BITALIGN2 (u8 ppi:3, @@ -135,9 +128,7 @@ typedef struct u8 padding[3]; } __attribute__ ((packed)) gtpu_paging_policy_t; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ typedef struct { u8 exthdrlen; @@ -155,7 +146,6 @@ typedef struct gtpu_paging_policy_t paging[0]; u8 nextexthdr; } __attribute__ ((packed)) gtpu_pdu_session_t; -/* *INDENT-ON* */ #define GTPU_PDU_SESSION_P_BIT_MASK 0x80 #define GTPU_PDU_SESSION_R_BIT_MASK 0x40 @@ -165,36 +155,30 @@ typedef struct #define SRV6_PDU_SESSION_R_BIT_MASK 0x02 #define SRV6_PDU_SESSION_QFI_MASK 0xfC -/* *INDENT-OFF* */ typedef struct { ip4_header_t ip4; /* 20 bytes */ udp_header_t udp; /* 8 bytes */ gtpu_header_t gtpu; /* 8 bytes */ } __attribute__ ((packed)) ip4_gtpu_header_t; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ typedef struct { ip6_header_t ip6; /* 40 bytes */ udp_header_t udp; /* 8 bytes */ gtpu_header_t gtpu; /* 8 bytes */ } __attribute__ ((packed)) ip6_gtpu_header_t; -/* *INDENT-ON* */ #define GTPU_V1_VER (1<<5) #define GTPU_PT_GTP (1<<4) -/* *INDENT-OFF* */ typedef struct { u8 type; u8 length; u8 value[0]; } __attribute__ ((packed)) user_plane_sub_tlv_t; -/* *INDENT-ON* */ #define USER_PLANE_SUB_TLV_IE 0x01 diff --git a/src/plugins/stn/stn.c b/src/plugins/stn/stn.c index 241f7169e8b..6e789feca5d 100644 --- a/src/plugins/stn/stn.c +++ b/src/plugins/stn/stn.c @@ -195,7 +195,6 @@ stn_ip6_punt_fn (vlib_main_t * vm, return stn_ip46_punt_fn(vm, node, frame, 0); } -/** *INDENT-OFF* */ VLIB_REGISTER_NODE (stn_ip6_punt, static) = { .function = stn_ip6_punt_fn, @@ -215,7 +214,6 @@ VNET_FEATURE_INIT (stn_ip6_punt_feat_node, static) = { .node_name = "stn-ip6-punt", .runs_before = VNET_FEATURES("ip6-punt-redirect"), }; -/** *INDENT-ON* */ u8 * format_stn_ip4_punt_trace (u8 * s, va_list * args) @@ -230,7 +228,6 @@ stn_ip4_punt_fn (vlib_main_t * vm, return stn_ip46_punt_fn(vm, node, frame, 1); } -/** *INDENT-OFF* */ VLIB_REGISTER_NODE (stn_ip4_punt, static) = { .function = stn_ip4_punt_fn, @@ -250,7 +247,6 @@ VNET_FEATURE_INIT (stn_ip4_punt_feat_node, static) = { .node_name = "stn-ip4-punt", .runs_before = VNET_FEATURES("ip4-punt-redirect"), }; -/** *INDENT-ON* */ clib_error_t * stn_init (vlib_main_t * vm) @@ -275,12 +271,10 @@ stn_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (stn_init); -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "VPP Steals the NIC (STN) for Container Integration", }; -/* *INDENT-ON* */ int stn_rule_add_del (stn_rule_add_del_args_t *args) { diff --git a/src/plugins/stn/stn_api.c b/src/plugins/stn/stn_api.c index 8d96014331a..4d1af36d448 100644 --- a/src/plugins/stn/stn_api.c +++ b/src/plugins/stn/stn_api.c @@ -82,11 +82,9 @@ vl_api_stn_rules_dump_t_handler (vl_api_stn_rules_dump_t * mp) if (reg == 0) return; - /* *INDENT-OFF* */ pool_foreach (r, stn->rules) { send_stn_rules_details (r, reg, mp->context); } - /* *INDENT-ON* */ } #include <stn/stn.api.c> diff --git a/src/plugins/svs/svs.c b/src/plugins/svs/svs.c index 555283397ff..4da7fb9263d 100644 --- a/src/plugins/svs/svs.c +++ b/src/plugins/svs/svs.c @@ -363,7 +363,6 @@ format_svs_input_trace (u8 * s, va_list * args) return s; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (svs_ip4_node) = { .function = svs_input_ip4, @@ -402,7 +401,6 @@ VNET_FEATURE_INIT (svs_ip6_feat, static) = .arc_name = "ip6-unicast", .node_name = "svs-ip6", }; -/* *INDENT-ON* */ static clib_error_t * svs_table_cli (vlib_main_t * vm, @@ -443,13 +441,11 @@ svs_table_cli (vlib_main_t * vm, return (NULL); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (svs_table_cmd_cli, static) = { .path = "svs table", .short_help = "Source VRF select table [add|delete] [ip4|ip6] table-id X", .function = svs_table_cli, }; -/* *INDENT-ON* */ static clib_error_t * svs_enable_cli (vlib_main_t * vm, @@ -497,13 +493,11 @@ svs_enable_cli (vlib_main_t * vm, return (NULL); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (svs_enable_cli_cmd, static) = { .path = "svs enable", .short_help = "Source VRF select [enable|disable] [ip4|ip6] <table-id> X <interface>", .function = svs_enable_cli, }; -/* *INDENT-ON* */ static clib_error_t * svs_route_cli (vlib_main_t * vm, @@ -559,13 +553,11 @@ svs_route_cli (vlib_main_t * vm, return (NULL); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (svs_route_cmd_cli, static) = { .path = "svs route", .short_help = "Source VRF select route [add|delete] <table-id> <prefix> <src-table-id>", .function = svs_route_cli, }; -/* *INDENT-ON* */ static clib_error_t * svs_show_cli (vlib_main_t * vm, @@ -588,13 +580,11 @@ svs_show_cli (vlib_main_t * vm, return (NULL); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (svs_show_cli_cmd, static) = { .path = "show svs", .short_help = "Source VRF select show", .function = svs_show_cli, }; -/* *INDENT-ON* */ static clib_error_t * svs_init (vlib_main_t * vm) diff --git a/src/plugins/tlsmbedtls/tls_mbedtls.c b/src/plugins/tlsmbedtls/tls_mbedtls.c index 00ac7fe6e17..af04f1adeb0 100644 --- a/src/plugins/tlsmbedtls/tls_mbedtls.c +++ b/src/plugins/tlsmbedtls/tls_mbedtls.c @@ -688,19 +688,15 @@ tls_mbedtls_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (tls_mbedtls_init) = { .runs_after = VLIB_INITS("tls_init"), }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Transport Layer Security (TLS) Engine, Mbedtls Based", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/tlsopenssl/tls_async.c b/src/plugins/tlsopenssl/tls_async.c index bea9b892fa2..d85af686d21 100644 --- a/src/plugins/tlsopenssl/tls_async.c +++ b/src/plugins/tlsopenssl/tls_async.c @@ -510,7 +510,6 @@ tls_async_process (vlib_main_t * vm, vlib_node_runtime_t * rt, VLIB_INIT_FUNCTION (tls_async_init); -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (tls_async_process_node,static) = { .function = tls_async_process, .type = VLIB_NODE_TYPE_INPUT, @@ -518,7 +517,6 @@ VLIB_REGISTER_NODE (tls_async_process_node,static) = { .state = VLIB_NODE_STATE_DISABLED, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/tlsopenssl/tls_openssl.c b/src/plugins/tlsopenssl/tls_openssl.c index 5e58913342b..87674337807 100644 --- a/src/plugins/tlsopenssl/tls_openssl.c +++ b/src/plugins/tlsopenssl/tls_openssl.c @@ -1231,12 +1231,10 @@ tls_openssl_init (vlib_main_t * vm) return error; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (tls_openssl_init) = { .runs_after = VLIB_INITS("tls_init"), }; -/* *INDENT-ON* */ #ifdef HAVE_OPENSSL_ASYNC static clib_error_t * @@ -1307,22 +1305,18 @@ tls_openssl_set_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (tls_openssl_set_command, static) = { .path = "tls openssl set", .short_help = "tls openssl set [engine <engine name>] [alg [algorithm] [async]", .function = tls_openssl_set_command_fn, }; -/* *INDENT-ON* */ #endif -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Transport Layer Security (TLS) Engine, OpenSSL Based", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/tlspicotls/tls_picotls.c b/src/plugins/tlspicotls/tls_picotls.c index 0ab2488e4f4..88b99a48aa1 100644 --- a/src/plugins/tlspicotls/tls_picotls.c +++ b/src/plugins/tlspicotls/tls_picotls.c @@ -786,18 +786,14 @@ tls_picotls_init (vlib_main_t * vm) return error; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (tls_picotls_init) = { .runs_after = VLIB_INITS ("tls_init"), }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Transport Layer Security (TLS) Engine, Picotls Based", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/tracedump/graph_cli.c b/src/plugins/tracedump/graph_cli.c index 2de191b2348..e83aabaf1fe 100644 --- a/src/plugins/tracedump/graph_cli.c +++ b/src/plugins/tracedump/graph_cli.c @@ -132,13 +132,11 @@ graph_node_show_cmd (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (graph_node_show_command, static) = { .path = "show graph", .short_help = "show graph [node <index>|<name>] [want_arcs] [input|trace_supported] [drop] [output] [punt] [handoff] [no_free] [polling] [interrupt]", .function = graph_node_show_cmd, }; -/* *INDENT-ON* */ /* diff --git a/src/plugins/tracedump/tracedump.c b/src/plugins/tracedump/tracedump.c index 08d338b1de0..6a26865c1f0 100644 --- a/src/plugins/tracedump/tracedump.c +++ b/src/plugins/tracedump/tracedump.c @@ -552,13 +552,11 @@ tracedump_init (vlib_main_t * vm) } VLIB_INIT_FUNCTION (tracedump_init); -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Streaming packet trace dump plugin", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/api_fuzz_test.c b/src/plugins/unittest/api_fuzz_test.c index 9cf767a5ccd..121c52a310b 100644 --- a/src/plugins/unittest/api_fuzz_test.c +++ b/src/plugins/unittest/api_fuzz_test.c @@ -126,14 +126,12 @@ test_api_fuzz_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_api_fuzz, static) = { .path = "test api fuzz", .short_help = "test api fuzz [disable][seed nnn]\n" " [fuzz-first nn][fuzz-cli-first nn][fuzz-cli-last nn]", .function = test_api_fuzz_command_fn, }; -/* *INDENT-ON* */ static u8 main_loop_enter_enable_api_fuzz; diff --git a/src/plugins/unittest/bihash_test.c b/src/plugins/unittest/bihash_test.c index f0c6da2acc3..1d3aeeca23d 100644 --- a/src/plugins/unittest/bihash_test.c +++ b/src/plugins/unittest/bihash_test.c @@ -541,14 +541,12 @@ test_bihash_command_fn (vlib_main_t * vm, return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_bihash_command, static) = { .path = "test bihash", .short_help = "test bihash", .function = test_bihash_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * bihash_test_init (vlib_main_t * vm) diff --git a/src/plugins/unittest/bitmap_test.c b/src/plugins/unittest/bitmap_test.c index eb232bd11e5..1b05be7b333 100644 --- a/src/plugins/unittest/bitmap_test.c +++ b/src/plugins/unittest/bitmap_test.c @@ -220,13 +220,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_bitmap_command, static) = { .path = "test bitmap", .short_help = "Coverage test for bitmap.h", .function = test_bitmap_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/crypto/aes_cbc.c b/src/plugins/unittest/crypto/aes_cbc.c index 05a16c29a5c..89b0163207f 100644 --- a/src/plugins/unittest/crypto/aes_cbc.c +++ b/src/plugins/unittest/crypto/aes_cbc.c @@ -53,7 +53,6 @@ static u8 ciphertext128[] = { 0x12, 0x0E, 0xCA, 0x30, 0x75, 0x86, 0xE1, 0xA7, }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (nist_aes128_cbc) = { .name = "NIST SP 800-38A", .alg = VNET_CRYPTO_ALG_AES_128_CBC, @@ -63,7 +62,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (nist_aes128_cbc) = { .ciphertext = TEST_DATA (ciphertext128), }; -/* *INDENT-ON* */ static u8 key192[24] = { 0x8E, 0x73, 0xB0, 0xF7, 0xDA, 0x0E, 0x64, 0x52, @@ -82,7 +80,6 @@ static u8 ciphertext192[64] = { 0xD9, 0x20, 0xA9, 0xE6, 0x4F, 0x56, 0x15, 0xCD, }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (nist_aes192_cbc) = { .name = "NIST SP 800-38A", .alg = VNET_CRYPTO_ALG_AES_192_CBC, @@ -92,7 +89,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (nist_aes192_cbc) = { .ciphertext = TEST_DATA (ciphertext192), }; -/* *INDENT-ON* */ static u8 key256[32] = { 0x60, 0x3D, 0xEB, 0x10, 0x15, 0xCA, 0x71, 0xBE, @@ -112,7 +108,6 @@ static u8 ciphertext256[64] = { 0xDA, 0x6C, 0x19, 0x07, 0x8C, 0x6A, 0x9D, 0x1B, }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (nist_aes256_cbc) = { .name = "NIST SP 800-38A", .alg = VNET_CRYPTO_ALG_AES_256_CBC, @@ -151,7 +146,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (nist_aes256_incr2) = { .key.length = 32, .plaintext_incremental = 1056, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/crypto/aes_ctr.c b/src/plugins/unittest/crypto/aes_ctr.c index 80e66111c12..581e283b0c3 100644 --- a/src/plugins/unittest/crypto/aes_ctr.c +++ b/src/plugins/unittest/crypto/aes_ctr.c @@ -41,7 +41,6 @@ static u8 tc1_ciphertext[] = { 0x1b, 0xef, 0x68, 0x64, 0x99, 0x0d, 0xb6, 0xce, }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (nist_aes128_ctr_tc1) = { .name = "CTR-AES128 TC1", .alg = VNET_CRYPTO_ALG_AES_128_CTR, @@ -50,7 +49,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (nist_aes128_ctr_tc1) = { .plaintext = TEST_DATA (tc1_plaintext), .ciphertext = TEST_DATA (tc1_ciphertext), }; -/* *INDENT-ON* */ static u8 tc1_192_key[] = { 0x8e, 0x73, 0xb0, 0xf7, 0xda, 0x0e, 0x64, 0x52, @@ -68,7 +66,6 @@ static u8 tc1_192_ciphertext[] = { 0x4f, 0x2b, 0x04, 0x59, 0xfe, 0x7e, 0x6e, 0x0b, }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (nist_aes192_ctr_tc1) = { .name = "CTR-AES192 TC1", .alg = VNET_CRYPTO_ALG_AES_192_CTR, @@ -77,7 +74,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (nist_aes192_ctr_tc1) = { .plaintext = TEST_DATA (tc1_plaintext), .ciphertext = TEST_DATA (tc1_192_ciphertext), }; -/* *INDENT-ON* */ static u8 tc1_256_key[] = { 0x60, 0x3d, 0xeb, 0x10, 0x15, 0xca, 0x71, 0xbe, @@ -96,7 +92,6 @@ static u8 tc1_256_ciphertext[] = { 0xb7, 0xa7, 0xf5, 0x04, 0xbb, 0xf3, 0xd2, 0x28, }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (nist_aes256_ctr_tc1) = { .name = "CTR-AES256 TC1", .alg = VNET_CRYPTO_ALG_AES_256_CTR, @@ -105,7 +100,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (nist_aes256_ctr_tc1) = { .plaintext = TEST_DATA (tc1_plaintext), .ciphertext = TEST_DATA (tc1_256_ciphertext), }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/crypto/aes_gcm.c b/src/plugins/unittest/crypto/aes_gcm.c index 3d1b221bf32..daa9ef11dcc 100644 --- a/src/plugins/unittest/crypto/aes_gcm.c +++ b/src/plugins/unittest/crypto/aes_gcm.c @@ -166,7 +166,6 @@ static u8 tc4_tag256[] = { 0xcd, 0xdf, 0x88, 0x53, 0xbb, 0x2d, 0x55, 0x1b }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (aes_gcm128_tc1) = { .name = "128-GCM Spec. TC1", .alg = VNET_CRYPTO_ALG_AES_128_GCM, @@ -318,7 +317,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (aes_gcm256_inc5) = { .aad.length = 20, .tag.length = 16, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/crypto/chacha20_poly1305.c b/src/plugins/unittest/crypto/chacha20_poly1305.c index 650898524fd..740d6304b8f 100644 --- a/src/plugins/unittest/crypto/chacha20_poly1305.c +++ b/src/plugins/unittest/crypto/chacha20_poly1305.c @@ -61,7 +61,6 @@ static u8 tc1_ciphertext[] = { 0x61, 0x16 }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (chacha20_poly1305_tc1) = { .name = "CHACHA20-POLY1305 TC1", .alg = VNET_CRYPTO_ALG_CHACHA20_POLY1305, @@ -72,7 +71,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (chacha20_poly1305_tc1) = { .plaintext = TEST_DATA (tc1_plaintext), .ciphertext = TEST_DATA (tc1_ciphertext), }; -/* *INDENT-ON* */ static u8 tc2_key[] = { 0x2d, 0xb0, 0x5d, 0x40, 0xc8, 0xed, 0x44, 0x88, @@ -100,7 +98,6 @@ static u8 tc2_plaintext[] = { }; static u8 tc2_ciphertext[] = { }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (chacha20_poly1305_tc2) = { .name = "CHACHA20-POLY1305 TC2", .alg = VNET_CRYPTO_ALG_CHACHA20_POLY1305, @@ -111,7 +108,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (chacha20_poly1305_tc2) = { .plaintext = TEST_DATA (tc2_plaintext), .ciphertext = TEST_DATA (tc2_ciphertext), }; -/* *INDENT-ON* */ static u8 tc3_key[] = { 0x4c, 0xf5, 0x96, 0x83, 0x38, 0xe6, 0xae, 0x7f, @@ -137,7 +133,6 @@ static u8 tc3_plaintext[] = { }; static u8 tc3_ciphertext[] = { }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (chacha20_poly1305_tc3) = { .name = "CHACHA20-POLY1305 TC3", .alg = VNET_CRYPTO_ALG_CHACHA20_POLY1305, @@ -148,5 +143,4 @@ UNITTEST_REGISTER_CRYPTO_TEST (chacha20_poly1305_tc3) = { .plaintext = TEST_DATA (tc3_plaintext), .ciphertext = TEST_DATA (tc3_ciphertext), }; -/* *INDENT-ON* */ diff --git a/src/plugins/unittest/crypto/rfc2202_hmac_md5.c b/src/plugins/unittest/crypto/rfc2202_hmac_md5.c index 7a39aed3030..c9604b84c1d 100644 --- a/src/plugins/unittest/crypto/rfc2202_hmac_md5.c +++ b/src/plugins/unittest/crypto/rfc2202_hmac_md5.c @@ -31,7 +31,6 @@ static u8 md5_tc1_digest[] = { 0x13, 0xf4, 0x8e, 0xf8, 0x15, 0x8b, 0xfc, 0x9d }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_md5_tc1) = { .name = "RFC2202 HMAC-MD5 TC1", .alg = VNET_CRYPTO_ALG_HMAC_MD5, @@ -39,7 +38,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_md5_tc1) = { .plaintext = TEST_DATA (md5_tc1_data), .digest = TEST_DATA (md5_tc1_digest), }; -/* *INDENT-ON* */ static char md5_tc2_key[4] = "Jefe"; @@ -50,7 +48,6 @@ static u8 md5_tc2_digest[] = { 0xea, 0xa8, 0x6e, 0x31, 0x0a, 0x5d, 0xb7, 0x38, }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_md5_tc2) = { .name = "RFC2202 HMAC-MD5 TC2", .alg = VNET_CRYPTO_ALG_HMAC_MD5, @@ -58,7 +55,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_md5_tc2) = { .plaintext = TEST_DATA (md5_tc2_data), .digest = TEST_DATA (md5_tc2_digest), }; -/* *INDENT-ON* */ static char md5_tc3_key[16] = { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, @@ -80,7 +76,6 @@ static u8 md5_tc3_digest[] = { 0xdb, 0xb8, 0xc7, 0x33, 0xf0, 0xe8, 0xb3, 0xf6, }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_md5_tc3) = { .name = "RFC2202 HMAC-MD5 TC3", .alg = VNET_CRYPTO_ALG_HMAC_MD5, @@ -88,7 +83,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_md5_tc3) = { .plaintext = TEST_DATA (md5_tc3_data), .digest = TEST_DATA (md5_tc3_digest), }; -/* *INDENT-ON* */ static u8 md5_tc4_key[25] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, @@ -112,7 +106,6 @@ static u8 md5_tc4_digest[] = { 0x3a, 0x75, 0x16, 0x47, 0x46, 0xff, 0xaa, 0x79, }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_md5_tc4) = { .name = "RFC2202 HMAC-MD5 TC4", .alg = VNET_CRYPTO_ALG_HMAC_MD5, @@ -120,7 +113,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_md5_tc4) = { .plaintext = TEST_DATA (md5_tc4_data), .digest = TEST_DATA (md5_tc4_digest), }; -/* *INDENT-ON* */ static u8 md5_tc5_key[16] = { 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, @@ -134,7 +126,6 @@ static u8 md5_tc5_digest[] = { 0xf9, 0xba, 0xb9, 0x95, 0x69, 0x0e, 0xfd, 0x4c, }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_md5_tc5) = { .name = "RFC2202 HMAC-MD5 TC5", .alg = VNET_CRYPTO_ALG_HMAC_MD5, @@ -142,7 +133,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_md5_tc5) = { .plaintext = TEST_DATA (md5_tc5_data), .digest = TEST_DATA (md5_tc5_digest), }; -/* *INDENT-ON* */ static u8 md5_tc6_key[80] = { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, @@ -165,7 +155,6 @@ static u8 md5_tc6_digest[] = { 0x0b, 0x62, 0xe6, 0xce, 0x61, 0xb9, 0xd0, 0xcd, }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_md5_tc6) = { .name = "RFC2202 HMAC-MD5 TC6", .alg = VNET_CRYPTO_ALG_HMAC_MD5, @@ -173,7 +162,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_md5_tc6) = { .plaintext = TEST_DATA (md5_tc6_data), .digest = TEST_DATA (md5_tc6_digest), }; -/* *INDENT-ON* */ static char md5_tc7_data[73] = "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data"; @@ -183,7 +171,6 @@ static u8 md5_tc7_digest[] = { 0x1f, 0xb1, 0xf5, 0x62, 0xdb, 0x3a, 0xa5, 0x3e, }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_md5_tc7) = { .name = "RFC2202 HMAC-MD5 TC7", .alg = VNET_CRYPTO_ALG_HMAC_MD5, @@ -203,7 +190,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_md5_tc7_chained) = { TEST_DATA_CHUNK (md5_tc7_data, 40, 33) }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/crypto/rfc2202_hmac_sha1.c b/src/plugins/unittest/crypto/rfc2202_hmac_sha1.c index 2513c5ebad2..aa440625cc6 100644 --- a/src/plugins/unittest/crypto/rfc2202_hmac_sha1.c +++ b/src/plugins/unittest/crypto/rfc2202_hmac_sha1.c @@ -33,7 +33,6 @@ static u8 sha1_tc1_digest[] = { 0xf1, 0x46, 0xbe, 0x00 }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_sha1_tc1) = { .name = "RFC2202 HMAC-SHA-1 TC1", .alg = VNET_CRYPTO_ALG_HMAC_SHA1, @@ -41,7 +40,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_sha1_tc1) = { .plaintext = TEST_DATA (sha1_tc1_data), .digest = TEST_DATA (sha1_tc1_digest), }; -/* *INDENT-ON* */ static char sha1_tc2_key[4] = "Jefe"; @@ -53,7 +51,6 @@ static u8 sha1_tc2_digest[] = { 0x25, 0x9a, 0x7c, 0x79 }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_sha1_tc2) = { .name = "RFC2202 HMAC-SHA-1 TC2", .alg = VNET_CRYPTO_ALG_HMAC_SHA1, @@ -61,7 +58,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_sha1_tc2) = { .plaintext = TEST_DATA (sha1_tc2_data), .digest = TEST_DATA (sha1_tc2_digest), }; -/* *INDENT-ON* */ static u8 sha1_tc3_key[20] = { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, @@ -85,7 +81,6 @@ static u8 sha1_tc3_digest[] = { 0x63, 0xf1, 0x75, 0xd3, }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_sha1_tc3) = { .name = "RFC2202 HMAC-SHA-1 TC3", .alg = VNET_CRYPTO_ALG_HMAC_SHA1, @@ -93,7 +88,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_sha1_tc3) = { .plaintext = TEST_DATA (sha1_tc3_data), .digest = TEST_DATA (sha1_tc3_digest), }; -/* *INDENT-ON* */ static u8 sha1_tc4_key[25] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, @@ -118,7 +112,6 @@ static u8 sha1_tc4_digest[] = { 0x2d, 0x72, 0x35, 0xda, }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_sha1_tc4) = { .name = "RFC2202 HMAC-SHA-1 TC4", .alg = VNET_CRYPTO_ALG_HMAC_SHA1, @@ -126,7 +119,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_sha1_tc4) = { .plaintext = TEST_DATA (sha1_tc4_data), .digest = TEST_DATA (sha1_tc4_digest), }; -/* *INDENT-ON* */ static u8 sha1_tc5_key[20] = { 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, @@ -142,7 +134,6 @@ static u8 sha1_tc5_digest[] = { 0x4a, 0x9a, 0x5a, 0x04 }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_sha1_tc5) = { .name = "RFC2202 HMAC-SHA-1 TC5", .alg = VNET_CRYPTO_ALG_HMAC_SHA1, @@ -150,14 +141,12 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_sha1_tc5) = { .plaintext = TEST_DATA (sha1_tc5_data), .digest = TEST_DATA (sha1_tc5_digest), }; -/* *INDENT-ON* */ static u8 sha1_tc5_digest_96[12] = { 0x4c, 0x1a, 0x03, 0x42, 0x4b, 0x55, 0xe0, 0x7f, 0xe7, 0xf2, 0x7b, 0xe1 }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_sha1_tc5_trunc) = { .name = "RFC2202 HMAC-SHA-1-96 TC5-trunc", .alg = VNET_CRYPTO_ALG_HMAC_SHA1, @@ -165,7 +154,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_sha1_tc5_trunc) = { .plaintext = TEST_DATA (sha1_tc5_data), .digest = TEST_DATA (sha1_tc5_digest_96), }; -/* *INDENT-ON* */ static u8 sha1_tc6_key[80] = { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, @@ -189,7 +177,6 @@ static u8 sha1_tc6_digest[] = { 0xed, 0x40, 0x21, 0x12 }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_sha1_tc6) = { .name = "RFC2202 HMAC-SHA-1 TC6", .alg = VNET_CRYPTO_ALG_HMAC_SHA1, @@ -197,7 +184,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_sha1_tc6) = { .plaintext = TEST_DATA (sha1_tc6_data), .digest = TEST_DATA (sha1_tc6_digest), }; -/* *INDENT-ON* */ static char sha1_tc7_data[73] = "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data"; @@ -208,7 +194,6 @@ static u8 sha1_tc7_digest[20] = { 0xbb, 0xff, 0x1a, 0x91 }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_sha1_tc7) = { .name = "RFC2202 HMAC-SHA-1 TC7", .alg = VNET_CRYPTO_ALG_HMAC_SHA1, @@ -237,7 +222,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc_2202_sha1_tc7_inc) = { .key.length = 80, .digest.length = 12, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/crypto/rfc4231.c b/src/plugins/unittest/crypto/rfc4231.c index 127e1bfe521..edd502e0609 100644 --- a/src/plugins/unittest/crypto/rfc4231.c +++ b/src/plugins/unittest/crypto/rfc4231.c @@ -61,7 +61,6 @@ static u8 tc1_digest_sha512[] = { 0x2e, 0x69, 0x6c, 0x20, 0x3a, 0x12, 0x68, 0x54 }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc4231_tc1_sha224) = { .name = "RFC4231 TC1", .alg = VNET_CRYPTO_ALG_HMAC_SHA224, @@ -93,7 +92,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc4231_tc1_sha512) = { .plaintext = TEST_DATA (tc1_data), .digest = TEST_DATA (tc1_digest_sha512), }; -/* *INDENT-ON* */ static char tc2_key[4] = "Jefe"; @@ -133,7 +131,6 @@ static u8 tc2_digest_sha512[] = { 0x63, 0x6e, 0x07, 0x0a, 0x38, 0xbc, 0xe7, 0x37, }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc4231_tc2_sha224) = { .name = "RFC4231 TC2", .alg = VNET_CRYPTO_ALG_HMAC_SHA224, @@ -165,7 +162,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc4231_tc2_sha512) = { .plaintext = TEST_DATA (tc2_data), .digest = TEST_DATA (tc2_digest_sha512), }; -/* *INDENT-ON* */ static u8 tc3_key[20] = { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, @@ -217,7 +213,6 @@ static u8 tc3_digest_sha512[] = { 0x74, 0x27, 0x88, 0x59, 0xe1, 0x32, 0x92, 0xfb }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc4231_tc3_sha224) = { .name = "RFC4231 TC3", .alg = VNET_CRYPTO_ALG_HMAC_SHA224, @@ -249,7 +244,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc4231_tc3_sha512) = { .plaintext = TEST_DATA (tc3_data), .digest = TEST_DATA (tc3_digest_sha512), }; -/* *INDENT-ON* */ static u8 tc4_key[25] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, @@ -302,7 +296,6 @@ static u8 tc4_digest_sha512[] = { 0xe2, 0xad, 0xeb, 0xeb, 0x10, 0xa2, 0x98, 0xdd }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc4231_tc4_sha224) = { .name = "RFC4231 TC4", .alg = VNET_CRYPTO_ALG_HMAC_SHA224, @@ -334,7 +327,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc4231_tc4_sha512) = { .plaintext = TEST_DATA (tc4_data), .digest = TEST_DATA (tc4_digest_sha512), }; -/* *INDENT-ON* */ static u8 tc5_key[20] = { 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, @@ -368,7 +360,6 @@ static u8 tc5_digest_sha512[16] = { 0x1d, 0x41, 0x79, 0xbc, 0x89, 0x1d, 0x87, 0xa6 }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc4231_tc5_sha224) = { .name = "RFC4231 TC5", .alg = VNET_CRYPTO_ALG_HMAC_SHA224, @@ -400,7 +391,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc4231_tc5_sha512) = { .plaintext = TEST_DATA (tc5_data), .digest = TEST_DATA (tc5_digest_sha512), }; -/* *INDENT-ON* */ static u8 tc6_key[131] = { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, @@ -459,7 +449,6 @@ static u8 tc6_digest_sha512[] = { 0x8b, 0x91, 0x5a, 0x98, 0x5d, 0x78, 0x65, 0x98 }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc4231_tc6_sha224) = { .name = "RFC4231 TC6", .alg = VNET_CRYPTO_ALG_HMAC_SHA224, @@ -491,7 +480,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc4231_tc6_sha512) = { .plaintext = TEST_DATA (tc6_data), .digest = TEST_DATA (tc6_digest_sha512), }; -/* *INDENT-ON* */ static u8 tc7_key[131] = { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, @@ -552,7 +540,6 @@ static u8 tc7_digest_sha512[] = { 0x65, 0xc9, 0x74, 0x40, 0xfa, 0x8c, 0x6a, 0x58 }; -/* *INDENT-OFF* */ UNITTEST_REGISTER_CRYPTO_TEST (rfc4231_tc7_sha224) = { .name = "RFC4231 TC7", .alg = VNET_CRYPTO_ALG_HMAC_SHA224, @@ -598,7 +585,6 @@ UNITTEST_REGISTER_CRYPTO_TEST (rfc4231_tc7_sha512_chain) = { TEST_DATA_CHUNK (tc7_data, 150, 2), }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/crypto_test.c b/src/plugins/unittest/crypto_test.c index 473ed126450..4bc06f71c79 100644 --- a/src/plugins/unittest/crypto_test.c +++ b/src/plugins/unittest/crypto_test.c @@ -454,7 +454,6 @@ test_crypto_static (vlib_main_t * vm, crypto_test_main_t * tm, current_op = ops; current_chained_op = chained_ops; - /* *INDENT-OFF* */ vec_foreach_index (i, rv) { r = rv[i]; @@ -644,7 +643,6 @@ test_crypto_static (vlib_main_t * vm, crypto_test_main_t * tm, op->user_data = i; } } - /* *INDENT-ON* */ vnet_crypto_process_ops (vm, ops, vec_len (ops)); vnet_crypto_process_chained_ops (vm, chained_ops, chunks, @@ -670,10 +668,8 @@ test_crypto_get_key_sz (vnet_crypto_alg_t alg) #define _(n, s, l) \ case VNET_CRYPTO_ALG_##n: \ return l; - /* *INDENT-OFF* */ foreach_crypto_cipher_alg foreach_crypto_aead_alg - /* *INDENT-ON* */ #undef _ case VNET_CRYPTO_ALG_HMAC_MD5: case VNET_CRYPTO_ALG_HMAC_SHA1: @@ -1060,14 +1056,12 @@ test_crypto_command_fn (vlib_main_t * vm, return test_crypto (vm, tm); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_crypto_command, static) = { .path = "test crypto", .short_help = "test crypto", .function = test_crypto_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * crypto_test_init (vlib_main_t * vm) diff --git a/src/plugins/unittest/interface_test.c b/src/plugins/unittest/interface_test.c index 4cf5ae43b3c..b5d5b6f776e 100644 --- a/src/plugins/unittest/interface_test.c +++ b/src/plugins/unittest/interface_test.c @@ -57,14 +57,12 @@ test_interface_command_fn (vlib_main_t * vm, return (NULL); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_interface_command, static) = { .path = "test interface link-state", .short_help = "test interface link-state <interface> [up] [down]", .function = test_interface_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/ipsec_test.c b/src/plugins/unittest/ipsec_test.c index bb7f2a8d9e2..98253eeb12a 100644 --- a/src/plugins/unittest/ipsec_test.c +++ b/src/plugins/unittest/ipsec_test.c @@ -373,13 +373,11 @@ VLIB_CLI_COMMAND (test_ipsec_spd_perf_command, static) = { .function = test_ipsec_spd_outbound_perf_command_fn, }; -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_ipsec_command, static) = { .path = "test ipsec", .short_help = "test ipsec sa <ID> seq-num <VALUE>", .function = test_ipsec_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/llist_test.c b/src/plugins/unittest/llist_test.c index a67075de44e..5a712cde33e 100644 --- a/src/plugins/unittest/llist_test.c +++ b/src/plugins/unittest/llist_test.c @@ -132,13 +132,11 @@ llist_test_basic (vlib_main_t * vm, unformat_input_t * input) list_test_is_sane (pelts, ll_test, he); i--; - /* *INDENT-OFF* */ clib_llist_foreach (pelts, ll_test, he, e, ({ if (i != e->data) LLIST_TEST (0, "incorrect element i = %u data = %u", i, e->data); i--; })); - /* *INDENT-ON* */ LLIST_TEST (i == -1, "head insertion works i = %d", i); @@ -180,13 +178,11 @@ llist_test_basic (vlib_main_t * vm, unformat_input_t * input) "list should not be empty"); i--; - /* *INDENT-OFF* */ clib_llist_foreach_reverse (pelts, ll_test2, he2, e, ({ if (i != e->data) LLIST_TEST (0, "incorrect element i = %u data = %u", i, e->data); i--; })); - /* *INDENT-ON* */ LLIST_TEST (i == -1, "tail insertion works"); /* @@ -217,13 +213,11 @@ llist_test_basic (vlib_main_t * vm, unformat_input_t * input) i = 0; - /* *INDENT-OFF* */ clib_llist_foreach (pelts, ll_test, he, e, ({ if (i != e->data) LLIST_TEST (0, "incorrect element i = %u data = %u", i, e->data); i++; })); - /* *INDENT-ON* */ LLIST_TEST (i == 100, "move from ll_test2 to ll_test worked i %u", i); @@ -335,14 +329,12 @@ done: return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (llist_test_command, static) = { .path = "test llist", .short_help = "internal llist unit tests", .function = llist_test, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/mactime_test.c b/src/plugins/unittest/mactime_test.c index 46d6263b938..5bc195c9694 100644 --- a/src/plugins/unittest/mactime_test.c +++ b/src/plugins/unittest/mactime_test.c @@ -165,14 +165,12 @@ test_time_range_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_time_range_command, static) = { .path = "test time-range", .short_help = "test time-range", .function = test_time_range_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/mpcap_node.c b/src/plugins/unittest/mpcap_node.c index 083c22e32df..12c62cf13cd 100644 --- a/src/plugins/unittest/mpcap_node.c +++ b/src/plugins/unittest/mpcap_node.c @@ -215,7 +215,6 @@ VLIB_NODE_FN (mpcap_node) (vlib_main_t * vm, vlib_node_runtime_t * node, 0 /* is_trace */ ); } -/* *INDENT-OFF* */ #ifndef CLIB_MARCH_VARIANT VLIB_REGISTER_NODE (mpcap_node) = { @@ -249,7 +248,6 @@ mpcap_node_init (vlib_main_t *vm) VLIB_INIT_FUNCTION (mpcap_node_init); #endif /* CLIB_MARCH_VARIANT */ -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/punt_test.c b/src/plugins/unittest/punt_test.c index 0c4622283e0..7d00e5b8920 100644 --- a/src/plugins/unittest/punt_test.c +++ b/src/plugins/unittest/punt_test.c @@ -129,7 +129,6 @@ punt_test_pg1_ip6 (vlib_main_t * vm, return (punt_test_fwd (vm, node, frame, FIB_PROTOCOL_IP6, SW_IF_INDEX_PG1)); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (punt_test_pg0_ip4_node) = { .function = punt_test_pg0_ip4, .name = "punt-test-pg0-ip4", @@ -154,7 +153,6 @@ VLIB_REGISTER_NODE (punt_test_pg1_ip6_node) = { .vector_size = sizeof (u32), .format_trace = format_punt_trace, }; -/* *INDENT-ON* */ typedef struct punt_feat_trace_t_ { @@ -242,7 +240,6 @@ punt_test_feat_ip6 (vlib_main_t * vm, return (punt_test_feat_inline (vm, node, frame, 0)); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (punt_test_feat_ip6_node) = { .function = punt_test_feat_ip6, .name = "punt-test-feat-ip6", @@ -273,7 +270,6 @@ VNET_FEATURE_INIT (punt_test_feat_ip4_feature, static) = .arc_name = "ip4-unicast", .node_name = "punt-test-feat-ip4", }; -/* *INDENT-ON* */ static clib_error_t * punt_test (vlib_main_t * vm, @@ -382,14 +378,12 @@ punt_test (vlib_main_t * vm, return (NULL); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_fib_command, static) = { .path = "test punt", .short_help = "punt unit tests - DO NOT RUN ON A LIVE SYSTEM", .function = punt_test, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/rbtree_test.c b/src/plugins/unittest/rbtree_test.c index bfab98c3cd7..4a1fcc4dd70 100644 --- a/src/plugins/unittest/rbtree_test.c +++ b/src/plugins/unittest/rbtree_test.c @@ -238,14 +238,12 @@ done: return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (rbtree_test_command, static) = { .path = "test rbtree", .short_help = "internal rbtree unit tests", .function = rbtree_test, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/segment_manager_test.c b/src/plugins/unittest/segment_manager_test.c index 35986c780aa..a106470ee48 100644 --- a/src/plugins/unittest/segment_manager_test.c +++ b/src/plugins/unittest/segment_manager_test.c @@ -79,7 +79,6 @@ placeholder_server_rx_callback (session_t * s) return -1; } -/* *INDENT-OFF* */ static session_cb_vft_t placeholder_session_cbs = { .session_reset_callback = placeholder_session_reset_callback, .session_connected_callback = placeholder_session_connected_callback, @@ -89,7 +88,6 @@ static session_cb_vft_t placeholder_session_cbs = { .add_segment_callback = placeholder_add_segment_callback, .del_segment_callback = placeholder_del_segment_callback, }; -/* *INDENT-ON* */ static char *states_str[] = { #define _(sym,str) str, @@ -776,7 +774,6 @@ done: return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (tcp_test_command, static) = { .path = "test segment-manager", diff --git a/src/plugins/unittest/session_test.c b/src/plugins/unittest/session_test.c index 96c2465f7fc..b7627acc129 100644 --- a/src/plugins/unittest/session_test.c +++ b/src/plugins/unittest/session_test.c @@ -107,7 +107,6 @@ placeholder_server_rx_callback (session_t * s) return -1; } -/* *INDENT-OFF* */ static session_cb_vft_t placeholder_session_cbs = { .session_reset_callback = placeholder_session_reset_callback, .session_connected_callback = placeholder_session_connected_callback, @@ -117,7 +116,6 @@ static session_cb_vft_t placeholder_session_cbs = { .add_segment_callback = placeholder_add_segment_callback, .del_segment_callback = placeholder_del_segment_callback, }; -/* *INDENT-ON* */ static int session_create_lookpback (u32 table_id, u32 * sw_if_index, @@ -2130,14 +2128,12 @@ done: return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (tcp_test_command, static) = { .path = "test session", .short_help = "internal session unit tests", .function = session_test, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/sparse_vec_test.c b/src/plugins/unittest/sparse_vec_test.c index bb875452cdf..b2239c64a18 100644 --- a/src/plugins/unittest/sparse_vec_test.c +++ b/src/plugins/unittest/sparse_vec_test.c @@ -55,14 +55,12 @@ test_sparse_vec_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_sparse_vec_command, static) = { .path = "test sparse_vec", .short_help = "test sparse_vec", .function = test_sparse_vec_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/string_test.c b/src/plugins/unittest/string_test.c index f0e40c5e142..3b39bf56478 100644 --- a/src/plugins/unittest/string_test.c +++ b/src/plugins/unittest/string_test.c @@ -1403,7 +1403,6 @@ string_test_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (string_test_command, static) = { .path = "test string", .short_help = @@ -1414,7 +1413,6 @@ VLIB_CLI_COMMAND (string_test_command, static) = { "strtok_s | clib_strtok | strnlen_s | clib_strnlen | strstr_s ]", .function = string_test_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/svm_fifo_test.c b/src/plugins/unittest/svm_fifo_test.c index 8e186a86c9d..9feb37cbc25 100644 --- a/src/plugins/unittest/svm_fifo_test.c +++ b/src/plugins/unittest/svm_fifo_test.c @@ -43,7 +43,6 @@ typedef struct u32 len; } test_pattern_t; -/* *INDENT-OFF* */ test_pattern_t test_pattern[] = { {380, 8}, {768, 8}, {1156, 8}, {1544, 8}, {1932, 8}, {2320, 8}, {2708, 8}, {2992, 8}, {372, 8}, {760, 8}, {1148, 8}, {1536, 8}, {1924, 8}, {2312, 8}, @@ -102,7 +101,6 @@ test_pattern_t test_pattern[] = { /* missing from original data set */ {388, 4}, {776, 4}, {1164, 4}, {1552, 4}, {1940, 4}, {2328, 4}, }; -/* *INDENT-ON* */ int pattern_cmp (const void *arg1, const void *arg2) @@ -1993,9 +1991,7 @@ sfifo_test_fifo_indirect (vlib_main_t * vm, unformat_input_t * input) return 0; } -/* *INDENT-OFF* */ svm_fifo_trace_elem_t fifo_trace[] = {}; -/* *INDENT-ON* */ static int sfifo_test_fifo_replay (vlib_main_t * vm, unformat_input_t * input) @@ -2863,14 +2859,12 @@ done: return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (svm_fifo_test_command, static) = { .path = "test svm fifo", .short_help = "internal svm fifo unit tests", .function = svm_fifo_test, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/tcp_test.c b/src/plugins/unittest/tcp_test.c index 25b6744244e..34033a0b622 100644 --- a/src/plugins/unittest/tcp_test.c +++ b/src/plugins/unittest/tcp_test.c @@ -35,9 +35,7 @@ } \ } -/* *INDENT-OFF* */ scoreboard_trace_elt_t sb_trace[] = {}; -/* *INDENT-ON* */ static int tcp_test_scoreboard_replay (vlib_main_t * vm, unformat_input_t * input) @@ -1596,14 +1594,12 @@ done: return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (tcp_test_command, static) = { .path = "test tcp", .short_help = "internal tcp unit tests", .function = tcp_test, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/test_buffer.c b/src/plugins/unittest/test_buffer.c index 584ce589012..24c86cd8697 100644 --- a/src/plugins/unittest/test_buffer.c +++ b/src/plugins/unittest/test_buffer.c @@ -262,14 +262,12 @@ test_linearize_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_linearize_command, static) = { .path = "test chained-buffer-linearization", .short_help = "test chained-buffer-linearization", .function = test_linearize_fn, }; -/* *INDENT-ON* */ static clib_error_t * test_linearize_speed_fn (vlib_main_t *vm, unformat_input_t *input, diff --git a/src/plugins/unittest/unittest.c b/src/plugins/unittest/unittest.c index 60ebac130da..555516fc9de 100644 --- a/src/plugins/unittest/unittest.c +++ b/src/plugins/unittest/unittest.c @@ -19,14 +19,12 @@ #include <vnet/plugin/plugin.h> #include <vpp/app/version.h> -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "C unit tests", .default_disabled = 1, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/util_test.c b/src/plugins/unittest/util_test.c index 8dce270f814..53384e55494 100644 --- a/src/plugins/unittest/util_test.c +++ b/src/plugins/unittest/util_test.c @@ -22,13 +22,11 @@ test_crash_command_fn (vlib_main_t * vm, { u64 *p = (u64 *) 0xdefec8ed; - /* *INDENT-OFF* */ ELOG_TYPE_DECLARE (e) = { .format = "deliberate crash: touching %x", .format_args = "i4", }; - /* *INDENT-ON* */ elog (&vlib_global_main.elog_main, &e, 0xdefec8ed); *p = 0xdeadbeef; @@ -37,14 +35,12 @@ test_crash_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_crash_command, static) = { .path = "test crash", .short_help = "crash the bus!", .function = test_crash_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * test_hash_command_fn (vlib_main_t * vm, @@ -98,14 +94,12 @@ test_hash_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_hash_command, static) = { .path = "test hash_memory", .short_help = "page boundary crossing test", .function = test_hash_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/unittest/vlib_test.c b/src/plugins/unittest/vlib_test.c index 3154b7d21cf..c9c46901a4d 100644 --- a/src/plugins/unittest/vlib_test.c +++ b/src/plugins/unittest/vlib_test.c @@ -129,14 +129,12 @@ test_vlib_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_vlib_command, static) = { .path = "test vlib", .short_help = "vlib code coverage unit test", .function = test_vlib_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * test_format_vlib_command_fn (vlib_main_t * vm, @@ -180,14 +178,12 @@ test_format_vlib_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_format_vlib_command, static) = { .path = "test format-vlib", .short_help = "vlib format code coverate unit test", .function = test_format_vlib_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * test_vlib2_command_fn (vlib_main_t * vm, @@ -215,14 +211,12 @@ test_vlib2_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_vlib2_command, static) = { .path = "test vlib2", .short_help = "vlib code coverage unit test #2", .function = test_vlib2_command_fn, }; -/* *INDENT-ON* */ diff --git a/src/plugins/urpf/ip4_urpf.c b/src/plugins/urpf/ip4_urpf.c index 1d329029478..7cbf81c50c3 100644 --- a/src/plugins/urpf/ip4_urpf.c +++ b/src/plugins/urpf/ip4_urpf.c @@ -74,7 +74,6 @@ VLIB_NODE_FN (ip4_tx_urpf_strict) (vlib_main_t * vm, return (urpf_inline (vm, node, frame, AF_IP4, VLIB_TX, URPF_MODE_STRICT)); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (ip4_rx_urpf_loose) = { .name = "ip4-rx-urpf-loose", .vector_size = sizeof (u32), @@ -160,7 +159,6 @@ VNET_FEATURE_INIT (ip4_tx_urpf_strict_feat, static) = .arc_name = "ip4-output", .node_name = "ip4-tx-urpf-strict", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/urpf/ip6_urpf.c b/src/plugins/urpf/ip6_urpf.c index 48d991573b5..d278289b5e2 100644 --- a/src/plugins/urpf/ip6_urpf.c +++ b/src/plugins/urpf/ip6_urpf.c @@ -74,7 +74,6 @@ VLIB_NODE_FN (ip6_tx_urpf_strict) (vlib_main_t * vm, return (urpf_inline (vm, node, frame, AF_IP6, VLIB_TX, URPF_MODE_STRICT)); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (ip6_rx_urpf_loose) = { .name = "ip6-rx-urpf-loose", .vector_size = sizeof (u32), @@ -160,7 +159,6 @@ VNET_FEATURE_INIT (ip6_tx_urpf_strict_feat, static) = .arc_name = "ip6-output", .node_name = "ip6-tx-urpf-strict", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/urpf/urpf.c b/src/plugins/urpf/urpf.c index 3c3b33c769c..e5209caafb4 100644 --- a/src/plugins/urpf/urpf.c +++ b/src/plugins/urpf/urpf.c @@ -17,7 +17,6 @@ #include <vnet/fib/fib_table.h> -/* *INDENT-OFF* */ static const char *urpf_feat_arcs[N_AF][VLIB_N_DIR] = { [AF_IP4] = { @@ -53,7 +52,6 @@ static const char *urpf_feats[N_AF][VLIB_N_DIR][URPF_N_MODES] = }, }, }; -/* *INDENT-ON* */ /** * Per-af, per-direction, per-interface uRPF configs @@ -311,14 +309,12 @@ done: * @cliexcmd{set urpf ip4 off GigabitEthernet2/0/0} * @endparblock ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_interface_ip_source_check_command, static) = { .path = "set urpf", .function = urpf_cli_update, .short_help = "set urpf [ip4|ip6] [rx|tx] [off|strict|loose] " "<INTERFACE> [table <table>]", }; -/* *INDENT-ON* */ static clib_error_t * urpf_cli_accept (vlib_main_t * vm, @@ -389,13 +385,11 @@ done: * loose RPF tests: * @cliexcmd{set urpf-accept table 7 10.0.0.0/8 add} ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (urpf_accept_command, static) = { .path = "set urpf-accept", .function = urpf_cli_accept, .short_help = "urpf-accept [table <table-id>] [add|del] <PREFIX>", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/urpf/urpf_api.c b/src/plugins/urpf/urpf_api.c index f5d31e1fce6..3d0f4b4e8d4 100644 --- a/src/plugins/urpf/urpf_api.c +++ b/src/plugins/urpf/urpf_api.c @@ -194,12 +194,10 @@ urpf_api_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (urpf_api_init); -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Unicast Reverse Path Forwarding (uRPF)", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/vhost/vhost_user.c b/src/plugins/vhost/vhost_user.c index fac20800848..fdee984f97b 100644 --- a/src/plugins/vhost/vhost_user.c +++ b/src/plugins/vhost/vhost_user.c @@ -52,7 +52,6 @@ vlib_node_registration_t vhost_user_send_interrupt_node; -/* *INDENT-OFF* */ vhost_user_main_t vhost_user_main = { .mtu_bytes = 1518, }; @@ -60,7 +59,6 @@ vhost_user_main_t vhost_user_main = { VNET_HW_INTERFACE_CLASS (vhost_interface_class, static) = { .name = "vhost-user", }; -/* *INDENT-ON* */ static long get_huge_page_size (int fd) @@ -1193,12 +1191,10 @@ vhost_user_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (vhost_user_init) = { .runs_after = VLIB_INITS("ip4_init"), }; -/* *INDENT-ON* */ static uword vhost_user_send_interrupt_process (vlib_main_t * vm, @@ -1244,7 +1240,6 @@ vhost_user_send_interrupt_process (vlib_main_t * vm, /* fall through */ case ~0: - /* *INDENT-OFF* */ pool_foreach (vui, vum->vhost_user_interfaces) { next_timeout = timeout; FOR_ALL_VHOST_RX_TXQ (qid, vui) @@ -1265,7 +1260,6 @@ vhost_user_send_interrupt_process (vlib_main_t * vm, timeout = next_timeout; } } - /* *INDENT-ON* */ break; default: @@ -1281,13 +1275,11 @@ vhost_user_send_interrupt_process (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vhost_user_send_interrupt_node) = { .function = vhost_user_send_interrupt_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "vhost-user-send-interrupt-process", }; -/* *INDENT-ON* */ static uword vhost_user_process (vlib_main_t * vm, @@ -1314,7 +1306,6 @@ vhost_user_process (vlib_main_t * vm, timeout = 3.0; - /* *INDENT-OFF* */ pool_foreach (vui, vum->vhost_user_interfaces) { if (vui->unix_server_index == ~0) { //Nothing to do for server sockets @@ -1386,18 +1377,15 @@ vhost_user_process (vlib_main_t * vm, } } } - /* *INDENT-ON* */ } return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vhost_user_process_node,static) = { .function = vhost_user_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "vhost-user-process", }; -/* *INDENT-ON* */ /** * Disables and reset interface structure. @@ -1507,11 +1495,9 @@ vhost_user_exit (vlib_main_t * vm) vhost_user_intf_t *vui; vlib_worker_thread_barrier_sync (vlib_get_main ()); - /* *INDENT-OFF* */ pool_foreach (vui, vum->vhost_user_interfaces) { vhost_user_delete_if (vnm, vm, vui->sw_if_index); } - /* *INDENT-ON* */ vlib_worker_thread_barrier_release (vlib_get_main ()); return 0; } @@ -2393,7 +2379,6 @@ done: * Once the vHost interface is created, enable the interface using: * @cliexcmd{set interface state VirtualEthernet0/0/0 up} ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (vhost_user_connect_command, static) = { .path = "create vhost-user", .short_help = "create vhost-user socket <socket-filename> [server] " @@ -2402,7 +2387,6 @@ VLIB_CLI_COMMAND (vhost_user_connect_command, static) = { .function = vhost_user_connect_command_fn, .is_mp_safe = 1, }; -/* *INDENT-ON* */ /*? * Delete a vHost User interface using the interface name or the @@ -2416,7 +2400,6 @@ VLIB_CLI_COMMAND (vhost_user_connect_command, static) = { * Example of how to delete a vhost interface by software interface index: * @cliexcmd{delete vhost-user sw_if_index 1} ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (vhost_user_delete_command, static) = { .path = "delete vhost-user", .short_help = "delete vhost-user {<interface> | sw_if_index <sw_idx>}", @@ -2557,14 +2540,12 @@ VLIB_CLI_COMMAND (vhost_user_delete_command, static) = { * @cliexend * @endparblock ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_vhost_user_command, static) = { .path = "show vhost-user", .short_help = "show vhost-user [<interface> [<interface> [..]]] " "[[descriptors] [verbose]]", .function = show_vhost_user_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * diff --git a/src/plugins/vhost/vhost_user.h b/src/plugins/vhost/vhost_user.h index 3479d65cbc6..a3582affb4b 100644 --- a/src/plugins/vhost/vhost_user.h +++ b/src/plugins/vhost/vhost_user.h @@ -122,7 +122,6 @@ int vhost_user_modify_if (vnet_main_t * vnm, vlib_main_t * vm, int vhost_user_delete_if (vnet_main_t * vnm, vlib_main_t * vm, u32 sw_if_index); -/* *INDENT-OFF* */ typedef struct vhost_user_memory_region { u64 guest_phys_addr; @@ -175,7 +174,6 @@ typedef struct vhost_user_msg { vhost_user_log_t log; }; } __attribute ((packed)) vhost_user_msg_t; -/* *INDENT-ON* */ typedef struct { diff --git a/src/plugins/vhost/vhost_user_api.c b/src/plugins/vhost/vhost_user_api.c index 3b0840a1b1b..33447c556a8 100644 --- a/src/plugins/vhost/vhost_user_api.c +++ b/src/plugins/vhost/vhost_user_api.c @@ -90,12 +90,10 @@ vl_api_create_vhost_user_if_t_handler (vl_api_create_vhost_user_if_t * mp) } } - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_CREATE_VHOST_USER_IF_REPLY, ({ rmp->sw_if_index = ntohl (args.sw_if_index); })); - /* *INDENT-ON* */ } static void @@ -190,12 +188,10 @@ vl_api_create_vhost_user_if_v2_t_handler (vl_api_create_vhost_user_if_v2_t * } } - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_CREATE_VHOST_USER_IF_V2_REPLY, ({ rmp->sw_if_index = ntohl (args.sw_if_index); })); - /* *INDENT-ON* */ } static void diff --git a/src/plugins/vhost/vhost_user_inline.h b/src/plugins/vhost/vhost_user_inline.h index 8bdff3733a7..e27f819e96d 100644 --- a/src/plugins/vhost/vhost_user_inline.h +++ b/src/plugins/vhost/vhost_user_inline.h @@ -135,13 +135,11 @@ vhost_map_guest_mem_done: } } #endif - /* *INDENT-OFF* */ ELOG_TYPE_DECLARE (el) = { .format = "failed to map guest mem addr %lx", .format_args = "i8", }; - /* *INDENT-ON* */ struct { uword addr; diff --git a/src/plugins/vhost/vhost_user_input.c b/src/plugins/vhost/vhost_user_input.c index c083f43ba7c..ca5072485ff 100644 --- a/src/plugins/vhost/vhost_user_input.c +++ b/src/plugins/vhost/vhost_user_input.c @@ -1447,7 +1447,6 @@ VLIB_NODE_FN (vhost_user_input_node) (vlib_main_t * vm, return n_rx_packets; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vhost_user_input_node) = { .type = VLIB_NODE_TYPE_INPUT, .name = "vhost-user-input", @@ -1463,7 +1462,6 @@ VLIB_REGISTER_NODE (vhost_user_input_node) = { .n_errors = VHOST_USER_INPUT_FUNC_N_ERROR, .error_strings = vhost_user_input_func_error_strings, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/vhost/vhost_user_output.c b/src/plugins/vhost/vhost_user_output.c index 9b52fc6265c..58fd4309f8c 100644 --- a/src/plugins/vhost/vhost_user_output.c +++ b/src/plugins/vhost/vhost_user_output.c @@ -1122,7 +1122,6 @@ vhost_user_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, return /* no error */ 0; } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (vhost_user_device_class) = { .name = "vhost-user", .tx_function_n_errors = VHOST_USER_TX_FUNC_N_ERROR, @@ -1134,7 +1133,6 @@ VNET_DEVICE_CLASS (vhost_user_device_class) = { .format_tx_trace = format_vhost_trace, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/vmxnet3/cli.c b/src/plugins/vmxnet3/cli.c index f751358262b..d682e3ec2c9 100644 --- a/src/plugins/vmxnet3/cli.c +++ b/src/plugins/vmxnet3/cli.c @@ -76,7 +76,6 @@ vmxnet3_create_command_fn (vlib_main_t * vm, unformat_input_t * input, return args.error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (vmxnet3_create_command, static) = { .path = "create interface vmxnet3", .short_help = @@ -86,7 +85,6 @@ VLIB_CLI_COMMAND (vmxnet3_create_command, static) = { " [gso]", .function = vmxnet3_create_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * vmxnet3_delete_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -131,14 +129,12 @@ vmxnet3_delete_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (vmxnet3_delete_command, static) = { .path = "delete interface vmxnet3", .short_help = "delete interface vmxnet3 " "{<interface> | sw_if_index <sw_idx>}", .function = vmxnet3_delete_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * vmxnet3_test_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -192,14 +188,12 @@ vmxnet3_test_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (vmxnet3_test_command, static) = { .path = "test vmxnet3", .short_help = "test vmxnet3 <interface> | sw_if_index <sw_idx> [irq] " "[elog-on] [elog-off]", .function = vmxnet3_test_command_fn, }; -/* *INDENT-ON* */ static void show_vmxnet3 (vlib_main_t * vm, u32 * hw_if_indices, u8 show_descr, @@ -582,14 +576,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_vmxnet3_command, static) = { .path = "show vmxnet3", .short_help = "show vmxnet3 [[<interface>] ([desc] | ([rx-comp] | " "[rx-desc-0] | [rx-desc-1] | [tx-comp] | [tx-desc]) [<slot>])]", .function = show_vmxnet3_fn, }; -/* *INDENT-ON* */ clib_error_t * vmxnet3_cli_init (vlib_main_t * vm) diff --git a/src/plugins/vmxnet3/input.c b/src/plugins/vmxnet3/input.c index ebf52d63ff1..25632546b6d 100644 --- a/src/plugins/vmxnet3/input.c +++ b/src/plugins/vmxnet3/input.c @@ -480,7 +480,6 @@ VLIB_NODE_FN (vmxnet3_input_node) (vlib_main_t * vm, } #ifndef CLIB_MARCH_VARIANT -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vmxnet3_input_node) = { .name = "vmxnet3-input", .sibling_of = "device-input", @@ -493,7 +492,6 @@ VLIB_REGISTER_NODE (vmxnet3_input_node) = { }; #endif -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/vmxnet3/plugin.c b/src/plugins/vmxnet3/plugin.c index 76f1cfc5e3e..20caf97f612 100644 --- a/src/plugins/vmxnet3/plugin.c +++ b/src/plugins/vmxnet3/plugin.c @@ -19,12 +19,10 @@ #include <vnet/plugin/plugin.h> #include <vpp/app/version.h> -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "VMWare Vmxnet3 Device Driver", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/vmxnet3/vmxnet3.c b/src/plugins/vmxnet3/vmxnet3.c index be862d7127a..e64e0d135d6 100644 --- a/src/plugins/vmxnet3/vmxnet3.c +++ b/src/plugins/vmxnet3/vmxnet3.c @@ -145,7 +145,6 @@ static char *vmxnet3_tx_func_error_strings[] = { #undef _ }; -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (vmxnet3_device_class,) = { .name = "VMXNET3 interface", @@ -158,7 +157,6 @@ VNET_DEVICE_CLASS (vmxnet3_device_class,) = .tx_function_n_errors = VMXNET3_TX_N_ERROR, .tx_function_error_strings = vmxnet3_tx_func_error_strings, }; -/* *INDENT-ON* */ static u32 vmxnet3_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hw, u32 flags) @@ -675,7 +673,6 @@ vmxnet3_create_if (vlib_main_t * vm, vmxnet3_create_if_args_t * args) return; } - /* *INDENT-OFF* */ pool_foreach (vd, vmxm->devices) { if (vd->pci_addr.as_u32 == args->addr.as_u32) { @@ -688,7 +685,6 @@ vmxnet3_create_if (vlib_main_t * vm, vmxnet3_create_if_args_t * args) return; } } - /* *INDENT-ON* */ if (args->bind) { @@ -907,7 +903,6 @@ vmxnet3_delete_if (vlib_main_t * vm, vmxnet3_device_t * vd) vlib_pci_device_close (vm, vd->pci_dev_handle); - /* *INDENT-OFF* */ vec_foreach_index (i, vd->rxqs) { vmxnet3_rxq_t *rxq = vec_elt_at_index (vd->rxqs, i); @@ -934,11 +929,9 @@ vmxnet3_delete_if (vlib_main_t * vm, vmxnet3_device_t * vd) } vlib_physmem_free (vm, rxq->rx_comp); } - /* *INDENT-ON* */ vec_free (vd->rxqs); vec_free (vd->rx_stats); - /* *INDENT-OFF* */ vec_foreach_index (i, vd->txqs) { vmxnet3_txq_t *txq = vec_elt_at_index (vd->txqs, i); @@ -959,7 +952,6 @@ vmxnet3_delete_if (vlib_main_t * vm, vmxnet3_device_t * vd) vlib_physmem_free (vm, txq->tx_desc); vlib_physmem_free (vm, txq->tx_comp); } - /* *INDENT-ON* */ vec_free (vd->txqs); vec_free (vd->tx_stats); diff --git a/src/plugins/vmxnet3/vmxnet3_api.c b/src/plugins/vmxnet3/vmxnet3_api.c index 36fa7bd9958..c51c07b705d 100644 --- a/src/plugins/vmxnet3/vmxnet3_api.c +++ b/src/plugins/vmxnet3/vmxnet3_api.c @@ -55,10 +55,8 @@ vl_api_vmxnet3_create_t_handler (vl_api_vmxnet3_create_t * mp) vmxnet3_create_if (vm, &args); rv = args.rv; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_VMXNET3_CREATE_REPLY, ({ rmp->sw_if_index = ntohl (args.sw_if_index); })); - /* *INDENT-ON* */ } static void @@ -172,7 +170,6 @@ vl_api_vmxnet3_dump_t_handler (vl_api_vmxnet3_dump_t * mp) if (!reg) return; - /* *INDENT-OFF* */ pool_foreach (vd, vmxm->devices) { swif = vnet_get_sw_interface (vnm, vd->sw_if_index); @@ -181,7 +178,6 @@ vl_api_vmxnet3_dump_t_handler (vl_api_vmxnet3_dump_t * mp) send_vmxnet3_details (reg, vd, swif, if_name, mp->context); vec_set_len (if_name, 0); } - /* *INDENT-ON* */ vec_free (if_name); } @@ -210,7 +206,6 @@ static void vl_api_sw_vmxnet3_interface_dump_t_handler (vnet_sw_interface_is_api_valid (vnm, filter_sw_if_index) == 0)) goto bad_sw_if_index; - /* *INDENT-OFF* */ pool_foreach (vd, vmxm->devices) { if ((filter_sw_if_index == ~0) || @@ -223,7 +218,6 @@ static void vl_api_sw_vmxnet3_interface_dump_t_handler vec_set_len (if_name, 0); } } - /* *INDENT-ON* */ BAD_SW_IF_INDEX_LABEL; vec_free (if_name); diff --git a/src/plugins/vrrp/node.c b/src/plugins/vrrp/node.c index 3cf4ec49635..d5594ae0e43 100644 --- a/src/plugins/vrrp/node.c +++ b/src/plugins/vrrp/node.c @@ -486,7 +486,6 @@ VLIB_NODE_FN (vrrp4_arp_input_node) (vlib_main_t * vm, return vrrp_arp_nd_input_inline (vm, node, frame, 0 /* is_ipv6 */ ); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vrrp4_arp_input_node) = { .name = "vrrp4-arp-input", @@ -519,7 +518,6 @@ VLIB_NODE_FN (vrrp6_nd_input_node) (vlib_main_t * vm, return vrrp_arp_nd_input_inline (vm, node, frame, 1 /* is_ipv6 */); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vrrp6_nd_input_node) = { .name = "vrrp6-nd-input", @@ -699,7 +697,6 @@ VLIB_NODE_FN (vrrp4_input_node) (vlib_main_t * vm, vlib_node_runtime_t * node, return vrrp_input_inline (vm, node, frame, 0); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vrrp4_input_node) = { .name = "vrrp4-input", @@ -1104,7 +1101,6 @@ vrrp_input_init (vlib_main_t *vm) VLIB_INIT_FUNCTION (vrrp_input_init); -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/vrrp/vrrp.c b/src/plugins/vrrp/vrrp.c index f3acb4756fc..fb0659605c7 100644 --- a/src/plugins/vrrp/vrrp.c +++ b/src/plugins/vrrp/vrrp.c @@ -1519,13 +1519,11 @@ vrrp_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (vrrp_init); -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "VRRP v3 (RFC 5798)", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/vrrp/vrrp.h b/src/plugins/vrrp/vrrp.h index cf529a153a4..acab7440ead 100644 --- a/src/plugins/vrrp/vrrp.h +++ b/src/plugins/vrrp/vrrp.h @@ -33,7 +33,6 @@ typedef struct vrrp_vr_key u8 is_ipv6; } vrrp_vr_key_t; -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct vrrp4_arp_key { union { @@ -44,15 +43,12 @@ typedef CLIB_PACKED u64 as_u64; }; }) vrrp4_arp_key_t; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct vrrp6_nd_key { u32 sw_if_index; ip6_address_t addr; }) vrrp6_nd_key_t; -/* *INDENT-ON* */ typedef struct vrrp_vr_tracking_if { diff --git a/src/plugins/vrrp/vrrp_api.c b/src/plugins/vrrp/vrrp_api.c index 5eb0ffc6f20..e31e0a74c14 100644 --- a/src/plugins/vrrp/vrrp_api.c +++ b/src/plugins/vrrp/vrrp_api.c @@ -318,7 +318,6 @@ 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) { if (sw_if_index && (sw_if_index != ~0) && @@ -327,7 +326,6 @@ vl_api_vrrp_vr_dump_t_handler (vl_api_vrrp_vr_dump_t * mp) send_vrrp_vr_details (vr, reg, mp->context); } - /* *INDENT-ON* */ } static void @@ -466,7 +464,6 @@ vl_api_vrrp_vr_peer_dump_t_handler (vl_api_vrrp_vr_peer_dump_t * mp) return; } - /* *INDENT-OFF* */ pool_foreach (vr, vmp->vrs) { if (!vec_len (vr->config.peer_addrs)) @@ -475,7 +472,6 @@ vl_api_vrrp_vr_peer_dump_t_handler (vl_api_vrrp_vr_peer_dump_t * mp) send_vrrp_vr_details (vr, reg, mp->context); } - /* *INDENT-ON* */ } static void @@ -570,7 +566,6 @@ vl_api_vrrp_vr_track_if_dump_t_handler (vl_api_vrrp_vr_track_if_dump_t * mp) return; } - /* *INDENT-OFF* */ pool_foreach (vr, vmp->vrs) { if (!vec_len (vr->tracking.interfaces)) @@ -579,7 +574,6 @@ vl_api_vrrp_vr_track_if_dump_t_handler (vl_api_vrrp_vr_track_if_dump_t * mp) send_vrrp_vr_track_if_details (vr, reg, mp->context); } - /* *INDENT-ON* */ } static void @@ -613,14 +607,12 @@ vrrp_vr_event (vrrp_vr_t * vr, vrrp_vr_state_t new_state) vpe_client_registration_t *reg; vl_api_registration_t *vl_reg; - /* *INDENT-OFF* */ 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* */ } pub_sub_handler (vrrp_vr_events, VRRP_VR_EVENTS); @@ -638,7 +630,6 @@ vrrp_plugin_api_hookup (vlib_main_t * vm) return 0; } -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/vrrp/vrrp_cli.c b/src/plugins/vrrp/vrrp_cli.c index 4496bbb7333..fb52da474fa 100644 --- a/src/plugins/vrrp/vrrp_cli.c +++ b/src/plugins/vrrp/vrrp_cli.c @@ -151,7 +151,6 @@ vrrp_vr_add_command_fn (vlib_main_t * vm, unformat_input_t * input, return vrrp_vr_add_del_command_fn (vm, input, cmd, 1 /* is_add */ ); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (vrrp_vr_add_command, static) = { .path = "vrrp vr add", @@ -159,7 +158,6 @@ VLIB_CLI_COMMAND (vrrp_vr_add_command, static) = "vrrp vr add <interface> [vr_id <n>] [ipv6] [priority <value>] [interval <value>] [no_preempt] [accept_mode] [unicast] [<ip_addr> ...]", .function = vrrp_vr_add_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * vrrp_vr_del_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -168,14 +166,12 @@ vrrp_vr_del_command_fn (vlib_main_t * vm, unformat_input_t * input, return vrrp_vr_add_del_command_fn (vm, input, cmd, 0 /* is_add */ ); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (vrrp_vr_del_command, static) = { .path = "vrrp vr del", .short_help = "vrrp vr del <interface> [vr_id <n>] [ipv6]", .function = vrrp_vr_del_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * vrrp_show_vr_command_fn (vlib_main_t * vm, @@ -208,7 +204,6 @@ vrrp_show_vr_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (vrrp_show_vr_command, static) = { .path = "show vrrp vr", @@ -216,7 +211,6 @@ VLIB_CLI_COMMAND (vrrp_show_vr_command, static) = "show vrrp vr [(<intf_name>|sw_if_index <n>)]", .function = vrrp_show_vr_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * vrrp_proto_start_stop_command_fn (vlib_main_t * vm, @@ -377,7 +371,6 @@ done: return ret; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (vrrp_proto_start_stop_command, static) = { .path = "vrrp proto", @@ -385,9 +378,7 @@ VLIB_CLI_COMMAND (vrrp_proto_start_stop_command, static) = "vrrp proto (start|stop) (<intf_name>|sw_if_index <n>) vr_id <n> [ipv6]", .function = vrrp_proto_start_stop_command_fn, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (vrrp_peers_command, static) = { .path = "vrrp peers", @@ -395,7 +386,6 @@ VLIB_CLI_COMMAND (vrrp_peers_command, static) = "vrrp peers (<intf_name>|sw_if_index <n>) vr_id <n> [ipv6] <peer1_addr> [<peer2_addr> ...]", .function = vrrp_peers_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * vrrp_vr_track_if_command_fn (vlib_main_t * vm, @@ -493,7 +483,6 @@ done: return ret; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (vrrp_vr_track_if_command, static) = { .path = "vrrp vr track-if", @@ -501,7 +490,6 @@ VLIB_CLI_COMMAND (vrrp_vr_track_if_command, static) = "vrrp vr track-if (add|del) (<intf_name>|sw_if_index <n>) vr_id <n> [ipv6] track-index <n> priority <n> [ track-index <n> priority <n> ...]", .function = vrrp_vr_track_if_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/vrrp/vrrp_periodic.c b/src/plugins/vrrp/vrrp_periodic.c index 9c1b76ae59d..5f9d7ae938e 100644 --- a/src/plugins/vrrp/vrrp_periodic.c +++ b/src/plugins/vrrp/vrrp_periodic.c @@ -210,14 +210,12 @@ vrrp_periodic_process (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vrrp_periodic_node) = { .function = vrrp_periodic_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "vrrp-periodic-process", .process_log2_n_stack_bytes = 17, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/vxlan/decap.c b/src/plugins/vxlan/decap.c index f5d1efa2b86..5f28c5e97bb 100644 --- a/src/plugins/vxlan/decap.c +++ b/src/plugins/vxlan/decap.c @@ -412,7 +412,6 @@ static char *vxlan_error_strings[] = { #undef vxlan_error }; -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vxlan4_input_node) = { .name = "vxlan4-input", @@ -442,7 +441,6 @@ VLIB_REGISTER_NODE (vxlan6_input_node) = }, .format_trace = format_vxlan_rx_trace, }; -/* *INDENT-ON* */ typedef enum { @@ -875,7 +873,6 @@ VLIB_NODE_FN (ip4_vxlan_bypass_node) (vlib_main_t * vm, return ip_vxlan_bypass_inline (vm, node, frame, /* is_ip4 */ 1); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (ip4_vxlan_bypass_node) = { .name = "ip4-vxlan-bypass", @@ -889,7 +886,6 @@ VLIB_REGISTER_NODE (ip4_vxlan_bypass_node) = .format_trace = format_ip4_forward_next_trace, }; -/* *INDENT-ON* */ /* Dummy init function to get us linked in. */ static clib_error_t * @@ -907,7 +903,6 @@ VLIB_NODE_FN (ip6_vxlan_bypass_node) (vlib_main_t * vm, return ip_vxlan_bypass_inline (vm, node, frame, /* is_ip4 */ 0); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (ip6_vxlan_bypass_node) = { .name = "ip6-vxlan-bypass", @@ -921,7 +916,6 @@ VLIB_REGISTER_NODE (ip6_vxlan_bypass_node) = .format_trace = format_ip6_forward_next_trace, }; -/* *INDENT-ON* */ /* Dummy init function to get us linked in. */ static clib_error_t * @@ -1299,7 +1293,6 @@ VLIB_NODE_FN (vxlan4_flow_input_node) (vlib_main_t * vm, return f->n_vectors; } -/* *INDENT-OFF* */ #ifndef CLIB_MULTIARCH_VARIANT VLIB_REGISTER_NODE (vxlan4_flow_input_node) = { .name = "vxlan-flow-input", @@ -1319,7 +1312,6 @@ VLIB_REGISTER_NODE (vxlan4_flow_input_node) = { }, }; #endif -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/vxlan/encap.c b/src/plugins/vxlan/encap.c index e4103ec0083..98464d809ba 100644 --- a/src/plugins/vxlan/encap.c +++ b/src/plugins/vxlan/encap.c @@ -503,7 +503,6 @@ VLIB_NODE_FN (vxlan6_encap_node) (vlib_main_t * vm, return vxlan_encap_inline (vm, node, from_frame, /* is_ip4 */ 0); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vxlan4_encap_node) = { .name = "vxlan4-encap", .vector_size = sizeof (u32), @@ -529,7 +528,6 @@ VLIB_REGISTER_NODE (vxlan6_encap_node) = { [VXLAN_ENCAP_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/vxlan/vxlan.c b/src/plugins/vxlan/vxlan.c index f1ab7a7cb8b..0885550d257 100644 --- a/src/plugins/vxlan/vxlan.c +++ b/src/plugins/vxlan/vxlan.c @@ -128,14 +128,12 @@ vxlan_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags) return /* no error */ 0; } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (vxlan_device_class, static) = { .name = "VXLAN", .format_device_name = format_vxlan_name, .format_tx_trace = format_vxlan_encap_trace, .admin_up_down_function = vxlan_interface_admin_up_down, }; -/* *INDENT-ON* */ static u8 * format_vxlan_header_with_length (u8 * s, va_list * args) @@ -145,13 +143,11 @@ format_vxlan_header_with_length (u8 * s, va_list * args) return s; } -/* *INDENT-OFF* */ VNET_HW_INTERFACE_CLASS (vxlan_hw_class) = { .name = "VXLAN", .format_header = format_vxlan_header_with_length, .build_rewrite = default_build_rewrite, }; -/* *INDENT-ON* */ static void vxlan_tunnel_restack_dpo (vxlan_tunnel_t * t) @@ -318,7 +314,6 @@ vxlan_decap_next_is_valid (vxlan_main_t * vxm, u32 is_ip6, return decap_next_index < r->n_next_nodes; } -/* *INDENT-OFF* */ typedef CLIB_PACKED(union { struct @@ -328,7 +323,6 @@ typedef CLIB_PACKED(union }; u64 as_u64; }) mcast_shared_t; -/* *INDENT-ON* */ static inline mcast_shared_t mcast_shared_get (ip46_address_t * ip) @@ -915,7 +909,6 @@ vxlan_add_del_tunnel_command_fn (vlib_main_t * vm, * Example of how to delete a VXLAN Tunnel: * @cliexcmd{create vxlan tunnel src 10.0.3.1 dst 10.0.3.3 vni 13 del} ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (create_vxlan_tunnel_command, static) = { .path = "create vxlan tunnel", .short_help = @@ -926,7 +919,6 @@ VLIB_CLI_COMMAND (create_vxlan_tunnel_command, static) = { " [src_port <local-vtep-udp-port>] [dst_port <remote-vtep-udp-port>]", .function = vxlan_add_del_tunnel_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * show_vxlan_tunnel_command_fn (vlib_main_t * vm, @@ -949,12 +941,10 @@ show_vxlan_tunnel_command_fn (vlib_main_t * vm, if (pool_elts (vxm->tunnels) == 0) vlib_cli_output (vm, "No vxlan tunnels configured..."); -/* *INDENT-OFF* */ pool_foreach (t, vxm->tunnels) { vlib_cli_output (vm, "%U", format_vxlan_tunnel, t); } -/* *INDENT-ON* */ if (raw) { @@ -979,13 +969,11 @@ show_vxlan_tunnel_command_fn (vlib_main_t * vm, encap_fib_index 0 sw_if_index 5 decap_next l2 * @cliexend ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_vxlan_tunnel_command, static) = { .path = "show vxlan tunnel", .short_help = "show vxlan tunnel [raw]", .function = show_vxlan_tunnel_command_fn, }; -/* *INDENT-ON* */ void @@ -1119,13 +1107,11 @@ set_ip4_vxlan_bypass (vlib_main_t * vm, * @cliexcmd{set interface ip vxlan-bypass GigabitEthernet2/0/0 del} * @endparblock ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_interface_ip_vxlan_bypass_command, static) = { .path = "set interface ip vxlan-bypass", .function = set_ip4_vxlan_bypass, .short_help = "set interface ip vxlan-bypass <interface> [del]", }; -/* *INDENT-ON* */ static clib_error_t * set_ip6_vxlan_bypass (vlib_main_t * vm, @@ -1176,13 +1162,11 @@ set_ip6_vxlan_bypass (vlib_main_t * vm, * @cliexcmd{set interface ip6 vxlan-bypass GigabitEthernet2/0/0 del} * @endparblock ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_interface_ip6_vxlan_bypass_command, static) = { .path = "set interface ip6 vxlan-bypass", .function = set_ip6_vxlan_bypass, .short_help = "set interface ip6 vxlan-bypass <interface> [del]", }; -/* *INDENT-ON* */ int vnet_vxlan_add_del_rx_flow (u32 hw_if_index, u32 t_index, int is_add) @@ -1297,14 +1281,12 @@ vxlan_offload_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (vxlan_offload_command, static) = { .path = "set flow-offload vxlan", .short_help = "set flow-offload vxlan hw <interface-name> rx <tunnel-name> [del]", .function = vxlan_offload_command_fn, }; -/* *INDENT-ON* */ #define VXLAN_HASH_NUM_BUCKETS (2 * 1024) #define VXLAN_HASH_MEMORY_SIZE (1 << 20) diff --git a/src/plugins/vxlan/vxlan.h b/src/plugins/vxlan/vxlan.h index 72d82e79cf5..ccddedeb279 100644 --- a/src/plugins/vxlan/vxlan.h +++ b/src/plugins/vxlan/vxlan.h @@ -33,7 +33,6 @@ #include <vnet/dpo/dpo.h> #include <vnet/adj/adj_types.h> -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { ip4_header_t ip4; /* 20 bytes */ udp_header_t udp; /* 8 bytes */ @@ -45,7 +44,6 @@ typedef CLIB_PACKED (struct { udp_header_t udp; /* 8 bytes */ vxlan_header_t vxlan; /* 8 bytes */ }) ip6_vxlan_header_t; -/* *INDENT-ON* */ /* * Key fields: remote ip, vni on incoming VXLAN packet diff --git a/src/plugins/wireguard/wireguard.c b/src/plugins/wireguard/wireguard.c index a87f73dc6f2..b1c8bc79870 100644 --- a/src/plugins/wireguard/wireguard.c +++ b/src/plugins/wireguard/wireguard.c @@ -92,7 +92,6 @@ wg_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (wg_init); -/* *INDENT-OFF* */ VNET_FEATURE_INIT (wg4_output_tun, static) = { .arc_name = "ip4-output", @@ -111,7 +110,6 @@ VLIB_PLUGIN_REGISTER () = .version = VPP_BUILD_VER, .description = "Wireguard Protocol", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/wireguard/wireguard_cli.c b/src/plugins/wireguard/wireguard_cli.c index 5fa620507d6..e412fa36c44 100644 --- a/src/plugins/wireguard/wireguard_cli.c +++ b/src/plugins/wireguard/wireguard_cli.c @@ -94,14 +94,12 @@ wg_if_create_cli (vlib_main_t * vm, /*? * Create a Wireguard interface. ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (wg_if_create_command, static) = { .path = "wireguard create", .short_help = "wireguard create listen-port <port> " "private-key <key> src <IP> [generate-key]", .function = wg_if_create_cli, }; -/* *INDENT-ON* */ static clib_error_t * wg_if_delete_cli (vlib_main_t * vm, @@ -143,13 +141,11 @@ wg_if_delete_cli (vlib_main_t * vm, /*? * Delete a Wireguard interface. ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (wg_if_delete_command, static) = { .path = "wireguard delete", .short_help = "wireguard delete <interface>", .function = wg_if_delete_cli, }; -/* *INDENT-ON* */ static clib_error_t * @@ -251,7 +247,6 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (wg_peer_add_command, static) = { .path = "wireguard peer add", .short_help = @@ -260,7 +255,6 @@ VLIB_CLI_COMMAND (wg_peer_add_command, static) = { "dst-port [port_dst] persistent-keepalive [keepalive_interval]", .function = wg_peer_add_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * wg_peer_remove_command_fn (vlib_main_t * vm, @@ -299,14 +293,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (wg_peer_remove_command, static) = { .path = "wireguard peer remove", .short_help = "wireguard peer remove <index>", .function = wg_peer_remove_command_fn, }; -/* *INDENT-ON* */ static walk_rc_t wg_peer_show_one (index_t peeri, void *arg) @@ -325,14 +317,12 @@ wg_show_peer_command_fn (vlib_main_t * vm, return NULL; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (wg_show_peers_command, static) = { .path = "show wireguard peer", .short_help = "show wireguard peer", .function = wg_show_peer_command_fn, }; -/* *INDENT-ON* */ static walk_rc_t wg_if_show_one (index_t itfi, void *arg) @@ -355,7 +345,6 @@ wg_show_if_command_fn (vlib_main_t * vm, return NULL; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (wg_show_itfs_command, static) = { .path = "show wireguard interface", @@ -417,7 +406,6 @@ VLIB_CLI_COMMAND (wg_show_modemode_command, static) = { .function = wg_show_mode_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/wireguard/wireguard_handoff.c b/src/plugins/wireguard/wireguard_handoff.c index 5f3dc14b412..195baf209a0 100644 --- a/src/plugins/wireguard/wireguard_handoff.c +++ b/src/plugins/wireguard/wireguard_handoff.c @@ -183,7 +183,6 @@ VLIB_NODE_FN (wg6_output_tun_handoff) WG_HANDOFF_OUT_TUN); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (wg4_handshake_handoff) = { .name = "wg4-handshake-handoff", @@ -267,7 +266,6 @@ VLIB_REGISTER_NODE (wg6_output_tun_handoff) = [0] = "error-drop", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/wireguard/wireguard_if.c b/src/plugins/wireguard/wireguard_if.c index ee744e7c3e4..afeeda1dd2b 100644 --- a/src/plugins/wireguard/wireguard_if.c +++ b/src/plugins/wireguard/wireguard_if.c @@ -169,7 +169,6 @@ wg_if_update_adj (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai) } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (wg_if_device_class) = { .name = "Wireguard Tunnel", .format_device_name = format_wg_if_name, @@ -181,7 +180,6 @@ VNET_HW_INTERFACE_CLASS(wg_hw_interface_class) = { .update_adjacency = wg_if_update_adj, .flags = VNET_HW_INTERFACE_CLASS_FLAG_NBMA, }; -/* *INDENT-ON* */ /* * Maintain a bitmap of allocated wg_if instance numbers. @@ -272,13 +270,11 @@ wg_if_create (u32 user_instance, if (instance == ~0) return VNET_API_ERROR_INVALID_REGISTRATION; - /* *INDENT-OFF* */ struct noise_upcall upcall = { .u_remote_get = wg_remote_get, .u_index_set = wg_index_set, .u_index_drop = wg_index_drop, }; - /* *INDENT-ON* */ pool_get (noise_local_pool, local); @@ -419,13 +415,11 @@ wg_if_walk (wg_if_walk_cb_t fn, void *data) { index_t wgii; - /* *INDENT-OFF* */ pool_foreach_index (wgii, wg_if_pool) { if (WALK_STOP == fn(wgii, data)) break; } - /* *INDENT-ON* */ } index_t @@ -433,12 +427,10 @@ wg_if_peer_walk (wg_if_t * wgi, wg_if_peer_walk_cb_t fn, void *data) { index_t peeri, val; - /* *INDENT-OFF* */ hash_foreach (peeri, val, wgi->peers, { if (WALK_STOP == fn (peeri, data)) return peeri; }); - /* *INDENT-ON* */ return INDEX_INVALID; } diff --git a/src/plugins/wireguard/wireguard_input.c b/src/plugins/wireguard/wireguard_input.c index cf8a59715dc..1eb7fbfed0b 100644 --- a/src/plugins/wireguard/wireguard_input.c +++ b/src/plugins/wireguard/wireguard_input.c @@ -1207,7 +1207,6 @@ VLIB_NODE_FN (wg6_input_post_node) return wg_input_post (vm, node, from_frame, /* is_ip4 */ 0); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (wg4_input_node) = { .name = "wg4-input", @@ -1270,7 +1269,6 @@ VLIB_REGISTER_NODE (wg6_input_post_node) = { .error_strings = wg_input_error_strings, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/wireguard/wireguard_output_tun.c b/src/plugins/wireguard/wireguard_output_tun.c index a5630811b9d..c9411f6ff20 100644 --- a/src/plugins/wireguard/wireguard_output_tun.c +++ b/src/plugins/wireguard/wireguard_output_tun.c @@ -913,7 +913,6 @@ VLIB_NODE_FN (wg6_output_tun_node) wg_encrypt_async_next.wg6_post_next); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (wg4_output_tun_node) = { .name = "wg4-output-tun", @@ -945,7 +944,6 @@ VLIB_REGISTER_NODE (wg6_output_tun_node) = [WG_OUTPUT_NEXT_ERROR] = "error-drop", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/wireguard/wireguard_peer.c b/src/plugins/wireguard/wireguard_peer.c index 32a92da102b..e71db86de0b 100644 --- a/src/plugins/wireguard/wireguard_peer.c +++ b/src/plugins/wireguard/wireguard_peer.c @@ -125,13 +125,11 @@ wg_peer_adj_stack (wg_peer_t *peer, adj_index_t ai) } else { - /* *INDENT-OFF* */ fib_prefix_t dst = { .fp_len = is_ip4 ? 32 : 128, .fp_proto = fib_proto, .fp_addr = peer->dst.addr, }; - /* *INDENT-ON* */ u32 fib_index; fib_index = fib_table_find (fib_proto, peer->table_id); @@ -457,7 +455,6 @@ wg_peer_add (u32 tun_sw_if_index, const u8 public_key[NOISE_PUBLIC_KEY_LEN], if (!wg_if) return (VNET_API_ERROR_INVALID_SW_IF_INDEX); - /* *INDENT-OFF* */ pool_foreach (peer, wg_peer_pool) { if (!memcmp (peer->remote.r_public, public_key, NOISE_PUBLIC_KEY_LEN)) @@ -465,7 +462,6 @@ wg_peer_add (u32 tun_sw_if_index, const u8 public_key[NOISE_PUBLIC_KEY_LEN], return (VNET_API_ERROR_ENTRY_ALREADY_EXISTS); } } - /* *INDENT-ON* */ if (pool_elts (wg_peer_pool) > MAX_PEERS) return (VNET_API_ERROR_LIMIT_EXCEEDED); @@ -526,13 +522,11 @@ wg_peer_walk (wg_peer_walk_cb_t fn, void *data) { index_t peeri; - /* *INDENT-OFF* */ pool_foreach_index (peeri, wg_peer_pool) { if (WALK_STOP == fn(peeri, data)) return peeri; } - /* *INDENT-ON* */ return INDEX_INVALID; } diff --git a/src/plugins/wireguard/wireguard_timer.c b/src/plugins/wireguard/wireguard_timer.c index 4319d534ffc..237e67c1f06 100644 --- a/src/plugins/wireguard/wireguard_timer.c +++ b/src/plugins/wireguard/wireguard_timer.c @@ -434,14 +434,12 @@ wg_timers_stop (wg_peer_t * peer) } } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (wg_timer_mngr_node, static) = { .function = wg_timer_mngr_fn, .type = VLIB_NODE_TYPE_PROCESS, .name = "wg-timer-manager", }; -/* *INDENT-ON* */ void wg_feature_init (wg_main_t * wmp) |