diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-11-09 21:47:21 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-11-09 21:47:21 +0000 |
| commit | 9822e9f80490d2d01cc3d9886360ad47e39df7de (patch) | |
| tree | e6d6ee833fe67d64888cf0cb0a3aafc331e36882 /asn1/s1ap | |
| parent | 989dcf58d19fa7f6fc1da1a6841cae565c229752 (diff) | |
Align RRC-Container dissection with RANAP.
svn path=/trunk/; revision=30911
Diffstat (limited to 'asn1/s1ap')
| -rw-r--r-- | asn1/s1ap/s1ap.cnf | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf index e522e1e99c..2ae08ed2b3 100644 --- a/asn1/s1ap/s1ap.cnf +++ b/asn1/s1ap/s1ap.cnf @@ -259,6 +259,8 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") #.FN_BODY Source-ToTarget-TransparentContainer #VAL_PTR = ¶meter_tvb +# I think the message is "directly encoded" into the octest string(no "double encoding") +# (Compare RANAP) # Annex A # ...Therefore the container content is encoded according to the # rules which are specified for the target radio system. In section 8.4.1.2, @@ -318,6 +320,8 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") #.FN_BODY Target-ToSource-TransparentContainer #VAL_PTR = ¶meter_tvb +# I think the message is "directly encoded" into the octest string(no "double encoding") +# See Target-ToSource-TransparentContainer in RANAP gint32 start_offset; tvbuff_t *parameter_tvb; @@ -375,8 +379,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") #TargetRNC-ToSourceRNC-TransparentContainer #TargetBSS-ToSourceBSS-TransparentContainer -#.FN_BODY RRC-Container -#VAL_PTR = ¶meter_tvb +#.FN_BODY RRC-Container VAL_PTR = ¶meter_tvb # Extracts from the standard: # Includes the RRC Handover Preparation Information message as defined @@ -409,18 +412,17 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") # Target eNB to Source eNB Transparent Container is present in # HandoverCommand and HandoverRequestAcknowledge. -# I think the message id "directly encoded" into the octest string(no "double encoding") gint32 start_offset; tvbuff_t *parameter_tvb; proto_tree *subtree; start_offset = offset; %(DEFAULT_BODY)s + if (!parameter_tvb) + return offset; subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_RRCContainer); - /* Make the new tvb to the end of the tvb as we don't (need to)know the length */ - parameter_tvb = tvb_new_subset(tvb, start_offset, -1, -1); switch(message_type){ case INITIATING_MESSAGE: /* 9.2.1.7 Source eNB to Target eNB Transparent Container */ |