osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From KATAOKA Toshihiro: 

3GPP S1AP Transparent Container.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4913

svn path=/trunk/; revision=33330
This commit is contained in:
Anders Broman 2010-06-26 16:39:18 +00:00
parent 3f9a94d773
commit f4c87595c9
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asn1/s1ap/s1ap.cnf
View File

@ -232,8 +232,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
#.FN_HDR HandoverRequest
handover_type_value = 0;
#.FN_BODY Source-ToTarget-TransparentContainer
#VAL_PTR = &parameter_tvb
#.FN_BODY Source-ToTarget-TransparentContainer VAL_PTR = &parameter_tvb
# I think the message is "directly encoded" into the octest string(no "double encoding")
# (Compare RANAP)
# Annex A
@ -248,7 +247,6 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
start_offset = offset;
%(DEFAULT_BODY)s
parameter_tvb = tvb_new_subset(tvb, start_offset>>3, -1, -1);
subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_ToTargetTransparentContainer);
switch(handover_type_value){
@ -293,8 +291,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
break;
}
#.FN_BODY Target-ToSource-TransparentContainer
#VAL_PTR = &parameter_tvb
#.FN_BODY Target-ToSource-TransparentContainer VAL_PTR = &parameter_tvb
# I think the message is "directly encoded" into the octest string(no "double encoding")
# See Target-ToSource-TransparentContainer in RANAP
@ -305,7 +302,6 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
start_offset = offset;
%(DEFAULT_BODY)s
parameter_tvb = tvb_new_subset(tvb, start_offset>>3, -1, -1);
subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_ToSourceTransparentContainer);
switch(handover_type_value){

14
epan/dissectors/packet-s1ap.c
View File

@ -3625,7 +3625,7 @@ dissect_s1ap_RepetitionPeriod(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
static int
dissect_s1ap_RRC_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 358 "s1ap.cnf"
#line 354 "s1ap.cnf"
gint32 start_offset;
@ -3858,17 +3858,16 @@ dissect_s1ap_SONConfigurationTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ct
static int
dissect_s1ap_Source_ToTarget_TransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 244 "s1ap.cnf"
#line 243 "s1ap.cnf"
gint32 start_offset;
tvbuff_t *parameter_tvb;
proto_tree *subtree;
start_offset = offset;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, NULL);
NO_BOUND, NO_BOUND, FALSE, &parameter_tvb);
parameter_tvb = tvb_new_subset(tvb, start_offset>>3, -1, -1);
subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_ToTargetTransparentContainer);
switch(handover_type_value){
@ -4230,7 +4229,7 @@ dissect_s1ap_TargeteNB_ToSourceeNB_TransparentContainer(tvbuff_t *tvb _U_, int o
static int
dissect_s1ap_Target_ToSource_TransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 300 "s1ap.cnf"
#line 297 "s1ap.cnf"
gint32 start_offset;
tvbuff_t *parameter_tvb;
@ -4238,10 +4237,9 @@ dissect_s1ap_Target_ToSource_TransparentContainer(tvbuff_t *tvb _U_, int offset
start_offset = offset;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, NULL);
NO_BOUND, NO_BOUND, FALSE, &parameter_tvb);
parameter_tvb = tvb_new_subset(tvb, start_offset>>3, -1, -1);
subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_ToSourceTransparentContainer);
switch(handover_type_value){
@ -4485,7 +4483,7 @@ dissect_s1ap_UEPagingID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
static int
dissect_s1ap_UERadioCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 418 "s1ap.cnf"
#line 414 "s1ap.cnf"
gint32 start_offset;
tvbuff_t *parameter_tvb;