Allow reusing them elsewhere in qemu. Signed-off-by: Gerd Hoffmann <[email protected]> --- include/qemu/pcap.h | 27 +++++++++++++++++++++++++++ hw/usb/pcap.c | 24 +----------------------- 2 files changed, 28 insertions(+), 23 deletions(-) create mode 100644 include/qemu/pcap.h
diff --git a/include/qemu/pcap.h b/include/qemu/pcap.h new file mode 100644 index 000000000000..48e6070ffe04 --- /dev/null +++ b/include/qemu/pcap.h @@ -0,0 +1,27 @@ +#ifndef QEMU_PCAP_H +#define QEMU_PCAP_H + +#define PCAP_MAGIC 0xa1b2c3d4 +#define PCAP_MAJOR 2 +#define PCAP_MINOR 4 + +/* https://wiki.wireshark.org/Development/LibpcapFileFormat */ + +struct pcap_hdr { + uint32_t magic_number; /* magic number */ + uint16_t version_major; /* major version number */ + uint16_t version_minor; /* minor version number */ + int32_t thiszone; /* GMT to local correction */ + uint32_t sigfigs; /* accuracy of timestamps */ + uint32_t snaplen; /* max length of captured packets, in octets */ + uint32_t network; /* data link type */ +}; + +struct pcaprec_hdr { + uint32_t ts_sec; /* timestamp seconds */ + uint32_t ts_usec; /* timestamp microseconds */ + uint32_t incl_len; /* number of octets of packet saved in file */ + uint32_t orig_len; /* actual length of packet */ +}; + +#endif /* QEMU_PCAP_H */ diff --git a/hw/usb/pcap.c b/hw/usb/pcap.c index dbff00be252e..10ca6279f7d3 100644 --- a/hw/usb/pcap.c +++ b/hw/usb/pcap.c @@ -8,31 +8,9 @@ */ #include "qemu/osdep.h" +#include "qemu/pcap.h" #include "hw/usb.h" -#define PCAP_MAGIC 0xa1b2c3d4 -#define PCAP_MAJOR 2 -#define PCAP_MINOR 4 - -/* https://wiki.wireshark.org/Development/LibpcapFileFormat */ - -struct pcap_hdr { - uint32_t magic_number; /* magic number */ - uint16_t version_major; /* major version number */ - uint16_t version_minor; /* minor version number */ - int32_t thiszone; /* GMT to local correction */ - uint32_t sigfigs; /* accuracy of timestamps */ - uint32_t snaplen; /* max length of captured packets, in octets */ - uint32_t network; /* data link type */ -}; - -struct pcaprec_hdr { - uint32_t ts_sec; /* timestamp seconds */ - uint32_t ts_usec; /* timestamp microseconds */ - uint32_t incl_len; /* number of octets of packet saved in file */ - uint32_t orig_len; /* actual length of packet */ -}; - /* https://www.tcpdump.org/linktypes.html */ /* linux: Documentation/usb/usbmon.rst */ /* linux: drivers/usb/mon/mon_bin.c */ -- 2.52.0
