diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2021-12-30 21:19:51 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2021-12-30 21:19:51 +0000 |
| commit | d5cccc53984c7320e351edc54995591c180be9fc (patch) | |
| tree | a1f7853020163d5814d823c564ad45465bcc79e5 /epan/dissectors/packet-mac-nr.c | |
| parent | b296db31a48c81a72422314c1edfa1daf0c3f8e1 (diff) | |
MAC-NR: Add a bi-directional lcid field to filter on.
Diffstat (limited to 'epan/dissectors/packet-mac-nr.c')
| -rw-r--r-- | epan/dissectors/packet-mac-nr.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/epan/dissectors/packet-mac-nr.c b/epan/dissectors/packet-mac-nr.c index f49ea19fe3..f252efa4a5 100644 --- a/epan/dissectors/packet-mac-nr.c +++ b/epan/dissectors/packet-mac-nr.c @@ -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, |