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

GSM RLC/MAC: fix dissection of SI Message List IE 

Change-Id: Ia3a4255ecd78e480135bbbbeccd9c0268c105400
Reviewed-on: https://code.wireshark.org/review/33648
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
This commit is contained in:
Pascal Quantin 2019-06-18 20:21:00 +02:00
parent af4b67d19a
commit 43259dcd4a
1 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
epan/dissectors/packet-gsm_rlcmac.c
View File

@ -572,6 +572,7 @@ static int hf_psi_message_exist = -1;
static int hf_psi_message_list = -1;
/* < Packet SI Status message content > */
static int hf_si_message_type = -1;
static int hf_si_message_mess_rec = -1;
static int hf_si_message_list_exist = -1;
static int hf_si_message_list = -1;
@ -3274,7 +3275,7 @@ CSN_DESCR_END (Packet_PSI_Status_t)
static const
CSN_DESCR_BEGIN(SI_Message_t)
M_UINT (SI_Message_t, SI_MESSAGE_TYPE, 8, &hf_dl_message_type),
M_UINT (SI_Message_t, SI_MESSAGE_TYPE, 8, &hf_si_message_type),
M_UINT (SI_Message_t, MESS_REC, 2, &hf_si_message_mess_rec),
CSN_DESCR_END (SI_Message_t)
@ -8418,6 +8419,38 @@ static const value_string access_tech_type_vals[] = {
{ 0, NULL}
};
static const value_string si_message_type_vals[] = {
{0x00, "SYSTEM INFORMATION TYPE 13"},
{0x01, "SYSTEM INFORMATION TYPE 14"},
{0x02, "SYSTEM INFORMATION TYPE 2bis"},
{0x03, "SYSTEM INFORMATION TYPE 2ter"},
{0x04, "SYSTEM INFORMATION TYPE 9"},
{0x05, "SYSTEM INFORMATION TYPE 5bis"},
{0x06, "SYSTEM INFORMATION TYPE 5ter"},
{0x07, "SYSTEM INFORMATION TYPE 2quater"},
{0x18, "SYSTEM INFORMATION TYPE 8"},
{0x19, "SYSTEM INFORMATION TYPE 1"},
{0x1a, "SYSTEM INFORMATION TYPE 2"},
{0x1b, "SYSTEM INFORMATION TYPE 3"},
{0x1c, "SYSTEM INFORMATION TYPE 4"},
{0x1d, "SYSTEM INFORMATION TYPE 5"},
{0x1e, "SYSTEM INFORMATION TYPE 6"},
{0x1f, "SYSTEM INFORMATION TYPE 7"},
{0x3d, "SYSTEM INFORMATION TYPE 16"},
{0x3e, "SYSTEM INFORMATION TYPE 17"},
{0x40, "SYSTEM INFORMATION TYPE 18"},
{0x41, "SYSTEM INFORMATION TYPE 19"},
{0x42, "SYSTEM INFORMATION TYPE 20"},
{0x43, "SYSTEM INFORMATION TYPE 15"},
{0x44, "SYSTEM INFORMATION TYPE 13alt"},
{0x45, "SYSTEM INFORMATION TYPE 2n"},
{0x46, "SYSTEM INFORMATION TYPE 21"},
{0x47, "SYSTEM INFORMATION TYPE 22"},
{0x4f, "SYSTEM INFORMATION TYPE 23"},
{ 0, NULL }
};
static value_string_ext si_message_type_vals_ext = VALUE_STRING_EXT_INIT(si_message_type_vals);
static gint construct_gprs_data_segment_li_array(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint8 initial_offset, guint8 *li_count, length_indicator_t *li_array, guint64 *e)
{
gint offset = initial_offset;
@ -12339,6 +12372,12 @@ proto_register_gsm_rlcmac(void)
},
/* < Packet SI Status message content > */
{ &hf_si_message_type,
{ "MESSAGE_TYPE", "gsm_rlcmac.ul.si_message_type",
FT_UINT8, BASE_HEX|BASE_EXT_STRING, &si_message_type_vals_ext, 0x0,
NULL, HFILL
}
},
{ &hf_si_message_mess_rec,
{ "MESS_REC", "gsm_rlcmac.ul.si_message_mess_rec",
FT_UINT8, BASE_DEC, NULL, 0x0,