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_dsd.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_dsd.c')
| -rw-r--r-- | plugins/wimax/msg_dsd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/plugins/wimax/msg_dsd.c b/plugins/wimax/msg_dsd.c index b01f45c75f..682b6330a3 100644 --- a/plugins/wimax/msg_dsd.c +++ b/plugins/wimax/msg_dsd.c @@ -56,7 +56,7 @@ static gint hf_dsd_invalid_tlv = -1; static gint hf_dsd_unknown_type = -1; -static void dissect_mac_mgmt_msg_dsd_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int dissect_mac_mgmt_msg_dsd_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint offset = 0; guint tvb_len, tlv_len, tlv_value_offset; @@ -123,9 +123,10 @@ static void dissect_mac_mgmt_msg_dsd_req_decoder(tvbuff_t *tvb, packet_info *pin offset += (tlv_len+tlv_value_offset); } /* end of while loop */ } + return tvb_captured_length(tvb); } -static void dissect_mac_mgmt_msg_dsd_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int dissect_mac_mgmt_msg_dsd_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint offset = 0; guint tvb_len, tlv_len, tlv_value_offset; @@ -195,6 +196,7 @@ static void dissect_mac_mgmt_msg_dsd_rsp_decoder(tvbuff_t *tvb, packet_info *pin offset += (tlv_len+tlv_value_offset); } /* end of while loop */ } + return tvb_captured_length(tvb); } /* Register Wimax Mac Payload Protocol and Dissector */ @@ -266,10 +268,10 @@ proto_reg_handoff_mac_mgmt_msg_dsd(void) { dissector_handle_t dsd_handle; - dsd_handle = create_dissector_handle(dissect_mac_mgmt_msg_dsd_req_decoder, proto_mac_mgmt_msg_dsd_decoder); + dsd_handle = new_create_dissector_handle(dissect_mac_mgmt_msg_dsd_req_decoder, proto_mac_mgmt_msg_dsd_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_DSD_REQ, dsd_handle); - dsd_handle = create_dissector_handle(dissect_mac_mgmt_msg_dsd_rsp_decoder, proto_mac_mgmt_msg_dsd_decoder); + dsd_handle = new_create_dissector_handle(dissect_mac_mgmt_msg_dsd_rsp_decoder, proto_mac_mgmt_msg_dsd_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_DSD_RSP, dsd_handle); } |