aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/pcapng.h
diff options
context:
space:
mode:
authorJames Ko <jck@exegin.com>2017-11-22 11:05:48 -0800
committerAnders Broman <a.broman58@gmail.com>2017-12-01 08:18:16 +0000
commit8606062cb38373f7e594bbaa812fb19719d7e6ef (patch)
tree3a1ed60dab5f56fde65bdcea268ef321b248753e /wiretap/pcapng.h
parent1683dd11e76f01760665ab15cd9204fa19923238 (diff)
dumpcap: enable capture of pcapng from pipe
Reads pcapng blocks from a pipe. Section header blocks are parsed for endianess. All other blocks only have the general block header parsed for type and length, and then endianess converted if necessary. Outputs all blocks using the original endianess format so none of the other block types or options require parsing. Change-Id: I2f4f0175013d8fc2cda42a63e7deacad537951e3 Bug: 11370 Reviewed-on: https://code.wireshark.org/review/24536 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wiretap/pcapng.h')
-rw-r--r--wiretap/pcapng.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/wiretap/pcapng.h b/wiretap/pcapng.h
index 36e14a483b..1c2cf87a94 100644
--- a/wiretap/pcapng.h
+++ b/wiretap/pcapng.h
@@ -25,6 +25,12 @@
#include "wtap.h"
#include "ws_symbol_export.h"
+#define PCAPNG_MAGIC 0x1A2B3C4D
+#define PCAPNG_SWAPPED_MAGIC 0xD4C3B2A1
+
+#define PCAPNG_MAJOR_VERSION 1
+#define PCAPNG_MINOR_VERSION 0
+
/* pcapng: common block header file encoding for every block type */
typedef struct pcapng_block_header_s {
guint32 block_type;