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

From Florent Drouin: 

Fix bug Some Toshiba format files with LAPD cannot be open
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1711

svn path=/trunk/; revision=23379
This commit is contained in:
Anders Broman 2007-11-06 19:22:51 +00:00
parent b349ff3e87
commit 5cd9fcc943
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wiretap/erf.c
View File

@ -128,12 +128,6 @@ int erf_open(wtap *wth, int *err, gchar **err_info _U_)
return 0;
}
/* fail on invalid record type, decreasing timestamps or non-zero pad-bits */
/* Not all types within this range are decoded, but it is a first filter */
if (header.type == 0 || header.type > ERF_TYPE_MAX ) {
return 0;
}
/* Skip PAD records, timestamps may not be set */
if (header.type == ERF_TYPE_PAD) {
if (file_seek(wth->fh, packet_size, SEEK_CUR, err) == -1) {
@ -142,6 +136,17 @@ int erf_open(wtap *wth, int *err, gchar **err_info _U_)
continue;
}
/* fail on invalid record type, decreasing timestamps or non-zero pad-bits */
/* Not all types within this range are decoded, but it is a first filter */
if (header.type == 0 || header.type > ERF_TYPE_MAX ) {
return 0;
}
/* The ERF_TYPE_MAX is the PAD record, but the last used type is ERF_TYPE_AAL2 */
if (header.type > ERF_TYPE_AAL2 ) {
return 0;
}
if ((ts = pletohll(&header.ts)) < prevts) {
/* reassembled AAL5 records may not be in time order, so allow 1 sec fudge */
if (header.type == ERF_TYPE_AAL5) {