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

From Pascal Quantin: 

- Set a default RNTI value for each type, in case optional RNTI value isn't supplied.
- Improve range checking of given type against acceptable range of values
- fix misplaced return (this fixed bug 5392)

svn path=/trunk/; revision=34859
This commit is contained in:
Martin Mathieson 2010-11-13 15:32:29 +00:00
parent 06d94db99f
commit a8b6aca90c
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
epan/dissectors/packet-mac-lte.c
View File

@ -882,6 +882,23 @@ static gboolean dissect_mac_lte_heur(tvbuff_t *tvb, packet_info *pinfo,
p_mac_lte_info->rntiType = tvb_get_guint8(tvb, offset++);
/* Initialize RNTI with a default value in case optional field is not present */
switch (p_mac_lte_info->rntiType) {
case P_RNTI:
p_mac_lte_info->rnti = 0xFFFE;
break;
case SI_RNTI:
p_mac_lte_info->rnti = 0xFFFF;
break;
case RA_RNTI:
case C_RNTI:
case SPS_RNTI:
p_mac_lte_info->rnti = 0x0001;
break;
default:
break;
}
/* Read optional fields */
while (tag != MAC_LTE_PAYLOAD_TAG) {
/* Process next tag */
@ -3028,14 +3045,23 @@ void dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
break;
case RA_RNTI:
if ((p_mac_lte_info->rnti < 0x0001) || (p_mac_lte_info->rnti > 0x003C)) {
expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR,
"RA_RNTI indicated, but given value %u (0x%x)is out of range",
p_mac_lte_info->rnti, p_mac_lte_info->rnti);
return;
}
break;
case C_RNTI:
case SPS_RNTI:
if ((p_mac_lte_info->rnti < 0x0001) || (p_mac_lte_info->rnti > 0xFFF3)) {
expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR,
"%s indicated, but given value %u (0x%x)is out of range",
val_to_str_const(p_mac_lte_info->rntiType, rnti_type_vals, "Unknown"),
p_mac_lte_info->rnti, p_mac_lte_info->rnti);
return;
}
return;
break;
default:
break;