diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-15 16:51:45 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-16 22:00:30 +0000 |
| commit | 799d6fd057b0c20a7692a1181d811a8ff3a88d04 (patch) | |
| tree | 31d6d1248aee7c3192ae6d854b43eeb2c0b996a0 /epan/dissectors/packet-isdn.c | |
| parent | 92bb13a4d22a48c43aa5fa6910c68829edebfdd0 (diff) | |
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I96aa9cf53533cbb07105aa400d42922baf3016b3
Reviewed-on: https://code.wireshark.org/review/11860
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-isdn.c')
| -rw-r--r-- | epan/dissectors/packet-isdn.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-isdn.c b/epan/dissectors/packet-isdn.c index fc27c8978e..80e7d87120 100644 --- a/epan/dissectors/packet-isdn.c +++ b/epan/dissectors/packet-isdn.c @@ -90,8 +90,8 @@ static const value_string channel_vals[] = { { 0, NULL } }; -static void -dissect_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_tree *isdn_tree; proto_item *ti; @@ -200,6 +200,8 @@ dissect_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (!try_circuit_dissector(CT_ISDN, pinfo->pseudo_header->isdn.channel, pinfo->fd->num, tvb, pinfo, tree, NULL)) call_dissector(data_handle, tvb, pinfo, tree); + + return tvb_captured_length(tvb); } void @@ -242,7 +244,7 @@ proto_reg_handoff_isdn(void) v120_handle = find_dissector("v120"); data_handle = find_dissector("data"); - isdn_handle = create_dissector_handle(dissect_isdn, proto_isdn); + isdn_handle = new_create_dissector_handle(dissect_isdn, proto_isdn); dissector_add_uint("wtap_encap", WTAP_ENCAP_ISDN, isdn_handle); } |