diff options
Diffstat (limited to 'src/plugins/mactime')
-rw-r--r-- | src/plugins/mactime/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/plugins/mactime/builtins.c | 21 | ||||
-rw-r--r-- | src/plugins/mactime/mactime.c | 24 | ||||
-rw-r--r-- | src/plugins/mactime/mactime_test.c | 2 | ||||
-rw-r--r-- | src/plugins/mactime/mactime_top.c | 22 | ||||
-rw-r--r-- | src/plugins/mactime/node.c | 4 |
6 files changed, 18 insertions, 56 deletions
diff --git a/src/plugins/mactime/CMakeLists.txt b/src/plugins/mactime/CMakeLists.txt index debf033f71e..7111f415f25 100644 --- a/src/plugins/mactime/CMakeLists.txt +++ b/src/plugins/mactime/CMakeLists.txt @@ -38,6 +38,5 @@ if(VPP_BUILD_MACTIME_TOP) svm vppinfra Threads::Threads - rt m dl crypto ) endif() diff --git a/src/plugins/mactime/builtins.c b/src/plugins/mactime/builtins.c index 321502454a2..c487d0375bf 100644 --- a/src/plugins/mactime/builtins.c +++ b/src/plugins/mactime/builtins.c @@ -1,5 +1,4 @@ #include <vnet/vnet.h> -#include <builtinurl/builtinurl.h> #include <http_static/http_static.h> #include <mactime/mactime.h> #include <vlib/unix/plugin.h> @@ -15,9 +14,8 @@ mactime_ip_neighbor_copy (index_t ipni, void *ctx) return (WALK_CONTINUE); } -static int -handle_get_mactime (http_builtin_method_type_t reqtype, - u8 * request, http_session_t * hs) +static hss_url_handler_rc_t +handle_get_mactime (hss_url_handler_args_t *args) { mactime_main_t *mm = &mactime_main; mactime_device_t *dp; @@ -147,21 +145,20 @@ handle_get_mactime (http_builtin_method_type_t reqtype, vec_free (macstring); vec_free (pool_indices); - hs->data = s; - hs->data_offset = 0; - hs->cache_pool_index = ~0; - hs->free_data = 1; - return 0; + args->data = s; + args->data_len = vec_len (s); + args->free_vec_data = 1; + return HSS_URL_HANDLER_OK; } void mactime_url_init (vlib_main_t * vm) { - void (*fp) (void *, char *, int); + hss_register_url_fn fp; /* Look up the builtin URL registration handler */ fp = vlib_get_plugin_symbol ("http_static_plugin.so", - "http_static_server_register_builtin_handler"); + "hss_register_url_handler"); if (fp == 0) { @@ -169,7 +166,7 @@ mactime_url_init (vlib_main_t * vm) return; } - (*fp) (handle_get_mactime, "mactime.json", HTTP_BUILTIN_METHOD_GET); + (*fp) (handle_get_mactime, "mactime.json", HTTP_REQ_GET); } /* diff --git a/src/plugins/mactime/mactime.c b/src/plugins/mactime/mactime.c index b8b1884119d..933e44ea5c1 100644 --- a/src/plugins/mactime/mactime.c +++ b/src/plugins/mactime/mactime.c @@ -28,7 +28,6 @@ #include <mactime/mactime.api_enum.h> #include <mactime/mactime.api_types.h> -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) #define REPLY_MSG_ID_BASE mm->msg_id_base #include <vlibapi/api_helper_macros.h> @@ -141,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", @@ -149,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 @@ -194,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) + @@ -231,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 @@ -429,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) @@ -462,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) @@ -576,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", @@ -637,7 +620,8 @@ show_mactime_command_fn (vlib_main_t * vm, print: vec_reset_length (macstring); - macstring = format (0, "%U", format_mac_address, dp->mac_address); + macstring = + format (macstring, "%U", format_mac_address, dp->mac_address); switch (current_status) { case 0: @@ -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 72d1964f32f..1517ec43e17 100644 --- a/src/plugins/mactime/mactime_top.c +++ b/src/plugins/mactime/mactime_top.c @@ -106,7 +106,6 @@ vl_api_mactime_details_t_handler (vl_api_mactime_details_t * mp) } } -#define vl_print(handle, ...) fformat(handle, __VA_ARGS__) #define vl_endianfun /* define message structures */ #include <mactime/mactime.api.h> #undef vl_endianfun @@ -143,14 +142,11 @@ connect_to_vpp (char *name) if (mm->msg_id_base == (u16) ~ 0) return -1; -#define _(N,n) \ - vl_msg_api_set_handlers((VL_API_##N + mm->msg_id_base), \ - #n, \ - vl_api_##n##_t_handler, \ - vl_noop_handler, \ - vl_api_##n##_t_endian, \ - vl_api_##n##_t_print, \ - sizeof(vl_api_##n##_t), 1); +#define _(N, n) \ + vl_msg_api_set_handlers ((VL_API_##N + mm->msg_id_base), #n, \ + vl_api_##n##_t_handler, vl_api_##n##_t_endian, \ + vl_api_##n##_t_format, sizeof (vl_api_##n##_t), 1, \ + vl_api_##n##_t_tojson, vl_api_##n##_t_fromjson); foreach_mactime_api_msg; #undef _ @@ -189,18 +185,16 @@ scrape_stats_segment (mt_main_t * mm) mactime_device_t *dev; stat_segment_access_t sa; stat_client_main_t *sm = mm->stat_client_main; - stat_segment_directory_entry_t *ep; + vlib_stats_entry_t *ep; int need_update2 = 0; static u32 *pool_indices; 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) @@ -443,13 +437,11 @@ print_device_table (mt_main_t * mm) { mactime_device_t *dev; - fformat (stdout, "%U", format_device, 0 /* header */ , 0 /* verbose */ ); - /* *INDENT-OFF* */ + fformat (stdout, "%U", format_device, NULL /* header */, 0 /* verbose */); 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 |