aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/s1ap
diff options
context:
space:
mode:
authoranonsvn <anonsvn@localhost>2012-02-20 20:26:03 +0000
committeranonsvn <anonsvn@localhost>2012-02-20 20:26:03 +0000
commit5cbb7a9d4ea94b9a152dab87a8a6ab41d44c1e93 (patch)
tree746d4c952eba6b5e4e4848bbc1c3b13ed3150905 /asn1/s1ap
parent8fce627622f7f0bb2c0207ab9886d595e5658c62 (diff)
From David Wei more containers not to dissect if pref is set
svn path=/trunk/; revision=41084
Diffstat (limited to 'asn1/s1ap')
-rw-r--r--asn1/s1ap/s1ap.cnf12
1 files changed, 8 insertions, 4 deletions
diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index 3fe2d5c238..13cf694731 100644
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -302,7 +302,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
# it is described how the container shall be encoded with respect to the scenario
# in which it is used.
tvbuff_t *parameter_tvb;
- proto_tree *subtree;
+ proto_tree *subtree = NULL;
%(DEFAULT_BODY)s
@@ -356,7 +356,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
# See Target-ToSource-TransparentContainer in RANAP
tvbuff_t *parameter_tvb;
- proto_tree *subtree;
+ proto_tree *subtree = NULL;
%(DEFAULT_BODY)s
@@ -445,12 +445,13 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
# HandoverCommand and HandoverRequestAcknowledge.
tvbuff_t *parameter_tvb;
- proto_tree *subtree;
+ proto_tree *subtree = NULL;
%(DEFAULT_BODY)s
if (!parameter_tvb)
return offset;
+if (g_s1ap_dissect_container) {
subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_RRCContainer);
switch(message_type){
@@ -465,20 +466,23 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
default:
break;
}
+}
#.FN_BODY UERadioCapability VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb;
- proto_tree *subtree;
+ proto_tree *subtree = NULL;
%(DEFAULT_BODY)s
if (!parameter_tvb)
return offset;
+if (g_s1ap_dissect_container) {
subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_UERadioCapability);
dissect_lte_rrc_UERadioAccessCapabilityInformation_PDU(parameter_tvb, actx->pinfo, subtree);
+}
# 9.2.3.24 RIM Information
# Contains the BSSGP RIM PDU