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

MAC-NR: Add a bi-directional lcid field to filter on.

This commit is contained in:
Martin Mathieson 2021-12-30 21:19:51 +00:00
parent b296db31a4
commit d5cccc5398
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
epan/dissectors/packet-mac-nr.c
View File

@ -52,6 +52,7 @@ static int hf_mac_nr_subheader_reserved = -1;
static int hf_mac_nr_subheader_f = -1;
static int hf_mac_nr_subheader_length_1_byte = -1;
static int hf_mac_nr_subheader_length_2_bytes = -1;
static int hf_mac_nr_lcid = -1;
static int hf_mac_nr_ulsch_lcid = -1;
static int hf_mac_nr_dlsch_lcid = -1;
static int hf_mac_nr_dlsch_sdu = -1;
@ -1612,11 +1613,14 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree
proto_tree_add_item_ret_boolean(subheader_tree, hf_mac_nr_subheader_f, tvb, offset, 1, ENC_BIG_ENDIAN, &F);
}
/* LCID */
/* LCID (UL or DL) */
proto_tree_add_uint(subheader_tree,
(p_mac_nr_info->direction == DIRECTION_UPLINK) ?
hf_mac_nr_ulsch_lcid : hf_mac_nr_dlsch_lcid,
tvb, offset, 1, lcid);
/* Also add as a hidden, direction-less field */
proto_item *bi_di_lcid = proto_tree_add_uint(subheader_tree, hf_mac_nr_lcid, tvb, offset, 1, lcid);
proto_item_set_hidden(bi_di_lcid);
offset++;
if (!fixed_len) {
@ -2968,6 +2972,13 @@ void proto_register_mac_nr(void)
NULL, HFILL
}
},
/* Will be hidden, but useful for bi-directional filtering */
{ &hf_mac_nr_lcid,
{ "LCID",
"mac-nr.lcid", FT_UINT8, BASE_HEX, NULL, 0x3f,
"Logical Channel Identifier", HFILL
}
},
{ &hf_mac_nr_ulsch_lcid,
{ "LCID",
"mac-nr.ulsch.lcid", FT_UINT8, BASE_HEX|BASE_EXT_STRING, &ulsch_lcid_vals_ext, 0x3f,