diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-03 02:45:22 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-03 02:45:22 +0000 |
| commit | 60e3e52a5329ca1b7559a18146f745254b24d7cd (patch) | |
| tree | 972474395810c1d9b3389a1a7baa5c749e3243cc /epan/dissectors/packet-h460.c | |
| parent | 3b7f6f0e5f5abf75a944b49745441a9565e70c0a (diff) | |
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 'epan/dissectors/packet-h460.c')
| -rw-r--r-- | epan/dissectors/packet-h460.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/dissectors/packet-h460.c b/epan/dissectors/packet-h460.c index 1782dc9061..2f88793e73 100644 --- a/epan/dissectors/packet-h460.c +++ b/epan/dissectors/packet-h460.c @@ -2128,12 +2128,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);*/ @@ -2871,7 +2870,7 @@ void proto_register_h460(void) { "UnicastAddress", HFILL }}, /*--- End of included file: packet-h460-hfarr.c ---*/ -#line 248 "../../asn1/h460/packet-h460-template.c" +#line 247 "../../asn1/h460/packet-h460-template.c" }; /* List of subtrees */ @@ -2970,7 +2969,7 @@ void proto_register_h460(void) { &ett_h460_21_TransmitCapabilities, /*--- End of included file: packet-h460-ettarr.c ---*/ -#line 253 "../../asn1/h460/packet-h460-template.c" +#line 252 "../../asn1/h460/packet-h460-template.c" }; /* Register protocol */ |