diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-11-29 06:44:07 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-11-29 06:44:07 +0000 |
| commit | 6c9ce8acf8610f9c5ff99215eb3650ec0b6e0688 (patch) | |
| tree | 8ec6fc9d92c3351e1dec0eec3a14a7a1290a6155 /wiretap/erf.c | |
| parent | 35482921b20efde6d5856cad5df217bfabd323c8 (diff) | |
Froim Rene Pilz:
This patch consists also the last issues. Additionally it solves:
- For the SSCOP frames the AAL5 decoding was not performed due to an earlier patch. This caused that no SSCOP message was properly decoded.
- As the detection between a LANE frame and a SSCOP frame is rather hard a switch within the atm dissector is included which enforce SSCOP dissecting over a LANE frame. At the moment I do not see a better solution for that.
svn path=/trunk/; revision=20013
Diffstat (limited to 'wiretap/erf.c')
| -rw-r--r-- | wiretap/erf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wiretap/erf.c b/wiretap/erf.c index 4961398b8d..60b2dfba2f 100644 --- a/wiretap/erf.c +++ b/wiretap/erf.c @@ -123,7 +123,10 @@ int erf_open(wtap *wth, int *err, gchar **err_info _U_) guint32 packet_size; erf_timestamp_t ts; - if (file_read(&header,1,sizeof(header),wth->fh) != sizeof(header)) { + int r = file_read(&header,1,sizeof(header),wth->fh); + + if (r == 0 ) break; + if (r != sizeof(header)) { if ((*err = file_error(wth->fh)) != 0) return -1; else |