diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-18 08:38:23 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-18 17:44:49 +0000 |
| commit | 3ca5e3ec7d9ad8c2b1ccb0cf9a5d56a1949766fa (patch) | |
| tree | f2289c6eb8694894a6a89c21fe5ce5e91b1b2178 /plugins/wimax/msg_dsc.c | |
| parent | 8826db5823480697b73103de3434f5c662517e9a (diff) | |
create_dissector_handle -> new_create_dissector_handle for plugins
Was able to actually convert all calls to "new style"
Change-Id: If9916a4762d410f2ad12aa5431174d7462dc7ac4
Reviewed-on: https://code.wireshark.org/review/11941
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'plugins/wimax/msg_dsc.c')
| -rw-r--r-- | plugins/wimax/msg_dsc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/plugins/wimax/msg_dsc.c b/plugins/wimax/msg_dsc.c index 27a84fad84..6c45ebf58f 100644 --- a/plugins/wimax/msg_dsc.c +++ b/plugins/wimax/msg_dsc.c @@ -49,7 +49,7 @@ static gint hf_dsc_transaction_id = -1; static gint hf_dsc_confirmation_code = -1; -static void dissect_mac_mgmt_msg_dsc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int dissect_mac_mgmt_msg_dsc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint offset = 0; proto_item *dsc_item; @@ -70,6 +70,7 @@ static void dissect_mac_mgmt_msg_dsc_req_decoder(tvbuff_t *tvb, packet_info *pin /* process DSC REQ message TLV Encode Information */ wimax_common_tlv_encoding_decoder(tvb_new_subset_remaining(tvb, offset), pinfo, dsc_tree); } + return tvb_captured_length(tvb); } static int dissect_mac_mgmt_msg_dsc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) @@ -99,7 +100,7 @@ static int dissect_mac_mgmt_msg_dsc_rsp_decoder(tvbuff_t *tvb, packet_info *pinf return tvb_captured_length(tvb); } -static void dissect_mac_mgmt_msg_dsc_ack_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int dissect_mac_mgmt_msg_dsc_ack_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint offset = 0; proto_item *dsc_item; @@ -123,6 +124,7 @@ static void dissect_mac_mgmt_msg_dsc_ack_decoder(tvbuff_t *tvb, packet_info *pin /* process DSC ACK message TLV Encode Information */ wimax_common_tlv_encoding_decoder(tvb_new_subset_remaining(tvb, offset), pinfo, dsc_tree); } + return tvb_captured_length(tvb); } /* Register Wimax Mac Payload Protocol and Dissector */ @@ -172,13 +174,13 @@ proto_reg_handoff_mac_mgmt_msg_dsc(void) { dissector_handle_t dsc_handle; - dsc_handle = create_dissector_handle(dissect_mac_mgmt_msg_dsc_req_decoder, proto_mac_mgmt_msg_dsc_decoder); + dsc_handle = new_create_dissector_handle(dissect_mac_mgmt_msg_dsc_req_decoder, proto_mac_mgmt_msg_dsc_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_DSC_REQ, dsc_handle); dsc_handle = new_create_dissector_handle(dissect_mac_mgmt_msg_dsc_rsp_decoder, proto_mac_mgmt_msg_dsc_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_DSC_RSP, dsc_handle); - dsc_handle = create_dissector_handle(dissect_mac_mgmt_msg_dsc_ack_decoder, proto_mac_mgmt_msg_dsc_decoder); + dsc_handle = new_create_dissector_handle(dissect_mac_mgmt_msg_dsc_ack_decoder, proto_mac_mgmt_msg_dsc_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_DSC_ACK, dsc_handle); } |