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

Convert the seconds value to the right byte order before using it at 

all, not just before the third time you use it....

svn path=/trunk/; revision=613
This commit is contained in:
Guy Harris 1999-08-31 00:25:19 +00:00
parent d6147cd00a
commit 2f1f2b08ed
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wiretap/radcom.c
View File

@ -48,6 +48,7 @@ int radcom_open(wtap *wth, int *err)
int bytes_read;
char magic[8];
struct frame_date start_date;
guint32 sec;
struct tm tm;
char byte;
char encap_magic[7] = {0x54, 0x43, 0x50, 0x00, 0x42, 0x43, 0x09};
@ -117,9 +118,10 @@ int radcom_open(wtap *wth, int *err)
tm.tm_year = pletohs(&start_date.year)-1900;
tm.tm_mon = start_date.month-1;
tm.tm_mday = start_date.day;
tm.tm_hour = start_date.sec/3600;
tm.tm_min = (start_date.sec%3600)/60;
tm.tm_sec = pletohl(&start_date.sec)%60;
sec = pletohl(&start_date.sec);
tm.tm_hour = sec/3600;
tm.tm_min = (sec%3600)/60;
tm.tm_sec = sec%60;
tm.tm_isdst = -1;
wth->capture.radcom->start = mktime(&tm);
@ -202,6 +204,7 @@ static int radcom_read(wtap *wth, int *err)
int bytes_read;
guint16 length;
struct frame_date date;
guint32 sec;
int data_offset;
struct tm tm;
char dce;
@ -250,9 +253,10 @@ static int radcom_read(wtap *wth, int *err)
tm.tm_year = pletohs(&date.year)-1900;
tm.tm_mon = date.month-1;
tm.tm_mday = date.day;
tm.tm_hour = date.sec/3600;
tm.tm_min = (date.sec%3600)/60;
tm.tm_sec = pletohl(&date.sec)%60;
sec = pletohl(&date.sec);
tm.tm_hour = sec/3600;
tm.tm_min = (sec%3600)/60;
tm.tm_sec = sec%60;
tm.tm_isdst = -1;
wth->phdr.ts.tv_sec = mktime(&tm);
wth->phdr.ts.tv_usec = pletohl(&date.usec);