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-maap.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-maap.c')
| -rw-r--r-- | epan/dissectors/packet-maap.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-maap.c b/epan/dissectors/packet-maap.c index 1f373507e4..dfa95d8e9f 100644 --- a/epan/dissectors/packet-maap.c +++ b/epan/dissectors/packet-maap.c @@ -81,8 +81,8 @@ static int hf_maap_conflict_count = -1; /* Initialize the subtree pointers */ static int ett_maap = -1; -static void -dissect_maap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_maap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint8 maap_msg_type; proto_item *maap_item = NULL; @@ -134,6 +134,8 @@ dissect_maap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(maap_tree, hf_maap_conflict_start_addr, tvb, MAAP_CONFLICT_START_ADDR_OFFSET, 6, ENC_NA); proto_tree_add_item(maap_tree, hf_maap_conflict_count, tvb, MAAP_CONFLICT_COUNT_OFFSET, 2, ENC_BIG_ENDIAN); } + + return tvb_captured_length(tvb); } /* end dissect_maap() */ /* Register the protocol with Wireshark */ @@ -211,7 +213,7 @@ proto_reg_handoff_maap(void) { dissector_handle_t maap_handle; - maap_handle = create_dissector_handle(dissect_maap, proto_maap); + maap_handle = new_create_dissector_handle(dissect_maap, proto_maap); dissector_add_uint("ieee1722.subtype", 0x7E, maap_handle); } |