From 8fc5631ef6d9cec462904203a5bb27cf5f1f7328 Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Tue, 30 May 2023 21:27:49 +0200 Subject: [PATCH] Run clang-format on all files. --- lcpng.c | 12 ++++-- lcpng.h | 10 ++--- lcpng_adj.c | 16 ++++---- lcpng_if.api | 41 +++++++++++-------- lcpng_if_api.c | 8 ++-- lcpng_if_cli.c | 82 +++++++++++++++++++------------------ lcpng_if_node.c | 102 +++++++++++++++++++++++----------------------- lcpng_if_sync.c | 9 ++-- lcpng_interface.c | 91 ++++++++++++++++++++++++----------------- lcpng_netlink.c | 2 +- lcpng_nl_sync.c | 2 +- 11 files changed, 204 insertions(+), 171 deletions(-) diff --git a/lcpng.c b/lcpng.c index 6432dd0..3b102b5 100644 --- a/lcpng.c +++ b/lcpng.c @@ -23,7 +23,9 @@ lcp_main_t lcp_main; -u8 *lcp_get_default_ns(void) { +u8 * +lcp_get_default_ns (void) +{ lcp_main_t *lcpm = &lcp_main; if (!lcpm->default_namespace || lcpm->default_namespace[0] == 0) @@ -31,7 +33,9 @@ u8 *lcp_get_default_ns(void) { return lcpm->default_namespace; } -int lcp_get_default_ns_fd(void) { +int +lcp_get_default_ns_fd (void) +{ lcp_main_t *lcpm = &lcp_main; return lcpm->default_ns_fd; @@ -40,7 +44,9 @@ int lcp_get_default_ns_fd(void) { /* * ns is expected to be or look like a NUL-terminated C string. */ -int lcp_set_default_ns(u8 *ns) { +int +lcp_set_default_ns (u8 *ns) +{ lcp_main_t *lcpm = &lcp_main; char *p; int len; diff --git a/lcpng.h b/lcpng.h index 8917db3..cf51411 100644 --- a/lcpng.h +++ b/lcpng.h @@ -21,8 +21,8 @@ typedef struct lcp_main_s { - u16 msg_id_base; /* API message ID base */ - u8 *default_namespace; /* default namespace if set */ + u16 msg_id_base; /* API message ID base */ + u8 *default_namespace; /* default namespace if set */ int default_ns_fd; u8 lcp_auto_subint; /* Automatically create/delete LCP sub-interfaces */ u8 lcp_sync; /* Automatically sync VPP changes to LCP */ @@ -35,9 +35,9 @@ extern lcp_main_t lcp_main; /** * Get/Set the default namespace for LCP host taps. */ -int lcp_set_default_ns(u8 *ns); -u8 *lcp_get_default_ns(void); /* Returns NULL or shared string */ -int lcp_get_default_ns_fd(void); +int lcp_set_default_ns (u8 *ns); +u8 *lcp_get_default_ns (void); /* Returns NULL or shared string */ +int lcp_get_default_ns_fd (void); /* * Sync state from VPP into all LCP devices diff --git a/lcpng_adj.c b/lcpng_adj.c index 0b8aa77..2d7bf6c 100644 --- a/lcpng_adj.c +++ b/lcpng_adj.c @@ -185,17 +185,17 @@ lcp_adj_show_cmd (vlib_main_t *vm, unformat_input_t *input, if (unformat (input, "verbose")) verbose = 1; - vlib_cli_output(vm, "lcp Adjs:\n%U", BV(format_bihash), &lcp_adj_tbl, - verbose); + vlib_cli_output (vm, "lcp Adjs:\n%U", BV (format_bihash), &lcp_adj_tbl, + verbose); return 0; } -VLIB_CLI_COMMAND(lcp_itf_pair_show_cmd_node, static) = { - .path = "show lcp adj", - .function = lcp_adj_show_cmd, - .short_help = "show lcp adj", - .is_mp_safe = 1, +VLIB_CLI_COMMAND (lcp_itf_pair_show_cmd_node, static) = { + .path = "show lcp adj", + .function = lcp_adj_show_cmd, + .short_help = "show lcp adj", + .is_mp_safe = 1, }; const adj_delegate_vft_t lcp_adj_vft = { @@ -210,7 +210,7 @@ lcp_adj_init (vlib_main_t *vm) { adj_type = adj_delegate_register_new_type (&lcp_adj_vft); - BV(clib_bihash_init)(&lcp_adj_tbl, "lcp ADJ table", 1024, 1 << 24); + BV (clib_bihash_init) (&lcp_adj_tbl, "lcp ADJ table", 1024, 1 << 24); BV (clib_bihash_set_kvp_format_fn) (&lcp_adj_tbl, format_lcp_adj_kvp); return (NULL); diff --git a/lcpng_if.api b/lcpng_if.api index 059ce64..ddd299b 100644 --- a/lcpng_if.api +++ b/lcpng_if.api @@ -30,7 +30,7 @@ autoreply define lcp_default_ns_set { u32 client_index; u32 context; - string netns[32]; /* LCP_NS_LEN */ + string netns[32]; /* LCP_NS_LEN */ }; /** \brief get the default Linux Control Plane netns @@ -51,7 +51,7 @@ define lcp_default_ns_get define lcp_default_ns_get_reply { u32 context; - string netns[32]; /* LCP_NS_LEN */ + string netns[32]; /* LCP_NS_LEN */ }; enum lcp_itf_host_type : u8 @@ -75,9 +75,9 @@ autoreply autoendian define lcp_itf_pair_add_del u32 context; bool is_add; vl_api_interface_index_t sw_if_index; - string host_if_name[16]; /* IFNAMSIZ */ + string host_if_name[16]; /* IFNAMSIZ */ vl_api_lcp_itf_host_type_t host_if_type; - string netns[32]; /* LCP_NS_LEN */ + string netns[32]; /* LCP_NS_LEN */ }; autoendian define lcp_itf_pair_add_del_v2 { @@ -85,9 +85,9 @@ autoendian define lcp_itf_pair_add_del_v2 u32 context; bool is_add; vl_api_interface_index_t sw_if_index; - string host_if_name[16]; /* IFNAMSIZ */ + string host_if_name[16]; /* IFNAMSIZ */ vl_api_lcp_itf_host_type_t host_if_type; - string netns[32]; /* LCP_NS_LEN */ + string netns[32]; /* LCP_NS_LEN */ }; define lcp_itf_pair_add_del_v2_reply { @@ -129,14 +129,15 @@ autoendian define lcp_itf_pair_details vl_api_interface_index_t phy_sw_if_index; vl_api_interface_index_t host_sw_if_index; u32 vif_index; - string host_if_name[16]; /* IFNAMSIZ */ + string host_if_name[16]; /* IFNAMSIZ */ vl_api_lcp_itf_host_type_t host_if_type; - string netns[32]; /* LCP_NS_LEN */ + string netns[32]; /* LCP_NS_LEN */ }; -service { - rpc lcp_itf_pair_get returns lcp_itf_pair_get_reply - stream lcp_itf_pair_details; +service +{ + rpc lcp_itf_pair_get returns lcp_itf_pair_get_reply stream + lcp_itf_pair_details; }; /** \brief Replace end/begin @@ -155,14 +156,17 @@ autoreply define lcp_itf_pair_replace_end /* * Linux-CP Error counters/messages */ -counters linuxcp { - packets { +counters linuxcp +{ + packets + { severity info; type counter64; units "packets"; description "ARP packets processed"; }; - copies { + copies + { severity info; type counter64; units "packets"; @@ -170,9 +174,12 @@ counters linuxcp { }; }; -paths { - "/err/linux-cp-arp-phy" "linuxcp"; - "/err/linux-cp-arp-host" "linuxcp"; +paths +{ + "/err/linux-cp-arp-phy" + "linuxcp"; + "/err/linux-cp-arp-host" + "linuxcp"; }; /* diff --git a/lcpng_if_api.c b/lcpng_if_api.c index 747cbee..58c46f6 100644 --- a/lcpng_if_api.c +++ b/lcpng_if_api.c @@ -162,18 +162,20 @@ vl_api_lcp_itf_pair_get_t_handler (vl_api_lcp_itf_pair_get_t *mp) } static void -vl_api_lcp_default_ns_set_t_handler(vl_api_lcp_default_ns_set_t *mp) { +vl_api_lcp_default_ns_set_t_handler (vl_api_lcp_default_ns_set_t *mp) +{ vl_api_lcp_default_ns_set_reply_t *rmp; int rv; mp->netns[LCP_NS_LEN - 1] = 0; rv = lcp_set_default_ns (mp->netns); - REPLY_MACRO(VL_API_LCP_DEFAULT_NS_SET_REPLY); + REPLY_MACRO (VL_API_LCP_DEFAULT_NS_SET_REPLY); } static void -vl_api_lcp_default_ns_get_t_handler(vl_api_lcp_default_ns_get_t *mp) { +vl_api_lcp_default_ns_get_t_handler (vl_api_lcp_default_ns_get_t *mp) +{ vl_api_lcp_default_ns_get_reply_t *rmp; vl_api_registration_t *reg; char *ns; diff --git a/lcpng_if_cli.c b/lcpng_if_cli.c index d237092..beab982 100644 --- a/lcpng_if_cli.c +++ b/lcpng_if_cli.c @@ -99,16 +99,16 @@ lcp_itf_pair_create_command_fn (vlib_main_t *vm, unformat_input_t *input, vec_free (ns); if (r) - return clib_error_return(0, "lcp pair creation failed (%d)", r); + return clib_error_return (0, "lcp pair creation failed (%d)", r); return 0; } -VLIB_CLI_COMMAND(lcp_itf_pair_create_command, static) = { - .path = "lcp create", - .short_help = "lcp create | host-if " - "netns [tun]", - .function = lcp_itf_pair_create_command_fn, +VLIB_CLI_COMMAND (lcp_itf_pair_create_command, static) = { + .path = "lcp create", + .short_help = "lcp create | host-if " + "netns [tun]", + .function = lcp_itf_pair_create_command_fn, }; static clib_error_t * @@ -173,39 +173,41 @@ VLIB_CLI_COMMAND (lcp_auto_subint_command, static) = { .function = lcp_auto_subint_command_fn, }; -static clib_error_t *lcp_default_netns_command_fn(vlib_main_t *vm, - unformat_input_t *input, - vlib_cli_command_t *cmd) { +static clib_error_t * +lcp_default_netns_command_fn (vlib_main_t *vm, unformat_input_t *input, + vlib_cli_command_t *cmd) +{ unformat_input_t _line_input, *line_input = &_line_input; u8 *ns; int r; clib_error_t *error = NULL; - if (!unformat_user(input, unformat_line_input, line_input)) + if (!unformat_user (input, unformat_line_input, line_input)) return 0; ns = 0; - while (unformat_check_input(line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat(line_input, "netns %s", &ns)) - ; - else if (unformat(line_input, "clear netns")) - ; - else - { - vec_free (ns); - error = clib_error_return (0, "unknown input `%U'", - format_unformat_error, line_input); - goto done; - } - } + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "netns %s", &ns)) + ; + else if (unformat (line_input, "clear netns")) + ; + else + { + vec_free (ns); + error = clib_error_return (0, "unknown input `%U'", + format_unformat_error, line_input); + goto done; + } + } - vlib_cli_output(vm, "lcp set default netns %v\n", ns); + vlib_cli_output (vm, "lcp set default netns %v\n", ns); - r = lcp_set_default_ns(ns); + r = lcp_set_default_ns (ns); if (r) - return clib_error_return(0, "linux-cp set default netns failed (%d)", r); + return clib_error_return (0, "linux-cp set default netns failed (%d)", r); done: unformat_free (line_input); @@ -213,10 +215,10 @@ done: return error; } -VLIB_CLI_COMMAND(lcp_default_netns_command, static) = { - .path = "lcp default", - .short_help = "lcp default netns []", - .function = lcp_default_netns_command_fn, +VLIB_CLI_COMMAND (lcp_default_netns_command, static) = { + .path = "lcp default", + .short_help = "lcp default netns []", + .function = lcp_default_netns_command_fn, }; static clib_error_t * @@ -253,14 +255,14 @@ lcp_itf_pair_delete_command_fn (vlib_main_t *vm, unformat_input_t *input, r = lcp_itf_pair_delete (sw_if_index); if (r) - return clib_error_return(0, "lcp pair deletion failed (%d)", r); + return clib_error_return (0, "lcp pair deletion failed (%d)", r); return 0; } -VLIB_CLI_COMMAND(lcp_itf_pair_delete_command, static) = { - .path = "lcp delete", - .short_help = "lcp delete |", - .function = lcp_itf_pair_delete_command_fn, +VLIB_CLI_COMMAND (lcp_itf_pair_delete_command, static) = { + .path = "lcp delete", + .short_help = "lcp delete |", + .function = lcp_itf_pair_delete_command_fn, }; static clib_error_t * @@ -287,11 +289,11 @@ lcp_itf_pair_show_cmd (vlib_main_t *vm, unformat_input_t *input, return 0; } -VLIB_CLI_COMMAND(lcp_itf_pair_show_cmd_node, static) = { - .path = "show lcp", - .function = lcp_itf_pair_show_cmd, - .short_help = "show lcp [phy ]", - .is_mp_safe = 1, +VLIB_CLI_COMMAND (lcp_itf_pair_show_cmd_node, static) = { + .path = "show lcp", + .function = lcp_itf_pair_show_cmd, + .short_help = "show lcp [phy ]", + .is_mp_safe = 1, }; clib_error_t * diff --git a/lcpng_if_node.c b/lcpng_if_node.c index 1095576..80417e6 100644 --- a/lcpng_if_node.c +++ b/lcpng_if_node.c @@ -181,7 +181,7 @@ format_lcp_punt_l3_trace (u8 *s, va_list *args) CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); lcp_punt_l3_trace_t *t = va_arg (*args, lcp_punt_l3_trace_t *); - s = format(s, "linux-cp-punt-l3: %u", t->phy_sw_if_index); + s = format (s, "linux-cp-punt-l3: %u", t->phy_sw_if_index); return s; } @@ -261,16 +261,16 @@ VLIB_REGISTER_NODE(lcp_punt_l3_node) = { }, }; -VNET_FEATURE_INIT(lcp_punt_l3_ip4, static) = { - .arc_name = "ip4-punt", - .node_name = "linux-cp-punt-l3", - .runs_before = VNET_FEATURES("ip4-punt-redirect"), +VNET_FEATURE_INIT (lcp_punt_l3_ip4, static) = { + .arc_name = "ip4-punt", + .node_name = "linux-cp-punt-l3", + .runs_before = VNET_FEATURES ("ip4-punt-redirect"), }; -VNET_FEATURE_INIT(lip_punt_l3_ip6, static) = { - .arc_name = "ip6-punt", - .node_name = "linux-cp-punt-l3", - .runs_before = VNET_FEATURES("ip6-punt-redirect"), +VNET_FEATURE_INIT (lip_punt_l3_ip6, static) = { + .arc_name = "ip6-punt", + .node_name = "linux-cp-punt-l3", + .runs_before = VNET_FEATURES ("ip6-punt-redirect"), }; #define foreach_lcp_xc \ @@ -408,34 +408,34 @@ VLIB_NODE_FN (lcp_xc_ip6) return (lcp_xc_inline (vm, node, frame, AF_IP6)); } -VLIB_REGISTER_NODE(lcp_xc_ip4) = {.name = "linux-cp-xc-ip4", - .vector_size = sizeof(u32), - .format_trace = format_lcp_xc_trace, - .type = VLIB_NODE_TYPE_INTERNAL, - .sibling_of = "ip4-rewrite"}; +VLIB_REGISTER_NODE (lcp_xc_ip4) = { .name = "linux-cp-xc-ip4", + .vector_size = sizeof (u32), + .format_trace = format_lcp_xc_trace, + .type = VLIB_NODE_TYPE_INTERNAL, + .sibling_of = "ip4-rewrite" }; -VNET_FEATURE_INIT(lcp_xc_ip4_ucast_node, static) = { - .arc_name = "ip4-unicast", - .node_name = "linux-cp-xc-ip4", +VNET_FEATURE_INIT (lcp_xc_ip4_ucast_node, static) = { + .arc_name = "ip4-unicast", + .node_name = "linux-cp-xc-ip4", }; -VNET_FEATURE_INIT(lcp_xc_ip4_mcast_node, static) = { - .arc_name = "ip4-multicast", - .node_name = "linux-cp-xc-ip4", +VNET_FEATURE_INIT (lcp_xc_ip4_mcast_node, static) = { + .arc_name = "ip4-multicast", + .node_name = "linux-cp-xc-ip4", }; -VLIB_REGISTER_NODE(lcp_xc_ip6) = {.name = "linux-cp-xc-ip6", - .vector_size = sizeof(u32), - .format_trace = format_lcp_xc_trace, - .type = VLIB_NODE_TYPE_INTERNAL, - .sibling_of = "ip6-rewrite"}; +VLIB_REGISTER_NODE (lcp_xc_ip6) = { .name = "linux-cp-xc-ip6", + .vector_size = sizeof (u32), + .format_trace = format_lcp_xc_trace, + .type = VLIB_NODE_TYPE_INTERNAL, + .sibling_of = "ip6-rewrite" }; -VNET_FEATURE_INIT(lcp_xc_ip6_ucast_node, static) = { - .arc_name = "ip6-unicast", - .node_name = "linux-cp-xc-ip6", +VNET_FEATURE_INIT (lcp_xc_ip6_ucast_node, static) = { + .arc_name = "ip6-unicast", + .node_name = "linux-cp-xc-ip6", }; -VNET_FEATURE_INIT(lcp_xc_ip6_mcast_node, static) = { - .arc_name = "ip6-multicast", - .node_name = "linux-cp-xc-ip6", +VNET_FEATURE_INIT (lcp_xc_ip6_mcast_node, static) = { + .arc_name = "ip6-multicast", + .node_name = "linux-cp-xc-ip6", }; typedef enum @@ -557,14 +557,14 @@ VLIB_REGISTER_NODE(lcp_xc_l3_ip4_node) = { }, }; -VNET_FEATURE_INIT(lcp_xc_node_l3_ip4_unicast, static) = { - .arc_name = "ip4-unicast", - .node_name = "linux-cp-xc-l3-ip4", +VNET_FEATURE_INIT (lcp_xc_node_l3_ip4_unicast, static) = { + .arc_name = "ip4-unicast", + .node_name = "linux-cp-xc-l3-ip4", }; -VNET_FEATURE_INIT(lcp_xc_node_l3_ip4_multicaast, static) = { - .arc_name = "ip4-multicast", - .node_name = "linux-cp-xc-l3-ip4", +VNET_FEATURE_INIT (lcp_xc_node_l3_ip4_multicaast, static) = { + .arc_name = "ip4-multicast", + .node_name = "linux-cp-xc-l3-ip4", }; VLIB_REGISTER_NODE(lcp_xc_l3_ip6_node) = { @@ -581,14 +581,14 @@ VLIB_REGISTER_NODE(lcp_xc_l3_ip6_node) = { }, }; -VNET_FEATURE_INIT(lcp_xc_node_l3_ip6_unicast, static) = { - .arc_name = "ip6-unicast", - .node_name = "linux-cp-xc-l3-ip6", +VNET_FEATURE_INIT (lcp_xc_node_l3_ip6_unicast, static) = { + .arc_name = "ip6-unicast", + .node_name = "linux-cp-xc-l3-ip6", }; -VNET_FEATURE_INIT(lcp_xc_node_l3_ip6_multicast, static) = { - .arc_name = "ip6-multicast", - .node_name = "linux-cp-xc-l3-ip6", +VNET_FEATURE_INIT (lcp_xc_node_l3_ip6_multicast, static) = { + .arc_name = "ip6-multicast", + .node_name = "linux-cp-xc-l3-ip6", }; #define foreach_lcp_arp \ @@ -850,10 +850,10 @@ VLIB_REGISTER_NODE(lcp_arp_phy_node) = { }, }; -VNET_FEATURE_INIT(lcp_arp_phy_arp_feat, static) = { - .arc_name = "arp", - .node_name = "linux-cp-arp-phy", - .runs_before = VNET_FEATURES("arp-reply"), +VNET_FEATURE_INIT (lcp_arp_phy_arp_feat, static) = { + .arc_name = "arp", + .node_name = "linux-cp-arp-phy", + .runs_before = VNET_FEATURES ("arp-reply"), }; /** @@ -935,10 +935,10 @@ VLIB_REGISTER_NODE(lcp_arp_host_node) = { }, }; -VNET_FEATURE_INIT(lcp_arp_host_arp_feat, static) = { - .arc_name = "arp", - .node_name = "linux-cp-arp-host", - .runs_before = VNET_FEATURES("arp-reply"), +VNET_FEATURE_INIT (lcp_arp_host_arp_feat, static) = { + .arc_name = "arp", + .node_name = "linux-cp-arp-host", + .runs_before = VNET_FEATURES ("arp-reply"), }; /* diff --git a/lcpng_if_sync.c b/lcpng_if_sync.c index 4d84570..43bbb0a 100644 --- a/lcpng_if_sync.c +++ b/lcpng_if_sync.c @@ -170,7 +170,7 @@ lcp_itf_pair_sync_state_hw (vnet_hw_interface_t *hi) } static clib_error_t * -lcp_itf_admin_state_change (vnet_main_t * vnm, u32 sw_if_index, u32 flags) +lcp_itf_admin_state_change (vnet_main_t *vnm, u32 sw_if_index, u32 flags) { lcp_itf_pair_t *lip; vnet_hw_interface_t *hi; @@ -184,7 +184,8 @@ lcp_itf_admin_state_change (vnet_main_t * vnm, u32 sw_if_index, u32 flags) // Sync interface state changes into host lip = lcp_itf_pair_get (lcp_itf_pair_find_by_phy (sw_if_index)); - if (!lip) return NULL; + if (!lip) + return NULL; LCP_IF_INFO ("admin_state_change: %U flags %u", format_lcp_itf_pair, lip, flags); @@ -213,9 +214,9 @@ lcp_itf_admin_state_change (vnet_main_t * vnm, u32 sw_if_index, u32 flags) lcp_itf_pair_sync_state_hw (hi); return NULL; -} +} -VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION(lcp_itf_admin_state_change); +VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (lcp_itf_admin_state_change); static clib_error_t * lcp_itf_mtu_change (vnet_main_t *vnm, u32 sw_if_index, u32 flags) diff --git a/lcpng_interface.c b/lcpng_interface.c index c910743..dd9cba6 100644 --- a/lcpng_interface.c +++ b/lcpng_interface.c @@ -128,7 +128,7 @@ lcp_itf_pair_show (u32 phy_sw_if_index) index_t api; vm = vlib_get_main (); - ns = lcp_get_default_ns(); + ns = lcp_get_default_ns (); vlib_cli_output (vm, "lcp default netns %v\n", ns); vlib_cli_output (vm, "lcp lcp-auto-subint %s\n", lcp_auto_subint () ? "on" : "off"); @@ -149,8 +149,10 @@ lcp_itf_pair_show (u32 phy_sw_if_index) lcp_itf_pair_t * lcp_itf_pair_get (u32 index) { - if (!lcp_itf_pair_pool) return NULL; - if (index == INDEX_INVALID) return NULL; + if (!lcp_itf_pair_pool) + return NULL; + if (index == INDEX_INVALID) + return NULL; return pool_elt_at_index (lcp_itf_pair_pool, index); } @@ -230,15 +232,17 @@ lcp_itf_pair_add (u32 host_sw_if_index, u32 phy_sw_if_index, u8 *host_name, if (lipi != INDEX_INVALID) return VNET_API_ERROR_VALUE_EXIST; - if (host_sw_if_index == ~0) { + if (host_sw_if_index == ~0) + { LCP_IF_ERROR ("pair_add: Cannot add LIP - invalid host"); return VNET_API_ERROR_INVALID_SW_IF_INDEX; - } + } - if (phy_sw_if_index == ~0) { + if (phy_sw_if_index == ~0) + { LCP_IF_ERROR ("pair_add: Cannot add LIP - invalid phy"); return VNET_API_ERROR_INVALID_SW_IF_INDEX; - } + } LCP_IF_NOTICE ( "pair_add: Adding LIP for host:%U phy:%U host_if:%v vif:%d netns:%v", @@ -304,10 +308,10 @@ lcp_itf_pair_add (u32 host_sw_if_index, u32 phy_sw_if_index, u8 *host_name, /* enable ARP feature node for broadcast interfaces */ if (lip->lip_host_type != LCP_ITF_HOST_TUN) { - vnet_feature_enable_disable("arp", "linux-cp-arp-phy", - lip->lip_phy_sw_if_index, 1, NULL, 0); - vnet_feature_enable_disable("arp", "linux-cp-arp-host", - lip->lip_host_sw_if_index, 1, NULL, 0); + vnet_feature_enable_disable ("arp", "linux-cp-arp-phy", + lip->lip_phy_sw_if_index, 1, NULL, 0); + vnet_feature_enable_disable ("arp", "linux-cp-arp-host", + lip->lip_host_sw_if_index, 1, NULL, 0); } else { @@ -343,11 +347,12 @@ lcp_netlink_add_link_vlan (int parent, u32 vlan, u16 proto, const char *name) int err; sk = nl_socket_alloc (); - if ((err = nl_connect (sk, NETLINK_ROUTE)) < 0) { + if ((err = nl_connect (sk, NETLINK_ROUTE)) < 0) + { LCP_IF_ERROR ("netlink_add_link_vlan: Netlink connect error: %s", nl_geterror (err)); return clib_error_return (NULL, "Unable to connect socket: %d", err); - } + } link = rtnl_link_vlan_alloc (); @@ -356,11 +361,12 @@ lcp_netlink_add_link_vlan (int parent, u32 vlan, u16 proto, const char *name) rtnl_link_vlan_set_id (link, vlan); rtnl_link_vlan_set_protocol (link, htons (proto)); - if ((err = rtnl_link_add (sk, link, NLM_F_CREATE)) < 0) { + if ((err = rtnl_link_add (sk, link, NLM_F_CREATE)) < 0) + { LCP_IF_ERROR ("netlink_add_link_vlan: Netlink link add error: %s", nl_geterror (err)); return clib_error_return (NULL, "Unable to add link %s: %d", name, err); - } + } rtnl_link_put (link); nl_close (sk); @@ -432,10 +438,10 @@ lcp_itf_pair_del (u32 phy_sw_if_index) /* disable ARP feature node for broadcast interfaces */ if (lip->lip_host_type != LCP_ITF_HOST_TUN) { - vnet_feature_enable_disable("arp", "linux-cp-arp-phy", - lip->lip_phy_sw_if_index, 0, NULL, 0); - vnet_feature_enable_disable("arp", "linux-cp-arp-host", - lip->lip_host_sw_if_index, 0, NULL, 0); + vnet_feature_enable_disable ("arp", "linux-cp-arp-phy", + lip->lip_phy_sw_if_index, 0, NULL, 0); + vnet_feature_enable_disable ("arp", "linux-cp-arp-host", + lip->lip_host_sw_if_index, 0, NULL, 0); } else { @@ -611,7 +617,8 @@ lcp_itf_set_link_state (const lcp_itf_pair_t *lip, u8 state) vnet_main_t *vnm = vnet_get_main (); int curr_ns_fd, vif_ns_fd; - if (!lip) return; + if (!lip) + return; curr_ns_fd = vif_ns_fd = -1; @@ -769,37 +776,41 @@ lcp_itf_pair_create (u32 phy_sw_if_index, u8 *host_if_name, const vnet_hw_interface_t *hw; lcp_itf_pair_t *lip; - if (!vnet_sw_if_index_is_api_valid (phy_sw_if_index)) { + if (!vnet_sw_if_index_is_api_valid (phy_sw_if_index)) + { LCP_IF_ERROR ("pair_create: Invalid phy index %u", phy_sw_if_index); return VNET_API_ERROR_INVALID_SW_IF_INDEX; - } + } - if (!lcp_validate_if_name (host_if_name)) { + if (!lcp_validate_if_name (host_if_name)) + { LCP_IF_ERROR ("pair_create: Invalid host-if-name '%s'", host_if_name); return VNET_API_ERROR_INVALID_ARGUMENT; - } + } vnm = vnet_get_main (); sw = vnet_get_sw_interface (vnm, phy_sw_if_index); hw = vnet_get_sup_hw_interface (vnm, phy_sw_if_index); - if (!sw && !hw) { + if (!sw && !hw) + { LCP_IF_ERROR ("pair_create: Invalid interface"); return VNET_API_ERROR_INVALID_SW_IF_INDEX; - } + } if (hw->hw_class_index != ethernet_hw_interface_class.index && - host_if_type == LCP_ITF_HOST_TAP) { + host_if_type == LCP_ITF_HOST_TAP) + { LCP_IF_ERROR ( "pair_create: don't create TAP for non-eth interface; use tun"); return VNET_API_ERROR_INVALID_ARGUMENT; - } + } /* * Use interface-specific netns if supplied. * Otherwise, use netns if defined, otherwise use the OS default. */ if (ns == 0 || ns[0] == 0) - ns = lcp_get_default_ns(); + ns = lcp_get_default_ns (); /* sub interfaces do not need a tap created */ if (vnet_sw_interface_is_sub (vnm, phy_sw_if_index)) @@ -812,16 +823,19 @@ lcp_itf_pair_create (u32 phy_sw_if_index, u8 *host_if_name, u16 vlan, proto; u32 parent_vif_index; - if (sw->type == VNET_SW_INTERFACE_TYPE_SUB && sw->sub.eth.flags.exact_match == 0) { + if (sw->type == VNET_SW_INTERFACE_TYPE_SUB && + sw->sub.eth.flags.exact_match == 0) + { LCP_IF_ERROR ("pair_create: Cannot create LIP for a " "sub-interface without exact-match set"); return VNET_API_ERROR_INVALID_ARGUMENT; - } + } outer_vlan = sw->sub.eth.outer_vlan_id; inner_vlan = sw->sub.eth.inner_vlan_id; outer_proto = inner_proto = ETH_P_8021Q; - if (1 == sw->sub.eth.flags.dot1ad) outer_proto = ETH_P_8021AD; + if (1 == sw->sub.eth.flags.dot1ad) + outer_proto = ETH_P_8021AD; LCP_IF_INFO ("pair_create: creating dot1%s %d inner-dot1q %d on %U", sw->sub.eth.flags.dot1ad ? "ad" : "q", outer_vlan, @@ -891,7 +905,7 @@ lcp_itf_pair_create (u32 phy_sw_if_index, u8 *host_if_name, "vlan %d proto %s on %U", outer_vlan, outer_proto == ETH_P_8021AD ? "dot1ad" : - "dot1q", + "dot1q", format_vnet_sw_if_index_name, vnet_get_main (), hw->sw_if_index); return VNET_API_ERROR_INVALID_SW_IF_INDEX; @@ -916,13 +930,14 @@ lcp_itf_pair_create (u32 phy_sw_if_index, u8 *host_if_name, err = lcp_netlink_add_link_vlan (parent_vif_index, vlan, proto, (const char *) host_if_name); - if (err != 0) { + if (err != 0) + { LCP_IF_ERROR ("pair_create: Cannot create link " "outer(proto:0x%04x,vlan:%u).inner(proto:0x%" "04x,vlan:%u) name:'%s'", outer_proto, outer_vlan, inner_proto, inner_vlan, host_if_name); - } + } if (!err) vif_index = if_nametoindex ((char *) host_if_name); @@ -1190,12 +1205,12 @@ VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION (lcp_itf_pair_link_up_down); static clib_error_t * lcp_itf_pair_init (vlib_main_t *vm) { - vlib_punt_hdl_t punt_hdl = vlib_punt_client_register("linux-cp"); + vlib_punt_hdl_t punt_hdl = vlib_punt_client_register ("linux-cp"); lcp_itf_pair_logger = vlib_log_register_class ("linux-cp", "if"); /* punt IKE */ - vlib_punt_register(punt_hdl, ipsec_punt_reason[IPSEC_PUNT_IP4_SPI_UDP_0], - "linux-cp-punt"); + vlib_punt_register (punt_hdl, ipsec_punt_reason[IPSEC_PUNT_IP4_SPI_UDP_0], + "linux-cp-punt"); /* punt all unknown ports */ udp_punt_unknown (vm, 0, 1); diff --git a/lcpng_netlink.c b/lcpng_netlink.c index 00fc86b..bd4ec1f 100644 --- a/lcpng_netlink.c +++ b/lcpng_netlink.c @@ -408,7 +408,7 @@ lcp_nl_pair_add_cb (lcp_itf_pair_t *lip) nm->nl_ns.clib_file_lcp_refcnt); if ((nm->nl_ns.clib_file_lcp_refcnt > 0) && - vec_cmp(nm->nl_ns.netns_name, lip->lip_namespace)) + vec_cmp (nm->nl_ns.netns_name, lip->lip_namespace)) { LCP_NL_WARN ( "pair_add_cb: Existing netlink listener for netns %v -- this " diff --git a/lcpng_nl_sync.c b/lcpng_nl_sync.c index 52d532d..6496e24 100644 --- a/lcpng_nl_sync.c +++ b/lcpng_nl_sync.c @@ -461,7 +461,7 @@ lcp_nl_route_add (struct rtnl_route *rr, int is_replace) uint8_t rtype, rproto; LCP_NL_DBG ("route_add: netlink %U %s", format_nl_object, rr, - is_replace?"replace":""); + is_replace ? "replace" : ""); rtype = rtnl_route_get_type (rr); table_id = rtnl_route_get_table (rr);