diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2005-07-02 15:40:49 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2005-07-02 15:40:49 +0000 |
| commit | adddb9819be201ba51b152ca56e39e7b8be9d796 (patch) | |
| tree | 47d16f126562ad10028f568aa5191eb44c636623 /wiretap/netxray.c | |
| parent | a42c4bc656d4baa10cf7ed712310fb2dc41431e6 (diff) | |
Chris Lydick: Support for Sniffer 2.003 files.
Modified to match the current codebase.
svn path=/trunk/; revision=14832
Diffstat (limited to 'wiretap/netxray.c')
| -rw-r--r-- | wiretap/netxray.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/wiretap/netxray.c b/wiretap/netxray.c index 02588f4a33..0333e20abe 100644 --- a/wiretap/netxray.c +++ b/wiretap/netxray.c @@ -153,6 +153,10 @@ static const char vers_2_002[] = { '0', '0', '2', '.', '0', '0', '2', '\0' }; +static const char vers_2_003[] = { + '0', '0', '2', '.', '0', '0', '3', '\0' +}; + /* Old NetXRay data record format - followed by frame data. */ struct old_netxrayrec_hdr { guint32 timelo; /* lower 32 bits of time stamp */ @@ -310,6 +314,10 @@ int netxray_open(wtap *wth, int *err, gchar **err_info) version_major = 2; version_minor = 2; file_type = WTAP_FILE_NETXRAY_2_00x; + } else if (memcmp(hdr.version, vers_2_003, sizeof vers_2_003) == 0) { + version_major = 2; + version_minor = 3; + file_type = WTAP_FILE_NETXRAY_2_00x; } else { *err = WTAP_ERR_UNSUPPORTED; *err_info = g_strdup_printf("netxray: version \"%.8s\" unsupported", hdr.version); @@ -406,7 +414,7 @@ int netxray_open(wtap *wth, int *err, gchar **err_info) * captures? */ if (network_type == 1 && hdr.xxc[4] == ETH_CAPTYPE_GIGPOD && - version_minor == 2) + (version_minor == 2 || version_minor == 3)) start_timestamp = 0.0; break; |