diff options
| author | Gerald Combs <gerald@wireshark.org> | 2019-04-03 14:32:30 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-04-04 04:03:38 +0000 |
| commit | 8d3ac3af866ecc7b847dd5b621d828872fe9ba18 (patch) | |
| tree | 3fa7aa1a57e1b828f636829f08d1adb9dfb5b395 /epan/dissectors/packet-ntp.c | |
| parent | bdf26a35f696a1524364945a2c868e57c97d1729 (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-ntp.c')
| -rw-r--r-- | epan/dissectors/packet-ntp.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c index 78aa3152b2..0730916e47 100644 --- a/epan/dissectors/packet-ntp.c +++ b/epan/dissectors/packet-ntp.c @@ -1311,7 +1311,7 @@ dissect_ntp_std(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ntp_tree, ntp_con proto_item *resp_it; resp_it = proto_tree_add_uint(ntp_tree, hf_ntp_response_in, tvb, 0, 0, ntp_trans->resp_frame); - PROTO_ITEM_SET_GENERATED(resp_it); + proto_item_set_generated(resp_it); } } } else if ((flags & NTP_MODE_MASK) == NTP_MODE_SERVER) { @@ -1326,10 +1326,10 @@ dissect_ntp_std(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ntp_tree, ntp_con nstime_t delta; req_it = proto_tree_add_uint(ntp_tree, hf_ntp_request_in, tvb, 0, 0, ntp_trans->req_frame); - PROTO_ITEM_SET_GENERATED(req_it); + proto_item_set_generated(req_it); nstime_delta(&delta, &pinfo->abs_ts, &ntp_trans->req_time); req_it = proto_tree_add_time(ntp_tree, hf_ntp_delta_time, tvb, 0, 0, &delta); - PROTO_ITEM_SET_GENERATED(req_it); + proto_item_set_generated(req_it); } } } @@ -1503,10 +1503,10 @@ dissect_ntp_ctrl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ntp_tree, nt nstime_t delta; req_it = proto_tree_add_uint(ntp_tree, hf_ntp_request_in, tvb, 0, 0, ntp_trans->req_frame); - PROTO_ITEM_SET_GENERATED(req_it); + proto_item_set_generated(req_it); nstime_delta(&delta, &pinfo->abs_ts, &ntp_trans->req_time); req_it = proto_tree_add_time(ntp_tree, hf_ntp_delta_time, tvb, 0, 0, &delta); - PROTO_ITEM_SET_GENERATED(req_it); + proto_item_set_generated(req_it); } } if (flags2 & NTPCTRL_ERROR_MASK) { @@ -1598,7 +1598,7 @@ dissect_ntp_ctrl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ntp_tree, nt proto_item *resp_it; resp_it = proto_tree_add_uint(ntp_tree, hf_ntp_response_in, tvb, 0, 0, ntp_trans->resp_frame); - PROTO_ITEM_SET_GENERATED(resp_it); + proto_item_set_generated(resp_it); } } proto_tree_add_item(ntp_tree, hf_ntpctrl_status, tvb, 4, 2, ENC_BIG_ENDIAN); @@ -1695,13 +1695,13 @@ dissect_ntp_ctrl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ntp_tree, nt { case 20: ti = proto_tree_add_uint(auth_tree, hf_ntp_key_type, tvb, data_offset, 0, NTP_MD5_ALGO); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_item(auth_tree, hf_ntp_key_index, tvb, data_offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(auth_tree, hf_ntp_key_signature, tvb, data_offset+4, 16, ENC_NA); break; case 24: ti = proto_tree_add_uint(auth_tree, hf_ntp_key_type, tvb, data_offset, 0, NTP_SHA_ALGO); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_item(auth_tree, hf_ntp_key_index, tvb, data_offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(auth_tree, hf_ntp_key_signature, tvb, data_offset+4, 20, ENC_NA); break; @@ -1810,10 +1810,10 @@ dissect_ntp_priv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ntp_tree, nt nstime_t delta; req_it = proto_tree_add_uint(ntp_tree, hf_ntp_request_in, tvb, 0, 0, ntp_trans->req_frame); - PROTO_ITEM_SET_GENERATED(req_it); + proto_item_set_generated(req_it); nstime_delta(&delta, &pinfo->abs_ts, &ntp_trans->req_time); req_it = proto_tree_add_time(ntp_tree, hf_ntp_delta_time, tvb, 0, 0, &delta); - PROTO_ITEM_SET_GENERATED(req_it); + proto_item_set_generated(req_it); } } } else { @@ -1831,7 +1831,7 @@ dissect_ntp_priv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ntp_tree, nt proto_item *resp_it; resp_it = proto_tree_add_uint(ntp_tree, hf_ntp_response_in, tvb, 0, 0, ntp_trans->resp_frame); - PROTO_ITEM_SET_GENERATED(resp_it); + proto_item_set_generated(resp_it); } } } |