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

rrc: fixed incorrect constants 

The macinf->content field should be compared to MAC_CONTENT_* and not MAC_*

Change-Id: I0dee7855938095c5d1c53f4db13003b90cf7ba91
Reviewed-on: https://code.wireshark.org/review/24460
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Darien Spencer 2017-11-17 10:39:47 +02:00 committed by Anders Broman
parent 00e217a732
commit 848cd4e291
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1015,10 +1015,10 @@ HNBName TYPE=FT_STRING DISPLAY=STR_UNICODE
rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_umts_rlc, 0);
if (fpinf && macinf && rlcinf) {
switch(macinf->content[fpinf->cur_tb]){
case MAC_DCCH:
case MAC_CONTENT_DCCH:
u_rnti = rlcinf->ueid[fpinf->cur_tb];
break;
case MAC_CCCH:
case MAC_CONTENT_CCCH:
default:
u_rnti = private_data_get_current_u_rnti(actx);
break;

4
epan/dissectors/packet-rrc.c
View File

@ -39102,10 +39102,10 @@ dissect_rrc_C_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot
rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_umts_rlc, 0);
if (fpinf && macinf && rlcinf) {
switch(macinf->content[fpinf->cur_tb]){
case MAC_DCCH:
case MAC_CONTENT_DCCH:
u_rnti = rlcinf->ueid[fpinf->cur_tb];
break;
case MAC_CCCH:
case MAC_CONTENT_CCCH:
default:
u_rnti = private_data_get_current_u_rnti(actx);
break;