[NAS-EPS] Use proto_tree_add_bitmask_list() for some bitfields.
Change-Id: I0b241a1e553beaf7527948ef067cc1f9356754c8 Reviewed-on: https://code.wireshark.org/review/26210 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:
AndersBroman
Anders Broman
parent
e8088329ec
commit
13bb4911af
|
|
@ -52,6 +52,7 @@ int hf_nas_eps_common_elem_id = -1;
|
|||
int hf_nas_eps_emm_elem_id = -1;
|
||||
static int hf_nas_eps_bearer_id = -1;
|
||||
static int hf_nas_eps_spare_bits = -1;
|
||||
static int hf_nas_eps_spare_b7 = -1;
|
||||
static int hf_nas_eps_security_header_type = -1;
|
||||
static int hf_nas_eps_msg_auth_code = -1;
|
||||
static int hf_nas_eps_seq_no = -1;
|
||||
|
|
@ -2113,45 +2114,78 @@ de_emm_ue_sec_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
|
|||
{
|
||||
guint32 curr_offset;
|
||||
|
||||
static const int * oct3_flags[] = {
|
||||
&hf_nas_eps_emm_eea0,
|
||||
&hf_nas_eps_emm_128eea1,
|
||||
&hf_nas_eps_emm_128eea2,
|
||||
&hf_nas_eps_emm_eea3,
|
||||
&hf_nas_eps_emm_eea4,
|
||||
&hf_nas_eps_emm_eea5,
|
||||
&hf_nas_eps_emm_eea6,
|
||||
&hf_nas_eps_emm_eea7,
|
||||
NULL
|
||||
};
|
||||
|
||||
static const int * oct4_flags[] = {
|
||||
&hf_nas_eps_emm_eia0,
|
||||
&hf_nas_eps_emm_128eia1,
|
||||
&hf_nas_eps_emm_128eia2,
|
||||
&hf_nas_eps_emm_eia3,
|
||||
&hf_nas_eps_emm_eia4,
|
||||
&hf_nas_eps_emm_eia5,
|
||||
&hf_nas_eps_emm_eia6,
|
||||
&hf_nas_eps_emm_eia7,
|
||||
NULL
|
||||
};
|
||||
|
||||
static const int * oct5_flags[] = {
|
||||
&hf_nas_eps_emm_uea0,
|
||||
&hf_nas_eps_emm_uea1,
|
||||
&hf_nas_eps_emm_uea2,
|
||||
&hf_nas_eps_emm_uea3,
|
||||
&hf_nas_eps_emm_uea4,
|
||||
&hf_nas_eps_emm_uea5,
|
||||
&hf_nas_eps_emm_uea6,
|
||||
&hf_nas_eps_emm_uea7,
|
||||
NULL
|
||||
};
|
||||
|
||||
static const int * oct6_flags[] = {
|
||||
&hf_nas_eps_spare_b7,
|
||||
&hf_nas_eps_emm_uia1,
|
||||
&hf_nas_eps_emm_uia2,
|
||||
&hf_nas_eps_emm_uia3,
|
||||
&hf_nas_eps_emm_uia4,
|
||||
&hf_nas_eps_emm_uia5,
|
||||
&hf_nas_eps_emm_uia6,
|
||||
&hf_nas_eps_emm_uia7,
|
||||
NULL
|
||||
};
|
||||
|
||||
static const int * oct7_flags[] = {
|
||||
&hf_nas_eps_spare_b7,
|
||||
&hf_nas_eps_emm_gea1,
|
||||
&hf_nas_eps_emm_gea2,
|
||||
&hf_nas_eps_emm_gea3,
|
||||
&hf_nas_eps_emm_gea4,
|
||||
&hf_nas_eps_emm_gea5,
|
||||
&hf_nas_eps_emm_gea6,
|
||||
&hf_nas_eps_emm_gea7,
|
||||
NULL
|
||||
};
|
||||
|
||||
curr_offset = offset;
|
||||
|
||||
/* EPS encryption algorithms supported (octet 3) */
|
||||
/* EPS encryption algorithm EEA0 supported (octet 3, bit 8) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_eea0, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* EPS encryption algorithm 128-EEA1 supported (octet 3, bit 7) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_128eea1, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* EPS encryption algorithm 128-EEA2 supported (octet 3, bit 6) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_128eea2, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* EPS encryption algorithm 128-EEA3 supported (octet 3, bit 5) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_eea3, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* EPS encryption algorithm EEA4 supported (octet 3, bit 4) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_eea4, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* EPS encryption algorithm EEA5 supported (octet 3, bit 3) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_eea5, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* EPS encryption algorithm EEA6 supported (octet 3, bit 2) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_eea6, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* EPS encryption algorithm EEA7 supported (octet 3, bit 1) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_eea7, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_bitmask_list(tree, tvb, curr_offset, 1, oct3_flags, ENC_NA);
|
||||
curr_offset++;
|
||||
|
||||
curr_offset++;
|
||||
|
||||
|
||||
/* EPS integrity algorithms supported (octet 4) */
|
||||
/* EPS integrity algorithm EIA0 supported (octet 4, bit 8) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_eia0, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* EPS integrity algorithm 128-EIA1 supported (octet 4, bit 7) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_128eia1, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* EPS integrity algorithm 128-EIA2 supported (octet 4, bit 6) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_128eia2, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* EPS integrity algorithm 128-EIA3 supported (octet 4, bit 5) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_eia3, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* EPS integrity algorithm EIA4 supported (octet 4, bit 4) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_eia4, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* EPS integrity algorithm EIA5 supported (octet 4, bit 3) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_eia5, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* EPS integrity algorithm EIA6 supported (octet 4, bit 2) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_eia6, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* EPS integrity algorithm EIA7 supported (octet 4, bit 1) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_eia7, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* EIA0 128-EIA1 128-EIA2 128-EIA3 EIA4 EIA5 EIA6 EIA7 */
|
||||
proto_tree_add_bitmask_list(tree, tvb, curr_offset, 1, oct4_flags, ENC_NA);
|
||||
curr_offset++;
|
||||
|
||||
|
||||
|
|
@ -2161,63 +2195,23 @@ de_emm_ue_sec_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
|
|||
if (len == 2)
|
||||
return(len);
|
||||
|
||||
/* UMTS encryption algorithms supported (octet 5) */
|
||||
/* UMTS encryption algorithm UEA0 supported (octet 5, bit 8) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_uea0, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* UMTS encryption algorithm UEA1 supported (octet 5, bit 7) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_uea1, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* UMTS encryption algorithm UEA2 supported (octet 5, bit 6) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_uea2, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* UMTS encryption algorithm UEA3 supported (octet 5, bit 5) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_uea3, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* UMTS encryption algorithm UEA4 supported (octet 5, bit 4) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_uea4, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* UMTS encryption algorithm UEA5 supported (octet 5, bit 3) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_uea5, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* UMTS encryption algorithm UEA6 supported (octet 5, bit 2) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_uea6, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* UMTS encryption algorithm UEA7 supported (octet 5, bit 1) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_uea7, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* UMTS encryption algorithms supported (octet 5)
|
||||
* UEA0 UEA1 UEA2 UEA3 UEA4 UEA5 UEA6 UEA7
|
||||
*/
|
||||
proto_tree_add_bitmask_list(tree, tvb, curr_offset, 1, oct5_flags, ENC_NA);
|
||||
curr_offset++;
|
||||
|
||||
/* UMTS integrity algorithms supported (octet 6) */
|
||||
/* Bit 8 of octet 6 is spare and shall be coded as zero. */
|
||||
proto_tree_add_bits_item(tree, hf_nas_eps_spare_bits, tvb, (curr_offset<<3), 1, ENC_BIG_ENDIAN);
|
||||
/* UMTS integrity algorithm UIA1 supported (octet 6, bit 7) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_uia1, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* UMTS integrity algorithm UIA2 supported (octet 6, bit 6) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_uia2, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* UMTS integrity algorithm UIA3 supported (octet 6, bit 5) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_uia3, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* UMTS integrity algorithm UIA4 supported (octet 6, bit 4) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_uia4, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* UMTS integrity algorithm UIA5 supported (octet 6, bit 3) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_uia5, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* UMTS integrity algorithm UIA6 supported (octet 6, bit 2) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_uia6, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* UMTS integrity algorithm UIA7 supported (octet 6, bit 1) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_uia7, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Spare UIA1 UIA2 UIA3 UIA4 UIA5 UIA6 UIA7 */
|
||||
proto_tree_add_bitmask_list(tree, tvb, curr_offset, 1, oct6_flags, ENC_NA);
|
||||
curr_offset++;
|
||||
|
||||
if (len == 4)
|
||||
return(len);
|
||||
|
||||
/* Bit 8 of octet 7 is spare and shall be coded as zero. */
|
||||
proto_tree_add_bits_item(tree, hf_nas_eps_spare_bits, tvb, (curr_offset<<3), 1, ENC_BIG_ENDIAN);
|
||||
/* GPRS encryption algorithm GEA1 supported (octet 7, bit 7) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_gea1, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* GPRS encryption algorithm GEA2 supported (octet 7, bit 6) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_gea2, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* GPRS encryption algorithm GEA3 supported (octet 7, bit 5) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_gea3, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* GPRS encryption algorithm GEA4 supported (octet 7, bit 4) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_gea4, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* GPRS encryption algorithm GEA5 supported (octet 7, bit 3) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_gea5, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* GPRS encryption algorithm GEA6 supported (octet 7, bit 2) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_gea6, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* GPRS encryption algorithm GEA7 supported (octet 7, bit 1) */
|
||||
proto_tree_add_item(tree, hf_nas_eps_emm_gea7, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
|
||||
/* GPRS encryption algorithms supported (octet 7) */
|
||||
/* 0 spare GEA1 GEA2 GEA3 GEA4 GEA5 GEA6 GEA7*/
|
||||
proto_tree_add_bitmask_list(tree, tvb, curr_offset, 1, oct7_flags, ENC_NA);
|
||||
curr_offset++;
|
||||
|
||||
return(len);
|
||||
|
|
@ -6313,7 +6307,12 @@ proto_register_nas_eps(void)
|
|||
FT_UINT8, BASE_HEX, NULL, 0x0,
|
||||
NULL, HFILL }
|
||||
},
|
||||
{ &hf_nas_eps_security_header_type,
|
||||
{ &hf_nas_eps_spare_b7,
|
||||
{ "Spare", "nas_eps.spare.b7",
|
||||
FT_UINT8, BASE_HEX, NULL, 0x80,
|
||||
NULL, HFILL }
|
||||
},
|
||||
{ &hf_nas_eps_security_header_type,
|
||||
{ "Security header type","nas_eps.security_header_type",
|
||||
FT_UINT8,BASE_DEC|BASE_EXT_STRING, &security_header_type_vals_ext, 0xf0,
|
||||
NULL, HFILL }
|
||||
|
|
|
|||
Loading…
Reference in New Issue