diff options
| author | Anthony Coddington <anthony.coddington@endace.com> | 2016-03-21 17:32:13 +1300 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-07 03:56:02 +0000 |
| commit | ad0e70f10c1cd18d17874db2264c7e1986b9b9b3 (patch) | |
| tree | ec0c362681e87a41b12bf8f608e369b68986daeb /wiretap/erf.h | |
| parent | 0ec5a271ea96e92d80060bded7245749a71e199d (diff) | |
| download | wireshark-ad0e70f10c1cd18d17874db2264c7e1986b9b9b3.tar.gz | |
ERF: Make ERF wiretap forwards compatible.
Dissector has always been able to cope with unknown record types so pass them
through (and call the data dissector from the ERF dissector in this case).
Previously was stopping processing on the first unrecognized record which is
very unhelpful for otherwise valid files that have new types mixed in.
Remove ERF type check altogether from open heuristic as ERF type could be past
48 in future and with more extension headers bit any byte value could be valid.
Also allow setting ERF_RECORDS_TO_CHECK to 0 to force skipping the heuristic.
Change-Id: I8331eef30ba2e949564f418b3100bd73b8f58116
Reviewed-on: https://code.wireshark.org/review/15361
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wiretap/erf.h')
| -rw-r--r-- | wiretap/erf.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/wiretap/erf.h b/wiretap/erf.h index 168f51a275..bf91311025 100644 --- a/wiretap/erf.h +++ b/wiretap/erf.h @@ -95,9 +95,6 @@ /* Pad records */ #define ERF_TYPE_PAD 48 -#define ERF_TYPE_MIN 1 /* sanity checking */ -#define ERF_TYPE_MAX 48 /* sanity checking */ - #define ERF_EXT_HDR_TYPE_CLASSIFICATION 3 #define ERF_EXT_HDR_TYPE_INTERCEPTID 4 #define ERF_EXT_HDR_TYPE_RAW_LINK 5 |