aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-pdcp-nr.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2019-04-03 14:32:30 -0700
committerAnders Broman <a.broman58@gmail.com>2019-04-04 04:03:38 +0000
commit8d3ac3af866ecc7b847dd5b621d828872fe9ba18 (patch)
tree3fa7aa1a57e1b828f636829f08d1adb9dfb5b395 /epan/dissectors/packet-pdcp-nr.c
parentbdf26a35f696a1524364945a2c868e57c97d1729 (diff)
epan: Convert our PROTO_ITEM_ macros to inline functions.
Convert our various PROTO_ITEM_ macros to inline functions and document them. Change-Id: I070b15d4f70d2189217a177ee8ba2740be36327c Reviewed-on: https://code.wireshark.org/review/32706 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-pdcp-nr.c')
-rw-r--r--epan/dissectors/packet-pdcp-nr.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/epan/dissectors/packet-pdcp-nr.c b/epan/dissectors/packet-pdcp-nr.c
index 860f68695e..147df3db46 100644
--- a/epan/dissectors/packet-pdcp-nr.c
+++ b/epan/dissectors/packet-pdcp-nr.c
@@ -378,7 +378,7 @@ static void addBearerSequenceInfo(pdcp_sequence_report_in_frame *p,
"", "Sequence Analysis");
seqnum_tree = proto_item_add_subtree(seqnum_ti,
ett_pdcp_nr_sequence_analysis);
- PROTO_ITEM_SET_GENERATED(seqnum_ti);
+ proto_item_set_generated(seqnum_ti);
/* Previous bearer frame */
@@ -390,7 +390,7 @@ static void addBearerSequenceInfo(pdcp_sequence_report_in_frame *p,
/* Expected sequence number */
ti_expected_sn = proto_tree_add_uint(seqnum_tree, hf_pdcp_nr_sequence_analysis_expected_sn,
tvb, 0, 0, p->sequenceExpected);
- PROTO_ITEM_SET_GENERATED(ti_expected_sn);
+ proto_item_set_generated(ti_expected_sn);
/* Make sure we have recognised SN length */
switch (p_pdcp_nr_info->seqnum_length) {
@@ -404,10 +404,10 @@ static void addBearerSequenceInfo(pdcp_sequence_report_in_frame *p,
switch (p->state) {
case SN_OK:
- PROTO_ITEM_SET_HIDDEN(ti_expected_sn);
+ proto_item_set_hidden(ti_expected_sn);
ti = proto_tree_add_boolean(seqnum_tree, hf_pdcp_nr_sequence_analysis_ok,
tvb, 0, 0, TRUE);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
proto_item_append_text(seqnum_ti, " - OK");
/* Link to next SN in bearer (if known) */
@@ -421,10 +421,10 @@ static void addBearerSequenceInfo(pdcp_sequence_report_in_frame *p,
case SN_Missing:
ti = proto_tree_add_boolean(seqnum_tree, hf_pdcp_nr_sequence_analysis_ok,
tvb, 0, 0, FALSE);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
ti = proto_tree_add_boolean(seqnum_tree, hf_pdcp_nr_sequence_analysis_skipped,
tvb, 0, 0, TRUE);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
if (p->lastSN != p->firstSN) {
expert_add_info_format(pinfo, ti, &ei_pdcp_nr_sequence_analysis_sn_missing,
"PDCP SNs (%u to %u) missing for %s on UE %u (%s-%u)",
@@ -452,10 +452,10 @@ static void addBearerSequenceInfo(pdcp_sequence_report_in_frame *p,
case SN_Repeated:
ti = proto_tree_add_boolean(seqnum_tree, hf_pdcp_nr_sequence_analysis_ok,
tvb, 0, 0, FALSE);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
ti = proto_tree_add_boolean(seqnum_tree, hf_pdcp_nr_sequence_analysis_repeated,
tvb, 0, 0, TRUE);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
expert_add_info_format(pinfo, ti, &ei_pdcp_nr_sequence_analysis_sn_repeated,
"PDCP SN (%u) repeated for %s for UE %u (%s-%u)",
p->firstSN,
@@ -687,30 +687,30 @@ static void show_pdcp_config(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree
/* Direction */
ti = proto_tree_add_uint(configuration_tree, hf_pdcp_nr_direction, tvb, 0, 0,
p_pdcp_info->direction);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
/* Plane */
ti = proto_tree_add_uint(configuration_tree, hf_pdcp_nr_plane, tvb, 0, 0,
p_pdcp_info->plane);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
/* UEId */
if (p_pdcp_info->ueid != 0) {
ti = proto_tree_add_uint(configuration_tree, hf_pdcp_nr_ueid, tvb, 0, 0,
p_pdcp_info->ueid);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
write_pdu_label_and_info(configuration_ti, pinfo, "UEId=%3u", p_pdcp_info->ueid);
}
/* Bearer type */
ti = proto_tree_add_uint(configuration_tree, hf_pdcp_nr_bearer_type, tvb, 0, 0,
p_pdcp_info->bearerType);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
if (p_pdcp_info->bearerId != 0) {
/* Bearer type */
ti = proto_tree_add_uint(configuration_tree, hf_pdcp_nr_bearer_id, tvb, 0, 0,
p_pdcp_info->bearerId);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
}
/* Show channel type in root/Info */
@@ -728,12 +728,12 @@ static void show_pdcp_config(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree
/* Seqnum length */
ti = proto_tree_add_uint(configuration_tree, hf_pdcp_nr_seqnum_length, tvb, 0, 0,
p_pdcp_info->seqnum_length);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
/* ROHC compression */
ti = proto_tree_add_boolean(configuration_tree, hf_pdcp_nr_rohc_compression, tvb, 0, 0,
p_pdcp_info->rohc.rohc_compression);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
/* ROHC-specific settings */
if (p_pdcp_info->rohc.rohc_compression) {
@@ -741,32 +741,32 @@ static void show_pdcp_config(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree
/* Show ROHC mode */
ti = proto_tree_add_uint(configuration_tree, hf_pdcp_nr_rohc_mode, tvb, 0, 0,
p_pdcp_info->rohc.mode);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
/* Show RND */
ti = proto_tree_add_boolean(configuration_tree, hf_pdcp_nr_rohc_rnd, tvb, 0, 0,
p_pdcp_info->rohc.rnd);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
/* UDP Checksum */
ti = proto_tree_add_boolean(configuration_tree, hf_pdcp_nr_rohc_udp_checksum_present, tvb, 0, 0,
p_pdcp_info->rohc.udp_checksum_present);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
/* ROHC profile */
ti = proto_tree_add_uint(configuration_tree, hf_pdcp_nr_rohc_profile, tvb, 0, 0,
p_pdcp_info->rohc.profile);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
/* CID Inclusion Info */
ti = proto_tree_add_boolean(configuration_tree, hf_pdcp_nr_cid_inclusion_info, tvb, 0, 0,
p_pdcp_info->rohc.cid_inclusion_info);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
/* Large CID */
ti = proto_tree_add_boolean(configuration_tree, hf_pdcp_nr_large_cid_present, tvb, 0, 0,
p_pdcp_info->rohc.large_cid_present);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
}
}
@@ -782,7 +782,7 @@ static void show_pdcp_config(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree
val_to_str_const(p_pdcp_info->rohc.profile, rohc_profile_vals, "Unknown"));
}
proto_item_append_text(configuration_ti, ")");
- PROTO_ITEM_SET_GENERATED(configuration_ti);
+ proto_item_set_generated(configuration_ti);
/* Show plane in info column */
col_append_fstr(pinfo->cinfo, COL_INFO, " %s: ",