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/m2m | |
| parent | 8826db5823480697b73103de3434f5c662517e9a (diff) | |
| download | wireshark-3ca5e3ec7d9ad8c2b1ccb0cf9a5d56a1949766fa.tar.gz | |
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/m2m')
| -rw-r--r-- | plugins/m2m/packet-m2m.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c index 80bea305b4..8eea8550ea 100644 --- a/plugins/m2m/packet-m2m.c +++ b/plugins/m2m/packet-m2m.c @@ -171,7 +171,7 @@ m2m_defragment_cleanup(void) /* WiMax MAC to MAC protocol dissector */ -static void dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *ti = NULL; proto_item *m2m_item = NULL; @@ -409,6 +409,7 @@ static void dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tlv_count--; } } + return tvb_captured_length(tvb); } /* Decode and display the FCH burst */ @@ -808,7 +809,7 @@ void proto_reg_handoff_m2m(void) { dissector_handle_t m2m_handle; - m2m_handle = create_dissector_handle(dissect_m2m, proto_m2m); + m2m_handle = new_create_dissector_handle(dissect_m2m, proto_m2m); dissector_add_uint("ethertype", ETHERTYPE_WMX_M2M, m2m_handle); /* find the wimax handlers */ |