aboutsummaryrefslogtreecommitdiffstats
path: root/test/captures
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2018-10-08 13:25:36 -0700
committerGerald Combs <gerald@wireshark.org>2018-11-16 19:28:11 +0000
commitf300676beca0a6358a7e1ca0349b7160f7cf6de5 (patch)
tree106109e36e559c23cc33a8b5098aeb48a4a28861 /test/captures
parent377f5d0de76628371b7ef436783c6720de36b588 (diff)
Dumpcap: Fix writing SHBs and IDBs.
If we have a single capture source and that capture source is pcapng and we're writing a pcapng file, do the following: - Pass its SHB and IDBs through unmodified. Don't save or write command line interface IDBs. - Save the most recent SHB and IDBs so that we can write them when we're writing multiple output files. If we have multiple capture sources, do the following: - Write Dumpcap's SHB. - Keep a global list of IDBs, consisting of both command line interfaces and IDBs read from pcapng sources. - When reading an EPB or ISB, remap its local interface number to its corresponding global number. Add Dumpcap pcapng section tests. Make the application IDs in the "many_interfaces" captures unique. Change-Id: I2005934c1f83d839727421960005f106d6c682dd Reviewed-on: https://code.wireshark.org/review/30085 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'test/captures')
-rw-r--r--test/captures/many_interfaces.pcapng.1bin20920 -> 20888 bytes
-rw-r--r--test/captures/many_interfaces.pcapng.2bin3424 -> 3392 bytes
-rw-r--r--test/captures/many_interfaces.pcapng.3bin3736 -> 3704 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/test/captures/many_interfaces.pcapng.1 b/test/captures/many_interfaces.pcapng.1
index 6fa742f47d..960e35d913 100644
--- a/test/captures/many_interfaces.pcapng.1
+++ b/test/captures/many_interfaces.pcapng.1
Binary files differ
diff --git a/test/captures/many_interfaces.pcapng.2 b/test/captures/many_interfaces.pcapng.2
index 653a1edc6b..7056f46c34 100644
--- a/test/captures/many_interfaces.pcapng.2
+++ b/test/captures/many_interfaces.pcapng.2
Binary files differ
diff --git a/test/captures/many_interfaces.pcapng.3 b/test/captures/many_interfaces.pcapng.3
index bd848d2e9e..48367c0a54 100644
--- a/test/captures/many_interfaces.pcapng.3
+++ b/test/captures/many_interfaces.pcapng.3
Binary files differ