From c3148b1be8f519c80c4417c21b978dfef72b351b Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Tue, 12 Mar 2024 17:42:49 +0100 Subject: misc: remove GNU Indent directives Type: refactor Change-Id: I5235bf3e9aff58af6ba2c14e8c6529c4fc9ec86c Signed-off-by: Damjan Marion --- src/plugins/wireguard/wireguard.c | 2 -- src/plugins/wireguard/wireguard_cli.c | 12 ------------ src/plugins/wireguard/wireguard_handoff.c | 2 -- src/plugins/wireguard/wireguard_if.c | 8 -------- src/plugins/wireguard/wireguard_input.c | 2 -- src/plugins/wireguard/wireguard_output_tun.c | 2 -- src/plugins/wireguard/wireguard_peer.c | 6 ------ src/plugins/wireguard/wireguard_timer.c | 2 -- 8 files changed, 36 deletions(-) (limited to 'src/plugins/wireguard') 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 " "private-key src [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 ", .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 ", .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) -- cgit 1.2.3-korg