summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-asf.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2010-10-30 03:34:29 +0000
committerGuy Harris <guy@alum.mit.edu>2010-10-30 03:34:29 +0000
commit19ac4ab7451608ea40ce93b827f264569208ab4e (patch)
tree24904167122e908b1257343c9eb192d776239fba /epan/dissectors/packet-asf.c
parent5c0ce795b3abaa0bd45863b182f1acf4ee9522d7 (diff)
downloadwireshark-19ac4ab7451608ea40ce93b827f264569208ab4e.tar.gz
The ASF dissector should be a new-style dissector, so its caller knows
how much of the packet data it's consumed - but that means the dissector handle for it must be created with new_create_dissector_handle(). svn path=/trunk/; revision=34707
Diffstat (limited to 'epan/dissectors/packet-asf.c')
-rw-r--r--epan/dissectors/packet-asf.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-asf.c b/epan/dissectors/packet-asf.c
index 0883bf561a..980fbc9f6b 100644
--- a/epan/dissectors/packet-asf.c
+++ b/epan/dissectors/packet-asf.c
@@ -147,7 +147,7 @@ static void dissect_asf_payload_authentication(tvbuff_t *tvb, proto_tree *tree,
static void dissect_asf_payload_integrity(tvbuff_t *tvb, proto_tree *tree,
gint offset, gint len);
-static void
+static int
dissect_asf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_tree *asf_tree = NULL;
@@ -193,6 +193,7 @@ dissect_asf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
}
}
+ return 8 + len;
}
static void dissect_asf_open_session_request(tvbuff_t *tvb, proto_tree *tree,
@@ -371,6 +372,6 @@ proto_reg_handoff_asf(void)
data_handle = find_dissector("data");
- asf_handle = create_dissector_handle(dissect_asf, proto_asf);
+ asf_handle = new_create_dissector_handle(dissect_asf, proto_asf);
dissector_add("rmcp.class", RMCP_CLASS_ASF, asf_handle);
}