X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fpcap_funcs.h;h=2c51ab723834f754ff6614cad3e8329407bdf192;hb=62d656ace95ea5002c6c5c8e2eddb2901d38ab6f;hp=a3a3072f9557a771d569badbe26423f0eeb5f2e8;hpb=9af7e2e87e6a11fb69309fc9ce4bf8432acbc4e3;p=vpp.git diff --git a/src/vppinfra/pcap_funcs.h b/src/vppinfra/pcap_funcs.h index a3a3072f955..2c51ab72383 100644 --- a/src/vppinfra/pcap_funcs.h +++ b/src/vppinfra/pcap_funcs.h @@ -17,6 +17,7 @@ #define included_vppinfra_pcap_funcs_h /** Write out data to output file. */ +clib_error_t *pcap_close (pcap_main_t * pm); clib_error_t *pcap_write (pcap_main_t * pm); /** Read data from file. */ @@ -53,45 +54,6 @@ pcap_add_packet (pcap_main_t * pm, return h->data; } -/** - * @brief Add buffer (vlib_buffer_t) to the trace - * - * @param *pm - pcap_main_t - * @param *vm - vlib_main_t - * @param buffer_index - u32 - * @param n_bytes_in_trace - u32 - * - */ -static inline void -pcap_add_buffer (pcap_main_t * pm, - struct vlib_main_t *vm, u32 buffer_index, - u32 n_bytes_in_trace) -{ - vlib_buffer_t *b = vlib_get_buffer (vm, buffer_index); - u32 n = vlib_buffer_length_in_chain (vm, b); - i32 n_left = clib_min (n_bytes_in_trace, n); - f64 time_now = vlib_time_now (vm); - void *d; - - if (PREDICT_TRUE (pm->n_packets_captured < pm->n_packets_to_capture)) - { - clib_spinlock_lock_if_init (&pm->lock); - d = pcap_add_packet (pm, time_now, n_left, n); - while (1) - { - u32 copy_length = clib_min ((u32) n_left, b->current_length); - clib_memcpy_fast (d, b->data + b->current_data, copy_length); - n_left -= b->current_length; - if (n_left <= 0) - break; - d += b->current_length; - ASSERT (b->flags & VLIB_BUFFER_NEXT_PRESENT); - b = vlib_get_buffer (vm, b->next_buffer); - } - clib_spinlock_unlock_if_init (&pm->lock); - } -} - #endif /* included_vppinfra_pcap_funcs_h */ /*