From Tom Brezinski - fix for bug 5869:

This patch incorporates the following fixes from the patch attached to
bug 5671 with changes as noted below:

1.) Files where the packet header and packet data are noncontiguous are
handled improperly, resulting in read misalignment and ultimately the
error message, "Observer: bad record: Invalid magic number 0xXXXXXXXX."
This bug is caused by not obeying the packet_entry_header.offset_to_frame
field.

2.) Daylight savings time is not properly accounted for in files using
local time encoding.

3.) As of Observer/GigaStor v13.10 (bug 5671 incorrectly stated v14),
timestamps in the file format changed from local time encoding to GMT
encoding.  Wiretap has been changed to support reading both formats. 
Patch submitted with bug 5671 added a separate file type to allow
writing local format.  This patch does not add the separate file type
and always writes GMT.

4.) The wtap_dumper.bytes_dumped field is not being properly incremented
as data is written to files.

This patch also incorporates the following additional enhancements /
fixes not in bug 5671:

1.) Support for reading BFR files which contain Fibre Channel captures. 
Test file Fibre_Channel_Capture.bfr attached.

2.) Support for modified file header used in upcoming v15.  New header
file format takes an unused byte from the version string to allow for a
larger offset to the first packet to be specified.  Test file
V15_Lrg_Hdr_Test.bfr is attached, it is also a fuzz test as the number
of TLV items given in the header is less then the actual.

3.) It was found that if the number of TLV items given in the header was
larger then present it would fail to open the file.  Test file
V9_Num_TLVs_Too_Big.bfr is attached.

svn path=/trunk/; revision=36970

1 files changed, 1 insertions, 1 deletions

diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 847e425059..701f9ad8ad 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -262,7 +262,7 @@ extern "C" {
 #define WTAP_FILE_NGSNIFFER_COMPRESSED          30
 #define WTAP_FILE_NETXRAY_1_1                   31
 #define WTAP_FILE_NETXRAY_2_00x                 32
-#define WTAP_FILE_NETWORK_INSTRUMENTS_V9        33
+#define WTAP_FILE_NETWORK_INSTRUMENTS           33
 #define WTAP_FILE_LANALYZER                     34
 #define WTAP_FILE_PPPDUMP                       35
 #define WTAP_FILE_RADCOM                        36