aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarien Spencer <cusneud@mail.com>2017-11-17 10:39:47 +0200
committerAnders Broman <a.broman58@gmail.com>2017-11-17 11:29:30 +0000
commit848cd4e291782ae9a59a3d4719d384870e2dddd8 (patch)
tree2f7d5dcba797e32f368fc171f8ed5e07b0ed1215
parent00e217a732dc7d8c38ea5fac93dd81fcc0bc0ef2 (diff)
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>
-rw-r--r--epan/dissectors/asn1/rrc/rrc.cnf4
-rw-r--r--epan/dissectors/packet-rrc.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/asn1/rrc/rrc.cnf b/epan/dissectors/asn1/rrc/rrc.cnf
index 033a271..c871691 100644
--- a/epan/dissectors/asn1/rrc/rrc.cnf
+++ b/epan/dissectors/asn1/rrc/rrc.cnf
@@ -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;
diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c
index 6a1bd55..7e6fe59 100644
--- a/epan/dissectors/packet-rrc.c
+++ b/epan/dissectors/packet-rrc.c
@@ -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;