diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-10-31 08:06:25 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-10-31 08:06:25 +0000 |
| commit | 1131dafe62750db555a429810ae3179d2ee0b3d7 (patch) | |
| tree | a06663abeb7319a83dbc8501c2e3d2c9afb6e4c6 /wiretap/network_instruments.c | |
| parent | 4c858d1ae7edb290fc7faf67a8485367d3aaf2d7 (diff) | |
Temporarily get rid of the "struct tm" in "struct observer_time", and
get rid of the reference to its "tm_gmtoff" member - there are platforms
on which Ethereal runs that don't have "tm_gmtoff" in "struct tm". If
the time stamp in the packets is nanoseconds since midnight 2001-01-01
*local* time, we'd need to compute the offset between that and midnight
2000-01-01 GMT, and adjust the time with that.
svn path=/trunk/; revision=8842
Diffstat (limited to 'wiretap/network_instruments.c')
| -rw-r--r-- | wiretap/network_instruments.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/wiretap/network_instruments.c b/wiretap/network_instruments.c index bc74ea20e6..eb64cd9cf0 100644 --- a/wiretap/network_instruments.c +++ b/wiretap/network_instruments.c @@ -1,5 +1,5 @@ /* - * $Id: network_instruments.c,v 1.1 2003/10/31 00:43:21 guy Exp $ + * $Id: network_instruments.c,v 1.2 2003/10/31 08:06:24 guy Exp $ */ /*************************************************************************** @@ -172,7 +172,11 @@ static gboolean observer_read(wtap *wth, int *err, long *data_offset) GUINT64_FROM_LE(packet_header.nano_seconds_since_2000); fill_time_struct(packet_header.nano_seconds_since_2000, &packet_time); useconds = (long)(packet_time.useconds_from_1970 - ((guint64)packet_time.seconds_from_1970)*1000000); +#if 0 seconds = (long)packet_time.seconds_from_1970 - packet_time.time_stamp.tm_gmtoff; +#else + seconds = (long)packet_time.seconds_from_1970; +#endif /* set-up the packet header */ packet_header.network_size = |