osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

The attached patch to fix bug 663 allows Ethereal to read Windows 

Sniffer V2 format capture files with captyp=5, timeunit=0.
The ticks_per_sec for this case apparently is 1e6.

Bill Meier

svn path=/trunk/; revision=17019
This commit is contained in:
Jaap Keuter 2006-01-12 15:02:25 +00:00
parent 963539f1bd
commit ca4000cbaf
1 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
wiretap/netxray.c
View File

@ -105,13 +105,17 @@ struct netxray_hdr {
* depends on the network type. We prefix all the capture types
* for WAN captures with WAN_.
*/
#define CAPTYPE_NDIS 0 /* Capture on network interface using NDIS */
#define CAPTYPE_NDIS 0 /* Capture on network interface using NDIS */
/*
* Ethernet capture types.
*/
#define ETH_CAPTYPE_GIGPOD 2 /* gigabit Ethernet captured with pod */
#define ETH_CAPTYPE_OTHERPOD 3 /* non-gigabit Ethernet captured with pod */
#define ETH_CAPTYPE_GIGPOD 2 /* gigabit Ethernet captured with pod */
#define ETH_CAPTYPE_OTHERPOD 3 /* non-gigabit Ethernet captured with pod */
#define ETH_CAPTYPE_OTHERPOD2 5 /* gigabit Ethernet via pod ?? */
/* Captype 5 seen in capture from Distributed Sniffer with: */
/* Version 4.50.211 software */
/* SysKonnect SK-9843 Gigabit Ethernet Server Adapter */
#define ETH_CAPTYPE_GIGPOD2 6 /* gigabit Ethernet captured with pod */
/*
@ -145,6 +149,9 @@ struct netxray_hdr {
* has a non-zero value; if so, perhaps we need a new TpS table for the
* corresponding network type and captype.
*
* TpS...[] entries of 0.0 mean that no capture file for the
* corresponding captype/timeunit values has yet been seen
*
* Note that the "realtick" value is wrong in many captures, so
* we no longer use it. We don't know what significance it has.
* In at least one capture where "realtick" doesn't correspond
@ -194,6 +201,12 @@ static double TpS_gigpod[] = { 1e9, 0.0, 31250000.0 };
static double TpS_otherpod[] = { 1e6, 0.0, 1250000.0 };
#define NUM_NETXRAY_TIMEUNITS_OTHERPOD (sizeof TpS_otherpod / sizeof TpS_otherpod[0])
/*
* Table of time units for Ethernet captures with captype ETH_CAPTYPE_OTHERPOD2.
*/
static double TpS_otherpod2[] = { 1e6, 0.0, 0.0 };
#define NUM_NETXRAY_TIMEUNITS_OTHERPOD2 (sizeof TpS_otherpod2 / sizeof TpS_otherpod2[0])
/*
* Table of time units for Ethernet captures with captype ETH_CAPTYPE_GIGPOD2.
*/
@ -522,6 +535,28 @@ int netxray_open(wtap *wth, int *err, gchar **err_info)
start_timestamp = 0.0;
break;
case ETH_CAPTYPE_OTHERPOD2:
if (hdr.timeunit > NUM_NETXRAY_TIMEUNITS_OTHERPOD2
|| TpS_otherpod2[hdr.timeunit] == 0.0) {
*err = WTAP_ERR_UNSUPPORTED;
*err_info = g_strdup_printf(
"netxray: Unknown timeunit %u for Ethernet/ETH_CAPTYPE_OTHERPOD2 version %.8s capture",
hdr.timeunit, hdr.version);
return -1;
}
timeunit = TpS_otherpod2[hdr.timeunit];
/*
* XXX: start time stamp in the one capture file examined of this type was 0;
* We'll assume the start time handling is the same as for other pods.
*
* At least for 002.002 and 002.003
* captures, the start time stamp is 0,
* not the value in the file.
*/
if (version_minor == 2 || version_minor == 3)
start_timestamp = 0.0;
break;
case ETH_CAPTYPE_GIGPOD2:
if (hdr.timeunit > NUM_NETXRAY_TIMEUNITS_GIGPOD2
|| TpS_gigpod2[hdr.timeunit] == 0.0) {