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

NR-RRC: Set drbid entry properly in mappings

This commit is contained in:
Martin Mathieson 2021-01-09 00:37:03 +00:00 committed by Martin Mathieson
parent 43ec0bd228
commit 4a72be5473
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
View File

@ -1482,12 +1482,12 @@ VisitedCellInfo-r16/timeSpent-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&uni
struct mac_nr_info *p_mac_nr_info;
/* Get the struct and clear it out */
nr_drb_mac_rlc_mapping_t *drb_mapping = &nr_rrc_get_private_data(actx)->drb_rlc_mapping;
drb_mapping->active = TRUE;
memset(drb_mapping, 0, sizeof(nr_drb_mac_rlc_mapping_t));
drb_mapping->active = TRUE;
%(DEFAULT_BODY)s
/* Need UE identifier */
p_mac_nr_info = (mac_nr_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_mac_nr, 0);
if (p_mac_nr_info) {
if (p_mac_nr_info && drb_mapping->drbid) {
drb_mapping->ueid = p_mac_nr_info->ueid;
/* Tell MAC about this mapping */
set_mac_nr_bearer_mapping(drb_mapping);
@ -1568,8 +1568,8 @@ VisitedCellInfo-r16/timeSpent-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&uni
#.FN_BODY DRB-ToAddMod
nr_drb_rlc_pdcp_mapping_t *mapping = &nr_rrc_get_private_data(actx)->drb_pdcp_mapping;
mapping->active = TRUE;
memset(mapping, 0, sizeof(*mapping));
mapping->active = TRUE;
%(DEFAULT_BODY)s
/* Need UE identifier. Use mac-nr. */
mac_nr_info *p_mac_nr_info = (mac_nr_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_mac_nr, 0);

6
epan/dissectors/packet-nr-rrc.c
View File

@ -25634,8 +25634,8 @@ static const per_sequence_t DRB_ToAddMod_sequence[] = {
static int
dissect_nr_rrc_DRB_ToAddMod(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
nr_drb_rlc_pdcp_mapping_t *mapping = &nr_rrc_get_private_data(actx)->drb_pdcp_mapping;
mapping->active = TRUE;
memset(mapping, 0, sizeof(*mapping));
mapping->active = TRUE;
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_nr_rrc_DRB_ToAddMod, DRB_ToAddMod_sequence);
@ -56925,14 +56925,14 @@ dissect_nr_rrc_RLC_BearerConfig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
struct mac_nr_info *p_mac_nr_info;
/* Get the struct and clear it out */
nr_drb_mac_rlc_mapping_t *drb_mapping = &nr_rrc_get_private_data(actx)->drb_rlc_mapping;
drb_mapping->active = TRUE;
memset(drb_mapping, 0, sizeof(nr_drb_mac_rlc_mapping_t));
drb_mapping->active = TRUE;
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_nr_rrc_RLC_BearerConfig, RLC_BearerConfig_sequence);
/* Need UE identifier */
p_mac_nr_info = (mac_nr_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_mac_nr, 0);
if (p_mac_nr_info) {
if (p_mac_nr_info && drb_mapping->drbid) {
drb_mapping->ueid = p_mac_nr_info->ueid;
/* Tell MAC about this mapping */
set_mac_nr_bearer_mapping(drb_mapping);