osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

X2AP: fix dissection of SeNB to MeNB Container 

Change-Id: I4f5af9d52646d74dfa264583b6f0a79e097527e7
Reviewed-on: https://code.wireshark.org/review/30032
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2018-10-05 18:01:53 +02:00
parent a3e18c1807
commit 3d77c3fc2c
5 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
View File

@ -39,6 +39,7 @@ HandoverPreparationInformation_PDU
HandoverPreparationInformation-NB_PDU
RLF-Report-r9_PDU
RLF-Report-v9e0_PDU
SCG-Config-r12_PDU
SCG-ConfigInfo-r12_PDU
UEPagingCoverageInformation_PDU
UEPagingCoverageInformation-NB_PDU
@ -53,6 +54,7 @@ HandoverPreparationInformation-NB
RLF-Report-r9
RLF-Report-v9e0
RRCConnectionReconfiguration @rrc_conn_reconf
SCG-Config-r12
SCG-ConfigInfo-r12
UEPagingCoverageInformation
UEPagingCoverageInformation-NB
@ -1447,7 +1449,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(&lte_rrc_duration_val)
if (private_data_get_bcch_dl_sch_msg(actx) == FALSE) {
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SystemInformationBlockType1");
}
}
#.FN_HDR SystemInformation-BR-r13

2
epan/dissectors/asn1/x2ap/x2ap.cnf
View File

@ -246,7 +246,7 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC
if (!parameter_tvb)
return offset;
subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_SeNBtoMeNBContainer);
dissect_lte_rrc_SCG_ConfigInfo_r12_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
dissect_lte_rrc_SCG_Config_r12_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
#.FN_BODY MeNBtoSgNBContainer VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb;

15
epan/dissectors/packet-lte-rrc.c
View File

@ -302,6 +302,7 @@ static int proto_lte_rrc = -1;
#line 1 "./asn1/lte-rrc/packet-lte-rrc-hf.c"
static int hf_lte_rrc_lte_rrc_HandoverCommand_PDU = -1; /* HandoverCommand */
static int hf_lte_rrc_lte_rrc_HandoverPreparationInformation_PDU = -1; /* HandoverPreparationInformation */
static int hf_lte_rrc_lte_rrc_SCG_Config_r12_PDU = -1; /* SCG_Config_r12 */
static int hf_lte_rrc_lte_rrc_SCG_ConfigInfo_r12_PDU = -1; /* SCG_ConfigInfo_r12 */
static int hf_lte_rrc_lte_rrc_UEPagingCoverageInformation_PDU = -1; /* UEPagingCoverageInformation */
static int hf_lte_rrc_UERadioAccessCapabilityInformation_PDU = -1; /* UERadioAccessCapabilityInformation */
@ -38940,7 +38941,7 @@ dissect_lte_rrc_SystemInformationBlockType1(tvbuff_t *tvb _U_, int offset _U_, a
if (private_data_get_bcch_dl_sch_msg(actx) == FALSE) {
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SystemInformationBlockType1");
}
}
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_lte_rrc_SystemInformationBlockType1, SystemInformationBlockType1_sequence);
@ -107371,6 +107372,14 @@ int dissect_lte_rrc_HandoverPreparationInformation_PDU(tvbuff_t *tvb _U_, packet
offset += 7; offset >>= 3;
return offset;
}
int dissect_lte_rrc_SCG_Config_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
offset = dissect_lte_rrc_SCG_Config_r12(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_SCG_Config_r12_PDU);
offset += 7; offset >>= 3;
return offset;
}
int dissect_lte_rrc_SCG_ConfigInfo_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@ -108249,6 +108258,10 @@ void proto_register_lte_rrc(void) {
{ "HandoverPreparationInformation", "lte-rrc.HandoverPreparationInformation_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_lte_rrc_SCG_Config_r12_PDU,
{ "SCG-Config-r12", "lte-rrc.SCG_Config_r12_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_lte_rrc_SCG_ConfigInfo_r12_PDU,
{ "SCG-ConfigInfo-r12", "lte-rrc.SCG_ConfigInfo_r12_element",
FT_NONE, BASE_NONE, NULL, 0,

1
epan/dissectors/packet-lte-rrc.h
View File

@ -26,6 +26,7 @@ extern value_string_ext lte_rrc_messageIdentifier_vals_ext;
#line 1 "./asn1/lte-rrc/packet-lte-rrc-exp.h"
int dissect_lte_rrc_HandoverCommand_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_HandoverPreparationInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_SCG_Config_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_SCG_ConfigInfo_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_UEPagingCoverageInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_RLF_Report_r9_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);

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

@ -8821,7 +8821,7 @@ dissect_x2ap_SeNBtoMeNBContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
if (!parameter_tvb)
return offset;
subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_SeNBtoMeNBContainer);
dissect_lte_rrc_SCG_ConfigInfo_r12_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
dissect_lte_rrc_SCG_Config_r12_PDU(parameter_tvb, actx->pinfo, subtree, NULL);