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

From Fredrik Kuivinen: 

Fix a problem with dissection of HandoverRequest.

svn path=/trunk/; revision=38776
This commit is contained in:
Anders Broman 2011-08-29 14:47:20 +00:00
parent bc62276831
commit 780acd9931
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
asn1/x2ap/x2ap.cnf
View File

@ -127,21 +127,17 @@ ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(x2ap_Prot
proto_tree_add_item(subtree, hf_x2ap_transportLayerAddressIPv6, parameter_tvb, 0, tvb_len, FALSE);
}
#.FN_BODY RRC-Context
#VAL_PTR = &parameter_tvb
#.FN_BODY RRC-Context VAL_PTR = &parameter_tvb
# Includes the RRC Handover Preparation Information message as defined in
# subclause 10.2.2 of [9].
# [9] 3GPP TS 36.331: "Evolved Universal Terrestrial Radio Access (E-UTRAN); Radio Resource
# Control (RRC) Protocol Specification".
tvbuff_t *parameter_tvb=NULL;
gint32 start_offset;
start_offset = offset;
%(DEFAULT_BODY)s
parameter_tvb = tvb_new_subset(tvb, start_offset>>3, -1, -1);
if (!parameter_tvb)
return offset;
dissect_lte_rrc_HandoverCommand_PDU(parameter_tvb, actx->pinfo, tree);
dissect_lte_rrc_HandoverPreparationInformation_PDU(parameter_tvb, actx->pinfo, tree);
#.ASSIGN_VALUE_TO_TYPE # X2AP does not have constants assigned to types, they are pure INTEGER
# ProcedureCode

13
epan/dissectors/packet-x2ap.c
View File

@ -2689,18 +2689,15 @@ dissect_x2ap_ReportCharacteristics(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
static int
dissect_x2ap_RRC_Context(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 136 "../../asn1/x2ap/x2ap.cnf"
#line 135 "../../asn1/x2ap/x2ap.cnf"
tvbuff_t *parameter_tvb=NULL;
gint32 start_offset;
start_offset = offset;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, NULL);
parameter_tvb = tvb_new_subset(tvb, start_offset>>3, -1, -1);
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &parameter_tvb);
if (!parameter_tvb)
return offset;
dissect_lte_rrc_HandoverCommand_PDU(parameter_tvb, actx->pinfo, tree);
dissect_lte_rrc_HandoverPreparationInformation_PDU(parameter_tvb, actx->pinfo, tree);