From 5a8783f5b12e017967ce178bac3d1826630dea1a Mon Sep 17 00:00:00 2001
From: Jakub Zawadzki <darkjames-ws@darkjames.pl>
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/h450/packet-h450-template.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'asn1/h450')

diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c
index 6f7e65254e..5550669f02 100644
--- a/asn1/h450/packet-h450-template.c
+++ b/asn1/h450/packet-h450-template.c
@@ -113,7 +113,7 @@ static const h450_err_t *get_err(gint32 errcode) {
 
 /*--- dissect_h450_arg ------------------------------------------------------*/
 static int   
-dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
+dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) {
   proto_item *hidden_item;
   int offset;
   rose_ctx_t *rctx;
@@ -143,7 +143,7 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   }
 
   if (op_ptr->arg_pdu && (tvb_length_remaining(tvb, offset) > 0))
-    offset = op_ptr->arg_pdu(tvb, pinfo, tree);
+    offset = op_ptr->arg_pdu(tvb, pinfo, tree, NULL);
   else 
     if (tvb_length_remaining(tvb, offset) > 0) {
       proto_tree_add_text(tree, tvb, offset, -1, "UNSUPPORTED ARGUMENT TYPE (H.450)");
@@ -155,7 +155,7 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 
 /*--- dissect_h450_res ------------------------------------------------------*/
 static int   
-dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
+dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) {
   proto_item *hidden_item;
   int offset;
   rose_ctx_t *rctx;
@@ -185,7 +185,7 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   }
 
   if (op_ptr->res_pdu && (tvb_length_remaining(tvb, offset) > 0))
-    offset = op_ptr->res_pdu(tvb, pinfo, tree);
+    offset = op_ptr->res_pdu(tvb, pinfo, tree, NULL);
   else 
     if (tvb_length_remaining(tvb, offset) > 0) {
       proto_tree_add_text(tree, tvb, offset, -1, "UNSUPPORTED RESULT TYPE (H.450)");
@@ -197,7 +197,7 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 
 /*--- dissect_h450_err ------------------------------------------------------*/
 static int   
-dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
+dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) {
   proto_item *hidden_item;
   int offset;
   rose_ctx_t *rctx;
@@ -227,7 +227,7 @@ dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   }
 
   if (err_ptr->err_pdu && (tvb_length_remaining(tvb, offset) > 0))
-    offset = err_ptr->err_pdu(tvb, pinfo, tree);
+    offset = err_ptr->err_pdu(tvb, pinfo, tree, NULL);
   else 
     if (tvb_length_remaining(tvb, offset) > 0) {
       proto_tree_add_text(tree, tvb, offset, -1, "UNSUPPORTED ERROR TYPE (H.450)");
-- 
cgit v1.2.1