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

DIAMETER: Process BCD encoded IMEISV in User-Equipment-Info 

Some example captures of DIAMETER show the IMEISV in User-Equipment-Info
being BCD encoded (as commonly seen in other protocols.) If the number
of octets used is 8, assume it is BCD encoded. If the number of octets
used is 16, assume it is ASCII. Otherwise, set an expert info for the
wrong length like the other types.

Use the defined constants to verify the lengths of the MAC, EUI64, and
MODIFIED_EUI64 types. Correct the length of the Modified EUI64 type,
as it is also 8 bytes, the same as EUI64 (there must have been confusion
with IPv6 addresses, which contain a Modified EUI64 in their 8 least
significant bytes.)
This commit is contained in:
John Thacker 2021-03-31 17:58:30 -04:00 committed by Wireshark GitLab Utility
parent 67f072e9f5
commit e44db606fa
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
epan/dissectors/packet-diameter.c
View File

@ -703,12 +703,20 @@ dissect_diameter_user_equipment_info_value(tvbuff_t *tvb, packet_info *pinfo, pr
case USER_EQUIPMENT_INFO_TYPE_IMEISV:
/* RFC 8506 section 8.53, 3GPP TS 23.003 */
len = tvb_reported_length(tvb);
proto_tree_add_item(tree, hf_diameter_user_equipment_info_imeisv, tvb, 0, len, ENC_ASCII|ENC_NA);
return len;
/* IMEISV is 16 digits, but often transmitted BCD coded in 8 octets. */
if (len == 8) {
proto_tree_add_item(tree, hf_diameter_user_equipment_info_imeisv, tvb, 0, len, ENC_BCD_DIGITS_0_9|ENC_NA);
return len;
} else if (len == 16) {
proto_tree_add_item(tree, hf_diameter_user_equipment_info_imeisv, tvb, 0, len, ENC_ASCII|ENC_NA);
return len;
}
proto_tree_add_expert(tree, pinfo, &ei_diameter_invalid_user_equipment_info_value_len, tvb, 0, len);
break;
case USER_EQUIPMENT_INFO_TYPE_MAC:
/* RFC 8506 section 8.54, RFC 5777 section 4.1.7.8 */
len = tvb_reported_length(tvb);
if (len == 6) {
if (len == FT_ETHER_LEN) {
proto_tree_add_item(tree, hf_diameter_user_equipment_info_mac, tvb, 0, len, ENC_NA);
return len;
}
@ -717,7 +725,7 @@ dissect_diameter_user_equipment_info_value(tvbuff_t *tvb, packet_info *pinfo, pr
case USER_EQUIPMENT_INFO_TYPE_EUI64:
/* RFC 8506 section 8.55 */
len = tvb_reported_length(tvb);
if (len == 8) {
if (len == FT_EUI64_LEN) {
proto_tree_add_item(tree, hf_diameter_user_equipment_info_eui64, tvb, 0, len, ENC_BIG_ENDIAN);
return len;
}
@ -726,8 +734,8 @@ dissect_diameter_user_equipment_info_value(tvbuff_t *tvb, packet_info *pinfo, pr
case USER_EQUIPMENT_INFO_TYPE_MODIFIED_EUI64:
/* RFC 8506 section 8.56, RFC 4291 */
len = tvb_reported_length(tvb);
if (len == 16) {
proto_tree_add_item(tree, hf_diameter_user_equipment_info_modified_eui64, tvb, 0, len, ENC_NA);
if (len == FT_EUI64_LEN) {
proto_tree_add_item(tree, hf_diameter_user_equipment_info_modified_eui64, tvb, 0, len, ENC_BIG_ENDIAN);
return len;
}
proto_tree_add_expert(tree, pinfo, &ei_diameter_invalid_user_equipment_info_value_len, tvb, 0, len);
@ -2492,7 +2500,7 @@ real_register_diameter_fields(void)
{ &hf_diameter_user_equipment_info_eui64,
{ "EUI64","diameter.user_equipment_info.eui64", FT_EUI64, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_diameter_user_equipment_info_modified_eui64,
{ "Modified EUI64","diameter.user_equipment_info.modified_eui64", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}
{ "Modified EUI64","diameter.user_equipment_info.modified_eui64", FT_EUI64, BASE_NONE, NULL, 0x0, NULL, HFILL }}
};
gint *ett_base[] = {