aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2009-03-05 04:32:08 +0000
committerBill Meier <wmeier@newsguy.com>2009-03-05 04:32:08 +0000
commit219ed7c2d08ee5c5a2e92584caed1e774c4837df (patch)
tree7abda08401dab6da4ac06c84117bdcc561a722f3 /epan
parent1c0924f62223cdbb91fe8150f8e139b32db4e874 (diff)
Oops! Fix the fix
svn path=/trunk/; revision=27613
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ziop.c23
1 files changed, 15 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ziop.c b/epan/dissectors/packet-ziop.c
index 530d6ac2f7..9828d280e4 100644
--- a/epan/dissectors/packet-ziop.c
+++ b/epan/dissectors/packet-ziop.c
@@ -95,7 +95,7 @@ static gint ett_ziop_original_length = -1;
static dissector_handle_t data_handle;
-static dissector_handle_t ziop_handle;
+static dissector_handle_t ziop_tcp_handle;
static const value_string ziop_compressor_ids[] = {
@@ -211,7 +211,7 @@ dissect_ziop_heur (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) {
&pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
}
/* Set dissector */
- conversation_set_dissector(conversation, ziop_handle);
+ conversation_set_dissector(conversation, ziop_tcp_handle);
}
dissect_ziop_tcp (tvb, pinfo, tree);
}
@@ -224,9 +224,17 @@ dissect_ziop_heur (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) {
}
+
+
+
+
+
+
+
+
+
/* Main entry point */
-static void
-dissect_ziop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) {
+void dissect_ziop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) {
guint offset = 0;
ZIOPHeader header;
CompressionData compression_data;
@@ -419,11 +427,10 @@ void proto_register_ziop (void) {
void proto_reg_handoff_ziop (void) {
- ziop_handle = find_dissector("ziop");
- dissector_add_handle("udp.port", ziop_handle); /* for 'Decode As' */
-
+ ziop_tcp_handle = create_dissector_handle(dissect_ziop_tcp, proto_ziop);
+ dissector_add_handle("udp.port", ziop_tcp_handle); /* For 'Decode As' */
+
heur_dissector_add("tcp", dissect_ziop_heur, proto_ziop);
data_handle = find_dissector("data");
-
}