diff options
author | Michael Mann <mmann78@netscape.net> | 2016-03-19 20:33:14 -0400 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2016-03-20 17:38:03 +0000 |
commit | 1e60d63c8c6882c8c0bdb00cf6df594e1bb6fccf (patch) | |
tree | 4147c4f2bee3b93c250a49fa8ec337072c80e713 /epan/dissectors/packet-iax2.c | |
parent | 2b2fc64447e5f778d969e6c850e9196d248cbbe1 (diff) |
Create call_data_dissector() to call data dissector.
This saves many dissectors the need to find the data dissector and store a handle to it.
There were also some that were finding it, but not using it.
For others this was the only reason for their handoff function, so it could be eliminated.
Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b
Reviewed-on: https://code.wireshark.org/review/14530
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-iax2.c')
-rw-r--r-- | epan/dissectors/packet-iax2.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index bd54dbbf8a..af46741f46 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -208,8 +208,6 @@ static const fragment_items iax2_fragment_items = { "iax2 fragments" }; -static dissector_handle_t data_handle; - /* data-call subdissectors, AST_DATAFORMAT_* */ static dissector_table_t iax2_dataformat_dissector_table; /* voice/video call subdissectors, AST_FORMAT_* */ @@ -2178,7 +2176,7 @@ static void process_iax_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* codec dissector handled our data */ } else { /* we don't know how to dissect our data: dissect it as data */ - call_dissector(data_handle, tvb, pinfo, tree); + call_data_dissector(tvb, pinfo, tree); } #ifdef DEBUG_DESEGMENT @@ -3223,7 +3221,6 @@ proto_reg_handoff_iax2(void) v110_handle = find_dissector("v110"); if (v110_handle) dissector_add_uint("iax2.dataformat", AST_DATAFORMAT_V110, v110_handle); - data_handle = find_dissector("data"); } /* |