diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2014-05-20 12:54:20 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-05-21 20:17:29 +0000 |
| commit | 2cfda31ff09893bd8c59acabc8faad7227f52ede (patch) | |
| tree | a0bee1c33fe7bc2eeced9c2f7fe0bbe7628cebcd /epan/dissectors/packet-mpeg-pes.c | |
| parent | bb01c7ac380a2978d8e1c5ca8fa7f2dd523a8323 (diff) | |
Change the signature of dissector_try_heuristic() to return hdtbl_entry
which can be used to call the found heuristic dissector on the next pass.
Introduce call_heur_dissector_direct() to be used to call a heuristic
dissector which accepted the frame on the first pass.
Change-Id: I524edd717b7d92b510bd60acfeea686d5f2b4582
Reviewed-on: https://code.wireshark.org/review/1697
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-mpeg-pes.c')
| -rw-r--r-- | epan/dissectors/packet-mpeg-pes.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index 03a38fcd31..2b03160086 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -985,7 +985,9 @@ static heur_dissector_list_t heur_subdissector_list; static void dissect_mpeg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - if (!dissector_try_heuristic(heur_subdissector_list, tvb, pinfo, tree, NULL)) { + heur_dtbl_entry_t *hdtbl_entry; + + if (!dissector_try_heuristic(heur_subdissector_list, tvb, pinfo, tree, &hdtbl_entry, NULL)) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG"); col_clear(pinfo->cinfo, COL_INFO); if (tree) @@ -1202,7 +1204,7 @@ proto_register_mpeg_pes(void) "BIT_STRING_SIZE_16", HFILL }}, /*--- End of included file: packet-mpeg-pes-hfarr.c ---*/ -#line 560 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" +#line 562 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" { &hf_mpeg_pes_pack_header, { "Pack header", "mpeg-pes.pack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -1320,7 +1322,7 @@ proto_register_mpeg_pes(void) &ett_mpeg_pes_Picture, /*--- End of included file: packet-mpeg-pes-ettarr.c ---*/ -#line 667 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" +#line 669 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" &ett_mpeg_pes_pack_header, &ett_mpeg_pes_header_data, &ett_mpeg_pes_trick_mode |