osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

"tm_isdst" must be set to -1 before "mktime()" is called, so that 

"mktime()" bases the DST-vs-non-DST decision on the date/time and on the
current time zone.

svn path=/trunk/; revision=6406
This commit is contained in:
Guy Harris 2002-10-10 21:47:12 +00:00
parent ccab7497b2
commit c0baecc0bb
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wiretap/dbs-etherwatch.c
View File

@ -1,6 +1,6 @@
/* dbs-etherwatch.c
*
* $Id: dbs-etherwatch.c,v 1.9 2002/08/28 20:30:44 jmayer Exp $
* $Id: dbs-etherwatch.c,v 1.10 2002/10/10 21:47:12 guy Exp $
*
* Wiretap Library
* Copyright (c) 2001 by Marc Milgram <mmilgram@arrayinc.com>
@ -297,6 +297,7 @@ parse_dbs_etherwatch_rec_hdr(wtap *wth, FILE_T fh, int *err)
time.tm_mon = (p - months) / 3;
time.tm_year -= 1900;
time.tm_isdst = -1;
wth->phdr.ts.tv_sec = mktime(&time);
wth->phdr.ts.tv_usec = csec * 10000;

4
wiretap/vms.c
View File

@ -1,6 +1,6 @@
/* vms.c
*
* $Id: vms.c,v 1.14 2002/08/28 20:30:45 jmayer Exp $
* $Id: vms.c,v 1.15 2002/10/10 21:47:12 guy Exp $
*
* Wiretap Library
* Copyright (c) 2001 by Marc Milgram <mmilgram@arrayinc.com>
@ -315,7 +315,6 @@ parse_vms_rec_hdr(wtap *wth, FILE_T fh, int *err)
time.tm_min = 1;
time.tm_sec = 1;
/* Skip lines until one starts with a hex number */
do {
if (file_gets(line, VMS_LINE_LENGTH, fh) == NULL) {
@ -362,6 +361,7 @@ parse_vms_rec_hdr(wtap *wth, FILE_T fh, int *err)
time.tm_mon = (p - months) / 3;
time.tm_year -= 1900;
time.tm_isdst = -1;
wth->phdr.ts.tv_sec = mktime(&time);
wth->phdr.ts.tv_usec = csec * 10000;