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 /plugins/docsis | |
| parent | 2b2fc64447e5f778d969e6c850e9196d248cbbe1 (diff) | |
| download | wireshark-1e60d63c8c6882c8c0bdb00cf6df594e1bb6fccf.tar.gz | |
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 'plugins/docsis')
| -rw-r--r-- | plugins/docsis/packet-docsis.c | 4 | ||||
| -rw-r--r-- | plugins/docsis/packet-macmgmt.c | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c index 58b8a88cab..2f2057ac3b 100644 --- a/plugins/docsis/packet-docsis.c +++ b/plugins/docsis/packet-docsis.c @@ -114,7 +114,6 @@ static int hf_docsis_ehdr_bpup2_ver = -1; static int hf_docsis_ehdr_bpup2_sid = -1; static dissector_handle_t docsis_handle; static dissector_handle_t eth_withoutfcs_handle; -static dissector_handle_t data_handle; static dissector_handle_t docsis_mgmt_handle; #if 0 static dissector_table_t docsis_dissector_table; @@ -586,7 +585,7 @@ dissect_docsis (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* da if (pdulen > 0) { mgt_tvb = tvb_new_subset (tvb, hdrlen, captured_length, pdulen); - call_dissector (data_handle, mgt_tvb, pinfo, tree); + call_data_dissector(mgt_tvb, pinfo, tree); } if (concatlen > 0) { @@ -837,7 +836,6 @@ proto_reg_handoff_docsis (void) { docsis_handle = find_dissector ("docsis"); - data_handle = find_dissector ("data"); dissector_add_uint ("wtap_encap", WTAP_ENCAP_DOCSIS, docsis_handle); docsis_mgmt_handle = find_dissector ("docsis_mgmt"); diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c index 90dc0b6e5d..b89a4c3304 100644 --- a/plugins/docsis/packet-macmgmt.c +++ b/plugins/docsis/packet-macmgmt.c @@ -87,7 +87,6 @@ static int hf_docsis_mgt_type = -1; static int hf_docsis_mgt_rsvd = -1; static dissector_table_t docsis_mgmt_dissector_table; -static dissector_handle_t data_handle; /* Initialize the subtree pointers */ static gint ett_docsis_mgmt = -1; @@ -193,7 +192,7 @@ dissect_macmgmt (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* d payload_tvb = tvb_new_subset_length (tvb, 20, msg_len - 6); if (!dissector_try_uint(docsis_mgmt_dissector_table, type, payload_tvb, pinfo, tree)) - call_dissector (data_handle, payload_tvb, pinfo, tree); + call_data_dissector(payload_tvb, pinfo, tree); return tvb_captured_length(tvb); } @@ -278,8 +277,6 @@ proto_reg_handoff_docsis_mgmt (void) docsis_mgmt_handle = find_dissector ("docsis_mgmt"); dissector_add_uint ("docsis", 0x03, docsis_mgmt_handle); #endif - - data_handle = find_dissector ("data"); } /* |