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

Fix a couple of dumping issues seen while working on 'reorder'. 

svn path=/trunk/; revision=45003
This commit is contained in:
Martin Mathieson 2012-09-19 09:24:11 +00:00
parent 30b7b74dde
commit a59117bd87
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
wiretap/catapult_dct2000.c
View File

@ -406,9 +406,9 @@ catapult_dct2000_read(wtap *wth, int *err, gchar **err_info _U_,
line_prefix_info = g_new(line_prefix_info_t,1);
/* Create and use buffer for contents before time */
line_prefix_info->before_time = g_malloc(before_time_offset+2);
memcpy(line_prefix_info->before_time, linebuff, before_time_offset+1);
line_prefix_info->before_time[before_time_offset+1] = '\0';
line_prefix_info->before_time = g_malloc(before_time_offset+1);
memcpy(line_prefix_info->before_time, linebuff, before_time_offset);
line_prefix_info->before_time[before_time_offset] = '\0';
/* Create and use buffer for contents before time.
Do this only if it doesn't correspond to " l ", which is by far the most
@ -468,6 +468,15 @@ catapult_dct2000_seek_read(wtap *wth, gint64 seek_off,
int encap;
int seconds, useconds, data_chars;
/* Get wtap external structure for this wtap */
dct2000_file_externals_t *file_externals =
(dct2000_file_externals_t*)wth->priv;
/* There *has* to be an entry for this wth */
if (!file_externals) {
return FALSE;
}
/* Reset errno */
*err = errno = 0;
@ -498,6 +507,14 @@ catapult_dct2000_seek_read(wtap *wth, gint64 seek_off,
/* Make sure all packets go to catapult dct2000 dissector */
wth->phdr.pkt_encap = WTAP_ENCAP_CATAPULT_DCT2000;
/* Fill in timestamp (capture base + packet offset) */
wth->phdr.ts.secs = file_externals->start_secs + seconds;
if ((file_externals->start_usecs + useconds) >= 1000000) {
wth->phdr.ts.secs++;
}
wth->phdr.ts.nsecs =
((file_externals->start_usecs + useconds) % 1000000) *1000;
/*********************/
/* Write stub header */
@ -659,7 +676,7 @@ catapult_dct2000_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
dct2000->start_time.nsecs =
(file_externals->start_usecs * 1000);
/* Set flag do don't write header out again */
/* Set flag so don't write header out again */
dct2000->first_packet_written = TRUE;
}