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-lbmc.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-lbmc.c')
| -rw-r--r-- | epan/dissectors/packet-lbmc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/epan/dissectors/packet-lbmc.c b/epan/dissectors/packet-lbmc.c index 100a908f23..7926271ae7 100644 --- a/epan/dissectors/packet-lbmc.c +++ b/epan/dissectors/packet-lbmc.c @@ -10883,6 +10883,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr puim_stream_info = NULL; tcp_sid_info.set = FALSE; has_source_index = FALSE; + while ((tvb_reported_length_remaining(lbmc_tvb, pkt_offset) >= L_LBMC_BASIC_HDR_T) && (next_hdr != LBMC_NHDR_DATA) && (next_hdr != LBMC_NHDR_NONE)) { tvbuff_t * hdr_tvb = NULL; @@ -11353,6 +11354,8 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr gboolean msg_reassembled = FALSE; lbmc_message_entry_t * msg = NULL; gboolean dissector_found = FALSE; + heur_dtbl_entry_t *hdtbl_entry; + if (frag_info.fragment_found == 0) { @@ -11559,7 +11562,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr } if (lbmc_use_heuristic_subdissectors) { - dissector_found = dissector_try_heuristic(lbmc_heuristic_subdissector_list, data_tvb, pinfo, subtree, NULL); + dissector_found = dissector_try_heuristic(lbmc_heuristic_subdissector_list, data_tvb, pinfo, subtree, &hdtbl_entry, NULL); } if (!dissector_found) { |