From 5a8783f5b12e017967ce178bac3d1826630dea1a Mon Sep 17 00:00:00 2001 From: Jakub Zawadzki Date: Mon, 10 Sep 2012 21:40:21 +0000 Subject: Initial commit to support yet another method of passing data between dissectors. Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860 --- asn1/h225/packet-h225-template.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'asn1/h225') diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c index f1913c7c46..f0b47ef500 100644 --- a/asn1/h225/packet-h225-template.c +++ b/asn1/h225/packet-h225-template.c @@ -70,7 +70,6 @@ static void reset_h225_packet_info(h225_packet_info *pi); static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, h225_packet_info *pi); -static int dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); static h225_packet_info pi_arr[5]; /* We assuming a maximum of 5 H225 messaages per packet */ static int pi_current=0; @@ -140,7 +139,7 @@ static const char *tpOID; void proto_reg_handoff_h225(void); static int -dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { proto_item *it; proto_tree *tr; @@ -165,7 +164,7 @@ dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree * it=proto_tree_add_protocol_format(tree, proto_h225, tvb, 0, tvb_length(tvb), PSNAME" CS"); tr=proto_item_add_subtree(it, ett_h225); - offset = dissect_H323_UserInformation_PDU(tvb, pinfo, tr); + offset = dissect_H323_UserInformation_PDU(tvb, pinfo, tr, NULL); if (h245_list.count){ col_append_str(pinfo->cinfo, COL_PROTOCOL, "/"); @@ -180,7 +179,7 @@ dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree * return offset; } static int -dissect_h225_h225_RasMessage(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){ +dissect_h225_h225_RasMessage(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_){ proto_item *it; proto_tree *tr; guint32 offset=0; @@ -200,7 +199,7 @@ dissect_h225_h225_RasMessage(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree it=proto_tree_add_protocol_format(tree, proto_h225, tvb, offset, tvb_length(tvb), PSNAME" RAS"); tr=proto_item_add_subtree(it, ett_h225); - offset = dissect_RasMessage_PDU(tvb, pinfo, tr); + offset = dissect_RasMessage_PDU(tvb, pinfo, tr, NULL); ras_call_matching(tvb, pinfo, tr, h225_pi); -- cgit v1.2.1