summaryrefslogtreecommitdiff
path: root/asn1/q932
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2007-05-13 20:58:29 +0000
committerAnders Broman <anders.broman@ericsson.com>2007-05-13 20:58:29 +0000
commitc01f3829742dacd6d94dc50be54537661bad0581 (patch)
treeeb3da0d69d5bc62ca587ebd999b6beacd693f168 /asn1/q932
parentb80cb43018aa49bac3e24cabca009ca0471cd579 (diff)
downloadwireshark-c01f3829742dacd6d94dc50be54537661bad0581.tar.gz
Second step in introducing asn context to BER dissectors just like in PER.
svn path=/trunk/; revision=21753
Diffstat (limited to 'asn1/q932')
-rw-r--r--asn1/q932/packet-q932-ros-template.c1
-rw-r--r--asn1/q932/packet-q932-template.c1
-rw-r--r--asn1/q932/q932-ros.cnf12
3 files changed, 8 insertions, 6 deletions
diff --git a/asn1/q932/packet-q932-ros-template.c b/asn1/q932/packet-q932-ros-template.c
index 5fb6124c74..e038008374 100644
--- a/asn1/q932/packet-q932-ros-template.c
+++ b/asn1/q932/packet-q932-ros-template.c
@@ -33,6 +33,7 @@
#include <epan/prefs.h>
#include <epan/strutil.h>
#include <epan/emem.h>
+#include <epan/asn1.h>
#include "packet-ber.h"
#include "packet-q932-ros.h"
diff --git a/asn1/q932/packet-q932-template.c b/asn1/q932/packet-q932-template.c
index 0bc5efdbc8..1c7ffe08a1 100644
--- a/asn1/q932/packet-q932-template.c
+++ b/asn1/q932/packet-q932-template.c
@@ -31,6 +31,7 @@
#include <epan/prefs.h>
#include <epan/strutil.h>
#include <epan/emem.h>
+#include <epan/asn1.h>
#include "packet-ber.h"
#include "packet-q932-ros.h"
diff --git a/asn1/q932/q932-ros.cnf b/asn1/q932/q932-ros.cnf
index e2d69f5abd..8053a1ea08 100644
--- a/asn1/q932/q932-ros.cnf
+++ b/asn1/q932/q932-ros.cnf
@@ -87,8 +87,8 @@ Invoke/argument TYPE = FT_BYTES DISPLAY = BASE_HEX
proto_item_append_text(proto_item_get_parent_nth(proto_tree_get_parent(tree), rose_ctx->apdu_depth), " %s", code_global);
}
if (arg_next_tvb) {
- pinfo->private_data = rose_ctx;
- call_dissector((arg_handle)?arg_handle:data_handle, arg_next_tvb, pinfo, tree);
+ actx->pinfo->private_data = rose_ctx;
+ call_dissector((arg_handle)?arg_handle:data_handle, arg_next_tvb, actx->pinfo, tree);
}
#.END
@@ -130,8 +130,8 @@ ReturnResult/result/result TYPE = FT_BYTES DISPLAY = BASE_HEX
proto_item_append_text(proto_item_get_parent_nth(proto_tree_get_parent(tree), rose_ctx->apdu_depth), " %s", code_global);
}
if (res_next_tvb) {
- pinfo->private_data = rose_ctx;
- call_dissector((res_handle)?res_handle:data_handle, res_next_tvb, pinfo, tree);
+ actx->pinfo->private_data = rose_ctx;
+ call_dissector((res_handle)?res_handle:data_handle, res_next_tvb, actx->pinfo, tree);
}
#.END
@@ -173,8 +173,8 @@ ReturnError/parameter TYPE = FT_BYTES DISPLAY = BASE_HEX
proto_item_append_text(proto_item_get_parent_nth(proto_tree_get_parent(tree), rose_ctx->apdu_depth), " %s", code_global);
}
if (err_next_tvb) {
- pinfo->private_data = rose_ctx;
- call_dissector((err_handle)?err_handle:data_handle, err_next_tvb, pinfo, tree);
+ actx->pinfo->private_data = rose_ctx;
+ call_dissector((err_handle)?err_handle:data_handle, err_next_tvb, actx->pinfo, tree);
}
#.END