summaryrefslogtreecommitdiff
path: root/asn1/h460
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2013-11-03 02:45:22 +0000
committerMichael Mann <mmann78@netscape.net>2013-11-03 02:45:22 +0000
commit60e3e52a5329ca1b7559a18146f745254b24d7cd (patch)
tree972474395810c1d9b3389a1a7baa5c749e3243cc /asn1/h460
parent3b7f6f0e5f5abf75a944b49745441a9565e70c0a (diff)
downloadwireshark-60e3e52a5329ca1b7559a18146f745254b24d7cd.tar.gz
Have asn1_ctx_t passed into the "h245.gef.name" and "h245.gef.content" subdissectors instead of using pinfo->private_data.
svn path=/trunk/; revision=53055
Diffstat (limited to 'asn1/h460')
-rw-r--r--asn1/h460/packet-h460-template.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/asn1/h460/packet-h460-template.c b/asn1/h460/packet-h460-template.c
index fe4989592a..4490fbc835 100644
--- a/asn1/h460/packet-h460-template.c
+++ b/asn1/h460/packet-h460-template.c
@@ -216,12 +216,11 @@ static h460_feature_t *find_ftr(const gchar *key) {
/*--- dissect_h460_name -------------------------------------------*/
static int
-dissect_h460_name(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree, void *data _U_) {
+dissect_h460_name(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree, void *data) {
int offset = 0;
- asn1_ctx_t *actx;
+ asn1_ctx_t *actx = get_asn1_ctx(data);
h460_feature_t *ftr;
- actx = get_asn1_ctx(pinfo->private_data);
DISSECTOR_ASSERT(actx);
if (tree) {
/* DEBUG */ /*proto_tree_add_text(tree, tvb, 0, 0, "*** DEBUG dissect_h460_name: %s", pinfo->match_string);*/