aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-tuxedo.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-tuxedo.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-tuxedo.c')
-rw-r--r--epan/dissectors/packet-tuxedo.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-tuxedo.c b/epan/dissectors/packet-tuxedo.c
index 641f469231..4e6a7f52d4 100644
--- a/epan/dissectors/packet-tuxedo.c
+++ b/epan/dissectors/packet-tuxedo.c
@@ -98,8 +98,8 @@ static const value_string tuxedo_opcode_vals[] = {
};
-static void
-dissect_tuxedo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+static int
+dissect_tuxedo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
proto_tree *tuxedoroot_tree = NULL;
proto_item *ti;
@@ -136,6 +136,7 @@ dissect_tuxedo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
}
}
+ return tvb_captured_length(tvb);
}
static gboolean
@@ -152,7 +153,7 @@ dissect_tuxedo_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
conversation = find_or_create_conversation(pinfo);
conversation_set_dissector(conversation, tuxedo_handle);
- dissect_tuxedo(tvb, pinfo, tree);
+ dissect_tuxedo(tvb, pinfo, tree, data);
return TRUE;
}
}
@@ -184,7 +185,7 @@ proto_register_tuxedo(void)
void
proto_reg_handoff_tuxedo(void)
{
- tuxedo_handle = create_dissector_handle(dissect_tuxedo, proto_tuxedo);
+ tuxedo_handle = new_create_dissector_handle(dissect_tuxedo, proto_tuxedo);
dissector_add_for_decode_as("tcp.port", tuxedo_handle);
heur_dissector_add("tcp", dissect_tuxedo_heur, "Tuxedo over TCP", "tuxedo_tcp", proto_tuxedo, HEURISTIC_ENABLE);
}