aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/wtap.c
diff options
context:
space:
mode:
authorMartin Mathieson <martin.r.mathieson@googlemail.com>2012-04-20 12:08:31 +0000
committerMartin Mathieson <martin.r.mathieson@googlemail.com>2012-04-20 12:08:31 +0000
commit45252c84e3dd2dad2844f570e257619d83c4469c (patch)
tree28a0695eb23772d68d6d0d8ecc4c7f9dc35ee393 /wiretap/wtap.c
parent54c7fc8bfbe449e252e7f29ab1ddb403d0d11a27 (diff)
Patch for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5048
From Tom Cook and Tom Alexander. 1. A VWR encapsulation that reads VeriWave capture files (*.vwr) generated from WaveTest test hardware 2. Dissectors that display the VeriWave tap headers (both 802.11 and Ethernet) 3. A dissector for the WaveAgent protocol. The WaveAgent dissector is heuristic and parses the WaveAgent packet (a UDP payload). The WaveAgent dissector has been Fuzz tested. The VWR ENCAP and dissectors have been used extensively by VeriWave customers in a special version of WireSark compiled by VeriWave. svn path=/trunk/; revision=42155
Diffstat (limited to 'wiretap/wtap.c')
-rw-r--r--wiretap/wtap.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 2bf90b26fc..c18756adb5 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -574,6 +574,9 @@ static struct encap_type_info encap_table_base[] = {
/* WTAP_ENCAP_BACNET_MS_TP_WITH_PHDR */
{ "BACnet MS/TP with Directional Info", "bacnet-ms-tp-with-direction" },
+
+ /* WTAP_ENCAP_IXVERIWAVE */
+ { "IxVeriWave header and stats block", "ixveriwave" }
};
gint wtap_num_encap_types = sizeof(encap_table_base) / sizeof(struct encap_type_info);