ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the official libpcap file type

Browse Source 
Change-Id: Ia34a4278eedc8cf450688b1fa0291e1f976868d3
Signed-off-by: Dave Barach <dave@barachs.net>
This commit is contained in:
Dave Barach
2019-01-09 10:22:24 -05:00
parent f0769631f4
commit 7b01e9e897
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extras/wireshark/packet-vpp.c
View File

@ -415,7 +415,7 @@ proto_reg_handoff_vpp(void)
vpp_opaque_dissector_handle = find_dissector("vppOpaque"); vpp_opaque_dissector_handle = find_dissector("vppOpaque");
vpp_opaque2_dissector_handle = find_dissector("vppOpaque2"); vpp_opaque2_dissector_handle = find_dissector("vppOpaque2");
vpp_trace_dissector_handle = find_dissector("vppTrace"); vpp_trace_dissector_handle = find_dissector("vppTrace");
dissector_add_uint("wtap_encap", WTAP_ENCAP_USER13, vpp_dissector_handle); dissector_add_uint("wtap_encap", WTAP_ENCAP_VPP, vpp_dissector_handle);
} }
/* /*

2
src/vlib/main.c
View File

@ -2220,7 +2220,7 @@ pcap_dispatch_trace_command_internal (vlib_main_t * vm,
pm->file_name = (char *) format (0, "/tmp/dispatch.pcap%c", 0); pm->file_name = (char *) format (0, "/tmp/dispatch.pcap%c", 0);
pm->n_packets_captured = 0; pm->n_packets_captured = 0;
pm->packet_type = PCAP_PACKET_TYPE_user13; pm->packet_type = PCAP_PACKET_TYPE_vpp;
if (pm->lock == 0) if (pm->lock == 0)
clib_spinlock_init (&(pm->lock)); clib_spinlock_init (&(pm->lock));
vm->dispatch_pcap_enable = 1; vm->dispatch_pcap_enable = 1;

21
src/vppinfra/pcap.h
View File

@ -49,7 +49,7 @@
#include <vppinfra/lock.h> #include <vppinfra/lock.h>
/** /**
* @brief Packet types supported by PCAP * @brief Known libpcap encap types
* *
* These codes end up in the pcap file header. * These codes end up in the pcap file header.
* If you decide to build a wireshark dissector, * If you decide to build a wireshark dissector,
@ -58,22 +58,16 @@
* *
* For example: * For example:
* *
* { 160, WTAP_ENCAP_USER13 }, * { 280, WTAP_ENCAP_VPP },
* *
* A file with (vpp) packet type PCAP_PACKET_TYPE_user13 * A file with the officially-allocated vpp packet type PCAP_PACKET_TYPE_vpp
* aka 160, will need a top-level dissector registered to * aka 280, will need a top-level dissector registered to
* deal with WTAP_ENCAP_USER13 [=58]. * deal with WTAP_ENCAP_VPP [=206].
* *
* Something like so: * Something like so:
* *
* dissector_add_uint("wtap_encap", WTAP_ENCAP_USER13, vpp_dissector_handle); * dissector_add_uint("wtap_encap", WTAP_ENCAP_VPP, vpp_dissector_handle);
* *
* null 0
* ethernet 1
* ppp 9
* ip 12
* hdlc 104
* user0 147 ... user15 162
*/ */
#define foreach_vnet_pcap_packet_type \ #define foreach_vnet_pcap_packet_type \
_ (null, 0) \ _ (null, 0) \
@ -96,7 +90,8 @@
_ (user12, 159) \ _ (user12, 159) \
_ (user13, 160) \ _ (user13, 160) \
_ (user14, 161) \ _ (user14, 161) \
_ (user15, 162) _ (user15, 162) \
_ (vpp, 280) \
typedef enum typedef enum
{ {