diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2006-04-15 19:00:42 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2006-04-15 19:00:42 +0000 |
| commit | b33cccd47f8a856a0db9bd8eeaac684abe563ae5 (patch) | |
| tree | 0cb1cd67d300d8db5aa1320c6ff17ae8df5d04ff /wiretap | |
| parent | 8f7a6edca8c91ec84d8785d95649724168de3288 (diff) | |
Sake Blok wrote....
I have taken a look at the trace myself and calculated the TpS to be
20000000.0 for this particular trace. If I also discard the start_timestamp
like it has been done for other versions of the netxray format, then I get
the proper results.
svn path=/trunk/; revision=17869
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/netxray.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/wiretap/netxray.c b/wiretap/netxray.c index c6f08a5b92..fa5207dea1 100644 --- a/wiretap/netxray.c +++ b/wiretap/netxray.c @@ -210,7 +210,7 @@ static double TpS_otherpod2[] = { 1e6, 0.0, 0.0 }; /* * Table of time units for Ethernet captures with captype ETH_CAPTYPE_GIGPOD2. */ -static double TpS_gigpod2[] = { 1e9, 0.0, 0.0 }; +static double TpS_gigpod2[] = { 1e9, 0.0, 20000000.0 }; #define NUM_NETXRAY_TIMEUNITS_GIGPOD2 (sizeof TpS_gigpod2 / sizeof TpS_gigpod2[0]) /* Version number strings. */ @@ -567,6 +567,16 @@ int netxray_open(wtap *wth, int *err, gchar **err_info) return -1; } timeunit = TpS_gigpod2[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; default: |