[ACSE] Get rid of global variable top_tree.

Change-Id: I2084c313e778f0895a4f7a58dee445f0e742e78e
Reviewed-on: https://code.wireshark.org/review/23290
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Tomáš Kukosa <tomas.kukosa@ixperta.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>

diff --git a/epan/dissectors/asn1/acse/acse.cnf b/epan/dissectors/asn1/acse/acse.cnf
index 6fa8bbc052367bb192493621ae2a25d7a9aa00d9..c9d531c6dc5b6683fdb74ea90e2cf6b2c1a614ce 100644 (file)
--- a/epan/dissectors/asn1/acse/acse.cnf
+++ b/epan/dissectors/asn1/acse/acse.cnf
@@ -52,7 +52,7 @@ PDV-list/presentation-data-values/octet-aligned               pDVList_octet_aligned
 
 #.FN_BODY Authentication-value-other/other-mechanism-value
   if (actx->external.direct_ref_present) {
-    offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, top_tree, actx->private_data);
+    offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, actx->subtree.top_tree, actx->private_data);
   }
 
 #.FN_BODY PDV-list/presentation-data-values/simple-ASN1-type
@@ -104,12 +104,12 @@ PDV-list/presentation-data-values/octet-aligned           pDVList_octet_aligned
 
 #.FN_BODY EXTERNALt/_untag/encoding/single-ASN1-type
   if (actx->external.direct_ref_present) {
-    offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, top_tree ? top_tree : tree, actx->private_data);
+    offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, actx->subtree.top_tree ? actx->subtree.top_tree : tree, actx->private_data);
   }
 
 #.FN_BODY EXTERNALt/_untag/encoding/octet-aligned
   if (actx->external.direct_ref_present) {
-    offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, top_tree ? top_tree : tree, actx->private_data);
+    offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, actx->subtree.top_tree ? actx->subtree.top_tree : tree, actx->private_data);
   }
 
 #.FN_BODY AARQ-apdu

diff --git a/epan/dissectors/asn1/acse/packet-acse-template.c b/epan/dissectors/asn1/acse/packet-acse-template.c
index 02adb4e98e70f63457e9b0aec8a77a0040bd2a18..ee179af8191c98f1aef621b2774a5104f1edfc52 100644 (file)
--- a/epan/dissectors/asn1/acse/packet-acse-template.c
+++ b/epan/dissectors/asn1/acse/packet-acse-template.c
@@ -81,8 +81,6 @@ static dissector_handle_t acse_handle = NULL;
    kind of data is transferred in SES_DATA_TRANSFER_PDUs */
 static guint32 indir_ref=0;
 
-static proto_tree *top_tree=NULL;
-
 #if NOT_NEEDED
 /* to keep track of presentation context identifiers and protocol-oids */
 typedef struct _acse_ctx_oid_t {
@@ -177,7 +175,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
 
        asn1_ctx.private_data = session;
        /* save parent_tree so subdissectors can create new top nodes */
-       top_tree=parent_tree;
+       asn1_ctx.subtree.top_tree = parent_tree;
 
        /*  ACSE has only AARQ,AARE,RLRQ,RLRE,ABRT type of pdu */
        /*  reject everything else                              */
@@ -198,17 +196,15 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
                                proto_tree_add_expert_format(parent_tree, pinfo, &ei_acse_invalid_oid, tvb, offset, -1,
                                    "Invalid OID: %s", ACSE_APDU_OID);
                        }
-         else {
-            call_ber_oid_callback(oid, tvb, offset, pinfo, parent_tree, NULL);
-         }
+                else {
+                       call_ber_oid_callback(oid, tvb, offset, pinfo, parent_tree, NULL);
+                }
                } else {
                        proto_tree_add_expert(parent_tree, pinfo, &ei_acse_dissector_not_available,
-                                    tvb, offset, -1);
+                                                                       tvb, offset, -1);
                }
-               top_tree = NULL;
                return 0;
        default:
-               top_tree = NULL;
                return 0;
        }
 
@@ -239,7 +235,6 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
                }
        }
 
-       top_tree = NULL;
        return tvb_captured_length(tvb);
 }
 

diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index ebb08558494c1068fc2bb0cef8aa73b7bd6e6e91..4c22bbe1ab5a78840209f134bb891dc9784d1565 100644 (file)
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -242,8 +242,6 @@ static dissector_handle_t acse_handle = NULL;
    kind of data is transferred in SES_DATA_TRANSFER_PDUs */
 static guint32 indir_ref=0;
 
-static proto_tree *top_tree=NULL;
-
 #if NOT_NEEDED
 /* to keep track of presentation context identifiers and protocol-oids */
 typedef struct _acse_ctx_oid_t {
@@ -357,7 +355,7 @@ static int
 dissect_acse_T_single_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 106 "./asn1/acse/acse.cnf"
   if (actx->external.direct_ref_present) {
-    offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, top_tree ? top_tree : tree, actx->private_data);
+    offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, actx->subtree.top_tree ? actx->subtree.top_tree : tree, actx->private_data);
   }
 
 
@@ -371,7 +369,7 @@ static int
 dissect_acse_T_octet_aligned(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 111 "./asn1/acse/acse.cnf"
   if (actx->external.direct_ref_present) {
-    offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, top_tree ? top_tree : tree, actx->private_data);
+    offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, actx->subtree.top_tree ? actx->subtree.top_tree : tree, actx->private_data);
   }
 
 
@@ -685,7 +683,7 @@ static int
 dissect_acse_T_other_mechanism_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 54 "./asn1/acse/acse.cnf"
   if (actx->external.direct_ref_present) {
-    offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, top_tree, actx->private_data);
+    offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, actx->subtree.top_tree, actx->private_data);
   }
 
 
@@ -1687,7 +1685,7 @@ dissect_acse_AE_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
 
 
 /*--- End of included file: packet-acse-fn.c ---*/
-#line 140 "./asn1/acse/packet-acse-template.c"
+#line 138 "./asn1/acse/packet-acse-template.c"
 
 
 /*
@@ -1728,7 +1726,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
 
        asn1_ctx.private_data = session;
        /* save parent_tree so subdissectors can create new top nodes */
-       top_tree=parent_tree;
+       asn1_ctx.subtree.top_tree = parent_tree;
 
        /*  ACSE has only AARQ,AARE,RLRQ,RLRE,ABRT type of pdu */
        /*  reject everything else                              */
@@ -1749,17 +1747,15 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
                                proto_tree_add_expert_format(parent_tree, pinfo, &ei_acse_invalid_oid, tvb, offset, -1,
                                    "Invalid OID: %s", ACSE_APDU_OID);
                        }
-         else {
-            call_ber_oid_callback(oid, tvb, offset, pinfo, parent_tree, NULL);
-         }
+                else {
+                       call_ber_oid_callback(oid, tvb, offset, pinfo, parent_tree, NULL);
+                }
                } else {
                        proto_tree_add_expert(parent_tree, pinfo, &ei_acse_dissector_not_available,
-                                    tvb, offset, -1);
+                                                                       tvb, offset, -1);
                }
-               top_tree = NULL;
                return 0;
        default:
-               top_tree = NULL;
                return 0;
        }
 
@@ -1790,7 +1786,6 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
                }
        }
 
-       top_tree = NULL;
        return tvb_captured_length(tvb);
 }
 
@@ -2236,7 +2231,7 @@ void proto_register_acse(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-acse-hfarr.c ---*/
-#line 256 "./asn1/acse/packet-acse-template.c"
+#line 251 "./asn1/acse/packet-acse-template.c"
   };
 
   /* List of subtrees */
@@ -2282,7 +2277,7 @@ void proto_register_acse(void) {
     &ett_acse_Authentication_value,
 
 /*--- End of included file: packet-acse-ettarr.c ---*/
-#line 262 "./asn1/acse/packet-acse-template.c"
+#line 257 "./asn1/acse/packet-acse-template.c"
   };
 
   static ei_register_info ei[] = {