aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-tdmop.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-11-17 20:16:06 -0500
committerAnders Broman <a.broman58@gmail.com>2015-11-18 07:33:08 +0000
commit4adeb424f5cdb74ca1f98cd4b87bd72e4d811f03 (patch)
tree6c73d6e0795cc5181ad53242581e4c7f2282081f /epan/dissectors/packet-tdmop.c
parent13297438d98e3388d650fc55c2a77d5b52367e1f (diff)
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I9c7d1c092bbae896ec0c2832617891346927f2e1 Reviewed-on: https://code.wireshark.org/review/11932 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-tdmop.c')
-rw-r--r--epan/dissectors/packet-tdmop.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-tdmop.c b/epan/dissectors/packet-tdmop.c
index b51a4c02af..196586f0da 100644
--- a/epan/dissectors/packet-tdmop.c
+++ b/epan/dissectors/packet-tdmop.c
@@ -89,7 +89,7 @@ static guint8 reverse_map[256]=
0x0F,0x8F,0x4F,0xCF,0x2F,0xAF,0x6F,0xEF,0x1F,0x9F,0x5F,0xDF,0x3F,0xBF,0x7F,0xFF
};
-static void dissect_tdmop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+static int dissect_tdmop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
guint8 dchannel_data[MAX_DCHANNEL_LEN];
guint dchannel_len;
@@ -199,6 +199,7 @@ static void dissect_tdmop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
call_dissector(lapd_handle, new_tvb, pinfo, tree);
}
}
+ return tvb_captured_length(tvb);
}
void proto_register_tdmop(void)
@@ -350,7 +351,7 @@ void proto_reg_handoff_tdmop(void)
static guint32 current_tdmop_udpport;
if (!init)
{
- tdmop_handle = create_dissector_handle(dissect_tdmop, proto_tdmop);
+ tdmop_handle = new_create_dissector_handle(dissect_tdmop, proto_tdmop);
dissector_add_uint("udp.port", pref_tdmop_udpport, tdmop_handle);
dissector_add_uint("ethertype", pref_tdmop_ethertype, tdmop_handle);
lapd_handle = find_dissector("lapd-bitstream");