X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fflowprobe%2Fflowprobe.c;h=93d380110a11c55ed1006163b77ba373b8af6818;hb=3013e6988;hp=8975f89cddf6e62d700b5d73da01ba9b7a777543;hpb=5c749734b14c2d3be8689b0c5b72ae8d1ddec099;p=vpp.git diff --git a/src/plugins/flowprobe/flowprobe.c b/src/plugins/flowprobe/flowprobe.c index 8975f89cddf..93d380110a1 100644 --- a/src/plugins/flowprobe/flowprobe.c +++ b/src/plugins/flowprobe/flowprobe.c @@ -30,38 +30,16 @@ #include #include -#include /* define message IDs */ -#include - -/* define message structures */ -#define vl_typedefs -#include -#undef vl_typedefs - -/* define generated endian-swappers */ -#define vl_endianfun -#include -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define vl_printfun -#include -#undef vl_printfun +#include +#include flowprobe_main_t flowprobe_main; -vlib_node_registration_t flowprobe_walker_node; static vlib_node_registration_t flowprobe_timer_node; uword flowprobe_walker_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f); -/* Get the API version number */ -#define vl_api_version(n,v) static u32 api_version=(v); -#include -#undef vl_api_version - #define REPLY_MSG_ID_BASE fm->msg_id_base #include @@ -90,6 +68,7 @@ VNET_FEATURE_INIT (flow_perpacket_l2, static) = /* *INDENT-ON* */ /* Macro to finish up custom dump fns */ +#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) #define FINISH \ vec_add1 (s, 0); \ vl_print (handle, (char *)s); \ @@ -164,7 +143,7 @@ flowprobe_template_l2_fields (ipfix_field_specifier_t * f) static inline ipfix_field_specifier_t * flowprobe_template_common_fields (ipfix_field_specifier_t * f) { -#define flowprobe_template_common_field_count() 3 +#define flowprobe_template_common_field_count() 5 /* ingressInterface, TLV type 10, u32 */ f->e_id_length = ipfix_e_id_length (0 /* enterprise */ , ingressInterface, 4); @@ -180,13 +159,23 @@ flowprobe_template_common_fields (ipfix_field_specifier_t * f) packetDeltaCount, 8); f++; + /* flowStartNanoseconds, TLV type 156, u64 */ + f->e_id_length = ipfix_e_id_length (0 /* enterprise */ , + flowStartNanoseconds, 8); + f++; + + /* flowEndNanoseconds, TLV type 157, u64 */ + f->e_id_length = ipfix_e_id_length (0 /* enterprise */ , + flowEndNanoseconds, 8); + f++; + return f; } static inline ipfix_field_specifier_t * flowprobe_template_l4_fields (ipfix_field_specifier_t * f) { -#define flowprobe_template_l4_field_count() 2 +#define flowprobe_template_l4_field_count() 3 /* sourceTransportPort, TLV type 7, u16 */ f->e_id_length = ipfix_e_id_length (0 /* enterprise */ , sourceTransportPort, 2); @@ -195,6 +184,11 @@ flowprobe_template_l4_fields (ipfix_field_specifier_t * f) f->e_id_length = ipfix_e_id_length (0 /* enterprise */ , destinationTransportPort, 2); f++; + /* tcpControlBits, TLV type 6, u16 */ + f->e_id_length = ipfix_e_id_length (0 /* enterprise */ , + tcpControlBits, 2); + f++; + return f; } @@ -319,7 +313,9 @@ flowprobe_template_rewrite_ip6 (flow_report_main_t * frm, flow_report_t * fr, ip4_address_t * collector_address, ip4_address_t * src_address, - u16 collector_port) + u16 collector_port, + ipfix_report_element_t * elts, + u32 n_elts, u32 * stream_index) { return flowprobe_template_rewrite_inline (frm, fr, collector_address, src_address, collector_port, @@ -331,7 +327,9 @@ flowprobe_template_rewrite_ip4 (flow_report_main_t * frm, flow_report_t * fr, ip4_address_t * collector_address, ip4_address_t * src_address, - u16 collector_port) + u16 collector_port, + ipfix_report_element_t * elts, + u32 n_elts, u32 * stream_index) { return flowprobe_template_rewrite_inline (frm, fr, collector_address, src_address, collector_port, @@ -343,7 +341,9 @@ flowprobe_template_rewrite_l2 (flow_report_main_t * frm, flow_report_t * fr, ip4_address_t * collector_address, ip4_address_t * src_address, - u16 collector_port) + u16 collector_port, + ipfix_report_element_t * elts, + u32 n_elts, u32 * stream_index) { return flowprobe_template_rewrite_inline (frm, fr, collector_address, src_address, collector_port, @@ -355,7 +355,9 @@ flowprobe_template_rewrite_l2_ip4 (flow_report_main_t * frm, flow_report_t * fr, ip4_address_t * collector_address, ip4_address_t * src_address, - u16 collector_port) + u16 collector_port, + ipfix_report_element_t * elts, + u32 n_elts, u32 * stream_index) { return flowprobe_template_rewrite_inline (frm, fr, collector_address, src_address, collector_port, @@ -367,7 +369,9 @@ flowprobe_template_rewrite_l2_ip6 (flow_report_main_t * frm, flow_report_t * fr, ip4_address_t * collector_address, ip4_address_t * src_address, - u16 collector_port) + u16 collector_port, + ipfix_report_element_t * elts, + u32 n_elts, u32 * stream_index) { return flowprobe_template_rewrite_inline (frm, fr, collector_address, src_address, collector_port, @@ -628,13 +632,6 @@ void vl_api_flowprobe_tx_interface_add_del_t_handler VALIDATE_SW_IF_INDEX (mp); - if (mp->which != FLOW_VARIANT_IP4 && mp->which != FLOW_VARIANT_L2 - && mp->which != FLOW_VARIANT_IP6) - { - rv = VNET_API_ERROR_UNIMPLEMENTED; - goto out; - } - if (fm->record == 0) { clib_warning ("Please specify flowprobe params record first..."); @@ -726,18 +723,16 @@ vl_api_flowprobe_params_t_handler (vl_api_flowprobe_params_t * mp) int rv = 0; rv = flowprobe_params - (fm, mp->record_l2, mp->record_l3, mp->record_l4, + (fm, + mp->record_flags & FLOWPROBE_RECORD_FLAG_L2, + mp->record_flags & FLOWPROBE_RECORD_FLAG_L3, + mp->record_flags & FLOWPROBE_RECORD_FLAG_L4, clib_net_to_host_u32 (mp->active_timer), clib_net_to_host_u32 (mp->passive_timer)); REPLY_MACRO (VL_API_FLOWPROBE_PARAMS_REPLY); } -/* List of message types that this plugin understands */ -#define foreach_flowprobe_plugin_api_msg \ -_(FLOWPROBE_TX_INTERFACE_ADD_DEL, flowprobe_tx_interface_add_del) \ -_(FLOWPROBE_PARAMS, flowprobe_params) - /* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, @@ -957,42 +952,6 @@ VLIB_CLI_COMMAND (flowprobe_show_stats_command, static) = { }; /* *INDENT-ON* */ -/** - * @brief Set up the API message handling tables - * @param vm vlib_main_t * vlib main data structure pointer - * @returns 0 to indicate all is well - */ -static clib_error_t * -flowprobe_plugin_api_hookup (vlib_main_t * vm) -{ - flowprobe_main_t *fm = &flowprobe_main; -#define _(N,n) \ - vl_msg_api_set_handlers((VL_API_##N + fm->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); - foreach_flowprobe_plugin_api_msg; -#undef _ - - return 0; -} - -#define vl_msg_name_crc_list -#include -#undef vl_msg_name_crc_list - -static void -setup_message_id_table (flowprobe_main_t * fm, api_main_t * am) -{ -#define _(id,n,crc) \ - vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + fm->msg_id_base); - foreach_vl_msg_name_crc_flowprobe; -#undef _ -} - /* * Main-core process, sending an interrupt to the per worker input * process that spins the per worker timer wheel. @@ -1053,6 +1012,8 @@ VLIB_REGISTER_NODE (flowprobe_timer_node,static) = { }; /* *INDENT-ON* */ +#include + /** * @brief Set up the API message handling tables * @param vm vlib_main_t * vlib main data structure pointer @@ -1064,34 +1025,21 @@ flowprobe_init (vlib_main_t * vm) flowprobe_main_t *fm = &flowprobe_main; vlib_thread_main_t *tm = &vlib_thread_main; clib_error_t *error = 0; - u8 *name; u32 num_threads; int i; fm->vnet_main = vnet_get_main (); - /* Construct the API name */ - name = format (0, "flowprobe_%08x%c", api_version, 0); - /* Ask for a correctly-sized block of API message decode slots */ - fm->msg_id_base = vl_msg_api_get_msg_ids - ((char *) name, VL_MSG_FIRST_AVAILABLE); - - /* Hook up message handlers */ - error = flowprobe_plugin_api_hookup (vm); - - /* Add our API messages to the global name_crc hash table */ - setup_message_id_table (fm, &api_main); - - vec_free (name); + fm->msg_id_base = setup_message_id_table (); /* Set up time reference pair */ fm->vlib_time_0 = vlib_time_now (vm); fm->nanosecond_time_0 = unix_time_now_nsec (); - memset (fm->template_reports, 0, sizeof (fm->template_reports)); - memset (fm->template_size, 0, sizeof (fm->template_size)); - memset (fm->template_per_flow, 0, sizeof (fm->template_per_flow)); + clib_memset (fm->template_reports, 0, sizeof (fm->template_reports)); + clib_memset (fm->template_size, 0, sizeof (fm->template_size)); + clib_memset (fm->template_per_flow, 0, sizeof (fm->template_per_flow)); /* Decide how many worker threads we have */ num_threads = 1 /* main thread */ + tm->n_threads;