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 | |
| 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')
397 files changed, 3657 insertions, 3616 deletions
diff --git a/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c b/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c index e3040053f9..b9760992df 100644 --- a/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c +++ b/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c @@ -260,7 +260,7 @@ find_tcap_subdissector(tvbuff_t *tvb, asn1_ctx_t *actx, proto_tree *tree){ }else{ item = proto_tree_add_int(tree, hf_ansi_tcap_private, tvb, 0, 0, ansi_tcap_private.d.OperationCode_private); } - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); ansi_tcap_private.d.OperationCode_item = item; } } @@ -345,7 +345,7 @@ dissect_ansi_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, vo if (g_ansi_tcap_HandleSRT && !tcap_subdissector_used ) { if (gtcap_DisplaySRT && tree) { stat_tree = proto_tree_add_subtree(tree, tvb, 0, 0, ett_ansi_tcap_stat, &stat_item, "Stat"); - PROTO_ITEM_SET_GENERATED(stat_item); + proto_item_set_generated(stat_item); } p_tcap_context=tcapsrt_call_matching(tvb, pinfo, stat_tree, gp_tcapsrt_info); ansi_tcap_private.context=p_tcap_context; diff --git a/epan/dissectors/asn1/c1222/packet-c1222-template.c b/epan/dissectors/asn1/c1222/packet-c1222-template.c index 5ea991135e..8847efd32e 100644 --- a/epan/dissectors/asn1/c1222/packet-c1222-template.c +++ b/epan/dissectors/asn1/c1222/packet-c1222-template.c @@ -1034,9 +1034,9 @@ dissect_epsem(tvbuff_t *tvb, int offset, guint32 len, packet_info *pinfo, proto_ /* now we have enough information to fill in the crypto subtree */ crypto_tree = proto_item_add_subtree(yt, ett_c1222_crypto); item = proto_tree_add_boolean(crypto_tree, hf_c1222_epsem_crypto_good, tvb, local_offset, 4, crypto_good); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_boolean(crypto_tree, hf_c1222_epsem_crypto_bad, tvb, local_offset, 4, crypto_bad); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } else { expert_add_info(pinfo, tree, &ei_c1222_mac_missing); return offset+len; diff --git a/epan/dissectors/asn1/camel/packet-camel-template.c b/epan/dissectors/asn1/camel/packet-camel-template.c index bdb6cb23f2..3df099cd5b 100644 --- a/epan/dissectors/asn1/camel/packet-camel-template.c +++ b/epan/dissectors/asn1/camel/packet-camel-template.c @@ -726,7 +726,7 @@ camelsrt_request_call_matching(tvbuff_t *tvb, packet_info *pinfo, p_camelsrt_info->msginfo[srt_type].is_duplicate = TRUE; if (gcamel_DisplaySRT){ hidden_item = proto_tree_add_uint(tree, hf_camelsrt_Duplicate, tvb, 0,0, 77); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } } else { @@ -755,7 +755,7 @@ camelsrt_request_call_matching(tvbuff_t *tvb, packet_info *pinfo, "Linked response %s in frame %u", val_to_str_const(srt_type, camelSRTtype_naming, "Unk"), p_camelsrt_call->category[srt_type].rsp_num); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* frame valid */ } /* call reference */ } @@ -774,34 +774,34 @@ camelsrt_display_DeltaTime(proto_tree *tree, tvbuff_t *tvb, nstime_t *value_ptr, switch(category) { case CAMELSRT_VOICE_INITIALDP: ti = proto_tree_add_time(tree, hf_camelsrt_DeltaTime31, tvb, 0, 0, value_ptr); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; case CAMELSRT_VOICE_ACR1: case CAMELSRT_VOICE_ACR2: case CAMELSRT_VOICE_ACR3: ti = proto_tree_add_time(tree, hf_camelsrt_DeltaTime22, tvb, 0, 0, value_ptr); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; case CAMELSRT_VOICE_DISC: ti = proto_tree_add_time(tree, hf_camelsrt_DeltaTime35, tvb, 0, 0, value_ptr); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; case CAMELSRT_GPRS_INITIALDP: ti = proto_tree_add_time(tree, hf_camelsrt_DeltaTime75, tvb, 0, 0, value_ptr); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; case CAMELSRT_GPRS_REPORT: ti = proto_tree_add_time(tree, hf_camelsrt_DeltaTime80, tvb, 0, 0, value_ptr); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; case CAMELSRT_SMS_INITIALDP: ti = proto_tree_add_time(tree, hf_camelsrt_DeltaTime65, tvb, 0, 0, value_ptr); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; default: @@ -884,7 +884,7 @@ camelsrt_report_call_matching(tvbuff_t *tvb, packet_info *pinfo, p_camelsrt_info->msginfo[srt_type].is_duplicate = TRUE; if ( gcamel_DisplaySRT ){ hidden_item = proto_tree_add_uint(tree, hf_camelsrt_Duplicate, tvb, 0,0, 77); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } } } /* rsp_num != 0 */ @@ -905,7 +905,7 @@ camelsrt_report_call_matching(tvbuff_t *tvb, packet_info *pinfo, "Linked request %s in frame %u", val_to_str_const(srt_type, camelSRTtype_naming, "Unk"), p_camelsrt_call->category[srt_type].req_num); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Calculate Service Response Time */ nstime_delta(&delta, &pinfo->abs_ts, &p_camelsrt_call->category[srt_type].req_time); diff --git a/epan/dissectors/asn1/gsm_map/gsm_map.cnf b/epan/dissectors/asn1/gsm_map/gsm_map.cnf index 0407866766..2b851143aa 100644 --- a/epan/dissectors/asn1/gsm_map/gsm_map.cnf +++ b/epan/dissectors/asn1/gsm_map/gsm_map.cnf @@ -268,7 +268,7 @@ MAP-DialoguePDU B "0.4.0.0.1.1.1.1" "map-DialogueAS" return offset; /* Hide the octet string default printout */ - PROTO_ITEM_SET_HIDDEN(actx->created_item); + proto_item_set_hidden(actx->created_item); imsi_str = dissect_e212_imsi(parameter_tvb, actx->pinfo, tree, 0, tvb_reported_length(parameter_tvb), FALSE); if (!PINFO_FD_VISITED(actx->pinfo)) @@ -1174,7 +1174,7 @@ MAP interfaces %(DEFAULT_BODY)s if (payload_tvb) { guint32 tvb_offset = 0; - PROTO_ITEM_SET_HIDDEN(actx->created_item); + proto_item_set_hidden(actx->created_item); dis_field_addr(payload_tvb, actx->pinfo, tree, &tvb_offset, "SM-RP-SMEA"); } diff --git a/epan/dissectors/asn1/h225/h225.cnf b/epan/dissectors/asn1/h225/h225.cnf index 244f3fe7e6..54f2ac54ec 100644 --- a/epan/dissectors/asn1/h225/h225.cnf +++ b/epan/dissectors/asn1/h225/h225.cnf @@ -864,7 +864,7 @@ H221NonStandard/manufacturerCode VAL_PTR = &manufacturerCode gefx = gef_ctx_get(actx->private_data); if (gefx) { ti = proto_tree_add_string(tree, hf_h225_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); dissector_try_string_new(gef_name_dissector_table, gefx->key, tvb_new_subset_length_caplen(tvb, offset>>3, 0, 0), actx->pinfo, tree, FALSE, actx); } actx->private_data = gefx; /* subdissector could overwrite it */ @@ -898,7 +898,7 @@ H221NonStandard/manufacturerCode VAL_PTR = &manufacturerCode gefx = gef_ctx_get(actx->private_data); if (gefx) { ti = proto_tree_add_string(tree, hf_h225_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, actx->pinfo, %(TREE)s, actx); } #.END diff --git a/epan/dissectors/asn1/h225/packet-h225-template.c b/epan/dissectors/asn1/h225/packet-h225-template.c index 2c0f41aada..239a72edf7 100644 --- a/epan/dissectors/asn1/h225/packet-h225-template.c +++ b/epan/dissectors/asn1/h225/packet-h225-template.c @@ -1018,7 +1018,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre Mark it as such. */ pi->is_duplicate = TRUE; hidden_item = proto_tree_add_uint(tree, hf_h225_ras_dup, tvb, 0,0, pi->requestSeqNum); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } break; } @@ -1035,7 +1035,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre proto_tree_add_uint_format(tree, hf_h225_ras_rsp_frame, tvb, 0, 0, h225ras_call->rsp_num, "The response to this request is in frame %u", h225ras_call->rsp_num); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* end of request message handling*/ @@ -1071,7 +1071,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre if (msg_category == 3 || msg_category == 5) { pi->guid = h225ras_call->guid; hidden_item = proto_tree_add_guid(tree, hf_h225_guid, tvb, 0, GUID_LEN, &pi->guid); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } if (h225ras_call->rsp_num == 0) { @@ -1088,7 +1088,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre Mark it as such. */ pi->is_duplicate = TRUE; hidden_item = proto_tree_add_uint(tree, hf_h225_ras_dup, tvb, 0,0, pi->requestSeqNum); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } } @@ -1100,7 +1100,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* Indicate the frame to which this is a reply. */ ti = proto_tree_add_uint_format(tree, hf_h225_ras_req_frame, tvb, 0, 0, h225ras_call->req_num, "This is a response to a request in frame %u", h225ras_call->req_num); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Calculate RAS Service Response Time */ nstime_delta(&delta, &pinfo->abs_ts, &h225ras_call->req_time); @@ -1108,7 +1108,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* display Ras Service Response Time and make it filterable */ ti = proto_tree_add_time(tree, hf_h225_ras_deltatime, tvb, 0, 0, &(pi->delta_time)); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } } diff --git a/epan/dissectors/asn1/h235/h235.cnf b/epan/dissectors/asn1/h235/h235.cnf index fdf0994d35..2de817e235 100644 --- a/epan/dissectors/asn1/h235/h235.cnf +++ b/epan/dissectors/asn1/h235/h235.cnf @@ -57,29 +57,29 @@ NonStandardParameter/data TYPE = FT_UINT32 DISPLAY = BASE_DEC #.FN_HDR SIGNED proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset>>3, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); #.END #.FN_HDR ENCRYPTED proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset>>3, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); #.END #.FN_HDR HASHED proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset>>3, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); #.END #.FN_HDR ClearToken proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset>>3, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); #.END #.FN_HDR CryptoToken proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset>>3, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); #.END diff --git a/epan/dissectors/asn1/h245/h245.cnf b/epan/dissectors/asn1/h245/h245.cnf index 92f41e04a6..cf2f6bb7e2 100644 --- a/epan/dissectors/asn1/h245/h245.cnf +++ b/epan/dissectors/asn1/h245/h245.cnf @@ -659,7 +659,7 @@ if (h245_pi != NULL) gefx = gef_ctx_get(actx->private_data); if (gefx) { ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, %(ACTX)s->pinfo, %(TREE)s, %(ACTX)s); } actx->private_data = parent_gefx; @@ -683,7 +683,7 @@ if (h245_pi != NULL) gefx = gef_ctx_get(actx->private_data); if (gefx) { ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); dissector_try_string(gef_name_dissector_table, gefx->key, tvb_new_subset_length_caplen(tvb, offset>>3, 0, 0), actx->pinfo, tree, actx); } actx->private_data = gefx; /* subdissector could overwrite it */ @@ -714,7 +714,7 @@ if (h245_pi != NULL) gefx = gef_ctx_get(actx->private_data); if (gefx) { ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); dissector_try_string_new(gef_name_dissector_table, gefx->key, tvb_new_subset_length_caplen(tvb, offset>>3, 0, 0), actx->pinfo, tree, FALSE, actx); } actx->private_data = gefx; /* subdissector could overwrite it */ @@ -743,7 +743,7 @@ if (h245_pi != NULL) buf[0] = value; value_tvb = tvb_new_child_real_data(tvb, buf, sizeof(guint8), sizeof(guint8)); ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); add_new_data_source(%(ACTX)s->pinfo, value_tvb, "booleanArray"); dissector_try_string_new(gef_content_dissector_table, gefx->key, value_tvb, %(ACTX)s->pinfo, %(TREE)s, FALSE, %(ACTX)s); } @@ -762,7 +762,7 @@ if (h245_pi != NULL) phton16(buf, value); value_tvb = tvb_new_child_real_data(tvb, buf, sizeof(guint16), sizeof(guint16)); ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); add_new_data_source(%(ACTX)s->pinfo, value_tvb, "unsignedMin"); dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, %(ACTX)s->pinfo, %(TREE)s, %(ACTX)s); } @@ -781,7 +781,7 @@ if (h245_pi != NULL) phton16(buf, value); value_tvb = tvb_new_child_real_data(tvb, buf, sizeof(guint16), sizeof(guint16)); ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); add_new_data_source(%(ACTX)s->pinfo, value_tvb, "unsignedMax"); dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, %(ACTX)s->pinfo, %(TREE)s, %(ACTX)s); } @@ -800,7 +800,7 @@ if (h245_pi != NULL) phton32(buf, value); value_tvb = tvb_new_child_real_data(tvb, buf, sizeof(guint32), sizeof(guint32)); ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); add_new_data_source(%(ACTX)s->pinfo, value_tvb, "unsigned32Min"); dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, %(ACTX)s->pinfo, %(TREE)s, %(ACTX)s); } @@ -819,7 +819,7 @@ if (h245_pi != NULL) phton32(buf, value); value_tvb = tvb_new_child_real_data(tvb, buf, sizeof(guint32), sizeof(guint32)); ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); add_new_data_source(%(ACTX)s->pinfo, value_tvb, "unsigned32Max"); dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, %(ACTX)s->pinfo, %(TREE)s, %(ACTX)s); } @@ -833,7 +833,7 @@ if (h245_pi != NULL) gefx = gef_ctx_get(actx->private_data); if (gefx) { ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, %(ACTX)s->pinfo, %(TREE)s, %(ACTX)s); } #.END @@ -998,7 +998,7 @@ NonStandardIdentifier/h221NonStandard/manufacturerCode VAL_PTR = &manufacturerC saved_h245_pi = h245_pi; h245_pi = NULL; subtree = proto_tree_add_subtree(tree, next_tvb, 0, -1, ett_h245_returnedFunction, &item, "The returned function"); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); dissect_h245_MultimediaSystemControlMessage(next_tvb, 0, actx, subtree, hf_h245_pdu_type); h245_pi = saved_h245_pi; } diff --git a/epan/dissectors/asn1/h248/packet-h248-template.c b/epan/dissectors/asn1/h248/packet-h248-template.c index 19d9b3ec93..e3c61c269e 100644 --- a/epan/dissectors/asn1/h248/packet-h248-template.c +++ b/epan/dissectors/asn1/h248/packet-h248-template.c @@ -770,7 +770,7 @@ void gcp_analyze_msg(proto_tree* gcp_tree, packet_info* pinfo, tvbuff_t* gcp_tvb proto_tree* ctx_tree = proto_item_add_subtree(ctx_item,ids->ett.ctx); gcp_terms_t *ctx_term; - PROTO_ITEM_SET_GENERATED(ctx_item); + proto_item_set_generated(ctx_item); if (ctx->cmds) { proto_tree* history_tree = proto_tree_add_subtree(ctx_tree,gcp_tvb,0,0,ids->ett.ctx_cmds,NULL,"[ Command History ]"); @@ -778,7 +778,7 @@ void gcp_analyze_msg(proto_tree* gcp_tree, packet_info* pinfo, tvbuff_t* gcp_tvb for (c = ctx->cmds; c; c = c->next) { proto_item* cmd_item = proto_tree_add_uint(history_tree,ids->hf.ctx_cmd,gcp_tvb,0,0,c->cmd->msg->framenum); if (c->cmd->str) proto_item_append_text(cmd_item," %s ",c->cmd->str); - PROTO_ITEM_SET_GENERATED(cmd_item); + proto_item_set_generated(cmd_item); if (c->cmd->error) { expert_add_info(pinfo, cmd_item, command_err); } @@ -793,21 +793,21 @@ void gcp_analyze_msg(proto_tree* gcp_tree, packet_info* pinfo, tvbuff_t* gcp_tvb proto_item* pi = proto_tree_add_string(terms_tree,ids->hf.ctx_term,gcp_tvb,0,0,ctx_term->term->str); proto_tree* term_tree = proto_item_add_subtree(pi,ids->ett.ctx_term); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); if (ctx_term->term->type) { pi = proto_tree_add_uint(term_tree,ids->hf.ctx_term_type,gcp_tvb,0,0,ctx_term->term->type); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (ctx_term->term->bir) { pi = proto_tree_add_string(term_tree,ids->hf.ctx_term_bir,gcp_tvb,0,0,ctx_term->term->bir); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (ctx_term->term->nsap) { pi = proto_tree_add_string(term_tree,ids->hf.ctx_term_nsap,gcp_tvb,0,0,ctx_term->term->nsap); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (ctx_term->term->bir && ctx_term->term->nsap) { @@ -2193,7 +2193,7 @@ dissect_h248(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ guint32 magic_num = 0, offset = 0; magic_num = tvb_get_ntohl(tvb, offset); hidden_item = proto_tree_add_uint(tree, hf_248_magic_num, tvb, offset, 4, magic_num); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); if( dissector_try_uint(subdissector_table, magic_num, tvb, pinfo, tree) ) { return tvb_captured_length(tvb); } diff --git a/epan/dissectors/asn1/h450/h450.cnf b/epan/dissectors/asn1/h450/h450.cnf index 27c586b57a..e58630c119 100644 --- a/epan/dissectors/asn1/h450/h450.cnf +++ b/epan/dissectors/asn1/h450/h450.cnf @@ -54,7 +54,7 @@ ERROR.&ParameterType proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h450, tvb, offset, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); #.END #.FN_HDR ServiceApdus/rosApdus/_item diff --git a/epan/dissectors/asn1/h450/packet-h450-template.c b/epan/dissectors/asn1/h450/packet-h450-template.c index 4396fb1118..724882779a 100644 --- a/epan/dissectors/asn1/h450/packet-h450-template.c +++ b/epan/dissectors/asn1/h450/packet-h450-template.c @@ -129,7 +129,7 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data return offset; hidden_item = proto_tree_add_uint(tree, hf_h450_operation, tvb, 0, 0, opcode); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); p = try_val_to_str(opcode, VALS(h450_str_operation)); if (p) { proto_item_append_text(rctx->d.code_item, " - %s", p); @@ -174,7 +174,7 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data return offset; hidden_item = proto_tree_add_uint(tree, hf_h450_operation, tvb, 0, 0, opcode); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); p = try_val_to_str(opcode, VALS(h450_str_operation)); if (p) { proto_item_append_text(rctx->d.code_item, " - %s", p); @@ -219,7 +219,7 @@ dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data return offset; hidden_item = proto_tree_add_uint(tree, hf_h450_error, tvb, 0, 0, errcode); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); p = try_val_to_str(errcode, VALS(h450_str_error)); if (p) { proto_item_append_text(rctx->d.code_item, " - %s", p); diff --git a/epan/dissectors/asn1/ldap/ldap.cnf b/epan/dissectors/asn1/ldap/ldap.cnf index 2473baaa63..bfb11b24e7 100644 --- a/epan/dissectors/asn1/ldap/ldap.cnf +++ b/epan/dissectors/asn1/ldap/ldap.cnf @@ -51,7 +51,7 @@ SyncInfoValue B "1.3.6.1.4.1.4203.1.9.1.4" "syncInfoOID" PasswordPolicyResponseValue B "1.3.6.1.4.1.42.2.27.8.5.1" "passwordPolicy" #.FN_FTR LDAPURL - PROTO_ITEM_SET_URL(actx->created_item); + proto_item_set_url(actx->created_item); #.FN_HDR LDAPOID diff --git a/epan/dissectors/asn1/ldap/packet-ldap-template.c b/epan/dissectors/asn1/ldap/packet-ldap-template.c index 0942d3d633..c759ec32a3 100644 --- a/epan/dissectors/asn1/ldap/packet-ldap-template.c +++ b/epan/dissectors/asn1/ldap/packet-ldap-template.c @@ -888,14 +888,14 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu if(lcrp->is_request){ it=proto_tree_add_uint(tree, hf_ldap_response_in, tvb, 0, 0, lcrp->rep_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { nstime_t ns; it=proto_tree_add_uint(tree, hf_ldap_response_to, tvb, 0, 0, lcrp->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &lcrp->req_time); it=proto_tree_add_time(tree, hf_ldap_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } diff --git a/epan/dissectors/asn1/logotypecertextn/logotypecertextn.cnf b/epan/dissectors/asn1/logotypecertextn/logotypecertextn.cnf index d3c6906be9..987cf8c7d4 100644 --- a/epan/dissectors/asn1/logotypecertextn/logotypecertextn.cnf +++ b/epan/dissectors/asn1/logotypecertextn/logotypecertextn.cnf @@ -13,10 +13,10 @@ LogotypeExtn B "1.3.6.1.5.5.7.20.1" "id-pe-logo-loyalty" LogotypeExtn B "1.3.6.1.5.5.7.20.2" "id-pe-logo-background" #.FN_FTR LogotypeDetails/logotypeURI/_item - PROTO_ITEM_SET_URL(actx->created_item); + proto_item_set_url(actx->created_item); #.FN_FTR LogotypeReference/refStructURI/_item - PROTO_ITEM_SET_URL(actx->created_item); + proto_item_set_url(actx->created_item); #.NO_EMIT diff --git a/epan/dissectors/asn1/lpp/lpp.cnf b/epan/dissectors/asn1/lpp/lpp.cnf index b7008250e8..2c010402ac 100644 --- a/epan/dissectors/asn1/lpp/lpp.cnf +++ b/epan/dissectors/asn1/lpp/lpp.cnf @@ -915,7 +915,7 @@ NavModelCNAV-KeplerianSet/cnavDeltaNoDot DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lpp %(DEFAULT_BODY)s #.FN_FTR NavModelCNAV-KeplerianSet/cnavMo - PROTO_ITEM_SET_HIDDEN(actx->created_item); + proto_item_set_hidden(actx->created_item); actx->created_item = proto_tree_add_int64_format_value(tree, hf_index, tvb, curr_offset>>3, (offset+7-curr_offset)>>3, cnavMo, "%g semi-circles (%"G_GINT64_MODIFIER"d)", (double)cnavMo*pow(2, -32), cnavMo); @@ -926,7 +926,7 @@ NavModelCNAV-KeplerianSet/cnavDeltaNoDot DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lpp %(DEFAULT_BODY)s #.FN_FTR NavModelCNAV-KeplerianSet/cnavE - PROTO_ITEM_SET_HIDDEN(actx->created_item); + proto_item_set_hidden(actx->created_item); actx->created_item = proto_tree_add_uint64_format_value(tree, hf_index, tvb, curr_offset>>3, (offset+7-curr_offset)>>3, cnavE, "%g (%"G_GINT64_MODIFIER"u)", (double)cnavE*pow(2, -34), cnavE); @@ -937,7 +937,7 @@ NavModelCNAV-KeplerianSet/cnavDeltaNoDot DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lpp %(DEFAULT_BODY)s #.FN_FTR NavModelCNAV-KeplerianSet/cnavOmega - PROTO_ITEM_SET_HIDDEN(actx->created_item); + proto_item_set_hidden(actx->created_item); actx->created_item = proto_tree_add_int64_format_value(tree, hf_index, tvb, curr_offset>>3, (offset+7-curr_offset)>>3, cnavOmega, "%g semi-circles (%"G_GINT64_MODIFIER"d)", (double)cnavOmega*pow(2, -32), cnavOmega); @@ -948,7 +948,7 @@ NavModelCNAV-KeplerianSet/cnavDeltaNoDot DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lpp %(DEFAULT_BODY)s #.FN_FTR NavModelCNAV-KeplerianSet/cnavOMEGA0 - PROTO_ITEM_SET_HIDDEN(actx->created_item); + proto_item_set_hidden(actx->created_item); actx->created_item = proto_tree_add_int64_format_value(tree, hf_index, tvb, curr_offset>>3, (offset+7-curr_offset)>>3, cnavOMEGA0, "%g semi-circles (%"G_GINT64_MODIFIER"d)", (double)cnavOMEGA0*pow(2, -32), cnavOMEGA0); @@ -962,7 +962,7 @@ NavModelCNAV-KeplerianSet/cnavDeltaOmegaDot DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC( %(DEFAULT_BODY)s #.FN_FTR NavModelCNAV-KeplerianSet/cnavIo - PROTO_ITEM_SET_HIDDEN(actx->created_item); + proto_item_set_hidden(actx->created_item); actx->created_item = proto_tree_add_int64_format_value(tree, hf_index, tvb, curr_offset>>3, (offset+7-curr_offset)>>3, cnavIo, "%g semi-circles (%"G_GINT64_MODIFIER"d)", (double)cnavIo*pow(2, -32), cnavIo); diff --git a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf index 4d065c35de..3ee07d72a2 100644 --- a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf +++ b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf @@ -2387,9 +2387,9 @@ DRX-Config/setup/shortDRX/drxShortCycleTimer DISPLAY=BASE_DEC|BASE_UNIT_STRING S /* Show parts as generated fields */ subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_sr_ConfigIndex); ti = proto_tree_add_uint(subtree, hf_lte_rrc_sr_config_periodicity, tvb, index_offset>>3, 1, periodicity); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(subtree, hf_lte_rrc_sr_config_subframe_offset, tvb, index_offset>>3, 1, subframe_offset); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); #.FN_BODY SchedulingRequestConfigSCell-r13/setup/sr-ConfigIndex-r13 VAL_PTR=&value guint32 value; @@ -2403,9 +2403,9 @@ DRX-Config/setup/shortDRX/drxShortCycleTimer DISPLAY=BASE_DEC|BASE_UNIT_STRING S /* Show parts as generated fields */ subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_sr_ConfigIndex); ti = proto_tree_add_uint(subtree, hf_lte_rrc_sr_config_periodicity, tvb, index_offset>>3, 1, periodicity); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(subtree, hf_lte_rrc_sr_config_subframe_offset, tvb, index_offset>>3, 1, subframe_offset); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); #.FN_BODY FreqBandIndicator VAL_PTR=&value guint32 value; @@ -2431,7 +2431,7 @@ DRX-Config/setup/shortDRX/drxShortCycleTimer DISPLAY=BASE_DEC|BASE_UNIT_STRING S /* Add a generated item showing serving & target band for this entry */ it = proto_tree_add_uint(tree, hf_lte_rrc_bandEUTRA, tvb, 0, 0, serving_band); proto_item_append_text(it, " -> band %%u", target_band); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } #.FN_BODY UE-EUTRA-Capability/measParameters diff --git a/epan/dissectors/asn1/q932/packet-q932-template.c b/epan/dissectors/asn1/q932/packet-q932-template.c index c4c4392b03..8b258ba626 100644 --- a/epan/dissectors/asn1/q932/packet-q932-template.c +++ b/epan/dissectors/asn1/q932/packet-q932-template.c @@ -243,7 +243,7 @@ dissect_q932_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data offset = 0; ti = proto_tree_add_item(tree, proto_q932, tvb, offset, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); ie_type = tvb_get_guint8(tvb, offset); ie_len = tvb_get_guint8(tvb, offset + 1); diff --git a/epan/dissectors/asn1/qsig/packet-qsig-template.c b/epan/dissectors/asn1/qsig/packet-qsig-template.c index fb500c7f1b..25b32442f1 100644 --- a/epan/dissectors/asn1/qsig/packet-qsig-template.c +++ b/epan/dissectors/asn1/qsig/packet-qsig-template.c @@ -553,7 +553,7 @@ dissect_qsig_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int codeset offset = 0; ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); ie_type = tvb_get_guint8(tvb, offset); ie_len = tvb_get_guint8(tvb, offset + 1); @@ -563,7 +563,7 @@ dissect_qsig_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int codeset proto_tree_add_item(ie_tree, *hf_qsig_ie_type_arr[codeset], tvb, offset, 1, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_item(ie_tree, hf_qsig_ie_type, tvb, offset, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(ie_tree, hf_qsig_ie_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN); offset += 2; if (tvb_reported_length_remaining(tvb, offset) <= 0) diff --git a/epan/dissectors/asn1/ranap/ranap.cnf b/epan/dissectors/asn1/ranap/ranap.cnf index 1f92b0a25c..7606c31850 100644 --- a/epan/dissectors/asn1/ranap/ranap.cnf +++ b/epan/dissectors/asn1/ranap/ranap.cnf @@ -195,7 +195,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") if(!imsi_tvb) return offset; /* Hide the octet string default printout */ - PROTO_ITEM_SET_HIDDEN(actx->created_item); + proto_item_set_hidden(actx->created_item); digit_str = dissect_e212_imsi(imsi_tvb, actx->pinfo, tree, 0, tvb_reported_length(imsi_tvb), FALSE); sccp_info = (sccp_msg_info_t *)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_ranap, actx->pinfo->curr_layer_num); diff --git a/epan/dissectors/asn1/ros/packet-ros-template.c b/epan/dissectors/asn1/ros/packet-ros-template.c index 3d4c5d649b..317dafaa6a 100644 --- a/epan/dissectors/asn1/ros/packet-ros-template.c +++ b/epan/dissectors/asn1/ros/packet-ros-template.c @@ -345,14 +345,14 @@ ros_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui if(rcrp->is_request){ item=proto_tree_add_uint(tree, hf_ros_response_in, tvb, 0, 0, rcrp->rep_frame); - PROTO_ITEM_SET_GENERATED (item); + proto_item_set_generated (item); } else { nstime_t ns; item=proto_tree_add_uint(tree, hf_ros_response_to, tvb, 0, 0, rcrp->req_frame); - PROTO_ITEM_SET_GENERATED (item); + proto_item_set_generated (item); nstime_delta(&ns, &pinfo->abs_ts, &rcrp->req_time); item=proto_tree_add_time(tree, hf_ros_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED (item); + proto_item_set_generated (item); } } diff --git a/epan/dissectors/asn1/rrc/rrc.cnf b/epan/dissectors/asn1/rrc/rrc.cnf index 1c8a556d6a..74894f56d3 100644 --- a/epan/dissectors/asn1/rrc/rrc.cnf +++ b/epan/dissectors/asn1/rrc/rrc.cnf @@ -1154,9 +1154,9 @@ HNBName TYPE=FT_STRING DISPLAY=STR_UNICODE sub_tree = proto_item_get_subtree(actx->created_item); item_len = proto_item_get_len(actx->created_item); ti = proto_tree_add_uint(sub_tree, generated_field_hf, tvb, original_offset/8, item_len, u_rnti_value); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(sub_tree, hf_urnti, tvb, original_offset/8, item_len, u_rnti_value); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); private_data_set_s_rnc_id(actx, 0); private_data_set_s_rnti(actx, 0); @@ -1253,9 +1253,9 @@ if(state_dec >= 0 && state_dec <= 3) { if(cell_id_tvb != NULL) { cell_identity_tree = proto_item_add_subtree(actx->created_item, ett_rrc_cellIdentity); temp_ti = proto_tree_add_bits_item(cell_identity_tree, hf_rrc_cellIdentity_rnc_id,cell_id_tvb, 0, 12, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(temp_ti); + proto_item_set_generated(temp_ti); temp_ti = proto_tree_add_bits_item(cell_identity_tree, hf_rrc_cellIdentity_c_id, cell_id_tvb, 12, 16, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(temp_ti); + proto_item_set_generated(temp_ti); } #.FN_BODY DL-TransportChannelType-r5 VAL_PTR = &type diff --git a/epan/dissectors/asn1/snmp/snmp.cnf b/epan/dissectors/asn1/snmp/snmp.cnf index b717d06d83..b9ba87b89f 100644 --- a/epan/dissectors/asn1/snmp/snmp.cnf +++ b/epan/dissectors/asn1/snmp/snmp.cnf @@ -197,7 +197,7 @@ gint pdu_type=-1; expert_field* expert; authen_item = proto_tree_add_boolean(authen_tree, hf_snmp_msgAuthentication, tvb, 0, 0, usm_p.authOK); - PROTO_ITEM_SET_GENERATED(authen_item); + proto_item_set_generated(authen_item); if (usm_p.authOK) { expert = &ei_snmp_authentication_ok; diff --git a/epan/dissectors/asn1/t38/packet-t38-template.c b/epan/dissectors/asn1/t38/packet-t38-template.c index 16e0055f72..ea289f60d0 100644 --- a/epan/dissectors/asn1/t38/packet-t38-template.c +++ b/epan/dissectors/asn1/t38/packet-t38-template.c @@ -608,17 +608,17 @@ show_setup_info(tvbuff_t *tvb, proto_tree *tree, t38_conv *p_t38_conversation) "Stream setup by %s (frame %u)", p_t38_conversation->setup_method, p_t38_conversation->setup_frame_number); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); t38_setup_tree = proto_item_add_subtree(ti, ett_t38_setup); if (t38_setup_tree) { /* Add details into subtree */ proto_item* item = proto_tree_add_uint(t38_setup_tree, hf_t38_setup_frame, tvb, 0, 0, p_t38_conversation->setup_frame_number); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_string(t38_setup_tree, hf_t38_setup_method, tvb, 0, 0, p_t38_conversation->setup_method); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } diff --git a/epan/dissectors/asn1/tcap/packet-tcap-template.c b/epan/dissectors/asn1/tcap/packet-tcap-template.c index 90b6639cd1..c59af6fa9e 100644 --- a/epan/dissectors/asn1/tcap/packet-tcap-template.c +++ b/epan/dissectors/asn1/tcap/packet-tcap-template.c @@ -944,12 +944,12 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_context=p_tcaphash_begincall->context; if (gtcap_DisplaySRT && tree) { stat_tree = proto_tree_add_subtree(tree, tvb, 0, -1, ett_tcap_stat, &stat_item, "Stat"); - PROTO_ITEM_SET_GENERATED(stat_item); + proto_item_set_generated(stat_item); pi = proto_tree_add_uint_format(stat_tree, hf_tcapsrt_Duplicate, tvb, 0, 0, p_tcaphash_context->first_frame, "Duplicate with session %u in frame %u", p_tcaphash_context->session_id,p_tcaphash_context->first_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } return p_tcaphash_context; } /* Previous session closed */ @@ -986,9 +986,9 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_context && p_tcaphash_context->session_id) { stat_tree = proto_tree_add_subtree(tree, tvb, 0, 0, ett_tcap_stat, &stat_item, "Stat"); - PROTO_ITEM_SET_GENERATED(stat_item); + proto_item_set_generated(stat_item); pi = proto_tree_add_uint(stat_tree, hf_tcapsrt_SessionId, tvb, 0,0, p_tcaphash_context->session_id); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* add link to response frame, if available */ /* p_tcaphash_begincall->context->last_frame) */ @@ -1000,7 +1000,7 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_context->last_frame, "End of session in frame %u", p_tcaphash_context->last_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } } return p_tcaphash_context; @@ -1160,9 +1160,9 @@ tcaphash_cont_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_context && p_tcaphash_context->session_id) { stat_tree = proto_tree_add_subtree(tree, tvb, 0, -1, ett_tcap_stat, &stat_item, "Stat"); - PROTO_ITEM_SET_GENERATED(stat_item); + proto_item_set_generated(stat_item); pi = proto_tree_add_uint(stat_tree, hf_tcapsrt_SessionId, tvb, 0,0, p_tcaphash_context->session_id); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } return p_tcaphash_context; @@ -1262,10 +1262,10 @@ tcaphash_end_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, #endif if (gtcap_DisplaySRT && tree) { stat_tree = proto_tree_add_subtree(tree, tvb, 0, -1, ett_tcap_stat, &stat_item, "Stat"); - PROTO_ITEM_SET_GENERATED(stat_item); + proto_item_set_generated(stat_item); pi = proto_tree_add_uint(stat_tree, hf_tcapsrt_SessionId, tvb, 0,0, p_tcaphash_context->session_id); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } #ifdef DEBUG_TCAPSRT @@ -1277,13 +1277,13 @@ tcaphash_end_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_context->first_frame, "Begin of session in frame %u", p_tcaphash_context->first_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* Calculate Service Response Time */ nstime_delta(&delta, &pinfo->abs_ts, &p_tcaphash_context->begin_time); /* display Service Response Time and make it filterable */ pi = proto_tree_add_time(stat_tree, hf_tcapsrt_SessionTime, tvb, 0, 0, &delta); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } /* Close the context and remove it (if needed) */ tcapsrt_close(p_tcaphash_context,pinfo); @@ -1385,10 +1385,10 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (gtcap_DisplaySRT && tree) { stat_tree = proto_tree_add_subtree(tree, tvb, 0, -1, ett_tcap_stat, &stat_item, "Stat"); - PROTO_ITEM_SET_GENERATED(stat_item); + proto_item_set_generated(stat_item); pi = proto_tree_add_uint(stat_tree, hf_tcapsrt_SessionId, tvb, 0,0, p_tcaphash_context->session_id); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); #ifdef DEBUG_TCAPSRT dbg(20,"Display framereqlink %d ",p_tcaphash_context->first_frame); @@ -1398,13 +1398,13 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_context->first_frame, "Begin of session in frame %u", p_tcaphash_context->first_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* Calculate Service Response Time */ nstime_delta(&delta, &pinfo->abs_ts, &p_tcaphash_context->begin_time); /* display Service Response Time and make it filterable */ pi = proto_tree_add_time(stat_tree, hf_tcapsrt_SessionTime, tvb, 0, 0, &delta); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } break; } /* Lastframe=0, so take it */ @@ -1477,10 +1477,10 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (gtcap_DisplaySRT && tree) { stat_tree = proto_tree_add_subtree(tree, tvb, 0, -1, ett_tcap_stat, &stat_item, "Stat"); - PROTO_ITEM_SET_GENERATED(stat_item); + proto_item_set_generated(stat_item); pi = proto_tree_add_uint(stat_tree, hf_tcapsrt_SessionId, tvb, 0,0, p_tcaphash_context->session_id); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); #ifdef DEBUG_TCAPSRT dbg(20,"Display framereqlink %d ",p_tcaphash_context->first_frame); @@ -1490,13 +1490,13 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_context->first_frame, "Begin of session in frame %u", p_tcaphash_context->first_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* Calculate Service Response Time */ nstime_delta(&delta, &pinfo->abs_ts, &p_tcaphash_context->begin_time); /* display Service Response Time and make it filterable */ pi = proto_tree_add_time(stat_tree, hf_tcapsrt_SessionTime, tvb, 0, 0, &delta); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } p_tcaphash_context=p_tcaphash_ansicall->context; } /* test with Timeout */ @@ -1529,9 +1529,9 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_context && p_tcaphash_context->session_id) { stat_tree = proto_tree_add_subtree(tree, tvb, 0, -1, ett_tcap_stat, &stat_item, "Stat"); - PROTO_ITEM_SET_GENERATED(stat_item); + proto_item_set_generated(stat_item); pi = proto_tree_add_uint(stat_tree, hf_tcapsrt_SessionId, tvb, 0,0, p_tcaphash_context->session_id); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } @@ -1546,7 +1546,7 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_ansicall->context->last_frame, "End of session in frame %u", p_tcaphash_ansicall->context->last_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } else { /* Response */ #ifdef DEBUG_TCAPSRT dbg(20,"Display framereqlink %d ",p_tcaphash_context->first_frame); @@ -1557,13 +1557,13 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_context->first_frame, "Begin of session in frame %u", p_tcaphash_context->first_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* Calculate Service Response Time */ nstime_delta(&delta, &pinfo->abs_ts, &p_tcaphash_context->begin_time); /* display Service Response Time and make it filterable */ pi = proto_tree_add_time(stat_tree, hf_tcapsrt_SessionTime, tvb, 0, 0, &delta); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } } /* Request or Response */ } diff --git a/epan/dissectors/asn1/tcap/tcap.cnf b/epan/dissectors/asn1/tcap/tcap.cnf index 0507f71fc7..09ed5656d8 100644 --- a/epan/dissectors/asn1/tcap/tcap.cnf +++ b/epan/dissectors/asn1/tcap/tcap.cnf @@ -146,7 +146,7 @@ ABRT-apdu/_untag/user-information abrt_user_information hf_index = hf_tcap_tid; saved_offset = offset; %(DEFAULT_BODY)s - PROTO_ITEM_SET_GENERATED(actx->created_item); + proto_item_set_generated(actx->created_item); offset = saved_offset; subtree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_otid, NULL, "Source Transaction ID"); @@ -195,7 +195,7 @@ ABRT-apdu/_untag/user-information abrt_user_information hf_index = hf_tcap_tid; saved_offset = offset; %(DEFAULT_BODY)s - PROTO_ITEM_SET_GENERATED(actx->created_item); + proto_item_set_generated(actx->created_item); offset = saved_offset; subtree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_dtid, NULL, "Destination Transaction ID"); diff --git a/epan/dissectors/asn1/x509ce/x509ce.cnf b/epan/dissectors/asn1/x509ce/x509ce.cnf index 7e8204352b..daa99fc6f7 100644 --- a/epan/dissectors/asn1/x509ce/x509ce.cnf +++ b/epan/dissectors/asn1/x509ce/x509ce.cnf @@ -188,7 +188,7 @@ EnhancedCertificateAssertion/pathToName enhancedPathToName #.FN_FTR GeneralName/uniformResourceIdentifier - PROTO_ITEM_SET_URL(actx->created_item); + proto_item_set_url(actx->created_item); #.END diff --git a/epan/dissectors/file-elf.c b/epan/dissectors/file-elf.c index 07f1fc5126..c51312ddd2 100644 --- a/epan/dissectors/file-elf.c +++ b/epan/dissectors/file-elf.c @@ -1675,7 +1675,7 @@ dissect_elf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) /* Try to detect blackholes and overlapping segments */ generated_tree = proto_tree_add_subtree(main_tree, tvb, 0, 0, ett_elf_info, &generated_item, "Infos"); - PROTO_ITEM_SET_GENERATED(generated_item); + proto_item_set_generated(generated_item); blackhole_tree = proto_tree_add_subtree(generated_tree, tvb, 0, 0, ett_elf_black_holes, NULL, "Backholes"); overlapping_tree = proto_tree_add_subtree(generated_tree, tvb, 0, 0, ett_elf_overlapping, NULL, "Overlapping"); diff --git a/epan/dissectors/file-file.c b/epan/dissectors/file-file.c index 25979287ef..9717556772 100644 --- a/epan/dissectors/file-file.c +++ b/epan/dissectors/file-file.c @@ -119,17 +119,17 @@ dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, frame_len, frame_plurality, frame_len * 8); ti = proto_tree_add_boolean(fh_tree, hf_file_marked, tvb, 0, 0,pinfo->fd->marked); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_boolean(fh_tree, hf_file_ignored, tvb, 0, 0,pinfo->fd->ignored); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if(pinfo->fd->pfd != 0){ proto_item *ppd_item; guint num_entries = g_slist_length(pinfo->fd->pfd); guint i; ppd_item = proto_tree_add_uint(fh_tree, hf_file_num_p_prot_data, tvb, 0, 0, num_entries); - PROTO_ITEM_SET_GENERATED(ppd_item); + proto_item_set_generated(ppd_item); for(i=0; i<num_entries; i++){ gchar* str = p_get_proto_name_and_key(wmem_file_scope(), pinfo, i); proto_tree_add_string_format(fh_tree, hf_file_proto_name_and_key, tvb, 0, 0, str, "%s", str); @@ -220,7 +220,7 @@ dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, frame = wmem_list_frame_next(frame); } ti = proto_tree_add_string(fh_tree, hf_file_protocols, tvb, 0, 0, wmem_strbuf_get_str(val)); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Call postdissectors if we have any (while trying to avoid another @@ -283,10 +283,10 @@ dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pinfo->fd->color_filter = color_filter; item = proto_tree_add_string(fh_tree, hf_file_color_filter_name, tvb, 0, 0, color_filter->filter_name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_string(fh_tree, hf_file_color_filter_text, tvb, 0, 0, color_filter->filter_text); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } tap_queue_packet(file_tap, pinfo, NULL); diff --git a/epan/dissectors/file-pcapng.c b/epan/dissectors/file-pcapng.c index 550a27665a..c5a2e608fe 100644 --- a/epan/dissectors/file-pcapng.c +++ b/epan/dissectors/file-pcapng.c @@ -1236,7 +1236,7 @@ pcapng_add_timestamp(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, timestamp.nsecs = (int)(ts - (ts / interface_description->timestamp_resolution) * interface_description->timestamp_resolution); ti = proto_tree_add_time(tree, hf_pcapng_timestamp, tvb, offset, 8, ×tamp); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); pinfo->abs_ts = timestamp; } diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index 2a4429f353..6f993add3c 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -1949,7 +1949,7 @@ dissect_6lowpan_iphc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint d proto_item *tclass_item; tclass_item = proto_tree_add_uint(tree, hf_6lowpan_traffic_class, tvb, 0, 0, (ipv6_dscp << LOWPAN_IPHC_ECN_BITS) | ipv6_ecn); - PROTO_ITEM_SET_GENERATED(tclass_item); + proto_item_set_generated(tclass_item); } /* Parse the flow label. */ @@ -2045,7 +2045,7 @@ dissect_6lowpan_iphc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint d /* Display the source IPv6 address. */ ti = proto_tree_add_ipv6(tree, hf_6lowpan_source, tvb, offset, length, &ipv6.ip6h_src); if (length == 0) { - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (ipv6_summary_in_tree) { address src_addr = ADDRESS_INIT(AT_IPv6, sizeof(ipv6.ip6h_src), &ipv6.ip6h_src); @@ -2056,10 +2056,10 @@ dissect_6lowpan_iphc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint d /* TODO: We should display the prefix length too. */ if (sctx->plen) { ti = proto_tree_add_ipv6(iphc_tree, hf_6lowpan_iphc_sctx_prefix, tvb, 0, 0, &sctx->prefix); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if ( sctx->frame ) { ti = proto_tree_add_uint(iphc_tree, hf_6lowpan_iphc_sctx_origin, tvb, 0, 0, sctx->frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } offset += length; @@ -2177,7 +2177,7 @@ dissect_6lowpan_iphc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint d /* Display the destination IPv6 address. */ ti = proto_tree_add_ipv6(tree, hf_6lowpan_dest, tvb, offset, length, &ipv6.ip6h_dst); if (length == 0) { - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (ipv6_summary_in_tree) { address dst_addr = ADDRESS_INIT(AT_IPv6, sizeof(ipv6.ip6h_dst), &ipv6.ip6h_dst); @@ -2188,10 +2188,10 @@ dissect_6lowpan_iphc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint d /* TODO: We should display the prefix length too. */ if (dctx->plen) { ti = proto_tree_add_ipv6(iphc_tree, hf_6lowpan_iphc_dctx_prefix, tvb, 0, 0, &dctx->prefix); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if ( dctx->frame ) { ti = proto_tree_add_uint(iphc_tree, hf_6lowpan_iphc_dctx_origin, tvb, 0, 0, dctx->frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } offset += length; diff --git a/epan/dissectors/packet-acap.c b/epan/dissectors/packet-acap.c index ae564d4eb7..8e9a9736fb 100644 --- a/epan/dissectors/packet-acap.c +++ b/epan/dissectors/packet-acap.c @@ -122,11 +122,11 @@ dissect_acap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (is_request) { hidden_item = proto_tree_add_boolean(acap_tree, &hfi_acap_request, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } else { hidden_item = proto_tree_add_boolean(acap_tree, &hfi_acap_response, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } /* diff --git a/epan/dissectors/packet-acr122.c b/epan/dissectors/packet-acr122.c index a1dbdebdaa..35ec230296 100644 --- a/epan/dissectors/packet-acr122.c +++ b/epan/dissectors/packet-acr122.c @@ -305,7 +305,7 @@ dissect_acr122(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } sub_item = proto_tree_add_uint(main_tree, hf_command, tvb, offset, 4 + length, command); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); if (command == CMD_UNKNOWN) expert_add_info(pinfo, sub_item, &ei_unknown_command_or_invalid_parameters); @@ -491,13 +491,13 @@ dissect_acr122(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } sub_item = proto_tree_add_uint(main_tree, hf_response, tvb, offset, tvb_captured_length_remaining(tvb, offset), command); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); col_add_fstr(pinfo->cinfo, COL_INFO, "Response: %s", val_to_str_ext_const(command, &command_vals_ext, "Unknown")); if (command != CMD_UNKNOWN) { sub_item = proto_tree_add_uint(main_tree, hf_response_for, tvb, offset, tvb_captured_length_remaining(tvb, offset), command_frame_number); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } switch (command) { diff --git a/epan/dissectors/packet-adb.c b/epan/dissectors/packet-adb.c index 494541e340..3039b6ca5f 100644 --- a/epan/dissectors/packet-adb.c +++ b/epan/dissectors/packet-adb.c @@ -476,21 +476,21 @@ dissect_adb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (service_data && !(command_data->command == A_OPEN && is_next_fragment)) { sub_item = proto_tree_add_string(main_tree, hf_service, tvb, offset, 0, service_data->service); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (service_data) { sub_item = proto_tree_add_uint(main_tree, hf_service_start_in_frame, tvb, offset, 0, service_data->start_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); if (service_data->close_local_in_frame < max_in_frame) { sub_item = proto_tree_add_uint(main_tree, hf_close_local_in_frame, tvb, offset, 0, service_data->close_local_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (service_data->close_remote_in_frame < max_in_frame) { sub_item = proto_tree_add_uint(main_tree, hf_close_remote_in_frame, tvb, offset, 0, service_data->close_remote_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } @@ -594,22 +594,22 @@ dissect_adb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (is_next_fragment && command_data) { sub_item = proto_tree_add_uint(main_tree, hf_command_in_frame, tvb, offset, 0, command_data->command_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); sub_item = proto_tree_add_uint(main_tree, hf_command, tvb, offset, 0, command_data->command); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); sub_item = proto_tree_add_uint(main_tree, hf_data_length, tvb, offset, 0, command_data->data_length); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); crc_item = proto_tree_add_uint(main_tree, hf_data_crc32, tvb, offset, 0, command_data->crc32); crc_tree = proto_item_add_subtree(crc_item, ett_adb_crc); - PROTO_ITEM_SET_GENERATED(crc_item); + proto_item_set_generated(crc_item); } if (command_data && command_data->completed_in_frame != frame_number) { sub_item = proto_tree_add_uint(main_tree, hf_completed_in_frame, tvb, offset, 0, command_data->completed_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } diff --git a/epan/dissectors/packet-adb_cs.c b/epan/dissectors/packet-adb_cs.c index 4de0cba0d7..99955eaa35 100644 --- a/epan/dissectors/packet-adb_cs.c +++ b/epan/dissectors/packet-adb_cs.c @@ -101,7 +101,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ direction = P2P_DIR_SENT; p_item = proto_tree_add_uint(main_tree, hf_role, tvb, offset, 0, 0x02); - PROTO_ITEM_SET_GENERATED(p_item); + proto_item_set_generated(p_item); col_add_fstr(pinfo->cinfo, COL_INFO, "Client"); @@ -121,7 +121,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ client_request = (subtree) ? (client_request_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL; if (client_request && client_request->service_in > -1 && client_request->service_in < pinfo->num) { p_item = proto_tree_add_string(main_tree, hf_service, tvb, offset, 0, client_request->service); - PROTO_ITEM_SET_GENERATED(p_item); + proto_item_set_generated(p_item); service = client_request->service; client_request_service = TRUE; } else { @@ -264,10 +264,10 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ } p_item = proto_tree_add_uint(main_tree, hf_role, tvb, offset, 0, 0x01); - PROTO_ITEM_SET_GENERATED(p_item); + proto_item_set_generated(p_item); p_item = proto_tree_add_string(main_tree, hf_service, tvb, offset, 0, service); - PROTO_ITEM_SET_GENERATED(p_item); + proto_item_set_generated(p_item); col_add_fstr(pinfo->cinfo, COL_INFO, "Server"); @@ -336,7 +336,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown role"); p_item = proto_tree_add_uint(main_tree, hf_role, tvb, offset, 0, 0x00); - PROTO_ITEM_SET_GENERATED(p_item); + proto_item_set_generated(p_item); next_tvb = tvb_new_subset_remaining(tvb, offset); call_data_dissector(next_tvb, pinfo, main_tree); diff --git a/epan/dissectors/packet-adb_service.c b/epan/dissectors/packet-adb_service.c index 25970e98aa..fb6bd698ad 100644 --- a/epan/dissectors/packet-adb_service.c +++ b/epan/dissectors/packet-adb_service.c @@ -156,7 +156,7 @@ dissect_adb_service(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d service = adb_service_data->service; sub_item = proto_tree_add_string(main_tree, hf_service, tvb, offset, 0, service); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); if (g_strcmp0(service, "host:version") == 0) { guint32 version; diff --git a/epan/dissectors/packet-adwin.c b/epan/dissectors/packet-adwin.c index 0692564d83..d06dd2defd 100644 --- a/epan/dissectors/packet-adwin.c +++ b/epan/dissectors/packet-adwin.c @@ -561,7 +561,7 @@ adwin_request_response_handling(tvbuff_t *tvb, packet_info *pinfo, it = proto_tree_add_uint(adwin_tree, hf_adwin_response_in, tvb, 0, 0, adwin_trans->rep_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else { /* This is a reply */ @@ -571,11 +571,11 @@ adwin_request_response_handling(tvbuff_t *tvb, packet_info *pinfo, it = proto_tree_add_uint(adwin_tree, hf_adwin_response_to, tvb, 0, 0, adwin_trans->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &adwin_trans->req_time); it = proto_tree_add_time(adwin_tree, hf_adwin_response_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } } @@ -851,11 +851,11 @@ dissect_UDPR2(tvbuff_t *tvb, packet_info *pinfo, "Data[%3d]: %10d - %10f - 0x%08x", i, value, *(float*)fvalue, value); item = proto_tree_add_item(adwin_debug_tree, hf_adwin_data_int, tvb, offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_item(adwin_debug_tree, hf_adwin_data_float, tvb, offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_item(adwin_debug_tree, hf_adwin_data_hex, tvb, offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); } } @@ -890,11 +890,11 @@ dissect_UDPR3(tvbuff_t *tvb, packet_info *pinfo, "Data[%3d]: %10d - %10f - 0x%08x", i, value, *(float*)fvalue, value); item = proto_tree_add_item(adwin_debug_tree, hf_adwin_data_int, tvb, offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_item(adwin_debug_tree, hf_adwin_data_float, tvb, offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_item(adwin_debug_tree, hf_adwin_data_hex, tvb, offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); } } @@ -946,25 +946,25 @@ dissect_UDPR4(tvbuff_t *tvb, packet_info *pinfo, "Data[%3d]: %10d - 0x%08x", i, value, value); item = proto_tree_add_item(adwin_debug_tree, hf_adwin_data_int, tvb, offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_item(adwin_debug_tree, hf_adwin_data_hex, tvb, offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); break; case 5: /* float */ proto_tree_add_none_format(adwin_debug_tree, hf_adwin_data, tvb, offset, 4, "Data[%3d]: %10f - 0x%08x", i, *(float*)fvalue, value); item = proto_tree_add_item(adwin_debug_tree, hf_adwin_data_float, tvb, offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_item(adwin_debug_tree, hf_adwin_data_hex, tvb, offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); break; default: /* string, double, variant, something funny... */ proto_tree_add_none_format(adwin_debug_tree, hf_adwin_data, tvb, offset, 4, "Data[%3d]: 0x%08x", i, value); item = proto_tree_add_item(adwin_debug_tree, hf_adwin_data_hex, tvb, offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); } } } @@ -1001,11 +1001,11 @@ dissect_GDSHP(tvbuff_t *tvb, packet_info *pinfo, "Data[%3d]: %10d - %10f - 0x%08x", i, value, *(float*)fvalue, value); item = proto_tree_add_item(adwin_debug_tree, hf_adwin_data_int, tvb, offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_item(adwin_debug_tree, hf_adwin_data_float, tvb, offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_item(adwin_debug_tree, hf_adwin_data_hex, tvb, offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); } } diff --git a/epan/dissectors/packet-aeron.c b/epan/dissectors/packet-aeron.c index 1ae82505da..170c76ffe3 100644 --- a/epan/dissectors/packet-aeron.c +++ b/epan/dissectors/packet-aeron.c @@ -1551,7 +1551,7 @@ static void aeron_sequence_report_frame(tvbuff_t * tvb, proto_tree * tree, aeron { item = proto_tree_add_uint(tree, hf_aeron_sequence_analysis_term_offset_frame, tvb, 0, 0, finfo->frame); } - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } static void aeron_sequence_report(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, aeron_transport_t * transport, aeron_packet_info_t * info, aeron_frame_info_t * finfo) @@ -1564,17 +1564,17 @@ static void aeron_sequence_report(tvbuff_t * tvb, packet_info * pinfo, proto_tre proto_item * item; item = proto_tree_add_item(tree, hf_aeron_sequence_analysis, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); subtree = proto_item_add_subtree(item, ett_aeron_sequence_analysis); if (finfo->transport.previous != 0) { item = proto_tree_add_uint(subtree, hf_aeron_sequence_analysis_channel_prev_frame, tvb, 0, 0, finfo->transport.previous); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (finfo->transport.next != 0) { item = proto_tree_add_uint(subtree, hf_aeron_sequence_analysis_channel_next_frame, tvb, 0, 0, finfo->transport.next); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if ((info->info_flags & AERON_PACKET_INFO_FLAGS_STREAM_ID_VALID) != 0) { @@ -1586,12 +1586,12 @@ static void aeron_sequence_report(tvbuff_t * tvb, packet_info * pinfo, proto_tre if (finfo->stream.previous != 0) { item = proto_tree_add_uint(subtree, hf_aeron_sequence_analysis_stream_prev_frame, tvb, 0, 0, finfo->stream.previous); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (finfo->stream.next != 0) { item = proto_tree_add_uint(subtree, hf_aeron_sequence_analysis_stream_next_frame, tvb, 0, 0, finfo->stream.next); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if ((info->info_flags & AERON_PACKET_INFO_FLAGS_TERM_ID_VALID) != 0) { @@ -1603,12 +1603,12 @@ static void aeron_sequence_report(tvbuff_t * tvb, packet_info * pinfo, proto_tre if (finfo->term.previous != 0) { item = proto_tree_add_uint(subtree, hf_aeron_sequence_analysis_term_prev_frame, tvb, 0, 0, finfo->term.previous); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (finfo->term.next != 0) { item = proto_tree_add_uint(subtree, hf_aeron_sequence_analysis_term_next_frame, tvb, 0, 0, finfo->term.next); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if ((info->info_flags & AERON_PACKET_INFO_FLAGS_TERM_OFFSET_VALID) != 0) { @@ -1630,7 +1630,7 @@ static void aeron_sequence_report(tvbuff_t * tvb, packet_info * pinfo, proto_tre wmem_list_frame_t * lf; frame_item = proto_tree_add_item(subtree, hf_aeron_sequence_analysis_term_offset, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(frame_item); + proto_item_set_generated(frame_item); frame_tree = proto_item_add_subtree(frame_item, ett_aeron_sequence_analysis_term_offset); lf = wmem_list_head(fragment->frame); while (lf != NULL) @@ -1647,7 +1647,7 @@ static void aeron_sequence_report(tvbuff_t * tvb, packet_info * pinfo, proto_tre } } fei_item = proto_tree_add_boolean(subtree, hf_aeron_sequence_analysis_retransmission, tvb, 0, 0, rx); - PROTO_ITEM_SET_GENERATED(fei_item); + proto_item_set_generated(fei_item); if (rx) { if (wmem_list_count(finfo->rx) > 0) @@ -1657,7 +1657,7 @@ static void aeron_sequence_report(tvbuff_t * tvb, packet_info * pinfo, proto_tre wmem_list_frame_t * lf; rx_item = proto_tree_add_item(subtree, hf_aeron_sequence_analysis_retransmission_rx, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(rx_item); + proto_item_set_generated(rx_item); rx_tree = proto_item_add_subtree(rx_item, ett_aeron_sequence_analysis_retransmission_rx); lf = wmem_list_head(finfo->rx); while (lf != NULL) @@ -1666,14 +1666,14 @@ static void aeron_sequence_report(tvbuff_t * tvb, packet_info * pinfo, proto_tre if (nak != NULL) { rx_item = proto_tree_add_uint(rx_tree, hf_aeron_sequence_analysis_retransmission_rx_frame, tvb, 0, 0, nak->frame); - PROTO_ITEM_SET_GENERATED(rx_item); + proto_item_set_generated(rx_item); } lf = wmem_list_frame_next(lf); } } } fei_item = proto_tree_add_boolean(subtree, hf_aeron_sequence_analysis_keepalive, tvb, 0, 0, ka); - PROTO_ITEM_SET_GENERATED(fei_item); + proto_item_set_generated(fei_item); } } } @@ -1682,7 +1682,7 @@ static void aeron_sequence_report(tvbuff_t * tvb, packet_info * pinfo, proto_tre proto_item * nak_item; nak_item = proto_tree_add_uint(subtree, hf_aeron_sequence_analysis_nak_unrecovered, tvb, 0, 0, finfo->nak_analysis->unrecovered_length); - PROTO_ITEM_SET_GENERATED(nak_item); + proto_item_set_generated(nak_item); if (wmem_list_count(finfo->nak_analysis->rx) > 0) { proto_tree * rx_tree; @@ -1690,7 +1690,7 @@ static void aeron_sequence_report(tvbuff_t * tvb, packet_info * pinfo, proto_tre wmem_list_frame_t * lf; rx_item = proto_tree_add_item(subtree, hf_aeron_sequence_analysis_nak_rx, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(rx_item); + proto_item_set_generated(rx_item); rx_tree = proto_item_add_subtree(rx_item, ett_aeron_sequence_analysis_nak_rx); lf = wmem_list_head(finfo->nak_analysis->rx); while (lf != NULL) @@ -1700,7 +1700,7 @@ static void aeron_sequence_report(tvbuff_t * tvb, packet_info * pinfo, proto_tre { rx_item = proto_tree_add_uint_format_value(rx_tree, hf_aeron_sequence_analysis_nak_rx_frame, tvb, 0, 0, rx->frame_info->frame, "%" G_GUINT32_FORMAT ", Term offset=%" G_GUINT32_FORMAT " (0x%08x), Length=%" G_GUINT32_FORMAT, rx->frame_info->frame, rx->term_offset, rx->term_offset, rx->length); - PROTO_ITEM_SET_GENERATED(rx_item); + proto_item_set_generated(rx_item); } lf = wmem_list_frame_next(lf); } @@ -1724,16 +1724,16 @@ static void aeron_stream_report(tvbuff_t * tvb, packet_info * pinfo, proto_tree proto_item * item; item = proto_tree_add_item(tree, hf_aeron_stream_analysis, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); subtree = proto_item_add_subtree(item, ett_aeron_stream_analysis); item = proto_tree_add_uint(subtree, hf_aeron_stream_analysis_high_term_id, tvb, 0, 0, finfo->stream_analysis->high.term_id); if ((finfo->stream_analysis->flags & AERON_STREAM_ANALYSIS_FLAGS_TERM_ID_CHANGE) != 0) { expert_add_info(pinfo, item, &ei_aeron_analysis_term_id_change); } - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(subtree, hf_aeron_stream_analysis_high_term_offset, tvb, 0, 0, finfo->stream_analysis->high.term_offset); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if ((finfo->stream_analysis->flags & AERON_STREAM_ANALYSIS_FLAGS_IDLE_RX) != 0) { expert_add_info(pinfo, item, &ei_aeron_analysis_idle_rx); @@ -1761,9 +1761,9 @@ static void aeron_stream_report(tvbuff_t * tvb, packet_info * pinfo, proto_tree if ((finfo->stream_analysis->flags2 & AERON_STREAM_ANALYSIS_FLAGS2_RCV_VALID) != 0) { item = proto_tree_add_uint(subtree, hf_aeron_stream_analysis_completed_term_id, tvb, 0, 0, finfo->stream_analysis->completed.term_id); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(subtree, hf_aeron_stream_analysis_completed_term_offset, tvb, 0, 0, finfo->stream_analysis->completed.term_offset); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if ((finfo->stream_analysis->flags & AERON_STREAM_ANALYSIS_FLAGS_OOO_SM) != 0) { expert_add_info(pinfo, item, &ei_aeron_analysis_ooo_sm); @@ -1773,7 +1773,7 @@ static void aeron_stream_report(tvbuff_t * tvb, packet_info * pinfo, proto_tree expert_add_info(pinfo, item, &ei_aeron_analysis_keepalive_sm); } item = proto_tree_add_uint(subtree, hf_aeron_stream_analysis_outstanding_bytes, tvb, 0, 0, finfo->stream_analysis->outstanding_bytes); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if ((finfo->stream_analysis->flags & AERON_STREAM_ANALYSIS_FLAGS_WINDOW_FULL) != 0) { expert_add_info(pinfo, item, &ei_aeron_analysis_window_full); @@ -1813,12 +1813,12 @@ static void aeron_next_offset_report(tvbuff_t * tvb, proto_tree * tree, aeron_tr next_offset_term_id++; } item = proto_tree_add_uint(tree, hf_aeron_data_next_offset, tvb, 0, 0, next_offset); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (next_offset_term_id != term_id) { next_offset_term = aeron_stream_term_find(stream, next_offset_term_id); item = proto_tree_add_uint(tree, hf_aeron_data_next_offset_term, tvb, 0, 0, next_offset_term_id); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } else { @@ -1834,7 +1834,7 @@ static void aeron_next_offset_report(tvbuff_t * tvb, proto_tree * tree, aeron_tr { next_offset_first_frame = next_offset_fragment->first_frame->frame; item = proto_tree_add_uint(tree, hf_aeron_data_next_offset_first_frame, tvb, 0, 0, next_offset_first_frame); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } } @@ -2254,7 +2254,7 @@ static int dissect_aeron_pad(tvbuff_t * tvb, int offset, packet_info * pinfo, pr term_id, term_offset, frame_length, rounded_length); subtree = proto_item_add_subtree(pad_item, ett_aeron_pad); channel_item = proto_tree_add_uint64(subtree, hf_aeron_channel_id, tvb, 0, 0, transport->channel_id); - PROTO_ITEM_SET_GENERATED(channel_item); + proto_item_set_generated(channel_item); frame_length_item = proto_tree_add_item(subtree, hf_aeron_pad_frame_length, tvb, offset + O_AERON_PAD_FRAME_LENGTH, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_aeron_pad_version, tvb, offset + O_AERON_PAD_VERSION, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_aeron_pad_flags, tvb, offset + O_AERON_PAD_FLAGS, 1, ENC_LITTLE_ENDIAN); @@ -2320,7 +2320,7 @@ static void dissect_aeron_reassembled_data(packet_info * pinfo, proto_tree * tre msg_ofs, (msg_ofs + frag->data_length) - 1, frag->data_length); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); if (first_item) { proto_item_append_text(frag_item, " #%" G_GUINT32_FORMAT "(%" G_GUINT32_FORMAT ")", frag->frame, frag->data_length); @@ -2334,7 +2334,7 @@ static void dissect_aeron_reassembled_data(packet_info * pinfo, proto_tree * tre } lf = wmem_list_frame_next(lf); } - PROTO_ITEM_SET_GENERATED(frag_item); + proto_item_set_generated(frag_item); } static int dissect_aeron_data(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, aeron_conversation_info_t * cinfo, aeron_frame_info_t * finfo) @@ -2398,7 +2398,7 @@ static int dissect_aeron_data(tvbuff_t * tvb, int offset, packet_info * pinfo, p (guint32) term_id, term_offset, frame_length, rounded_length); subtree = proto_item_add_subtree(data_item, ett_aeron_data); channel_item = proto_tree_add_uint64(subtree, hf_aeron_channel_id, tvb, 0, 0, transport->channel_id); - PROTO_ITEM_SET_GENERATED(channel_item); + proto_item_set_generated(channel_item); frame_length_item = proto_tree_add_item(subtree, hf_aeron_data_frame_length, tvb, offset + O_AERON_DATA_FRAME_LENGTH, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_aeron_data_version, tvb, offset + O_AERON_DATA_VERSION, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask(subtree, tvb, offset + O_AERON_DATA_FLAGS, hf_aeron_data_flags, ett_aeron_data_flags, flags, ENC_LITTLE_ENDIAN); @@ -2504,7 +2504,7 @@ static int dissect_aeron_nak(tvbuff_t * tvb, int offset, packet_info * pinfo, pr term_id, nak_term_offset, nak_length); subtree = proto_item_add_subtree(nak_item, ett_aeron_nak); channel_item = proto_tree_add_uint64(subtree, hf_aeron_channel_id, tvb, 0, 0, transport->channel_id); - PROTO_ITEM_SET_GENERATED(channel_item); + proto_item_set_generated(channel_item); frame_length_item = proto_tree_add_item(subtree, hf_aeron_nak_frame_length, tvb, offset + O_AERON_NAK_FRAME_LENGTH, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_aeron_nak_version, tvb, offset + O_AERON_NAK_VERSION, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_aeron_nak_flags, tvb, offset + O_AERON_NAK_FLAGS, 1, ENC_LITTLE_ENDIAN); @@ -2605,7 +2605,7 @@ static int dissect_aeron_sm(tvbuff_t * tvb, int offset, packet_info * pinfo, pro term_id, consumption_offset, rcv_window, rcv_id); subtree = proto_item_add_subtree(sm_item, ett_aeron_sm); item = proto_tree_add_uint64(subtree, hf_aeron_channel_id, tvb, 0, 0, transport->channel_id); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); frame_length_item = proto_tree_add_item(subtree, hf_aeron_sm_frame_length, tvb, offset + O_AERON_SM_FRAME_LENGTH, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_aeron_sm_version, tvb, offset + O_AERON_SM_VERSION, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask(subtree, tvb, offset + O_AERON_SM_FLAGS, hf_aeron_sm_flags, ett_aeron_sm_flags, flags, ENC_LITTLE_ENDIAN); @@ -2729,7 +2729,7 @@ static int dissect_aeron_heartbeat(tvbuff_t * tvb, int offset, packet_info * pin (guint32) term_id, term_offset, frame_length, rounded_length); subtree = proto_item_add_subtree(data_item, ett_aeron_data); channel_item = proto_tree_add_uint64(subtree, hf_aeron_channel_id, tvb, 0, 0, transport->channel_id); - PROTO_ITEM_SET_GENERATED(channel_item); + proto_item_set_generated(channel_item); frame_length_item = proto_tree_add_item(subtree, hf_aeron_heartbeat_frame_length, tvb, offset + O_AERON_HEAERTBEAT_FRAME_LENGTH, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_aeron_heartbeat_version, tvb, offset + O_AERON_HEAERTBEAT_VERSION, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask(subtree, tvb, offset + O_AERON_HEAERTBEAT_FLAGS, hf_aeron_heartbeat_flags, ett_aeron_data_flags, flags, ENC_LITTLE_ENDIAN); @@ -2784,7 +2784,7 @@ static int dissect_aeron_rtt(tvbuff_t * tvb, int offset, packet_info * pinfo, pr stream_id, rcv_id); subtree = proto_item_add_subtree(rtt_item, ett_aeron_rtt); item = proto_tree_add_uint64(subtree, hf_aeron_channel_id, tvb, 0, 0, transport->channel_id); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); frame_length_item = proto_tree_add_item(subtree, hf_aeron_rtt_frame_length, tvb, offset + O_AERON_RTT_FRAME_LENGTH, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_aeron_rtt_version, tvb, offset + O_AERON_RTT_VERSION, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask(subtree, tvb, offset + O_AERON_RTT_FLAGS, hf_aeron_rtt_flags, ett_aeron_rtt_flags, flags, ENC_LITTLE_ENDIAN); @@ -2874,7 +2874,7 @@ static int dissect_aeron_setup(tvbuff_t * tvb, int offset, packet_info * pinfo, initial_term_id, (guint32) active_term_id, term_length, term_offset, mtu, ttl); subtree = proto_item_add_subtree(setup_item, ett_aeron_setup); channel_item = proto_tree_add_uint64(subtree, hf_aeron_channel_id, tvb, 0, 0, transport->channel_id); - PROTO_ITEM_SET_GENERATED(channel_item); + proto_item_set_generated(channel_item); frame_length_item = proto_tree_add_item(subtree, hf_aeron_setup_frame_length, tvb, offset + O_AERON_SETUP_FRAME_LENGTH, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_aeron_setup_version, tvb, offset + O_AERON_SETUP_VERSION, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_aeron_setup_flags, tvb, offset + O_AERON_SETUP_FLAGS, 1, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index 1ac504b53e..12459232a0 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -5180,7 +5180,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (request_val->frame_res != 0) { ti = proto_tree_add_uint(afp_tree, hf_afp_response_in, tvb, 0, 0, request_val->frame_res); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } offset++; @@ -5388,11 +5388,11 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (request_val->frame_req != 0) { ti = proto_tree_add_uint(afp_tree, hf_afp_response_to, tvb, 0, 0, request_val->frame_req); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); nstime_delta(&delta_ts, &pinfo->abs_ts, &request_val->req_time); ti = proto_tree_add_time(afp_tree, hf_afp_time, tvb, 0, 0, &delta_ts); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c index dc25fdff02..66a3ea949c 100644 --- a/epan/dissectors/packet-afs.c +++ b/epan/dissectors/packet-afs.c @@ -2955,7 +2955,7 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) if ( typenode != 0 ) { /* indicate the type of request */ hidden_item = proto_tree_add_boolean(afs_tree, typenode, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } /* Process the packet according to what service it is */ diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c index 88beefaf13..a2d4c87b77 100644 --- a/epan/dissectors/packet-alcap.c +++ b/epan/dissectors/packet-alcap.c @@ -1244,42 +1244,42 @@ static void alcap_leg_tree(proto_tree* tree, tvbuff_t* tvb, packet_info *pinfo, if (leg->dsaid) { pi = proto_tree_add_uint(tree,hf_alcap_leg_dsaid,tvb,0,0,leg->dsaid); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (leg->osaid) { pi = proto_tree_add_uint(tree,hf_alcap_leg_osaid,tvb,0,0,leg->osaid); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (leg->pathid) { pi = proto_tree_add_uint(tree,hf_alcap_leg_pathid,tvb,0,0,leg->pathid); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (leg->cid) { pi = proto_tree_add_uint(tree,hf_alcap_leg_cid,tvb,0,0,leg->cid); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (leg->sugr) { pi = proto_tree_add_uint(tree,hf_alcap_leg_sugr,tvb,0,0,leg->sugr); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (leg->orig_nsap) { pi = proto_tree_add_string(tree,hf_alcap_leg_onsea,tvb,0,0,leg->orig_nsap); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (leg->dest_nsap) { pi = proto_tree_add_string(tree,hf_alcap_leg_dnsea,tvb,0,0,leg->dest_nsap); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if(leg->release_cause) { pi = proto_tree_add_uint(tree,hf_alcap_leg_release_cause,tvb,0,0,leg->release_cause); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); if (leg->release_cause && leg->release_cause != 31) expert_add_info(pinfo, pi, &ei_alcap_release_cause_not31); } @@ -1294,7 +1294,7 @@ static void alcap_leg_tree(proto_tree* tree, tvbuff_t* tvb, packet_info *pinfo, proto_item_set_text(pi_local,"%s in frame %u", val_to_str_ext_const(msg->msg_type,&msg_type_strings_ext,"Unknown message"), msg->framenum); - PROTO_ITEM_SET_GENERATED(pi_local); + proto_item_set_generated(pi_local); } while (( msg = msg->next)); } diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index c77aff3b31..801d1f268f 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -7719,7 +7719,7 @@ dissect_amqp_0_9_method_basic_publish(guint16 channel_num, { pi = proto_tree_add_uint64(args_tree, hf_amqp_method_basic_publish_number, tvb, offset-2, 2, delivery->delivery_tag); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } /* ticket (short) */ @@ -9874,7 +9874,7 @@ generate_msg_reference(tvbuff_t *tvb, packet_info *pinfo, proto_tree *amqp_tree) { pi = proto_tree_add_uint(amqp_tree, hf_amqp_message_in, tvb, 0, 0, delivery->msg_framenum); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } delivery = delivery->prev; @@ -9893,7 +9893,7 @@ generate_ack_reference(tvbuff_t *tvb, packet_info *pinfo, proto_tree *amqp_tree) proto_item *pi; pi = proto_tree_add_uint(amqp_tree, hf_amqp_ack_in, tvb, 0, 0, delivery->ack_framenum); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } } diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c index 8328ee5009..8608443693 100644 --- a/epan/dissectors/packet-amr.c +++ b/epan/dissectors/packet-amr.c @@ -443,7 +443,7 @@ dissect_amr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint amr item = proto_tree_add_uint(amr_tree, hf_amr_payload_decoded_as, tvb, offset, 4, amr_encoding_type); proto_item_set_len(item, tvb_reported_length(tvb)); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); switch (amr_encoding_type) { case 0: /* RFC 3267 Byte aligned */ @@ -477,7 +477,7 @@ dissect_amr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint amr item = proto_tree_add_item(amr_tree, hf_amr_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); if ( octet != 0 ) { expert_add_info(pinfo, item, &ei_amr_reserved); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); return; } diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c index 6741052749..9b63fdd941 100644 --- a/epan/dissectors/packet-ansi_801.c +++ b/epan/dissectors/packet-ansi_801.c @@ -1315,7 +1315,7 @@ dissect_ansi_801_for_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree proto_tree_add_item(tree, hf_ansi_801_for_sess_tag, tvb, offset, 1, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_item(tree, hf_ansi_801_sess_tag, tvb, offset, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset++; oct = tvb_get_guint8(tvb, offset); @@ -1437,7 +1437,7 @@ dissect_ansi_801_rev_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree proto_tree_add_item(tree, hf_ansi_801_rev_sess_tag, tvb, offset, 1, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_item(tree, hf_ansi_801_sess_tag, tvb, offset, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset++; oct = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c index ed3cf3442f..56bd18a743 100644 --- a/epan/dissectors/packet-ansi_tcap.c +++ b/epan/dissectors/packet-ansi_tcap.c @@ -351,7 +351,7 @@ find_tcap_subdissector(tvbuff_t *tvb, asn1_ctx_t *actx, proto_tree *tree){ }else{ item = proto_tree_add_int(tree, hf_ansi_tcap_private, tvb, 0, 0, ansi_tcap_private.d.OperationCode_private); } - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); ansi_tcap_private.d.OperationCode_item = item; } } @@ -1406,7 +1406,7 @@ dissect_ansi_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, vo if (g_ansi_tcap_HandleSRT && !tcap_subdissector_used ) { if (gtcap_DisplaySRT && tree) { stat_tree = proto_tree_add_subtree(tree, tvb, 0, 0, ett_ansi_tcap_stat, &stat_item, "Stat"); - PROTO_ITEM_SET_GENERATED(stat_item); + proto_item_set_generated(stat_item); } p_tcap_context=tcapsrt_call_matching(tvb, pinfo, stat_tree, gp_tcapsrt_info); ansi_tcap_private.context=p_tcap_context; diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c index ae462d0a8c..dc297109e8 100644 --- a/epan/dissectors/packet-aoe.c +++ b/epan/dissectors/packet-aoe.c @@ -250,15 +250,15 @@ dissect_ata_pdu(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, if(ata_info->request_frame){ nstime_t delta_ts; tmp_item=proto_tree_add_uint(tree, hf_aoe_response_to, tvb, 0, 0, ata_info->request_frame); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); nstime_delta(&delta_ts, &pinfo->abs_ts, &ata_info->req_time); tmp_item=proto_tree_add_time(tree, hf_aoe_time, tvb, offset, 0, &delta_ts); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); } } else { if(ata_info->response_frame){ tmp_item=proto_tree_add_uint(tree, hf_aoe_response_in, tvb, 0, 0, ata_info->response_frame); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); } } } @@ -292,7 +292,7 @@ dissect_ata_pdu(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, if(ata_info != NULL && ata_info->request_frame){ /* we don't know what command it was unless we saw the request_frame */ tmp_item=proto_tree_add_uint(tree, hf_aoe_acmd, tvb, 0, 0, ata_info->cmd); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); col_append_fstr(pinfo->cinfo, COL_INFO, " ATA:%s", val_to_str(ata_info->cmd, ata_cmd_vals, " Unknown ATA<0x%02x>")); } } diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index 69d6212d1b..75b96eeb84 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -712,12 +712,12 @@ check_for_duplicate_addresses(packet_info *pinfo, proto_tree *tree, address_to_str(wmem_packet_scope(), &mac_addr), address_to_str(wmem_packet_scope(), &result_mac_addr), result->frame_num); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Add item for navigating to earlier frame */ ti = proto_tree_add_uint(duplicate_tree, hf_arp_duplicate_ip_address_earlier_frame, tvb, 0, 0, result->frame_num); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); expert_add_info_format(pinfo, ti, &ei_seq_arp_dup_ip, "Duplicate IP address configured (%s)", @@ -728,7 +728,7 @@ check_for_duplicate_addresses(packet_info *pinfo, proto_tree *tree, hf_arp_duplicate_ip_address_seconds_since_earlier_frame, tvb, 0, 0, (guint32)(pinfo->abs_ts.secs - result->time_of_entry)); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Set out parameter */ *duplicate_ip = ip; @@ -1710,15 +1710,15 @@ dissect_arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if (is_gratuitous) { item = proto_tree_add_boolean(arp_tree, hf_arp_isgratuitous, tvb, 0, 0, is_gratuitous); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (is_probe) { item = proto_tree_add_boolean(arp_tree, hf_arp_isprobe, tvb, 0, 0, is_probe); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (is_announcement) { item = proto_tree_add_boolean(arp_tree, hf_arp_isannouncement, tvb, 0, 0, is_announcement); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (ar_hln != 0) { proto_tree_add_item(arp_tree, diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c index 846ffd129b..e6a0ea64ae 100644 --- a/epan/dissectors/packet-artnet.c +++ b/epan/dissectors/packet-artnet.c @@ -2165,7 +2165,7 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) uni_port = tvb_get_guint8(tvb, offset) & 0x0F; tf = proto_tree_add_uint(ti,hf_artnet_poll_reply_swin_1_universe,tvb, offset, 0, universe | uni_port); - PROTO_ITEM_SET_GENERATED(tf); + proto_item_set_generated(tf); offset += 1; proto_tree_add_item(ti, hf_artnet_poll_reply_swin_2, tvb, @@ -2173,7 +2173,7 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) uni_port = tvb_get_guint8(tvb, offset) & 0x0F; tf = proto_tree_add_uint(ti,hf_artnet_poll_reply_swin_2_universe,tvb, offset, 0, universe | uni_port); - PROTO_ITEM_SET_GENERATED(tf); + proto_item_set_generated(tf); offset += 1; proto_tree_add_item(ti, hf_artnet_poll_reply_swin_3, tvb, @@ -2181,7 +2181,7 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) uni_port = tvb_get_guint8(tvb, offset) & 0x0F; tf = proto_tree_add_uint(ti,hf_artnet_poll_reply_swin_3_universe,tvb, offset, 0, universe | uni_port); - PROTO_ITEM_SET_GENERATED(tf); + proto_item_set_generated(tf); offset += 1; proto_tree_add_item(ti, hf_artnet_poll_reply_swin_4, tvb, @@ -2189,7 +2189,7 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) uni_port = tvb_get_guint8(tvb, offset) & 0x0F; tf = proto_tree_add_uint(ti,hf_artnet_poll_reply_swin_4_universe,tvb, offset, 0, universe | uni_port); - PROTO_ITEM_SET_GENERATED(tf); + proto_item_set_generated(tf); offset += 1; hi = proto_tree_add_item(si, @@ -2206,7 +2206,7 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) uni_port = tvb_get_guint8(tvb, offset) & 0x0F; tf = proto_tree_add_uint(ti,hf_artnet_poll_reply_swout_1_universe,tvb, offset, 0, universe | uni_port); - PROTO_ITEM_SET_GENERATED(tf); + proto_item_set_generated(tf); offset += 1; proto_tree_add_item(ti, hf_artnet_poll_reply_swout_2, tvb, @@ -2214,7 +2214,7 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) uni_port = tvb_get_guint8(tvb, offset) & 0x0F; tf = proto_tree_add_uint(ti,hf_artnet_poll_reply_swout_2_universe,tvb, offset, 0, universe | uni_port); - PROTO_ITEM_SET_GENERATED(tf); + proto_item_set_generated(tf); offset += 1; proto_tree_add_item(ti, hf_artnet_poll_reply_swout_3, tvb, @@ -2222,7 +2222,7 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) uni_port = tvb_get_guint8(tvb, offset) & 0x0F; tf = proto_tree_add_uint(ti,hf_artnet_poll_reply_swout_3_universe,tvb, offset, 0, universe | uni_port); - PROTO_ITEM_SET_GENERATED(tf); + proto_item_set_generated(tf); offset += 1; proto_tree_add_item(ti, hf_artnet_poll_reply_swout_4, tvb, @@ -2230,7 +2230,7 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) uni_port = tvb_get_guint8(tvb, offset) & 0x0F; tf = proto_tree_add_uint(ti,hf_artnet_poll_reply_swout_4_universe,tvb, offset, 0, universe | uni_port); - PROTO_ITEM_SET_GENERATED(tf); + proto_item_set_generated(tf); offset += 1; proto_tree_add_item(tree, hf_artnet_poll_reply_swvideo, tvb, @@ -2679,7 +2679,7 @@ dissect_artnet_tod_data(tvbuff_t *tvb, guint offset, proto_tree *tree) universe |= tvb_get_guint8(tvb, offset); tf = proto_tree_add_uint(tree,hf_artnet_tod_control_universe,tvb, offset, 0, universe); - PROTO_ITEM_SET_GENERATED(tf); + proto_item_set_generated(tf); offset += 1; proto_tree_add_item(tree, hf_artnet_tod_data_uid_total, tvb, @@ -2733,7 +2733,7 @@ dissect_artnet_tod_control(tvbuff_t *tvb, guint offset, proto_tree *tree) universe |= tvb_get_guint8(tvb, offset); tf = proto_tree_add_uint(tree,hf_artnet_tod_control_universe,tvb, offset, 0, universe); - PROTO_ITEM_SET_GENERATED(tf); + proto_item_set_generated(tf); offset += 1; return offset; @@ -2788,7 +2788,7 @@ dissect_artnet_rdm(tvbuff_t *tvb, guint offset, proto_tree *tree, packet_info * universe |= tvb_get_guint8(tvb, offset); tf = proto_tree_add_uint(tree,hf_artnet_tod_control_universe,tvb, offset, 0, universe); - PROTO_ITEM_SET_GENERATED(tf); + proto_item_set_generated(tf); offset += 1; /* check for old version that included the 0xCC startcode diff --git a/epan/dissectors/packet-aruba-erm.c b/epan/dissectors/packet-aruba-erm.c index 2710c8ac6b..0d6e309620 100644 --- a/epan/dissectors/packet-aruba-erm.c +++ b/epan/dissectors/packet-aruba-erm.c @@ -276,7 +276,7 @@ dissect_aruba_erm_type3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi (float)data_rate / 2, "Data Rate: %.1f Mb/s", (float)data_rate / 2); - PROTO_ITEM_SET_GENERATED(ti_data_rate); + proto_item_set_generated(ti_data_rate); offset += 2; proto_tree_add_item_ret_uint(aruba_erm_tree, hf_aruba_erm_channel, tvb, offset, 1, ENC_BIG_ENDIAN, &channel); diff --git a/epan/dissectors/packet-ascend.c b/epan/dissectors/packet-ascend.c index 10a3924d80..2ee0f22a00 100644 --- a/epan/dissectors/packet-ascend.c +++ b/epan/dissectors/packet-ascend.c @@ -74,14 +74,14 @@ dissect_ascend(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ proto_tree_add_uint(fh_tree, hf_chunk, tvb, 0, 0, pseudo_header->ascend.chunk); hidden_item = proto_tree_add_uint(fh_tree, hf_session_id, tvb, 0, 0, 0); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } else { /* It's wandsession data */ proto_tree_add_string(fh_tree, hf_user_name, tvb, 0, 0, pseudo_header->ascend.user); proto_tree_add_uint(fh_tree, hf_session_id, tvb, 0, 0, pseudo_header->ascend.sess); hidden_item = proto_tree_add_uint(fh_tree, hf_chunk, tvb, 0, 0, 0); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } proto_tree_add_uint(fh_tree, hf_task, tvb, 0, 0, pseudo_header->ascend.task); } diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c index 20ce944e1a..ab31ee5335 100644 --- a/epan/dissectors/packet-assa_r3.c +++ b/epan/dissectors/packet-assa_r3.c @@ -5940,7 +5940,7 @@ dissect_r3_cmd_downloadfirmware (tvbuff_t *tvb, guint32 start_offset, guint32 le packetCRC, "0x%04x (incorrect, should be 0x%04x)", calculatedCRC, packetCRC); tmp_item = proto_tree_add_boolean (dlfw_tree, hf_r3_firmwaredownload_crc_bad, payload_tvb, cmdLen - 2 - 2, 2, TRUE); - PROTO_ITEM_SET_GENERATED (tmp_item); + proto_item_set_generated (tmp_item); } } @@ -6665,7 +6665,7 @@ dissect_r3_packet (tvbuff_t *tvb, packet_info *pinfo, proto_tree *r3_tree) proto_tree_add_uint_format_value(tail_tree, hf_r3_crc, tvb, offset, 2, packetCRC, "0x%04x (incorrect, should be 0x%04x)", calculatedCRC, packetCRC); tmp_item = proto_tree_add_boolean (tail_tree, hf_r3_crc_bad, tvb, offset, 2, TRUE); - PROTO_ITEM_SET_GENERATED (tmp_item); + proto_item_set_generated (tmp_item); } if ((packetLen ^ 0xff) == packetXor) @@ -6678,7 +6678,7 @@ dissect_r3_packet (tvbuff_t *tvb, packet_info *pinfo, proto_tree *r3_tree) proto_tree_add_uint_format_value(tail_tree, hf_r3_xor, tvb, offset + 7, 1, packetXor, "0x%02x (incorrect, should be 0x%02x)", packetXor, packetLen ^ 0xff); tmp_item = proto_tree_add_boolean (tail_tree, hf_r3_xor_bad, tvb, offset + 7, 1, TRUE); - PROTO_ITEM_SET_GENERATED (tmp_item); + proto_item_set_generated (tmp_item); } } diff --git a/epan/dissectors/packet-at.c b/epan/dissectors/packet-at.c index 571947a47d..ff4e2c00b0 100644 --- a/epan/dissectors/packet-at.c +++ b/epan/dissectors/packet-at.c @@ -970,7 +970,7 @@ dissect_cimi_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Only parameter is found in the response from DCE - the IMSI */ pitem = proto_tree_add_item(tree, hf_cimi_imsi, tvb, offset, parameter_length, ENC_NA | ENC_ASCII); /* Hiding the AT IMSI item because we are showing the detailed E.212 item */ - PROTO_ITEM_SET_HIDDEN(pitem); + proto_item_set_hidden(pitem); dissect_e212_utf8_imsi(tvb, pinfo, tree, offset, parameter_length); return TRUE; @@ -1857,7 +1857,7 @@ dissect_at_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* No suffix, assume line break (which translates to 'ACTION_SIMPLY') */ type = TYPE_ACTION_SIMPLY; pitem = proto_tree_add_uint(command_tree, hf_at_cmd_type, tvb, offset, 0, type); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); } } @@ -2022,7 +2022,7 @@ static int dissect_at(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* /* Show role in tree */ item = proto_tree_add_uint(at_tree, hf_role, tvb, 0, 0, role); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); /* Dissect command(s) */ diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index 1ab8c69fe1..fcdc5d2765 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -1437,10 +1437,10 @@ dissect_ddp_short(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat if (tree) { hidden_item = proto_tree_add_string(ddp_tree, hf_ddp_src, tvb, 4, 3, address_to_str(wmem_packet_scope(), &pinfo->src)); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_string(ddp_tree, hf_ddp_dst, tvb, 6, 3, address_to_str(wmem_packet_scope(), &pinfo->dst)); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_uint(ddp_tree, hf_ddp_type, tvb, 4, 1, type); } @@ -1472,11 +1472,11 @@ dissect_ddp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) hidden_item = proto_tree_add_string(ddp_tree, hf_ddp_src, tvb, 4, 3, address_to_str(wmem_packet_scope(), &pinfo->src)); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_string(ddp_tree, hf_ddp_dst, tvb, 6, 3, address_to_str(wmem_packet_scope(), &pinfo->dst)); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(ddp_tree, hf_ddp_hopcount, tvb, 0, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ddp_tree, hf_ddp_len, tvb, 0, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-awdl.c b/epan/dissectors/packet-awdl.c index 3f28a8150c..0ee69d8f98 100755 --- a/epan/dissectors/packet-awdl.c +++ b/epan/dissectors/packet-awdl.c @@ -1388,7 +1388,7 @@ dissect_awdl_action(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d targettime = tvb_get_guint32(tvb, offset, ENC_LITTLE_ENDIAN); offset += 4; item = proto_tree_add_uint(fixed_tree, hf_awdl_txdelay, tvb, 0, 0, phytime - targettime); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); col_set_str(pinfo->cinfo, COL_PROTOCOL, "AWDL"); col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(subtype, awdl_subtype_col, "Unknown")); diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c index 0b0660abba..32a0b683ba 100644 --- a/epan/dissectors/packet-beep.c +++ b/epan/dissectors/packet-beep.c @@ -199,7 +199,7 @@ dissect_beep_more(tvbuff_t *tvb, packet_info *pinfo, int offset, guint8 more = tvb_get_guint8(tvb, offset); hidden_item = proto_tree_add_item(tree, hf_beep_more, tvb, offset, 1, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); switch(more) { case '.': @@ -370,7 +370,7 @@ dissect_beep_int(tvbuff_t *tvb, int offset, while (hfa[ind]) { hidden_item = proto_tree_add_uint(tree, *hfa[ind], tvb, offset, len, ival); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); ind++; } diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c index 4718cc9135..dff8979242 100644 --- a/epan/dissectors/packet-bluetooth.c +++ b/epan/dissectors/packet-bluetooth.c @@ -3258,30 +3258,30 @@ dissect_bluetooth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (src && src->type == AT_STRINGZ) { sub_item = proto_tree_add_string(main_tree, hf_bluetooth_addr_str, tvb, 0, 0, (const char *) src->data); - PROTO_ITEM_SET_HIDDEN(sub_item); + proto_item_set_hidden(sub_item); sub_item = proto_tree_add_string(main_tree, hf_bluetooth_src_str, tvb, 0, 0, (const char *) src->data); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } else if (src && src->type == AT_ETHER) { sub_item = proto_tree_add_ether(main_tree, hf_bluetooth_addr, tvb, 0, 0, (const guint8 *) src->data); - PROTO_ITEM_SET_HIDDEN(sub_item); + proto_item_set_hidden(sub_item); sub_item = proto_tree_add_ether(main_tree, hf_bluetooth_src, tvb, 0, 0, (const guint8 *) src->data); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (dst && dst->type == AT_STRINGZ) { sub_item = proto_tree_add_string(main_tree, hf_bluetooth_addr_str, tvb, 0, 0, (const char *) dst->data); - PROTO_ITEM_SET_HIDDEN(sub_item); + proto_item_set_hidden(sub_item); sub_item = proto_tree_add_string(main_tree, hf_bluetooth_dst_str, tvb, 0, 0, (const char *) dst->data); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } else if (dst && dst->type == AT_ETHER) { sub_item = proto_tree_add_ether(main_tree, hf_bluetooth_addr, tvb, 0, 0, (const guint8 *) dst->data); - PROTO_ITEM_SET_HIDDEN(sub_item); + proto_item_set_hidden(sub_item); sub_item = proto_tree_add_ether(main_tree, hf_bluetooth_dst, tvb, 0, 0, (const guint8 *) dst->data); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } return bluetooth_data; diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c index b99d30b6f1..2dae3e0809 100644 --- a/epan/dissectors/packet-brdwlk.c +++ b/epan/dissectors/packet-brdwlk.c @@ -260,7 +260,7 @@ dissect_brdwlk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ hidden_item = proto_tree_add_boolean(brdwlk_tree, hf_brdwlk_drop, tvb, offset, 0, dropped_packets); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); packet_count = pkt_cnt; diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index bd1d456dd8..2a01827156 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -4521,7 +4521,7 @@ dissect_handle(proto_tree *tree, packet_info *pinfo, gint hf, handle = tvb_get_guint16(tvb, offset, ENC_LITTLE_ENDIAN); } else if (handle >= 0 && handle <= G_MAXUINT16) { handle_item = proto_tree_add_uint(tree, hf, tvb, 0, 0, handle); - PROTO_ITEM_SET_GENERATED(handle_item); + proto_item_set_generated(handle_item); } else { DISSECTOR_ASSERT_NOT_REACHED(); } @@ -4541,7 +4541,7 @@ dissect_handle(proto_tree *tree, packet_info *pinfo, gint hf, else sub_item = proto_tree_add_bytes_with_length(sub_tree, hf_btatt_service_uuid128, tvb, 0, 0, service_uuid.data, 16); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } @@ -4555,7 +4555,7 @@ dissect_handle(proto_tree *tree, packet_info *pinfo, gint hf, else sub_item = proto_tree_add_bytes_with_length(sub_tree, hf_btatt_characteristic_uuid128, tvb, 0, 0, characteristic_uuid.data, 16); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } @@ -4568,7 +4568,7 @@ dissect_handle(proto_tree *tree, packet_info *pinfo, gint hf, else sub_item = proto_tree_add_bytes_with_length(sub_tree, hf_btatt_uuid128, tvb, 0, 0, attribute_uuid.data, 16); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (uuid) @@ -10864,7 +10864,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (request_data && (request_opcode == 0x08 || request_opcode == 0x10)) { sub_item = proto_tree_add_uint(main_tree, hf_btatt_uuid16, tvb, 0, 0, request_data->parameters.read_by_type.uuid.bt_uuid); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } break; @@ -11109,7 +11109,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (request_data) { sub_item = proto_tree_add_uint(main_tree, hf_btatt_uuid16, tvb, 0, 0, request_data->parameters.read_by_type.uuid.bt_uuid); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } break; @@ -11295,7 +11295,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (request_data) { sub_item = proto_tree_add_uint(main_tree, hf_btatt_uuid16, tvb, 0, 0, request_data->parameters.read_by_type.uuid.bt_uuid); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } break; @@ -11440,7 +11440,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (request_data) { if (request_data->request_in_frame > 0 && request_data->request_in_frame != pinfo->num) { sub_item = proto_tree_add_uint(main_tree, hf_request_in_frame, tvb, 0, 0, request_data->request_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (!pinfo->fd->visited && request_data->response_in_frame == 0 && @@ -11449,7 +11449,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (request_data->response_in_frame > 0 && request_data->response_in_frame != pinfo->num) { sub_item = proto_tree_add_uint(main_tree, hf_response_in_frame, tvb, 0, 0, request_data->response_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c index e21b80a06f..30d4a89944 100644 --- a/epan/dissectors/packet-btavdtp.c +++ b/epan/dissectors/packet-btavdtp.c @@ -3090,30 +3090,30 @@ dissect_aptx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) cumulative_frame_duration = (tvb_reported_length(tvb) / 4.0) * frame_duration; pitem = proto_tree_add_double(aptx_tree, hf_aptx_cumulative_frame_duration, tvb, 0, 0, cumulative_frame_duration); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); if (info && info->previous_media_packet_info && info->current_media_packet_info) { nstime_t delta; nstime_delta(&delta, &pinfo->abs_ts, &info->previous_media_packet_info->abs_ts); pitem = proto_tree_add_double(aptx_tree, hf_aptx_delta_time, tvb, 0, 0, nstime_to_msec(&delta)); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); pitem = proto_tree_add_double(aptx_tree, hf_aptx_avrcp_song_position, tvb, 0, 0, info->previous_media_packet_info->avrcp_song_position); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); nstime_delta(&delta, &pinfo->abs_ts, &info->previous_media_packet_info->first_abs_ts); pitem = proto_tree_add_double(aptx_tree, hf_aptx_delta_time_from_the_beginning, tvb, 0, 0, nstime_to_msec(&delta)); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); if (!pinfo->fd->visited) info->current_media_packet_info->cumulative_frame_duration += cumulative_frame_duration; pitem = proto_tree_add_double(aptx_tree, hf_aptx_cumulative_duration, tvb, 0, 0, info->previous_media_packet_info->cumulative_frame_duration); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); pitem = proto_tree_add_double(aptx_tree, hf_aptx_diff, tvb, 0, 0, info->previous_media_packet_info->cumulative_frame_duration - nstime_to_msec(&delta)); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); } } @@ -3298,7 +3298,7 @@ dissect_ldac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ expected_speed_data = (8*(frame_length+3) * frequency) / (frame_sample_size*1000); pitem = proto_tree_add_uint(rtree, hf_ldac_expected_data_speed, tvb, offset, 0, expected_speed_data); proto_item_append_text(pitem, " kbits/sec"); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); counter += 1; } @@ -3473,20 +3473,20 @@ dissect_bta2dp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) bta2dp_tree = proto_item_add_subtree(ti, ett_bta2dp); pitem = proto_tree_add_uint(bta2dp_tree, hf_bta2dp_acp_seid, tvb, 0, 0, sep_data.acp_seid); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); pitem = proto_tree_add_uint(bta2dp_tree, hf_bta2dp_int_seid, tvb, 0, 0, sep_data.int_seid); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); pitem = proto_tree_add_uint(bta2dp_tree, hf_bta2dp_codec, tvb, 0, 0, sep_data.codec); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); if (sep_data.codec == 0xFF) { /* Vendor Specific Codec */ pitem = proto_tree_add_uint(bta2dp_tree, hf_bta2dp_vendor_id, tvb, 0, 0, sep_data.vendor_id); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); pitem = proto_tree_add_uint(bta2dp_tree, hf_bta2dp_vendor_codec_id, tvb, 0, 0, sep_data.vendor_codec); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); if ((sep_data.vendor_id == 0x004F && sep_data.vendor_codec == CODECID_APT_X) || (sep_data.vendor_id == 0x00D7 && sep_data.vendor_codec == CODECID_APT_X_HD)) @@ -3498,21 +3498,21 @@ dissect_bta2dp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (sep_data.content_protection_type > 0) { pitem = proto_tree_add_uint(bta2dp_tree, hf_bta2dp_content_protection, tvb, 0, 0, sep_data.content_protection_type); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); } if (sep_data.stream_start_in_frame > 0) { pitem = proto_tree_add_uint(bta2dp_tree, hf_bta2dp_stream_start_in_frame, tvb, 0, 0, sep_data.stream_start_in_frame); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); } if (sep_data.stream_end_in_frame > 0) { pitem = proto_tree_add_uint(bta2dp_tree, hf_bta2dp_stream_end_in_frame, tvb, 0, 0, sep_data.stream_end_in_frame); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); } pitem = proto_tree_add_uint(bta2dp_tree, hf_bta2dp_stream_number, tvb, 0, 0, sep_data.stream_number); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); switch (sep_data.codec) { case CODEC_SBC: @@ -3731,39 +3731,39 @@ dissect_btvdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) btvdp_tree = proto_item_add_subtree(ti, ett_btvdp); pitem = proto_tree_add_uint(btvdp_tree, hf_btvdp_acp_seid, tvb, 0, 0, sep_data.acp_seid); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); pitem = proto_tree_add_uint(btvdp_tree, hf_btvdp_int_seid, tvb, 0, 0, sep_data.int_seid); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); pitem = proto_tree_add_uint(btvdp_tree, hf_btvdp_codec, tvb, 0, 0, sep_data.codec); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); if (sep_data.codec == 0xFF) { /* Vendor Specific Codec */ pitem = proto_tree_add_uint(btvdp_tree, hf_btvdp_vendor_id, tvb, 0, 0, sep_data.vendor_id); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); pitem = proto_tree_add_uint(btvdp_tree, hf_btvdp_vendor_codec_id, tvb, 0, 0, sep_data.vendor_codec); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); } if (sep_data.content_protection_type > 0) { pitem = proto_tree_add_uint(btvdp_tree, hf_btvdp_content_protection, tvb, 0, 0, sep_data.content_protection_type); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); } if (sep_data.stream_start_in_frame > 0) { pitem = proto_tree_add_uint(btvdp_tree, hf_btvdp_stream_start_in_frame, tvb, 0, 0, sep_data.stream_start_in_frame); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); } if (sep_data.stream_end_in_frame > 0) { pitem = proto_tree_add_uint(btvdp_tree, hf_btvdp_stream_end_in_frame, tvb, 0, 0, sep_data.stream_end_in_frame); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); } pitem = proto_tree_add_uint(btvdp_tree, hf_btvdp_stream_number, tvb, 0, 0, sep_data.stream_number); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); switch (sep_data.codec) { case CODEC_H263_BASELINE: diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c index dbe436aa1c..315f0ea3a0 100644 --- a/epan/dissectors/packet-btavrcp.c +++ b/epan/dissectors/packet-btavrcp.c @@ -1217,7 +1217,7 @@ dissect_vendor_dependent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset = 0; pitem = proto_tree_add_item(tree, hf_btavrcp_reassembled, tvb, offset, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); } } } @@ -2265,18 +2265,18 @@ dissect_btavrcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (response_time > timing_info->max_response_time) { proto_item_append_text(pitem, "; TIME EXCEEDED"); } - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); if (timing_info->response_frame_number == 0) { pitem = proto_tree_add_expert(btavrcp_tree, pinfo, &ei_btavrcp_no_response, tvb, 0, 0); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); } else { if (is_command) { pitem = proto_tree_add_uint(btavrcp_tree, hf_btavrcp_response_in_frame, tvb, 0, 0, timing_info->response_frame_number); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); } else { pitem = proto_tree_add_uint(btavrcp_tree, hf_btavrcp_command_in_frame, tvb, 0, 0, timing_info->command_frame_number); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); } } diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c index 4b62b49722..4bdf614d22 100644 --- a/epan/dissectors/packet-bthci_acl.c +++ b/epan/dissectors/packet-bthci_acl.c @@ -445,7 +445,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat proto_item *item; item = proto_tree_add_uint(bthci_acl_tree, hf_bthci_acl_reassembled_in, tvb, 0, 0, mfp->last_frame); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); col_append_frame_number(pinfo, COL_INFO, " [Reassembled in #%u]", mfp->last_frame); } } @@ -465,11 +465,11 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat proto_item *item; item = proto_tree_add_uint(bthci_acl_tree, hf_bthci_acl_continuation_to, tvb, 0, 0, mfp->first_frame); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); col_append_frame_number(pinfo, COL_INFO, " [Continuation to #%u]", mfp->first_frame); if (mfp->last_frame && mfp->last_frame != pinfo->num) { item = proto_tree_add_uint(bthci_acl_tree, hf_bthci_acl_reassembled_in, tvb, 0, 0, mfp->last_frame); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); col_append_frame_number(pinfo, COL_INFO, " [Reassembled in #%u]", mfp->last_frame); } } @@ -491,11 +491,11 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat if (chandle_session) { sub_item = proto_tree_add_uint(bthci_acl_tree, hf_bthci_acl_connect_in, tvb, 0, 0, chandle_session->connect_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); if (chandle_session->disconnect_in_frame < G_MAXUINT32) { sub_item = proto_tree_add_uint(bthci_acl_tree, hf_bthci_acl_disconnect_in, tvb, 0, 0, chandle_session->disconnect_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } @@ -516,34 +516,34 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat } sub_item = proto_tree_add_ether(bthci_acl_tree, hf_bthci_acl_src_bd_addr, tvb, 0, 0, src_bd_addr); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); sub_item = proto_tree_add_string(bthci_acl_tree, hf_bthci_acl_src_name, tvb, 0, 0, src_name); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); sub_item = proto_tree_add_uint(bthci_acl_tree, hf_bthci_acl_src_role, tvb, 0, 0, src_role); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); sub_item = proto_tree_add_ether(bthci_acl_tree, hf_bthci_acl_dst_bd_addr, tvb, 0, 0, dst_bd_addr); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); sub_item = proto_tree_add_string(bthci_acl_tree, hf_bthci_acl_dst_name, tvb, 0, 0, dst_name); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); sub_item = proto_tree_add_uint(bthci_acl_tree, hf_bthci_acl_dst_role, tvb, 0, 0, dst_role); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); if (role_last_change_in_frame > 0) { sub_item = proto_tree_add_uint(bthci_acl_tree, hf_bthci_acl_role_last_change_in_frame, tvb, 0, 0, role_last_change_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } sub_item = proto_tree_add_int(bthci_acl_tree, hf_bthci_acl_mode, tvb, 0, 0, mode); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); if (mode_last_change_in_frame > 0) { sub_item = proto_tree_add_uint(bthci_acl_tree, hf_bthci_acl_mode_last_change_in_frame, tvb, 0, 0, mode_last_change_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } return tvb_captured_length(tvb); diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index 93a4ff4191..9fb8bfe996 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -5258,21 +5258,21 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat nstime_t delta; sub_item = proto_tree_add_uint(bthci_cmd_tree, hf_pending_in_frame, tvb, 0, 0, bthci_cmd_data->pending_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); nstime_delta(&delta, &bthci_cmd_data->pending_abs_ts, &bthci_cmd_data->command_abs_ts); sub_item = proto_tree_add_double(bthci_cmd_tree, hf_command_pending_time_delta, tvb, 0, 0, nstime_to_msec(&delta)); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (bthci_cmd_data && bthci_cmd_data->response_in_frame < max_disconnect_in_frame) { nstime_t delta; sub_item = proto_tree_add_uint(bthci_cmd_tree, hf_response_in_frame, tvb, 0, 0, bthci_cmd_data->response_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); nstime_delta(&delta, &bthci_cmd_data->response_abs_ts, &bthci_cmd_data->command_abs_ts); sub_item = proto_tree_add_double(bthci_cmd_tree, hf_command_response_time_delta, tvb, 0, 0, nstime_to_msec(&delta)); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } return offset; diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index e54a207fa0..1d2bc72c47 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -4238,21 +4238,21 @@ dissect_bthci_evt_command_complete(tvbuff_t *tvb, int offset, expert_add_info(pinfo, manufacturer_item, &ei_manufacturer_data_changed); sub_tree = proto_item_add_subtree(manufacturer_item, ett_expert); sub_item = proto_tree_add_uint(sub_tree, hf_changed_in_frame, tvb, 0, 0, hci_vendor_data->change_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (hci_revision != hci_vendor_data->hci_revision) { expert_add_info(pinfo, hci_revision_item, &ei_manufacturer_data_changed); sub_tree = proto_item_add_subtree(hci_revision_item, ett_expert); sub_item = proto_tree_add_uint(sub_tree, hf_changed_in_frame, tvb, 0, 0, hci_vendor_data->change_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (lmp_subversion != hci_vendor_data->lmp_subversion) { expert_add_info(pinfo, lmp_subversion_item, &ei_manufacturer_data_changed); sub_tree = proto_item_add_subtree(lmp_subversion_item, ett_expert); sub_item = proto_tree_add_uint(sub_tree, hf_changed_in_frame, tvb, 0, 0, hci_vendor_data->change_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } @@ -6451,40 +6451,40 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat if (lastest_bthci_cmd_data->pending_in_frame == frame_number) { sub_item = proto_tree_add_uint(bthci_evt_tree, hf_command_in_frame, tvb, 0, 0, lastest_bthci_cmd_data->command_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); if (lastest_bthci_cmd_data->response_in_frame < max_disconnect_in_frame) { sub_item = proto_tree_add_uint(bthci_evt_tree, hf_response_in_frame, tvb, 0, 0, lastest_bthci_cmd_data->response_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } nstime_delta(&delta, &lastest_bthci_cmd_data->pending_abs_ts, &lastest_bthci_cmd_data->command_abs_ts); sub_item = proto_tree_add_double(bthci_evt_tree, hf_command_pending_time_delta, tvb, 0, 0, nstime_to_msec(&delta)); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); if (lastest_bthci_cmd_data->response_in_frame < max_disconnect_in_frame) { nstime_delta(&delta, &lastest_bthci_cmd_data->response_abs_ts, &lastest_bthci_cmd_data->pending_abs_ts); sub_item = proto_tree_add_double(bthci_evt_tree, hf_pending_response_time_delta, tvb, 0, 0, nstime_to_msec(&delta)); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } if (lastest_bthci_cmd_data->response_in_frame == frame_number) { sub_item = proto_tree_add_uint(bthci_evt_tree, hf_command_in_frame, tvb, 0, 0, lastest_bthci_cmd_data->command_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); if (lastest_bthci_cmd_data->pending_in_frame < max_disconnect_in_frame) { sub_item = proto_tree_add_uint(bthci_evt_tree, hf_pending_in_frame, tvb, 0, 0, lastest_bthci_cmd_data->pending_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); nstime_delta(&delta, &lastest_bthci_cmd_data->response_abs_ts, &lastest_bthci_cmd_data->pending_abs_ts); sub_item = proto_tree_add_double(bthci_evt_tree, hf_pending_response_time_delta, tvb, 0, 0, nstime_to_msec(&delta)); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } nstime_delta(&delta, &lastest_bthci_cmd_data->response_abs_ts, &lastest_bthci_cmd_data->command_abs_ts); sub_item = proto_tree_add_double(bthci_evt_tree, hf_command_response_time_delta, tvb, 0, 0, nstime_to_msec(&delta)); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c index 64f0a3309f..a2efc6e259 100644 --- a/epan/dissectors/packet-bthci_sco.c +++ b/epan/dissectors/packet-bthci_sco.c @@ -259,16 +259,16 @@ dissect_bthci_sco(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat if (chandle_session) { sub_item = proto_tree_add_uint(bthci_sco_tree, hf_bthci_sco_connect_in, tvb, 0, 0, chandle_session->connect_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); if (chandle_session->disconnect_in_frame < G_MAXUINT32) { sub_item = proto_tree_add_uint(bthci_sco_tree, hf_bthci_sco_disconnect_in, tvb, 0, 0, chandle_session->disconnect_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } if (sco_stream_number) { sub_item = proto_tree_add_uint(bthci_sco_tree, hf_bthci_sco_stream_number, tvb, 0, 0, sco_stream_number->stream_number); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } return tvb_reported_length(tvb); diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c index 856cacf4e9..d957fb41f0 100644 --- a/epan/dissectors/packet-bthfp.c +++ b/epan/dissectors/packet-bthfp.c @@ -2204,7 +2204,7 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } pitem = proto_tree_add_uint(main_tree, hf_role, tvb, 0, 0, role); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); if (role == ROLE_UNKNOWN) { col_append_fstr(pinfo->cinfo, COL_INFO, "Data: %s", @@ -2440,7 +2440,7 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) col_append_fstr(pinfo->cinfo, COL_INFO, "Fragment: %s", tvb_format_text_wsp(wmem_packet_scope(), tvb, offset, tvb_captured_length_remaining(tvb, offset))); pitem = proto_tree_add_item(main_tree, hf_fragmented, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); proto_tree_add_item(main_tree, hf_fragment, tvb, offset, tvb_captured_length_remaining(tvb, offset), ENC_ASCII | ENC_NA); offset = tvb_captured_length(tvb); diff --git a/epan/dissectors/packet-bthsp.c b/epan/dissectors/packet-bthsp.c index 5acbb1aafe..c45ed06410 100644 --- a/epan/dissectors/packet-bthsp.c +++ b/epan/dissectors/packet-bthsp.c @@ -603,10 +603,10 @@ dissect_at_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (command_frame_number) { pitem = proto_tree_add_uint(command_tree, hf_command_in, tvb, offset, 0, command_frame_number); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); } else { pitem = proto_tree_add_item(command_tree, hf_unsolicited, tvb, offset, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); } } @@ -753,7 +753,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } pitem = proto_tree_add_uint(main_tree, hf_role, tvb, 0, 0, role); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); if (role == ROLE_UNKNOWN) { col_append_fstr(pinfo->cinfo, COL_INFO, "Data: %s", @@ -989,7 +989,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) col_append_fstr(pinfo->cinfo, COL_INFO, "Fragment: %s", tvb_format_text_wsp(wmem_packet_scope(), tvb, offset, tvb_captured_length_remaining(tvb, offset))); pitem = proto_tree_add_item(main_tree, hf_fragmented, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); proto_tree_add_item(main_tree, hf_fragment, tvb, offset, tvb_captured_length_remaining(tvb, offset), ENC_ASCII | ENC_NA); offset = tvb_captured_length(tvb); diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index d18dd29aba..cb30450cee 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -795,12 +795,12 @@ dissect_connrequest(tvbuff_t *tvb, int offset, packet_info *pinfo, if (bt_uuid) { sub_item = proto_tree_add_uint(tree, hf_btl2cap_service, tvb, 0, 0, bt_uuid); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (disconnect_in_frame < max_disconnect_in_frame) { sub_item = proto_tree_add_uint(tree, hf_btl2cap_disconnect_in_frame, tvb, 0, 0, disconnect_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } @@ -820,7 +820,7 @@ dissect_le_credit_based_connrequest(tvbuff_t *tvb, int offset, packet_info *pinf proto_tree_add_item_ret_uint(command_tree, hf_btl2cap_le_psm, tvb, offset, 2, ENC_LITTLE_ENDIAN, &psm); if (psm < 0x80) { psm_item = proto_tree_add_item(command_tree, hf_btl2cap_psm, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_GENERATED(psm_item); + proto_item_set_generated(psm_item); } offset += 2; @@ -948,12 +948,12 @@ dissect_le_credit_based_connrequest(tvbuff_t *tvb, int offset, packet_info *pinf if (bt_uuid) { sub_item = proto_tree_add_uint(tree, hf_btl2cap_service, tvb, 0, 0, bt_uuid); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (disconnect_in_frame < max_disconnect_in_frame) { sub_item = proto_tree_add_uint(tree, hf_btl2cap_disconnect_in_frame, tvb, 0, 0, disconnect_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } @@ -1908,17 +1908,17 @@ dissect_disconnrequestresponse(tvbuff_t *tvb, int offset, packet_info *pinfo, if (psm > 0) { sub_item = proto_tree_add_uint(tree, hf_btl2cap_psm, tvb, offset, 0, psm); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (bt_uuid) { sub_item = proto_tree_add_uint(tree, hf_btl2cap_service, tvb, 0, 0, bt_uuid); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (connect_in_frame > 0) { sub_item = proto_tree_add_uint(tree, hf_btl2cap_connect_in_frame, tvb, 0, 0, connect_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } @@ -1980,7 +1980,7 @@ dissect_b_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item_append_text(psm_item, ": %s", val_to_str_ext_const(uuid.bt_uuid, &bluetooth_uuid_vals_ext, "Unknown service")); } - PROTO_ITEM_SET_GENERATED(psm_item); + proto_item_set_generated(psm_item); /* call next dissector */ if (!dissector_try_uint_new(l2cap_cid_dissector_table, (guint32) cid, next_tvb, pinfo, tree, TRUE, l2cap_data)) { @@ -2096,7 +2096,7 @@ dissect_le_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item_append_text(psm_item, ": %s", val_to_str_ext_const(uuid.bt_uuid, &bluetooth_uuid_vals_ext, "Unknown service")); } - PROTO_ITEM_SET_GENERATED(psm_item); + proto_item_set_generated(psm_item); }/*psm*/ if (btl2cap_frame_data->first_fragment) { @@ -2229,7 +2229,7 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (mfp != NULL && mfp->last_frame) { proto_item *item; item = proto_tree_add_uint(btl2cap_tree, hf_btl2cap_reassembled_in, tvb, 0, 0, mfp->last_frame); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); col_append_frame_number(pinfo, COL_INFO, "[Reassembled in #%u] ", mfp->last_frame); } } else { @@ -2254,7 +2254,7 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (mfp) { proto_item *item; item = proto_tree_add_uint(btl2cap_tree, hf_btl2cap_continuation_to, tvb, 0, 0, mfp->first_frame); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); col_append_fstr(pinfo->cinfo, COL_INFO, "[Continuation to #%u] ", mfp->first_frame); } } @@ -2304,7 +2304,7 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item_append_text(psm_item, " (%s)", val_to_str_ext_const(uuid.bt_uuid, &bluetooth_uuid_vals_ext, "Unknown service")); } - PROTO_ITEM_SET_GENERATED(psm_item); + proto_item_set_generated(psm_item); /* call next dissector */ if (!dissector_try_uint_new(l2cap_psm_dissector_table, (guint32) psm, next_tvb, pinfo, tree, TRUE, l2cap_data)) { @@ -2764,18 +2764,18 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (psm_data->connect_in_frame > 0 && psm_data->connect_in_frame < G_MAXUINT32) { sub_item = proto_tree_add_uint(btl2cap_tree, hf_btl2cap_connect_in_frame, tvb, 0, 0, psm_data->connect_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (psm_data->disconnect_in_frame > 0 && psm_data->disconnect_in_frame < G_MAXUINT32) { sub_item = proto_tree_add_uint(btl2cap_tree, hf_btl2cap_disconnect_in_frame, tvb, 0, 0, psm_data->disconnect_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } bt_uuid = get_service_uuid(pinfo, l2cap_data, psm_data->psm, psm_data->local_service); if (bt_uuid) { sub_item = proto_tree_add_uint(btl2cap_tree, hf_btl2cap_service, tvb, 0, 0, bt_uuid); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (config_data->mode == L2CAP_BASIC_MODE) { diff --git a/epan/dissectors/packet-btle.c b/epan/dissectors/packet-btle.c index 1fb59f8f30..9fcbdb550c 100644 --- a/epan/dissectors/packet-btle.c +++ b/epan/dissectors/packet-btle.c @@ -623,7 +623,7 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_tree_add_item(advertising_header_tree, hf_advertising_header_length, tvb, offset, 1, ENC_LITTLE_ENDIAN); item = proto_tree_add_item_ret_uint(btle_tree, hf_length, tvb, offset, 1, ENC_LITTLE_ENDIAN, &length); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); offset += 1; switch (pdu_type) { @@ -883,10 +883,10 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) str_addr_dst = (gchar *) wmem_alloc(pinfo->pool, str_addr_len); sub_item = proto_tree_add_ether(btle_tree, hf_master_bd_addr, tvb, 0, 0, connection_info->master_bd_addr); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); sub_item = proto_tree_add_ether(btle_tree, hf_slave_bd_addr, tvb, 0, 0, connection_info->slave_bd_addr); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); switch (direction) { case BTLE_DIR_MASTER_SLAVE: @@ -988,7 +988,7 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_tree_add_item(data_header_tree, hf_data_header_length, tvb, offset, 1, ENC_LITTLE_ENDIAN); item = proto_tree_add_item_ret_uint(btle_tree, hf_length, tvb, offset, 1, ENC_LITTLE_ENDIAN, &length); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); offset += 1; switch (llid) { @@ -1372,7 +1372,7 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (add_l2cap_index) { item = proto_tree_add_uint(btle_tree, hf_l2cap_index, tvb, 0, 0, btle_frame_info->l2cap_index); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if ((crc_status == CRC_INDETERMINATE) && diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index 1251cf47d8..bd587af631 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -4226,7 +4226,7 @@ dissect_sdp_service_search_response(proto_tree *tree, tvbuff_t *tvb, reassembled_item = proto_tree_add_item(tree, (is_continued) ? hf_partial_record_handle_list : hf_reassembled_record_handle_list,new_tvb, 0, new_length, ENC_NA); proto_item_append_text(reassembled_item, " [count = %u]", new_length / 4); reassembled_tree = proto_item_add_subtree(reassembled_item, ett_btsdp_reassembled); - PROTO_ITEM_SET_GENERATED(reassembled_item); + proto_item_set_generated(reassembled_item); while (new_length > 0) { proto_tree_add_item(reassembled_tree, hf_sdp_service_record_handle, new_tvb, @@ -4322,7 +4322,7 @@ dissect_sdp_service_attribute_response(proto_tree *tree, tvbuff_t *tvb, (is_continued) ? hf_partial_attribute_list : hf_reassembled_attribute_list, new_tvb, 0, tvb_reported_length(new_tvb), ENC_NA); reassembled_tree = proto_item_add_subtree(reassembled_item, ett_btsdp_reassembled); - PROTO_ITEM_SET_GENERATED(reassembled_item); + proto_item_set_generated(reassembled_item); if (!is_continued) { dissect_sdp_service_attribute_list(reassembled_tree, new_tvb, 0, @@ -4447,7 +4447,7 @@ dissect_sdp_service_search_attribute_response(proto_tree *tree, tvbuff_t *tvb, (is_continued) ? hf_partial_attribute_list : hf_reassembled_attribute_list, new_tvb, 0, tvb_reported_length(new_tvb), ENC_NA); reassembled_tree = proto_item_add_subtree(reassembled_item, ett_btsdp_reassembled); - PROTO_ITEM_SET_GENERATED(reassembled_item); + proto_item_set_generated(reassembled_item); if (!is_continued) dissect_sdp_service_attribute_list_array(reassembled_tree, new_tvb, 0, diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c index 96ce65e872..312b2abb68 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -1085,9 +1085,9 @@ dissect_epsem(tvbuff_t *tvb, int offset, guint32 len, packet_info *pinfo, proto_ /* now we have enough information to fill in the crypto subtree */ crypto_tree = proto_item_add_subtree(yt, ett_c1222_crypto); item = proto_tree_add_boolean(crypto_tree, hf_c1222_epsem_crypto_good, tvb, local_offset, 4, crypto_good); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_boolean(crypto_tree, hf_c1222_epsem_crypto_bad, tvb, local_offset, 4, crypto_bad); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } else { expert_add_info(pinfo, tree, &ei_c1222_mac_missing); return offset+len; diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 73fd788bbf..ff4c08f793 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -7756,7 +7756,7 @@ camelsrt_request_call_matching(tvbuff_t *tvb, packet_info *pinfo, p_camelsrt_info->msginfo[srt_type].is_duplicate = TRUE; if (gcamel_DisplaySRT){ hidden_item = proto_tree_add_uint(tree, hf_camelsrt_Duplicate, tvb, 0,0, 77); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } } else { @@ -7785,7 +7785,7 @@ camelsrt_request_call_matching(tvbuff_t *tvb, packet_info *pinfo, "Linked response %s in frame %u", val_to_str_const(srt_type, camelSRTtype_naming, "Unk"), p_camelsrt_call->category[srt_type].rsp_num); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* frame valid */ } /* call reference */ } @@ -7804,34 +7804,34 @@ camelsrt_display_DeltaTime(proto_tree *tree, tvbuff_t *tvb, nstime_t *value_ptr, switch(category) { case CAMELSRT_VOICE_INITIALDP: ti = proto_tree_add_time(tree, hf_camelsrt_DeltaTime31, tvb, 0, 0, value_ptr); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; case CAMELSRT_VOICE_ACR1: case CAMELSRT_VOICE_ACR2: case CAMELSRT_VOICE_ACR3: ti = proto_tree_add_time(tree, hf_camelsrt_DeltaTime22, tvb, 0, 0, value_ptr); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; case CAMELSRT_VOICE_DISC: ti = proto_tree_add_time(tree, hf_camelsrt_DeltaTime35, tvb, 0, 0, value_ptr); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; case CAMELSRT_GPRS_INITIALDP: ti = proto_tree_add_time(tree, hf_camelsrt_DeltaTime75, tvb, 0, 0, value_ptr); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; case CAMELSRT_GPRS_REPORT: ti = proto_tree_add_time(tree, hf_camelsrt_DeltaTime80, tvb, 0, 0, value_ptr); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; case CAMELSRT_SMS_INITIALDP: ti = proto_tree_add_time(tree, hf_camelsrt_DeltaTime65, tvb, 0, 0, value_ptr); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; default: @@ -7914,7 +7914,7 @@ camelsrt_report_call_matching(tvbuff_t *tvb, packet_info *pinfo, p_camelsrt_info->msginfo[srt_type].is_duplicate = TRUE; if ( gcamel_DisplaySRT ){ hidden_item = proto_tree_add_uint(tree, hf_camelsrt_Duplicate, tvb, 0,0, 77); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } } } /* rsp_num != 0 */ @@ -7935,7 +7935,7 @@ camelsrt_report_call_matching(tvbuff_t *tvb, packet_info *pinfo, "Linked request %s in frame %u", val_to_str_const(srt_type, camelSRTtype_naming, "Unk"), p_camelsrt_call->category[srt_type].req_num); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Calculate Service Response Time */ nstime_delta(&delta, &pinfo->abs_ts, &p_camelsrt_call->category[srt_type].req_time); diff --git a/epan/dissectors/packet-canopen.c b/epan/dissectors/packet-canopen.c index ad3d2d3a7d..85588f86cc 100644 --- a/epan/dissectors/packet-canopen.c +++ b/epan/dissectors/packet-canopen.c @@ -1125,11 +1125,11 @@ dissect_canopen(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) /* add function code */ ti = proto_tree_add_uint(canopen_cob_tree, hf_canopen_function_code, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* add node id */ ti = proto_tree_add_uint(canopen_cob_tree, hf_canopen_node_id, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* add CANopen frame type */ diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 19481247a1..d04c877fe9 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -2530,10 +2530,10 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo /* Add PDCP thread info as generated fields */ ti = proto_tree_add_uint(dct2000_tree, hf_catapult_dct2000_lte_ueid, tvb, 0, 0, pinfo->pseudo_header->dct2000.inner_pseudo_header.pdcp.ueid); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(dct2000_tree, hf_catapult_dct2000_lte_drbid, tvb, 0, 0, pinfo->pseudo_header->dct2000.inner_pseudo_header.pdcp.drbid); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } #endif break; @@ -2668,7 +2668,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo if (strncmp(string, ">> ERR", 6) == 0) { proto_item *error_ti = proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_error_comment, tvb, offset, -1, ENC_NA); - PROTO_ITEM_SET_GENERATED(error_ti); + proto_item_set_generated(error_ti); expert_add_info_format(pinfo, string_ti, &ei_catapult_dct2000_error_comment_expert, "%s", string); } @@ -2821,7 +2821,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo hf_catapult_dct2000_ipprim_addr_v6, tvb, source_addr_offset, source_addr_length, ENC_NA); - PROTO_ITEM_SET_HIDDEN(addr_ti); + proto_item_set_hidden(addr_ti); } if (source_port_offset != 0) { proto_item *port_ti; @@ -2838,7 +2838,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo hf_catapult_dct2000_ipprim_udp_port : hf_catapult_dct2000_ipprim_tcp_port, tvb, source_port_offset, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(port_ti); + proto_item_set_hidden(port_ti); } if (dest_addr_offset != 0) { proto_item *addr_ti; @@ -2861,7 +2861,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo hf_catapult_dct2000_ipprim_addr_v6, tvb, dest_addr_offset, dest_addr_length, ENC_NA); - PROTO_ITEM_SET_HIDDEN(addr_ti); + proto_item_set_hidden(addr_ti); } if (dest_port_offset != 0) { proto_item *port_ti; @@ -2878,7 +2878,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo hf_catapult_dct2000_ipprim_udp_port : hf_catapult_dct2000_ipprim_tcp_port, tvb, dest_port_offset, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(port_ti); + proto_item_set_hidden(port_ti); } if (conn_id_offset != 0) { proto_tree_add_item(ipprim_tree, @@ -2970,7 +2970,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo hf_catapult_dct2000_sctpprim_addr_v6, tvb, dest_addr_offset, dest_addr_length, ENC_NA); - PROTO_ITEM_SET_HIDDEN(addr_ti); + proto_item_set_hidden(addr_ti); } if (dest_port_offset != 0) { @@ -3042,7 +3042,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo proto_item *ti_local = proto_tree_add_uint(dct2000_tree, hf_catapult_dct2000_dissected_length, tvb, 0, 0, tvb_reported_length(tvb)-offset); - PROTO_ITEM_SET_GENERATED(ti_local); + proto_item_set_generated(ti_local); } } diff --git a/epan/dissectors/packet-ccsds.c b/epan/dissectors/packet-ccsds.c index a1c19d8352..5f9ae61fff 100644 --- a/epan/dissectors/packet-ccsds.c +++ b/epan/dissectors/packet-ccsds.c @@ -471,17 +471,17 @@ dissect_ccsds(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U "0x%04x [correct]", checkword_field); checkword_tree = proto_item_add_subtree(item, ett_ccsds_checkword); item = proto_tree_add_boolean(checkword_tree, hf_ccsds_checkword_good, tvb, offset, 2, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_boolean(checkword_tree, hf_ccsds_checkword_bad, tvb, offset, 2, FALSE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } else { item = proto_tree_add_uint_format_value(ccsds_tree, hf_ccsds_checkword, tvb, offset, 2, checkword_field, "0x%04x [incorrect, should be 0x%04x]", checkword_field, checkword_sum); checkword_tree = proto_item_add_subtree(item, ett_ccsds_checkword); item = proto_tree_add_boolean(checkword_tree, hf_ccsds_checkword_good, tvb, offset, 2, FALSE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_boolean(checkword_tree, hf_ccsds_checkword_bad, tvb, offset, 2, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } offset += 2; } diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c index 913557b8fc..f858b161f1 100644 --- a/epan/dissectors/packet-ceph.c +++ b/epan/dissectors/packet-ceph.c @@ -6888,16 +6888,16 @@ guint c_dissect_pdu(proto_tree *root, /*** General Filter Data ***/ fi = proto_tree_add_string(tree_filter, hf_src_slug, NULL, 0, 0, srcn); - PROTO_ITEM_SET_GENERATED(fi); + proto_item_set_generated(fi); fi = proto_tree_add_uint(tree_filter, hf_src_type, NULL, 0, 0, data->src->name.type); - PROTO_ITEM_SET_GENERATED(fi); + proto_item_set_generated(fi); fi = proto_tree_add_string(tree_filter, hf_dst_slug, NULL, 0, 0, dstn); - PROTO_ITEM_SET_GENERATED(fi); + proto_item_set_generated(fi); fi = proto_tree_add_uint(tree_filter, hf_dst_type, NULL, 0, 0, data->dst->name.type); - PROTO_ITEM_SET_GENERATED(fi); + proto_item_set_generated(fi); proto_item_set_end(tif, tvb, off); } diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c index 3ff7000103..d6545e6806 100644 --- a/epan/dissectors/packet-cigi.c +++ b/epan/dissectors/packet-cigi.c @@ -2651,17 +2651,17 @@ dissect_cigi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Ports */ hidden_item = proto_tree_add_uint(cigi_tree, hf_cigi_src_port, tvb, 0, 0, pinfo->srcport); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_uint(cigi_tree, hf_cigi_dest_port, tvb, 0, 0, pinfo->destport); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_uint(cigi_tree, hf_cigi_port, tvb, 0, 0, pinfo->srcport); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_uint(cigi_tree, hf_cigi_port, tvb, 0, 0, pinfo->destport); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Frame Size */ hidden_item = proto_tree_add_uint(cigi_tree, hf_cigi_frame_size, tvb, 0, 0, tvb_reported_length(tvb)); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Since the versions of CIGI are not backwards compatible, * dissection is different for each version. diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index a8d834e8b2..6ca23d8fbe 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -3937,7 +3937,7 @@ dissect_cia(tvbuff_t *tvb, int offset, unsigned char segment_type, { temp_data = tvb_get_guint8(tvb, offset + 1); *ret_item = proto_tree_add_uint(path_tree, hf_cip_ext_logical_type, tvb, 0, 0, temp_data); - PROTO_ITEM_SET_GENERATED(*ret_item); + proto_item_set_generated(*ret_item); } else { @@ -3961,7 +3961,7 @@ dissect_cia(tvbuff_t *tvb, int offset, unsigned char segment_type, if ( generate ) { *ret_item = proto_tree_add_uint(path_tree, hf8, tvb, 0, 0, temp_data ); - PROTO_ITEM_SET_GENERATED(*ret_item); + proto_item_set_generated(*ret_item); } else { @@ -4010,7 +4010,7 @@ dissect_cia(tvbuff_t *tvb, int offset, unsigned char segment_type, if ( generate ) { *ret_item = proto_tree_add_uint(path_tree, hf16, tvb, 0, 0, temp_data ); - PROTO_ITEM_SET_GENERATED(*ret_item); + proto_item_set_generated(*ret_item); } else { @@ -4049,7 +4049,7 @@ dissect_cia(tvbuff_t *tvb, int offset, unsigned char segment_type, if ( generate ) { *ret_item = proto_tree_add_uint(path_tree, hf32, tvb, 0, 0, temp_data ); - PROTO_ITEM_SET_GENERATED(*ret_item); + proto_item_set_generated(*ret_item); } else { @@ -4177,11 +4177,11 @@ static int dissect_segment_network_extended(packet_info *pinfo, proto_item *epat guint16 temp_data; it = proto_tree_add_uint(net_tree, hf_cip_seg_network_size, tvb, 0, 0, data_words); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); temp_data = tvb_get_letohs(tvb, offset + 2); it = proto_tree_add_uint(net_tree, hf_cip_seg_network_subtype, tvb, 0, 0, temp_data); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4232,10 +4232,10 @@ static int dissect_segment_network_production_inhibit_us(tvbuff_t *tvb, int offs { proto_item *it; it = proto_tree_add_uint(net_tree, hf_cip_seg_network_size, tvb, 0, 0, data_words); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); it = proto_tree_add_uint(net_tree, hf_cip_seg_prod_inhibit_time_us, tvb, 0, 0, inhibit_time); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4259,7 +4259,7 @@ static int dissect_segment_symbolic(tvbuff_t *tvb, proto_tree *path_seg_tree, if (generate) { it = proto_tree_add_uint(path_seg_tree, hf_cip_symbol_size, tvb, 0, 0, symbol_size); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4276,7 +4276,7 @@ static int dissect_segment_symbolic(tvbuff_t *tvb, proto_tree *path_seg_tree, if (generate) { it = proto_tree_add_string(path_seg_tree, hf_cip_symbol_ascii, tvb, 0, 0, symbol_name); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4302,7 +4302,7 @@ static int dissect_segment_symbolic(tvbuff_t *tvb, proto_tree *path_seg_tree, if (generate) { it = proto_tree_add_uint(path_seg_tree, hf_cip_symbol_extended_format, tvb, 0, 0, string_format); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4317,7 +4317,7 @@ static int dissect_segment_symbolic(tvbuff_t *tvb, proto_tree *path_seg_tree, if (generate) { it = proto_tree_add_uint(path_seg_tree, hf_cip_symbol_double_size, tvb, 0, 0, string_size); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4334,7 +4334,7 @@ static int dissect_segment_symbolic(tvbuff_t *tvb, proto_tree *path_seg_tree, if (generate) { it = proto_tree_add_uint(path_seg_tree, hf_cip_symbol_triple_size, tvb, 0, 0, string_size); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4352,7 +4352,7 @@ static int dissect_segment_symbolic(tvbuff_t *tvb, proto_tree *path_seg_tree, if (generate) { it = proto_tree_add_uint(path_seg_tree, hf_cip_symbol_numeric_format, tvb, 0, 0, string_size); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4367,7 +4367,7 @@ static int dissect_segment_symbolic(tvbuff_t *tvb, proto_tree *path_seg_tree, if (generate) { it = proto_tree_add_uint(path_seg_tree, hf_cip_numeric_usint, tvb, 0, 0, numeric_data); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4382,7 +4382,7 @@ static int dissect_segment_symbolic(tvbuff_t *tvb, proto_tree *path_seg_tree, if (generate) { it = proto_tree_add_uint(path_seg_tree, hf_cip_numeric_uint, tvb, 0, 0, numeric_data); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4397,7 +4397,7 @@ static int dissect_segment_symbolic(tvbuff_t *tvb, proto_tree *path_seg_tree, if (generate) { it = proto_tree_add_uint(path_seg_tree, hf_cip_numeric_udint, tvb, 0, 0, numeric_data); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4440,9 +4440,9 @@ static int dissect_segment_port(tvbuff_t* tvb, int offset, gboolean generate, if (generate) { proto_item* it = proto_tree_add_boolean(path_seg_tree, hf_cip_port_ex_link_addr, tvb, 0, 0, segment_type & CI_PORT_SEG_EX_LINK_ADDRESS); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); it = proto_tree_add_uint(path_seg_tree, hf_cip_port, tvb, 0, 0, (segment_type & CI_PORT_SEG_PORT_ID_MASK)); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4484,10 +4484,10 @@ static int dissect_segment_port(tvbuff_t* tvb, int offset, gboolean generate, { /* Add size of extended link address */ proto_item* it = proto_tree_add_uint(path_seg_item, hf_cip_link_address_size, tvb, 0, 0, opt_link_size); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); /* Add extended link address */ it = proto_tree_add_string(path_seg_item, hf_cip_link_address_string, tvb, 0, 0, tvb_format_text(tvb, offset + offset_link_address, opt_link_size)); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4525,7 +4525,7 @@ static int dissect_segment_port(tvbuff_t* tvb, int offset, gboolean generate, { guint8 link_address_byte = tvb_get_guint8(tvb, offset + offset_link_address); proto_item* it = proto_tree_add_uint(path_seg_item, hf_cip_link_address_byte, tvb, 0, 0, link_address_byte); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4541,7 +4541,7 @@ static int dissect_segment_port(tvbuff_t* tvb, int offset, gboolean generate, { guint16 port_extended = tvb_get_letohs(tvb, extended_port_offset); proto_item* it = proto_tree_add_uint(path_seg_item, hf_cip_port_extended, tvb, 0, 0, port_extended); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4690,7 +4690,7 @@ static int dissect_segment_data_simple(tvbuff_t* tvb, int offset, gboolean gener if (generate) { proto_item* it = proto_tree_add_uint(path_seg_tree, hf_cip_data_seg_size_simple, tvb, 0, 0, seg_size); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4727,7 +4727,7 @@ static int dissect_segment_ansi_extended_symbol(packet_info* pinfo, tvbuff_t* tv if (generate) { proto_item* it = proto_tree_add_uint(path_seg_tree, hf_cip_data_seg_size_extended, tvb, 0, 0, seg_size); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else proto_tree_add_item(path_seg_tree, hf_cip_data_seg_size_extended, tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); @@ -4740,7 +4740,7 @@ static int dissect_segment_ansi_extended_symbol(packet_info* pinfo, tvbuff_t* tv if (generate) { proto_item* it = proto_tree_add_string(path_seg_tree, hf_cip_symbol, tvb, 0, 0, symbol_name); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else proto_tree_add_item(path_seg_tree, hf_cip_symbol, tvb, offset + 2, seg_size, ENC_ASCII | ENC_NA); @@ -4787,7 +4787,7 @@ static int dissect_segment_logical_special(packet_info* pinfo, tvbuff_t* tvb, in if (generate) { proto_item* it = proto_tree_add_uint(path_seg_tree, hf_cip_ekey_format, tvb, 0, 0, key_format); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4841,7 +4841,7 @@ static int dissect_segment_network(packet_info* pinfo, tvbuff_t* tvb, int offset if (generate) { proto_item* it = proto_tree_add_uint(path_seg_tree, hf_cip_network_seg_type, tvb, 0, 0, segment_type & CI_NETWORK_SEG_TYPE_MASK); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4857,7 +4857,7 @@ static int dissect_segment_network(packet_info* pinfo, tvbuff_t* tvb, int offset { guint8 schedule = tvb_get_guint8(tvb, offset + 1); proto_item* it = proto_tree_add_uint(path_seg_tree, hf_cip_seg_schedule, tvb, 0, 0, schedule); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4872,7 +4872,7 @@ static int dissect_segment_network(packet_info* pinfo, tvbuff_t* tvb, int offset { guint8 fixed_tag = tvb_get_guint8(tvb, offset + 1); proto_item* it = proto_tree_add_uint(path_seg_tree, hf_cip_seg_fixed_tag, tvb, 0, 0, fixed_tag); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4887,7 +4887,7 @@ static int dissect_segment_network(packet_info* pinfo, tvbuff_t* tvb, int offset { guint8 inhibit_time = tvb_get_guint8(tvb, offset + 1); proto_item* it = proto_tree_add_uint(path_seg_tree, hf_cip_seg_prod_inhibit_time, tvb, 0, 0, inhibit_time); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4946,7 +4946,7 @@ static int dissect_segment_logical_service_id(packet_info* pinfo, tvbuff_t* tvb, if (generate) { proto_item* it = proto_tree_add_uint(path_seg_tree, hf_cip_serviceid8, tvb, 0, 0, service_id); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -4991,10 +4991,10 @@ int dissect_cip_segment_single(packet_info *pinfo, tvbuff_t *tvb, int offset, pr if ( generate ) { path_seg_item = proto_tree_add_uint(path_tree, hf_cip_path_segment, tvb, 0, 0, segment_type ); - PROTO_ITEM_SET_GENERATED(path_seg_item); + proto_item_set_generated(path_seg_item); path_seg_tree = proto_item_add_subtree( path_seg_item, ett_path_seg ); it = proto_tree_add_uint(path_seg_tree, hf_cip_path_segment_type, tvb, 0, 0, segment_type&CI_SEGMENT_TYPE_MASK); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -5022,11 +5022,11 @@ int dissect_cip_segment_single(packet_info *pinfo, tvbuff_t *tvb, int offset, pr if ( generate ) { it = proto_tree_add_uint(path_seg_tree, hf_cip_logical_seg_type, tvb, 0, 0, logical_seg_type); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); if (logical_seg_type != CI_LOGICAL_SEG_SPECIAL && logical_seg_type != CI_LOGICAL_SEG_SERV_ID) { it = proto_tree_add_uint(path_seg_tree, hf_cip_logical_seg_format, tvb, 0, 0, segment_type & CI_LOGICAL_SEG_FORMAT_MASK); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else @@ -5139,7 +5139,7 @@ int dissect_cip_segment_single(packet_info *pinfo, tvbuff_t *tvb, int offset, pr if ( generate ) { it = proto_tree_add_uint(path_seg_tree, hf_cip_data_seg_type, tvb, 0, 0, segment_type & CI_DATA_SEG_TYPE_MASK); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { @@ -5227,7 +5227,7 @@ void dissect_epath(tvbuff_t *tvb, packet_info *pinfo, proto_tree *path_tree, pro { hidden_item = proto_tree_add_item(path_tree, hf_cip_epath, tvb, offset, path_length, ENC_NA ); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } while( pathpos < path_length ) @@ -5513,7 +5513,7 @@ dissect_cip_generic_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int } else { - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); } add_cip_service_to_info_column(pinfo, service, cip_sc_vals); @@ -6295,7 +6295,7 @@ static void mark_cip_connection(packet_info* pinfo, tvbuff_t* tvb, proto_tree* t if (conn_val) { proto_item* pi = proto_tree_add_uint(tree, hf_cip_connection, tvb, 0, 0, conn_val->connid); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } } @@ -6652,11 +6652,11 @@ static void display_previous_request_path(cip_req_info_t *preq_info, proto_tree if (tvbIOI) { pi = proto_tree_add_uint(item_tree, hf_cip_request_path_size, tvb, 0, 0, preq_info->IOILen); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* Add the epath */ epath_tree = proto_tree_add_subtree(item_tree, tvb, 0, 0, ett_path, &pi, "Request Path: "); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); if (preq_info->ciaData == NULL) { diff --git a/epan/dissectors/packet-cipsafety.c b/epan/dissectors/packet-cipsafety.c index 6852881e54..f8383829c5 100644 --- a/epan/dissectors/packet-cipsafety.c +++ b/epan/dissectors/packet-cipsafety.c @@ -1577,7 +1577,7 @@ dissect_cip_safety_data( proto_tree *tree, proto_item *item, tvbuff_t *tvb, int { crc_s5_status_item = proto_tree_add_uint(tree, hf_cipsafety_crc_s5_status, tvb, 5, 0, PROTO_CHECKSUM_E_UNVERIFIED); } - PROTO_ITEM_SET_GENERATED(crc_s5_status_item); + proto_item_set_generated(crc_s5_status_item); break; } @@ -1820,7 +1820,7 @@ dissect_cip_safety_data( proto_tree *tree, proto_item *item, tvbuff_t *tvb, int { crc_s5_status_item = proto_tree_add_uint(tree, hf_cipsafety_crc_s5_status, tvb, io_data_size+5, 0, PROTO_CHECKSUM_E_UNVERIFIED); } - PROTO_ITEM_SET_GENERATED(crc_s5_status_item); + proto_item_set_generated(crc_s5_status_item); if (multicast) { @@ -1922,7 +1922,7 @@ dissect_cip_safety_data( proto_tree *tree, proto_item *item, tvbuff_t *tvb, int { crc_s5_status_item = proto_tree_add_uint(tree, hf_cipsafety_crc_s5_status, tvb, (io_data_size*2)+7, 0, PROTO_CHECKSUM_E_UNVERIFIED); } - PROTO_ITEM_SET_GENERATED(crc_s5_status_item); + proto_item_set_generated(crc_s5_status_item); if (multicast) { diff --git a/epan/dissectors/packet-classicstun.c b/epan/dissectors/packet-classicstun.c index 4596f60d00..adfe0f4df8 100644 --- a/epan/dissectors/packet-classicstun.c +++ b/epan/dissectors/packet-classicstun.c @@ -321,7 +321,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d it=proto_tree_add_uint(classicstun_tree, hf_classicstun_response_in, tvb, 0, 0, classicstun_trans->rep_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else if ((((msg_type & CLASS_MASK) >> 4) == RESPONSE) || @@ -332,11 +332,11 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d nstime_t ns; it=proto_tree_add_uint(classicstun_tree, hf_classicstun_response_to, tvb, 0, 0, classicstun_trans->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &classicstun_trans->req_time); it=proto_tree_add_time(classicstun_tree, hf_classicstun_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } @@ -482,7 +482,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d Add host-order port into tree. */ clear_port = tvb_get_ntohs(tvb, offset+2) ^ (transaction_id_first_word >> 16); ti = proto_tree_add_uint(att_tree, classicstun_att_port, tvb, offset+2, 2, clear_port); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); switch( tvb_get_guint8(tvb, offset+1) ){ case 1: @@ -495,7 +495,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d Add in network order tree. */ clear_ip = tvb_get_ipv4(tvb, offset+4) ^ g_htonl(transaction_id_first_word); ti = proto_tree_add_ipv4(att_tree, classicstun_att_ipv4, tvb, offset+4, 4, clear_ip); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; case 2: diff --git a/epan/dissectors/packet-coap.c b/epan/dissectors/packet-coap.c index 98f35aa0aa..da8e25fcf3 100644 --- a/epan/dissectors/packet-coap.c +++ b/epan/dissectors/packet-coap.c @@ -972,7 +972,7 @@ dissect_coap_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *coap_tree, p proto_tree_add_string(payload_tree, dissect_hf->hf.payload_desc, tvb, offset, 0, coinfo->ctype_str); length_item = proto_tree_add_uint(payload_tree, dissect_hf->hf.payload_length, tvb, offset, 0, payload_length); - PROTO_ITEM_SET_GENERATED(length_item); + proto_item_set_generated(length_item); payload_tvb = tvb_new_subset_length(tvb, offset, payload_length); message_info.type = HTTP_OTHERS; @@ -1180,7 +1180,7 @@ dissect_coap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", wmem_strbuf_get_str(coinfo->uri_str_strbuf)); /* Add a generated protocol item as well */ pi = proto_tree_add_string(coap_tree, dissect_coap_hf.hf.opt_uri_path_recon, tvb, 0, 0, wmem_strbuf_get_str(coinfo->uri_str_strbuf)); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (wmem_strbuf_get_len(coinfo->uri_query_strbuf) > 0) col_append_str(pinfo->cinfo, COL_INFO, wmem_strbuf_get_str(coinfo->uri_query_strbuf)); @@ -1194,13 +1194,13 @@ dissect_coap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d it = proto_tree_add_uint(coap_tree, hf_coap_response_in, tvb, 0, 0, coap_trans->rsp_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } if (coap_trans->req_frame != pinfo->num) { col_append_str(pinfo->cinfo, COL_INFO, " [Retransmission]"); proto_item *it = proto_tree_add_uint(coap_tree, hf_coap_request_resend_in, tvb, 0, 0, coap_trans->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); expert_add_info(pinfo, it, &ei_retransmitted); } } else if ((code_class >= 2) && (code_class <= 5)) { @@ -1211,34 +1211,34 @@ dissect_coap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d it = proto_tree_add_uint(coap_tree, hf_coap_response_to, tvb, 0, 0, coap_trans->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &coap_trans->req_time); it = proto_tree_add_time(coap_tree, hf_coap_response_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } if (coap_trans->rsp_frame != pinfo->num) { col_append_str(pinfo->cinfo, COL_INFO, " [Retransmission]"); proto_item *it = proto_tree_add_uint(coap_tree, hf_coap_response_resend_in, tvb, 0, 0, coap_trans->rsp_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); expert_add_info(pinfo, it, &ei_retransmitted); } if (coinfo->object_security && coap_trans->oscore_info) { proto_item *it; it = proto_tree_add_bytes(coap_tree, hf_coap_oscore_kid, tvb, 0, coap_trans->oscore_info->kid_len, coap_trans->oscore_info->kid); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); it = proto_tree_add_bytes(coap_tree, hf_coap_oscore_kid_context, tvb, 0, coap_trans->oscore_info->kid_context_len, coap_trans->oscore_info->kid_context); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); if (coap_trans->oscore_info->piv_in_response) { it = proto_tree_add_bytes(coap_tree, hf_coap_oscore_piv, tvb, 0, coinfo->oscore_info->piv_len, coinfo->oscore_info->piv); } else { it = proto_tree_add_bytes(coap_tree, hf_coap_oscore_piv, tvb, 0, coap_trans->oscore_info->piv_len, coap_trans->oscore_info->piv); } - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } } diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c index 7534321d86..e0199ddcf3 100644 --- a/epan/dissectors/packet-collectd.c +++ b/epan/dissectors/packet-collectd.c @@ -271,7 +271,7 @@ collectd_proto_tree_add_assembled_metric (tvbuff_t *tvb, subtree = proto_tree_add_subtree(root, tvb, offset + 6, length - 6, ett_collectd_dispatch, &root_item, "Assembled metric"); - PROTO_ITEM_SET_GENERATED (root_item); + proto_item_set_generated (root_item); proto_tree_add_string (subtree, hf_collectd_data_host, tvb, vdispatch->host_off, vdispatch->host_len, @@ -319,7 +319,7 @@ collectd_proto_tree_add_assembled_notification (tvbuff_t *tvb, subtree = proto_tree_add_subtree(root, tvb, offset + 6, length - 6, ett_collectd_dispatch, &root_item, "Assembled notification"); - PROTO_ITEM_SET_GENERATED (root_item); + proto_item_set_generated (root_item); proto_tree_add_string (subtree, hf_collectd_data_host, tvb, ndispatch->host_off, ndispatch->host_len, diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 9efb971721..d2395ebb39 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -1072,7 +1072,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data && cops_call->rsp_num != 0) { ti = proto_tree_add_uint_format(cops_tree, hf_cops_response_in, tvb, 0, 0, cops_call->rsp_num, "Response to this request is in frame %u", cops_call->rsp_num); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } } @@ -1117,11 +1117,11 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data if ( cops_call->rsp_num == pinfo->num ) { ti = proto_tree_add_uint_format(cops_tree, hf_cops_response_to, tvb, 0, 0, cops_call->req_num, "Response to a request in frame %u", cops_call->req_num); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); nstime_delta(&delta, &pinfo->abs_ts, &cops_call->req_time); ti = proto_tree_add_time(cops_tree, hf_cops_response_time, tvb, 0, 0, &delta); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; } diff --git a/epan/dissectors/packet-corosync-totemnet.c b/epan/dissectors/packet-corosync-totemnet.c index 706e98e522..ad1fe56ce6 100644 --- a/epan/dissectors/packet-corosync-totemnet.c +++ b/epan/dissectors/packet-corosync-totemnet.c @@ -98,7 +98,7 @@ dissect_corosync_totemnet_security_header(tvbuff_t *tvb, key_item = proto_tree_add_string(tree, hf_corosync_totemnet_security_crypto_key, tvb, 0, 0, key); - PROTO_ITEM_SET_GENERATED(key_item); + proto_item_set_generated(key_item); } } return HASH_SHA1_LENGTH + SALT_SIZE; diff --git a/epan/dissectors/packet-coseventcomm.c b/epan/dissectors/packet-coseventcomm.c index 3335f6a9d3..bf551f7d3d 100644 --- a/epan/dissectors/packet-coseventcomm.c +++ b/epan/dissectors/packet-coseventcomm.c @@ -345,7 +345,7 @@ process_RequestOperation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, M } /* fill-up the field */ pi=proto_tree_add_string(ptree, hf_operationrequest, tvb, 0, 0, operation); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); return pi; } diff --git a/epan/dissectors/packet-cosnaming.c b/epan/dissectors/packet-cosnaming.c index e78f5e8ccd..5721e432f5 100644 --- a/epan/dissectors/packet-cosnaming.c +++ b/epan/dissectors/packet-cosnaming.c @@ -840,7 +840,7 @@ process_RequestOperation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, M } /* fill-up the field */ pi=proto_tree_add_string(ptree, hf_operationrequest, tvb, 0, 0, operation); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); return pi; } diff --git a/epan/dissectors/packet-couchbase.c b/epan/dissectors/packet-couchbase.c index 7d9b72dcbe..79522372b7 100644 --- a/epan/dissectors/packet-couchbase.c +++ b/epan/dissectors/packet-couchbase.c @@ -2088,7 +2088,7 @@ dissect_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ti = proto_tree_add_item(tree, hf_failover_log, tvb, offset, value_len, ENC_ASCII|ENC_NA); failover_log_tree = proto_item_add_subtree(ti, ett_failover_log); ti = proto_tree_add_uint(failover_log_tree, hf_failover_log_size, tvb, offset, 0, (end - cur) / 16); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); while (cur < end) { proto_tree_add_item(failover_log_tree, hf_failover_log_vbucket_uuid, tvb, cur, 8, ENC_BIG_ENDIAN); cur += 8; @@ -2105,7 +2105,7 @@ dissect_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ti = proto_tree_add_item(tree, hf_vbucket_states, tvb, offset, value_len, ENC_ASCII|ENC_NA); vbucket_states_tree = proto_item_add_subtree(ti, ett_vbucket_states); ti = proto_tree_add_uint(vbucket_states_tree, hf_vbucket_states_size, tvb, offset, 0, (end - cur) / 10); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); while (cur < end) { proto_tree_add_item(vbucket_states_tree, hf_vbucket_states_id, tvb, cur, 2, ENC_BIG_ENDIAN); cur += 2; @@ -2647,7 +2647,7 @@ dissect_couchbase(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat bodylen = tvb_get_ntohl(tvb, offset); value_len = bodylen - extlen - keylen - flex_frame_extras; ti = proto_tree_add_uint(couchbase_tree, hf_value_length, tvb, offset, 0, value_len); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_item(couchbase_tree, hf_total_bodylength, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; diff --git a/epan/dissectors/packet-cp2179.c b/epan/dissectors/packet-cp2179.c index 4064100d69..d106aa4e50 100644 --- a/epan/dissectors/packet-cp2179.c +++ b/epan/dissectors/packet-cp2179.c @@ -578,7 +578,7 @@ dissect_response_frame(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, int req_address_word = request_data->address_word; if ((pinfo->num > req_frame_num) && (req_address_word == address_word)) { response_item = proto_tree_add_uint(cp2179_proto_tree, hf_cp2179_request_frame, tvb, 0, 0, req_frame_num); - PROTO_ITEM_SET_GENERATED(response_item); + proto_item_set_generated(response_item); request_found = TRUE; } frame = wmem_list_frame_next(frame); diff --git a/epan/dissectors/packet-cpfi.c b/epan/dissectors/packet-cpfi.c index bbd319af1e..536c919205 100644 --- a/epan/dissectors/packet-cpfi.c +++ b/epan/dissectors/packet-cpfi.c @@ -226,32 +226,32 @@ dissect_cpfi_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ( src != 0 ) { hidden_item = proto_tree_add_bytes(extra_tree, hf_cpfi_t_instance, tvb, 0, 1, &src_instance); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_bytes(extra_tree, hf_cpfi_t_src_instance, tvb, 0, 1, &src_instance); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_bytes(extra_tree, hf_cpfi_t_board, tvb, 0, 1, &src_board); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_bytes(extra_tree, hf_cpfi_t_src_board, tvb, 0, 1, &src_board); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_bytes(extra_tree, hf_cpfi_t_port, tvb, 0, 1, &src_port); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_bytes(extra_tree, hf_cpfi_t_src_port, tvb, 0, 1, &src_port); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } if ( dst != 0 ) { hidden_item = proto_tree_add_bytes(extra_tree, hf_cpfi_t_instance, tvb, 0, 1, &dst_instance); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_bytes(extra_tree, hf_cpfi_t_dst_instance, tvb, 0, 1, &dst_instance); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_bytes(extra_tree, hf_cpfi_t_board, tvb, 0, 1, &dst_board); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_bytes(extra_tree, hf_cpfi_t_dst_board, tvb, 0, 1, &dst_board); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_bytes(extra_tree, hf_cpfi_t_port, tvb, 0, 1, &dst_port); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_bytes(extra_tree, hf_cpfi_t_dst_port, tvb, 0, 1, &dst_port); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } /* add word 1 components to the protocol tree */ diff --git a/epan/dissectors/packet-cql.c b/epan/dissectors/packet-cql.c index 1b70edc1f1..fa1d873db5 100644 --- a/epan/dissectors/packet-cql.c +++ b/epan/dissectors/packet-cql.c @@ -697,7 +697,7 @@ static int parse_value(proto_tree* columns_subtree, packet_info *pinfo, tvbuff_t offset += 4; item = proto_tree_add_item_ret_uint(columns_subtree, hf_cql_result_rows_data_type, tvb, *offset_metadata, 2, ENC_BIG_ENDIAN, &data_type); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); *offset_metadata += 2; if (bytes_length == -1) { @@ -840,32 +840,32 @@ static int parse_value(proto_tree* columns_subtree, packet_info *pinfo, tvbuff_t case CQL_RESULT_ROW_TYPE_UDT: /* keyspace */ item = proto_tree_add_item_ret_uint(columns_subtree, hf_cql_string_length, tvb, *offset_metadata, 2, ENC_BIG_ENDIAN, &string_length); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); *offset_metadata += 2; item = proto_tree_add_item(columns_subtree, hf_cql_string_result_rows_keyspace_name, tvb, *offset_metadata, string_length, ENC_UTF_8 | ENC_NA); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); *offset_metadata += string_length; /* UDT name */ item = proto_tree_add_item_ret_uint(columns_subtree, hf_cql_string_length, tvb, *offset_metadata, 2, ENC_BIG_ENDIAN, &string_length); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); *offset_metadata += 2; item = proto_tree_add_item(columns_subtree, hf_cql_string_result_rows_udt_name, tvb, *offset_metadata, string_length, ENC_UTF_8 | ENC_NA); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); *offset_metadata += string_length; /* UDT size */ item = proto_tree_add_item_ret_uint(columns_subtree, hf_cql_string_result_rows_udt_size, tvb, *offset_metadata, 2, ENC_BIG_ENDIAN, &udt_size); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); *offset_metadata += 2; for (i = 0; i < udt_size; i++) { /* UDT field name */ item = proto_tree_add_item_ret_uint(columns_subtree, hf_cql_string_length, tvb, *offset_metadata, 2, ENC_BIG_ENDIAN, &string_length); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); *offset_metadata += 2; item = proto_tree_add_item(columns_subtree, hf_cql_string_result_rows_udt_field_name, tvb, *offset_metadata, string_length, ENC_UTF_8 | ENC_NA); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); *offset_metadata += string_length; /* UDT field option */ @@ -874,7 +874,7 @@ static int parse_value(proto_tree* columns_subtree, packet_info *pinfo, tvbuff_t break; case CQL_RESULT_ROW_TYPE_TUPLE: item = proto_tree_add_item_ret_uint(columns_subtree, hf_cql_result_rows_tuple_size, tvb, *offset_metadata, 2, ENC_BIG_ENDIAN, &tuple_size); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); *offset_metadata += 2; for (i = 0; i < tuple_size; i++) { offset = parse_value(columns_subtree, pinfo, tvb, offset_metadata, offset); @@ -901,25 +901,25 @@ static int parse_row(proto_tree* columns_subtree, packet_info *pinfo, tvbuff_t* if (!(result_rows_flags & CQL_RESULT_ROWS_FLAG_GLOBAL_TABLES_SPEC)) { /* ksname and tablename */ item = proto_tree_add_item_ret_uint(columns_subtree, hf_cql_string_length, tvb, shadow_offset, 2, ENC_BIG_ENDIAN, &string_length); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); shadow_offset += 2; item = proto_tree_add_item(columns_subtree, hf_cql_string_result_rows_keyspace_name, tvb, shadow_offset, string_length, ENC_UTF_8 | ENC_NA); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); shadow_offset += string_length; item = proto_tree_add_item_ret_uint(columns_subtree, hf_cql_string_length, tvb, shadow_offset, 2, ENC_BIG_ENDIAN, &string_length); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); shadow_offset += 2; item = proto_tree_add_item(columns_subtree, hf_cql_string_result_rows_table_name, tvb, shadow_offset, string_length, ENC_UTF_8 | ENC_NA); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); shadow_offset += string_length; } /* column name */ item = proto_tree_add_item_ret_uint(columns_subtree, hf_cql_string_length, tvb, shadow_offset, 2, ENC_BIG_ENDIAN, &string_length); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); shadow_offset += 2; item = proto_tree_add_item(columns_subtree, hf_cql_string_result_rows_column_name, tvb, shadow_offset, string_length, ENC_UTF_8 | ENC_NA); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); shadow_offset += string_length; offset = parse_value(columns_subtree, pinfo, tvb, &shadow_offset, offset); @@ -1063,17 +1063,17 @@ dissect_cql_tcp_pdu(tvbuff_t* raw_tvb, packet_info* pinfo, proto_tree* tree, voi if (server_to_client == 0 && cql_trans->rep_frame) { /* request */ ti = proto_tree_add_uint(cql_tree, hf_cql_response_in, raw_tvb, 0, 0, cql_trans->rep_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (server_to_client && cql_trans->req_frame) { /* reply */ nstime_t ns; ti = proto_tree_add_uint(cql_tree, hf_cql_response_to, raw_tvb, 0, 0, cql_trans->req_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); nstime_delta(&ns, &pinfo->abs_ts, &cql_trans->req_time); ti = proto_tree_add_time(cql_tree, hf_cql_response_time, raw_tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* We cannot rely on compression negociation in the STARTUP message because the diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c index 229cd9eca0..b4caa32c9e 100644 --- a/epan/dissectors/packet-ctdb.c +++ b/epan/dissectors/packet-ctdb.c @@ -613,13 +613,13 @@ ctdb_display_trans(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, ctdb_tra if(ctdb_trans->request_in!=pinfo->num){ item=proto_tree_add_uint(tree, hf_ctdb_request_in, tvb, 0, 0, ctdb_trans->request_in); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if( (ctdb_trans->response_in!=0) &&(ctdb_trans->response_in!=pinfo->num) ){ item=proto_tree_add_uint(tree, hf_ctdb_response_in, tvb, 0, 0, ctdb_trans->response_in); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if(pinfo->num==ctdb_trans->response_in){ @@ -627,7 +627,7 @@ ctdb_display_trans(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, ctdb_tra nstime_delta(&ns, &pinfo->abs_ts, &ctdb_trans->req_time); item=proto_tree_add_time(tree, hf_ctdb_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } @@ -638,13 +638,13 @@ ctdb_display_control(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, ctdb_c if(ctdb_control->request_in!=pinfo->num){ item=proto_tree_add_uint(tree, hf_ctdb_request_in, tvb, 0, 0, ctdb_control->request_in); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if( (ctdb_control->response_in!=0) &&(ctdb_control->response_in!=pinfo->num) ){ item=proto_tree_add_uint(tree, hf_ctdb_response_in, tvb, 0, 0, ctdb_control->response_in); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if(pinfo->num==ctdb_control->response_in){ @@ -652,7 +652,7 @@ ctdb_display_control(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, ctdb_c nstime_delta(&ns, &pinfo->abs_ts, &ctdb_control->req_time); item=proto_tree_add_time(tree, hf_ctdb_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } @@ -684,7 +684,7 @@ dissect_ctdb_key(proto_tree *tree, tvbuff_t *tvb, int offset, guint32 keylen, gu keyhash=ctdb_hash(tvb, offset, keylen); proto_item_append_text(key_item, " (Hash:0x%08x)", keyhash); key_item=proto_tree_add_uint(key_tree, hf_ctdb_keyhash, tvb, 0, 0, keyhash); - PROTO_ITEM_SET_GENERATED(key_item); + proto_item_set_generated(key_item); offset+=keylen; @@ -967,7 +967,7 @@ dissect_ctdb_reply_control(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_ /* ctrl opcode */ item=proto_tree_add_uint(tree, hf_ctdb_ctrl_opcode, tvb, 0, 0, ctdb_control->opcode); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); col_add_fstr(pinfo->cinfo, COL_INFO, "%s Reply %d->%d", val_to_str(ctdb_control->opcode, ctrl_opcode_vals, "Unknown:%d"), diff --git a/epan/dissectors/packet-data.c b/epan/dissectors/packet-data.c index f8bfaf54e6..381562c64a 100644 --- a/epan/dissectors/packet-data.c +++ b/epan/dissectors/packet-data.c @@ -92,7 +92,7 @@ dissect_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ add_new_data_source(pinfo, uncompr_tvb, "Uncompressed Data"); proto_tree_add_item(data_tree, &hfi_data_uncompressed_data, uncompr_tvb, 0, uncompr_len, ENC_NA); ti = proto_tree_add_int(data_tree, &hfi_data_uncompressed_len, uncompr_tvb, 0, 0, uncompr_len); - PROTO_ITEM_SET_GENERATED (ti); + proto_item_set_generated (ti); } } @@ -114,11 +114,11 @@ dissect_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ gcry_md_hash_buffer(GCRY_MD_MD5, digest, cp, bytes); digest_string = bytestring_to_str(wmem_packet_scope(), digest, HASH_MD5_LENGTH, '\0'); ti = proto_tree_add_string(data_tree, &hfi_data_md5_hash, tvb, 0, 0, digest_string); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } ti = proto_tree_add_int(data_tree, &hfi_data_len, data_tvb, 0, 0, bytes); - PROTO_ITEM_SET_GENERATED (ti); + proto_item_set_generated (ti); } } return tvb_captured_length(tvb); diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c index 8611bdd28a..f6eabdb04d 100644 --- a/epan/dissectors/packet-dccp.c +++ b/epan/dissectors/packet-dccp.c @@ -629,12 +629,12 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ proto_tree_add_item(dccp_tree, hf_dccp_srcport, tvb, offset, 2, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_item(dccp_tree, hf_dccp_port, tvb, offset, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset += 2; proto_tree_add_item(dccp_tree, hf_dccp_dstport, tvb, offset, 2, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_item(dccp_tree, hf_dccp_port, tvb, offset, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset += 2; /* @@ -708,7 +708,7 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ hidden_item = proto_tree_add_uint(dccp_tree, hf_dccp_res1, tvb, offset, 1, dccph->reserved1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dccph->type = tvb_get_guint8(tvb, offset) & 0x1E; dccph->type >>= 1; @@ -739,7 +739,7 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ hidden_item = proto_tree_add_uint(dccp_tree, hf_dccp_res2, tvb, offset, 1, dccph->reserved2); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset += 1; dccph->seq = tvb_get_ntoh48(tvb, offset); @@ -797,7 +797,7 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ hidden_item = proto_tree_add_uint(dccp_tree, hf_dccp_ack_res, tvb, offset, 2, dccph->ack_reserved); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } dccph->ack = tvb_get_ntohs(tvb, offset + 2); dccph->ack <<= 32; @@ -838,7 +838,7 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ hidden_item = proto_tree_add_uint(dccp_tree, hf_dccp_ack_res, tvb, offset, 2, dccph->ack_reserved); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } dccph->ack = tvb_get_ntohs(tvb, offset + 2); dccph->ack <<= 32; @@ -863,7 +863,7 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ hidden_item = proto_tree_add_uint(dccp_tree, hf_dccp_ack_res, tvb, offset, 1, dccph->ack_reserved); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } dccph->ack = tvb_get_guint8(tvb, offset + 1); dccph->ack <<= 16; @@ -889,7 +889,7 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ hidden_item = proto_tree_add_uint(dccp_tree, hf_dccp_ack_res, tvb, offset, 2, dccph->ack_reserved); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } dccph->ack = tvb_get_ntohs(tvb, offset + 2); @@ -940,7 +940,7 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ hidden_item = proto_tree_add_uint(dccp_tree, hf_dccp_ack_res, tvb, offset, 2, dccph->ack_reserved); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } dccph->ack = tvb_get_ntohs(tvb, offset + 2); dccph->ack <<= 32; diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c index 7dbe2a0b4e..69ea0a0ade 100644 --- a/epan/dissectors/packet-dcerpc-nt.c +++ b/epan/dissectors/packet-dcerpc-nt.c @@ -978,14 +978,14 @@ dissect_nt_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo, item_local=proto_tree_add_uint( subtree, hf_nt_policy_open_frame, tvb, old_offset, sizeof(e_ctx_hnd), open_frame); - PROTO_ITEM_SET_GENERATED(item_local); + proto_item_set_generated(item_local); } if (close_frame) { proto_item *item_local; item_local=proto_tree_add_uint( subtree, hf_nt_policy_close_frame, tvb, old_offset, sizeof(e_ctx_hnd), close_frame); - PROTO_ITEM_SET_GENERATED(item_local); + proto_item_set_generated(item_local); } /* diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index 46b3d34188..3f330ef63e 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -711,7 +711,7 @@ dissect_printerdata_data(tvbuff_t *tvb, int offset, hidden_item = proto_tree_add_item_ret_string( tree, hf_printerdata_data_sz, tvb, offset - size, size, ENC_UTF_16|ENC_LITTLE_ENDIAN, wmem_packet_scope(), &data); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_item_append_text(item, ": %s", data); @@ -730,7 +730,7 @@ dissect_printerdata_data(tvbuff_t *tvb, int offset, hidden_item = proto_tree_add_uint( tree, hf_printerdata_data_dword, tvb, offset - size, 4, data); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); break; } @@ -765,7 +765,7 @@ SpoolssGetPrinterData_q(tvbuff_t *tvb, int offset, hidden_item = proto_tree_add_uint( tree, hf_printerdata, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -805,7 +805,7 @@ SpoolssGetPrinterData_r(tvbuff_t *tvb, int offset, hidden_item = proto_tree_add_uint( tree, hf_printerdata, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -843,7 +843,7 @@ SpoolssGetPrinterDataEx_q(tvbuff_t *tvb, int offset, hidden_item = proto_tree_add_uint( tree, hf_printerdata, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -892,7 +892,7 @@ SpoolssGetPrinterDataEx_r(tvbuff_t *tvb, int offset, hidden_item = proto_tree_add_uint( tree, hf_printerdata, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -936,7 +936,7 @@ SpoolssSetPrinterData_q(tvbuff_t *tvb, int offset, hidden_item = proto_tree_add_uint( tree, hf_printerdata, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -983,7 +983,7 @@ SpoolssSetPrinterData_r(tvbuff_t *tvb, int offset, hidden_item = proto_tree_add_uint( tree, hf_printerdata, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -1012,7 +1012,7 @@ SpoolssSetPrinterDataEx_q(tvbuff_t *tvb, int offset, hidden_item = proto_tree_add_uint( tree, hf_printerdata, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -1058,7 +1058,7 @@ SpoolssSetPrinterDataEx_r(tvbuff_t *tvb, int offset, hidden_item = proto_tree_add_uint( tree, hf_printerdata, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -1423,7 +1423,7 @@ dissect_DEVMODE_fields(tvbuff_t *tvb, gint offset, packet_info *pinfo, hidden_item = proto_tree_add_uint( tree, hf_devmode, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, di, drep, -1, &fields); @@ -3437,7 +3437,7 @@ SpoolssEnumForms_q(tvbuff_t *tvb, int offset, packet_info *pinfo, hidden_item = proto_tree_add_uint( tree, hf_form, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -3476,7 +3476,7 @@ SpoolssEnumForms_r(tvbuff_t *tvb, int offset, packet_info *pinfo, hidden_item = proto_tree_add_uint( tree, hf_form, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -3606,7 +3606,7 @@ SpoolssEnumPrinterData_q(tvbuff_t *tvb, int offset, hidden_item = proto_tree_add_uint( tree, hf_printerdata, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -3644,7 +3644,7 @@ SpoolssEnumPrinterData_r(tvbuff_t *tvb, int offset, hidden_item = proto_tree_add_uint( tree, hf_printerdata, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -3667,7 +3667,7 @@ SpoolssEnumPrinterData_r(tvbuff_t *tvb, int offset, hidden_item = proto_tree_add_string( tree, hf_printerdata_value, tvb, offset, 0, value); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } proto_item_set_len(value_item, value_len * 2 + 4); @@ -3942,7 +3942,7 @@ SpoolssAddForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, hidden_item = proto_tree_add_uint( tree, hf_form, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -3973,7 +3973,7 @@ SpoolssAddForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, hidden_item = proto_tree_add_uint( tree, hf_form, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -3996,7 +3996,7 @@ SpoolssDeleteForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, hidden_item = proto_tree_add_uint( tree, hf_form, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -4022,7 +4022,7 @@ SpoolssDeleteForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, hidden_item = proto_tree_add_uint( tree, hf_form, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -4046,7 +4046,7 @@ SpoolssSetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, hidden_item = proto_tree_add_uint( tree, hf_form, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -4079,7 +4079,7 @@ SpoolssSetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, hidden_item = proto_tree_add_uint( tree, hf_form, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -4104,7 +4104,7 @@ SpoolssGetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, hidden_item = proto_tree_add_uint( tree, hf_form, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -4148,7 +4148,7 @@ SpoolssGetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, hidden_item = proto_tree_add_uint( tree, hf_form, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -4958,7 +4958,7 @@ SpoolssDeletePrinterData_q(tvbuff_t *tvb, int offset, hidden_item = proto_tree_add_uint( tree, hf_printerdata, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -4984,7 +4984,7 @@ SpoolssDeletePrinterData_r(tvbuff_t *tvb, int offset, hidden_item = proto_tree_add_uint( tree, hf_printerdata, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -5535,7 +5535,7 @@ cb_notify_str_postprocess(packet_info *pinfo _U_, if (hf_index != -1) { hidden_item = proto_tree_add_string( tree, hf_index, tvb, start_offset, len, s); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } } @@ -5847,7 +5847,7 @@ dissect_NOTIFY_INFO_DATA_job(tvbuff_t *tvb, int offset, packet_info *pinfo, hidden_item = proto_tree_add_uint( tree, job_notify_hf_index(field), tvb, offset, 4, value); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); break; } @@ -6295,7 +6295,7 @@ SpoolssEnumPrinterDataEx_q(tvbuff_t *tvb, int offset, hidden_item = proto_tree_add_uint( tree, hf_printerdata, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ @@ -6436,7 +6436,7 @@ SpoolssEnumPrinterDataEx_r(tvbuff_t *tvb, int offset, hidden_item = proto_tree_add_uint( tree, hf_printerdata, tvb, offset, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Parse packet */ diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 98b10c127e..4f3d2adbf1 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -1462,12 +1462,12 @@ dissect_dcerpc_guid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d if ((dissector_data->info->ptype == PDU_REQ) && (dissector_data->info->call_data->rep_frame != 0)) { pi = proto_tree_add_uint(sub_tree, hf_dcerpc_response_in, tvb, 0, 0, dissector_data->info->call_data->rep_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if ((dissector_data->info->ptype == PDU_RESP) && (dissector_data->info->call_data->req_frame != 0)) { pi = proto_tree_add_uint(sub_tree, hf_dcerpc_request_in, tvb, 0, 0, dissector_data->info->call_data->req_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } } /* tree */ @@ -3711,7 +3711,7 @@ dcerpc_try_handoff(packet_info *pinfo, proto_tree *tree, hidden_item = proto_tree_add_boolean(dcerpc_tree, hf_dcerpc_unknown_if_id, tvb, offset, 0, TRUE); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); col_append_fstr(pinfo->cinfo, COL_INFO, " %s V%u", guids_resolve_guid_to_str(&info->call_data->uuid), info->call_data->ver); @@ -3730,7 +3730,7 @@ dissect_dcerpc_cn_auth_move(dcerpc_auth_info *auth_info, proto_tree *dcerpc_tree proto_item *last_item = proto_tree_add_item(dcerpc_tree, hf_dcerpc_auth_info, auth_info->auth_tvb, 0, 0, ENC_NA); if (last_item != NULL) { - PROTO_ITEM_SET_HIDDEN(last_item); + proto_item_set_hidden(last_item); proto_tree_move_item(dcerpc_tree, last_item, auth_info->auth_item); } } @@ -4428,7 +4428,7 @@ end_cn_stub: pi = proto_tree_add_uint(dcerpc_tree, hf_dcerpc_reassembled_in, payload_tvb, 0, 0, fd_head->reassembled_in); } - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); parent_pi = proto_tree_get_parent(dcerpc_tree); if (parent_pi != NULL) { proto_item_append_text(parent_pi, ", [Reas: #%u]", fd_head->reassembled_in); @@ -4602,7 +4602,7 @@ dissect_dcerpc_cn_rqst(tvbuff_t *tvb, gint offset, packet_info *pinfo, if (value->rep_frame != 0) { pi = proto_tree_add_uint(dcerpc_tree, hf_dcerpc_response_in, tvb, 0, 0, value->rep_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); if (parent_pi != NULL) { proto_item_append_text(parent_pi, ", [Resp: #%u]", value->rep_frame); } @@ -4718,14 +4718,14 @@ dissect_dcerpc_cn_resp(tvbuff_t *tvb, gint offset, packet_info *pinfo, di->call_data = value; pi = proto_tree_add_uint(dcerpc_tree, hf_dcerpc_opnum, tvb, 0, 0, value->opnum); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* (optional) "Object UUID" from request */ if (dcerpc_tree && (memcmp(&value->object_uuid, &obj_id_null, sizeof(obj_id_null)) != 0)) { pi = proto_tree_add_guid_format(dcerpc_tree, hf_dcerpc_obj_id, tvb, offset, 0, (e_guid_t *) &value->object_uuid, "Object UUID: %s", guid_to_str(wmem_packet_scope(), (e_guid_t *) &value->object_uuid)); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } /* request in */ @@ -4733,13 +4733,13 @@ dissect_dcerpc_cn_resp(tvbuff_t *tvb, gint offset, packet_info *pinfo, nstime_t delta_ts; pi = proto_tree_add_uint(dcerpc_tree, hf_dcerpc_request_in, tvb, 0, 0, value->req_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); if (parent_pi != NULL) { proto_item_append_text(parent_pi, ", [Req: #%u]", value->req_frame); } nstime_delta(&delta_ts, &pinfo->abs_ts, &value->req_time); pi = proto_tree_add_time(dcerpc_tree, hf_dcerpc_time, tvb, offset, 0, &delta_ts); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } else { proto_tree_add_expert(dcerpc_tree, pinfo, &ei_dcerpc_no_request_found, tvb, 0, 0); } @@ -4886,19 +4886,19 @@ dissect_dcerpc_cn_fault(tvbuff_t *tvb, gint offset, packet_info *pinfo, di->call_data = value; pi = proto_tree_add_uint(dcerpc_tree, hf_dcerpc_opnum, tvb, 0, 0, value->opnum); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); if (value->req_frame != 0) { nstime_t delta_ts; pi = proto_tree_add_uint(dcerpc_tree, hf_dcerpc_request_in, tvb, 0, 0, value->req_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); parent_pi = proto_tree_get_parent(dcerpc_tree); if (parent_pi != NULL) { proto_item_append_text(parent_pi, ", [Req: #%u]", value->req_frame); } nstime_delta(&delta_ts, &pinfo->abs_ts, &value->req_time); pi = proto_tree_add_time(dcerpc_tree, hf_dcerpc_time, tvb, offset, 0, &delta_ts); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } else { proto_tree_add_expert(dcerpc_tree, pinfo, &ei_dcerpc_no_request_found, tvb, 0, 0); } @@ -6068,7 +6068,7 @@ dissect_dcerpc_dg_stub(tvbuff_t *tvb, int offset, packet_info *pinfo, /* ...and this isn't the reassembled RPC PDU */ pi = proto_tree_add_uint(dcerpc_tree, hf_dcerpc_reassembled_in, tvb, 0, 0, fd_head->reassembled_in); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); parent_pi = proto_tree_get_parent(dcerpc_tree); if (parent_pi != NULL) { proto_item_append_text(parent_pi, ", [Reas: #%u]", fd_head->reassembled_in); @@ -6151,7 +6151,7 @@ dissect_dcerpc_dg_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, if (value->rep_frame != 0) { pi = proto_tree_add_uint(dcerpc_tree, hf_dcerpc_response_in, tvb, 0, 0, value->rep_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); parent_pi = proto_tree_get_parent(dcerpc_tree); if (parent_pi != NULL) { proto_item_append_text(parent_pi, ", [Resp: #%u]", value->rep_frame); @@ -6213,14 +6213,14 @@ dissect_dcerpc_dg_resp(tvbuff_t *tvb, int offset, packet_info *pinfo, nstime_t delta_ts; pi = proto_tree_add_uint(dcerpc_tree, hf_dcerpc_request_in, tvb, 0, 0, value->req_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); parent_pi = proto_tree_get_parent(dcerpc_tree); if (parent_pi != NULL) { proto_item_append_text(parent_pi, ", [Req: #%u]", value->req_frame); } nstime_delta(&delta_ts, &pinfo->abs_ts, &value->req_time); pi = proto_tree_add_time(dcerpc_tree, hf_dcerpc_time, tvb, offset, 0, &delta_ts); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } else { proto_tree_add_expert(dcerpc_tree, pinfo, &ei_dcerpc_no_request_found, tvb, 0, 0); } @@ -6247,7 +6247,7 @@ dissect_dcerpc_dg_ping_ack(tvbuff_t *tvb, int offset, packet_info *pinfo, pi = proto_tree_add_uint(dcerpc_tree, hf_dcerpc_request_in, tvb, 0, 0, call_value->req_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); parent_pi = proto_tree_get_parent(dcerpc_tree); if (parent_pi != NULL) { proto_item_append_text(parent_pi, ", [Req: #%u]", call_value->req_frame); @@ -6257,7 +6257,7 @@ dissect_dcerpc_dg_ping_ack(tvbuff_t *tvb, int offset, packet_info *pinfo, nstime_delta(&delta_ts, &pinfo->abs_ts, &call_value->req_time); pi = proto_tree_add_time(dcerpc_tree, hf_dcerpc_time, tvb, offset, 0, &delta_ts); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* }*/ } } diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c index 79cf6a6009..103950630a 100644 --- a/epan/dissectors/packet-dcom.c +++ b/epan/dissectors/packet-dcom.c @@ -807,7 +807,7 @@ dissect_dcom_this(tvbuff_t *tvb, int offset, pi = proto_tree_add_guid_format(tree, hf_dcom_ipid, tvb, offset, 0, (e_guid_t *) &di->call_data->object_uuid, "Object UUID/IPID: %s", guids_resolve_guid_to_str(&di->call_data->object_uuid)); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } return offset; @@ -841,7 +841,7 @@ dissect_dcom_that(tvbuff_t *tvb, int offset, pi = proto_tree_add_guid_format(tree, hf_dcom_ipid, tvb, offset, 0, (e_guid_t *) &di->call_data->object_uuid, "Object UUID/IPID: %s", guids_resolve_guid_to_str(&di->call_data->object_uuid)); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } return offset; @@ -930,7 +930,7 @@ dissect_dcom_tobedone_data(tvbuff_t *tvb, int offset, item = proto_tree_add_item(tree, hf_dcom_tobedone, tvb, offset, length, ENC_NA); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); expert_add_info(pinfo, item, &ei_dcom_dissetion_incomplete); offset += length; @@ -949,7 +949,7 @@ dissect_dcom_nospec_data(tvbuff_t *tvb, int offset, item = proto_tree_add_item(tree, hf_dcom_nospec, tvb, offset, length, ENC_NA); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); expert_add_info(pinfo, item, &ei_dcom_no_spec); offset += length; diff --git a/epan/dissectors/packet-devicenet.c b/epan/dissectors/packet-devicenet.c index e99e493320..cf5bb7006f 100644 --- a/epan/dissectors/packet-devicenet.c +++ b/epan/dissectors/packet-devicenet.c @@ -431,7 +431,7 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree can_tree = proto_tree_add_subtree_format(devicenet_tree, tvb, 0, 0, ett_devicenet_can, NULL, "CAN Identifier: 0x%04x", can_id.id); can_id_item = proto_tree_add_uint(can_tree, hf_devicenet_can_id, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(can_id_item); + proto_item_set_generated(can_id_item); /* * Message group 1 @@ -439,9 +439,9 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree if ( can_id.id <= MESSAGE_GROUP_1_ID ) { ti = proto_tree_add_uint(can_tree, hf_devicenet_grp_msg1_id, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(can_tree, hf_devicenet_src_mac_id, tvb, 0, 0, can_id.id & MESSAGE_GROUP_1_MAC_ID_MASK); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Set source address */ src_address = (guint8*)wmem_alloc(pinfo->pool, 1); @@ -459,14 +459,14 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree else if (can_id.id <= MESSAGE_GROUP_2_ID ) { ti = proto_tree_add_uint(can_tree, hf_devicenet_grp_msg2_id, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* create display subtree for the protocol */ message_id = can_id.id & MESSAGE_GROUP_2_MSG_MASK; col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(message_id, devicenet_grp_msg2_vals, "Unknown")); ti = proto_tree_add_uint(can_tree, hf_devicenet_src_mac_id, tvb, 0, 0, (can_id.id & MESSAGE_GROUP_2_MAC_ID_MASK) >> 3); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Set source address */ src_address = (guint8*)wmem_alloc(pinfo->pool, 1); @@ -510,9 +510,9 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree guint8 byte1; msg_id_item = proto_tree_add_uint(can_tree, hf_devicenet_grp_msg3_id, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(msg_id_item); + proto_item_set_generated(msg_id_item); ti = proto_tree_add_uint(can_tree, hf_devicenet_src_mac_id, tvb, 0, 0, can_id.id & MESSAGE_GROUP_3_MAC_ID_MASK); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Set source address */ src_address = (guint8*)wmem_alloc(pinfo->pool, 1); @@ -687,7 +687,7 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree else if (can_id.id <= MESSAGE_GROUP_4_ID ) { ti = proto_tree_add_uint(can_tree, hf_devicenet_grp_msg4_id, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); message_id = can_id.id & MESSAGE_GROUP_4_MSG_MASK; col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(message_id, devicenet_grp_msg4_vals, "Reserved Group 4 Message")); diff --git a/epan/dissectors/packet-dhcp.c b/epan/dissectors/packet-dhcp.c index 791efa8ca4..bba09b96b9 100644 --- a/epan/dissectors/packet-dhcp.c +++ b/epan/dissectors/packet-dhcp.c @@ -2048,7 +2048,7 @@ dhcp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff, proto_tree_add_item(v_tree, hf_dhcp_option_length, tvb, voff+1, 1, ENC_BIG_ENDIAN); ti_value = proto_tree_add_item(v_tree, hf_dhcp_option_value, tvb, voff+2, optlen, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti_value); + proto_item_set_hidden(ti_value); /* prepate data for dissector table */ option_tvb = tvb_new_subset_length(tvb, voff+2, optlen); @@ -2060,7 +2060,7 @@ dhcp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff, if (!dissector_try_uint_new(dhcp_option_table, code, option_tvb, pinfo, v_tree, FALSE, &option_data)) { /* hf_dhcp_option_value is already in tree, just make it visible */ - PROTO_ITEM_SET_VISIBLE(ti_value); + proto_item_set_visible(ti_value); } return consumed; @@ -3107,7 +3107,7 @@ dissect_dhcpopt_dhcp_captive_portal(tvbuff_t *tvb, packet_info *pinfo _U_, proto { proto_item *ti_cp; ti_cp = proto_tree_add_item(tree, hf_dhcp_option_captive_portal, tvb, 0, tvb_reported_length(tvb), ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_URL(ti_cp); + proto_item_set_url(ti_cp); return tvb_captured_length(tvb); } @@ -3386,7 +3386,7 @@ dhcp_dhcp_decode_agent_info(packet_info *pinfo, proto_item *v_ti, proto_tree *v_ ti = proto_tree_add_item(o82_v_tree, hf_dhcp_option82_value, tvb, suboptoff, subopt_len, ENC_NA); if ( (idx >= 1 ) && (idx < array_length(o82_opt)) ) { - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); if (o82_opt[idx].info.ftype == special) { switch(subopt) { @@ -3784,7 +3784,7 @@ dissect_vendor_pxeclient_suboption(packet_info *pinfo, proto_item *v_ti, proto_t suboptoff++; ti = proto_tree_add_item(o43pxeclient_v_tree, hf_dhcp_option43_value, tvb, suboptoff, subopt_len, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); if ((subopt < 1) || (subopt >= array_length(o43pxeclient_opt))) { expert_add_info_format(pinfo, vti, &ei_dhcp_suboption_invalid, "Unknown suboption %d (%d bytes)", subopt, subopt_len); @@ -5104,7 +5104,7 @@ dissect_netware_ip_suboption(packet_info *pinfo, proto_item *v_ti, proto_tree *v suboptoff++; ti = proto_tree_add_item(o63_v_tree, hf_dhcp_option63_value, tvb, suboptoff, subopt_len, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); if (subopt < array_length(o63_opt)) { if (dhcp_handle_basic_types(pinfo, o63_v_tree, vti, tvb, o63_opt[subopt].ftype, @@ -5210,7 +5210,7 @@ dissect_vendor_tr111_suboption(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr } ti = proto_tree_add_item(tree, hf_dhcp_option125_value, tvb, offset, subopt_len, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); if (subopt < array_length(o125_tr111_opt)) { if (dhcp_handle_basic_types(pinfo, o125_v_tree, vti, tvb, o125_tr111_opt[subopt].ftype, offset, subopt_len, o125_tr111_opt[subopt].phf, &default_hfs) == 0) { @@ -7006,7 +7006,7 @@ dissect_dhcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ voff = VENDOR_INFO_OFFSET; if (dhcp_type == NULL) { hidden_item = proto_tree_add_boolean(bp_tree, hf_dhcp_bootp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } if (tvb_bytes_exist(tvb, voff, 4) && (tvb_get_ntohl(tvb, voff) == 0x63825363)) { diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index 2bb6c9f8ad..0a1a0ade2a 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -2204,7 +2204,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, case OPTION_CAPTIVE_PORTAL:{ proto_item *ti_cp; ti_cp = proto_tree_add_item(subtree, hf_option_captive_portal, tvb, off, optlen, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_URL(ti_cp); + proto_item_set_url(ti_cp); break; } } diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index e606043c20..291943340a 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -1002,7 +1002,7 @@ integer32_avp(diam_ctx_t *c, diam_avp_t *a, tvbuff_t *tvb, diam_sub_dis_t *diam_ "Error! Bad Integer32 Length"); expert_add_info_format(c->pinfo, pi, &ei_diameter_avp_len, "Bad Integer32 Length (%u)", length); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } return label; @@ -1030,7 +1030,7 @@ integer64_avp(diam_ctx_t *c, diam_avp_t *a, tvbuff_t *tvb, diam_sub_dis_t *diam_ "Error! Bad Integer64 Length"); expert_add_info_format(c->pinfo, pi, &ei_diameter_avp_len, "Bad Integer64 Length (%u)", length); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } return label; @@ -1058,7 +1058,7 @@ unsigned32_avp(diam_ctx_t *c, diam_avp_t *a, tvbuff_t *tvb, diam_sub_dis_t *diam "Error! Bad Unsigned32 Length"); expert_add_info_format(c->pinfo, pi, &ei_diameter_avp_len, "Bad Unsigned32 Length (%u)", length); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } return label; @@ -1086,7 +1086,7 @@ unsigned64_avp(diam_ctx_t *c, diam_avp_t *a, tvbuff_t *tvb, diam_sub_dis_t *diam "Error! Bad Unsigned64 Length"); expert_add_info_format(c->pinfo, pi, &ei_diameter_avp_len, "Bad Unsigned64 Length (%u)", length); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } return label; @@ -1114,7 +1114,7 @@ float32_avp(diam_ctx_t *c, diam_avp_t *a, tvbuff_t *tvb, diam_sub_dis_t *diam_su "Error! Bad Float32 Length"); expert_add_info_format(c->pinfo, pi, &ei_diameter_avp_len, "Bad Float32 Length (%u)", length); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } return label; @@ -1142,7 +1142,7 @@ float64_avp(diam_ctx_t *c, diam_avp_t *a, tvbuff_t *tvb, diam_sub_dis_t *diam_su "Error! Bad Float64 Length"); expert_add_info_format(c->pinfo, pi, &ei_diameter_avp_len, "Bad Float64 Length (%u)", length); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } return label; @@ -1392,19 +1392,19 @@ dissect_diameter_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi if (diameter_pair->ans_frame) { it = proto_tree_add_uint(diam_tree, hf_diameter_answer_in, tvb, 0, 0, diameter_pair->ans_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else { /* This is an answer */ if (diameter_pair->req_frame) { it = proto_tree_add_uint(diam_tree, hf_diameter_answer_to, tvb, 0, 0, diameter_pair->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &diameter_pair->req_time); diameter_pair->srt_time = ns; it = proto_tree_add_time(diam_tree, hf_diameter_answer_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); /* TODO: Populate result_code in tap record from AVP 268 */ } } diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c index f710a53486..745393715f 100644 --- a/epan/dissectors/packet-diameter_3gpp.c +++ b/epan/dissectors/packet-diameter_3gpp.c @@ -580,7 +580,7 @@ dissect_diameter_3gpp_imeisv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * item = proto_tree_add_item_ret_string(tree, hf_diameter_3gpp_imeisv, tvb, offset, length, ENC_UTF_8 | ENC_NA, wmem_packet_scope(), (const guint8**)&diam_sub_dis->avp_str); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } return length; @@ -698,7 +698,7 @@ dissect_diameter_3gpp_af_application_identifier(tvbuff_t *tvb, packet_info *pinf item = proto_tree_add_item_ret_string(tree, hf_diameter_3gpp_af_application_identifier, tvb, offset, length, ENC_UTF_8 | ENC_NA, wmem_packet_scope(), (const guint8**)&diam_sub_dis->avp_str); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } return length; @@ -722,7 +722,7 @@ dissect_diameter_3gpp_af_charging_identifier(tvbuff_t *tvb, packet_info *pinfo _ item = proto_tree_add_item_ret_string(tree, hf_diameter_3gpp_af_charging_identifier, tvb, offset, length, ENC_UTF_8 | ENC_NA, wmem_packet_scope(), (const guint8**)&diam_sub_dis->avp_str); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } return length; @@ -746,7 +746,7 @@ dissect_diameter_3gpp_visited_nw_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto return length; item = proto_tree_add_item(tree, hf_diameter_3gpp_visited_nw_id, tvb, offset, length, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); return length; } @@ -1103,7 +1103,7 @@ dissect_diameter_3gpp_contact(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree int offset = 0; item = proto_tree_add_item(tree, hf_diameter_3gpp_contact, tvb, offset, -1, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); return tvb_reported_length(tvb); } @@ -1180,7 +1180,7 @@ dissect_diameter_3gpp_service_ind(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t return length; item = proto_tree_add_item(tree, hf_diameter_3gpp_service_ind, tvb, offset, length, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); return length; } @@ -1354,7 +1354,7 @@ dissect_diameter_3gpp_charging_rule_name(tvbuff_t *tvb, packet_info *pinfo _U_, item = proto_tree_add_item_ret_string(tree, hf_diameter_3gpp_charging_rule_name, tvb, offset, length, ENC_UTF_8 | ENC_NA, wmem_packet_scope(), (const guint8**)&diam_sub_dis->avp_str); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } return length; @@ -1377,7 +1377,7 @@ dissect_diameter_3gpp_monitoring_key(tvbuff_t *tvb, packet_info *pinfo _U_, prot item = proto_tree_add_item_ret_string(tree, hf_diameter_3gpp_monitoring_key, tvb, offset, length, ENC_UTF_8 | ENC_NA, wmem_packet_scope(), (const guint8**)&diam_sub_dis->avp_str); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } return length; diff --git a/epan/dissectors/packet-dji-uav.c b/epan/dissectors/packet-dji-uav.c index 96d881a207..35fdbdf490 100644 --- a/epan/dissectors/packet-dji-uav.c +++ b/epan/dissectors/packet-dji-uav.c @@ -140,7 +140,7 @@ request_response_handling(tvbuff_t *tvb, packet_info *pinfo, proto_tree *djiuav_ it = proto_tree_add_uint(djiuav_tree, hf_djiuav_response_in, tvb, 0, 0, djiuav_trans->reply_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else { if (djiuav_trans->request_frame) { @@ -149,11 +149,11 @@ request_response_handling(tvbuff_t *tvb, packet_info *pinfo, proto_tree *djiuav_ it = proto_tree_add_uint(djiuav_tree, hf_djiuav_response_to, tvb, 0, 0, djiuav_trans->request_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &djiuav_trans->request_time); it = proto_tree_add_time(djiuav_tree, hf_djiuav_response_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } } diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index cd65cb0a09..d2e0fd0a04 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -1467,14 +1467,14 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, } analysis_tree = proto_tree_add_subtree(dmp_tree, tvb, 0, 0, ett_analysis, &en, "SEQ/ACK analysis"); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); if ((dmp.msg_type == STANAG) || (dmp.msg_type == IPM) || (dmp.msg_type == REPORT) || (dmp.msg_type == NOTIF)) { if (dmp.id_val->ack_id) { en = proto_tree_add_uint (analysis_tree, hf_analysis_ack_num, tvb, 0, 0, dmp.id_val->ack_id); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); if (!dmp.checksum) { proto_item_append_text (en, " (unexpected)"); expert_add_info(pinfo, en, &ei_analysis_ack_unexpected); @@ -1485,7 +1485,7 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, /* We do not know this on first visit and we do not want to add a entry in the "Expert Severity Info" for this note */ expert_add_info(pinfo, en, &ei_analysis_ack_missing); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); } } @@ -1493,12 +1493,12 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, if (dmp.id_val->msg_id) { en = proto_tree_add_uint (analysis_tree, hf_analysis_msg_num, tvb, 0, 0, dmp.id_val->msg_id); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); nstime_delta (&ns, &pinfo->abs_ts, &dmp.id_val->rep_not_msg_time); en = proto_tree_add_time (analysis_tree, hf_analysis_rep_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); } else { proto_tree_add_expert (analysis_tree, pinfo, &ei_analysis_msg_missing, tvb, 0, 0); } @@ -1506,12 +1506,12 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, if (dmp.id_val->msg_id) { en = proto_tree_add_uint (analysis_tree, hf_analysis_msg_num, tvb, 0, 0, dmp.id_val->msg_id); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); nstime_delta (&ns, &pinfo->abs_ts, &dmp.id_val->rep_not_msg_time); en = proto_tree_add_time (analysis_tree, hf_analysis_not_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); } else { proto_tree_add_expert (analysis_tree, pinfo, &ei_analysis_msg_missing, tvb, 0, 0); } @@ -1520,7 +1520,7 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, if (dmp.id_val->msg_resend_count) { en = proto_tree_add_uint (analysis_tree, hf_analysis_retrans_no, tvb, 0, 0, dmp.id_val->msg_resend_count); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); expert_add_info_format(pinfo, en, &ei_analysis_retrans_no, "Retransmission #%d", dmp.id_val->msg_resend_count); @@ -1534,22 +1534,22 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, en = proto_tree_add_uint (analysis_tree, hf_analysis_msg_resend_from, tvb, 0, 0, dmp.id_val->msg_id); } - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); nstime_delta (&ns, &pinfo->abs_ts, &dmp.id_val->prev_msg_time); en = proto_tree_add_time (analysis_tree, hf_analysis_retrans_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); nstime_delta (&ns, &pinfo->abs_ts, &dmp.id_val->first_msg_time); eh = proto_tree_add_time (analysis_tree, hf_analysis_total_retrans_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED (eh); + proto_item_set_generated (eh); if (dmp.id_val->first_msg_time.secs == dmp.id_val->prev_msg_time.secs && dmp.id_val->first_msg_time.nsecs == dmp.id_val->prev_msg_time.nsecs) { /* Time values does not differ, hide the total time */ - PROTO_ITEM_SET_HIDDEN (eh); + proto_item_set_hidden (eh); } } } else if (dmp.msg_type == ACK) { @@ -1564,22 +1564,22 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, en = proto_tree_add_uint (analysis_tree, hf_analysis_acks_msg_num, tvb, 0, 0, dmp.id_val->msg_id); } - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); nstime_delta (&ns, &pinfo->abs_ts, &dmp.id_val->msg_time); en = proto_tree_add_time (analysis_tree, hf_analysis_ack_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); nstime_delta (&ns, &pinfo->abs_ts, &dmp.id_val->first_msg_time); eh = proto_tree_add_time (analysis_tree, hf_analysis_total_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED (eh); + proto_item_set_generated (eh); if (dmp.id_val->first_msg_time.secs == dmp.id_val->msg_time.secs && dmp.id_val->first_msg_time.nsecs == dmp.id_val->msg_time.nsecs) { /* Time values does not differ, hide the total time */ - PROTO_ITEM_SET_HIDDEN (eh); + proto_item_set_hidden (eh); } else { /* Different times, add a reference to the message we have ack'ed */ proto_item_append_text (en, " (from frame %d)", @@ -1592,13 +1592,13 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, if (dmp.id_val->ack_resend_count) { en = proto_tree_add_uint (analysis_tree, hf_analysis_ack_dup_no, tvb, 0, 0, dmp.id_val->ack_resend_count); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); expert_add_info_format(pinfo, en, &ei_analysis_ack_dup_no, "Dup ACK #%d", dmp.id_val->ack_resend_count); en = proto_tree_add_uint (analysis_tree, hf_analysis_ack_resend_from, tvb, 0, 0, dmp.id_val->ack_id); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); } } } @@ -1965,7 +1965,7 @@ static gint dissect_dmp_direct_addr (tvbuff_t *tvb, packet_info *pinfo, "%sDirect Address: %d", val_to_str_const (addr_type, addr_type_str, ""), dir_addr); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); } else { en = proto_tree_add_uint_format (field_tree, hf_addr_dir_address, tvb, offset, 1, value, @@ -2074,7 +2074,7 @@ static gint dissect_dmp_ext_addr (tvbuff_t *tvb, packet_info *pinfo, en = proto_tree_add_uint_format (ext_tree, hf_addr_ext_length_generated, tvb, offset, 0, length, "Address Length: %d", length); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); } proto_item_append_text (ef, ", Type: %s, Length: %d", @@ -2211,7 +2211,7 @@ static gint dissect_dmp_originator (tvbuff_t *tvb, packet_info *pinfo, en = proto_tree_add_boolean (field_tree, hf_addr_dl_expanded, tvb, offset, 0, TRUE); } - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); } } proto_item_set_len (tf, offset - boffset); @@ -2390,13 +2390,13 @@ static gint dissect_dmp_direct_encoding (tvbuff_t *tvb, packet_info *pinfo, proto_item_append_text (en, " (maximum 32767)"); expert_add_info(pinfo, en, &ei_addr_dir_rec_no_generated); } - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); if (dir_addr_extended) { en = proto_tree_add_uint_format (field_tree, hf_addr_dir_address_generated, tvb, offset, 0, dir_addr, "Direct Address: %d", dir_addr); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); } proto_item_append_text (tf, " %d", rec_no); @@ -2510,7 +2510,7 @@ static gint dissect_dmp_ext_encoding (tvbuff_t *tvb, packet_info *pinfo, proto_item_append_text (en, " (maximum 32767)"); expert_add_info(pinfo, en, &ei_addr_ext_rec_no_generated); } - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); switch (dmp_addr_form) { @@ -2615,7 +2615,7 @@ static gint dissect_dmp_ack (tvbuff_t *tvb, packet_info *pinfo, dmp.subj_id = tvb_get_ntohs (tvb, offset); proto_tree_add_item (ack_tree, hf_message_subj_id, tvb, offset, 2, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_item (ack_tree, hf_dmp_id, tvb, offset, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN (hidden_item); + proto_item_set_hidden (hidden_item); offset += 2; if (use_seq_ack_analysis) { @@ -2672,7 +2672,7 @@ static gint dissect_mts_identifier (tvbuff_t *tvb, packet_info *pinfo, proto_tre /* Insert into hash, for analysis */ wmem_map_insert (dmp_long_id_hash_table, wmem_strdup (wmem_file_scope(), mts_id), GUINT_TO_POINTER ((guint)dmp.msg_id)); } - PROTO_ITEM_SET_HIDDEN (hidden_item); + proto_item_set_hidden (hidden_item); offset += dmp.mts_id_length; if (byte_rest) { @@ -2728,7 +2728,7 @@ static gint dissect_ipm_identifier (tvbuff_t *tvb, packet_info *pinfo, proto_tre /* Insert into hash, for analysis */ wmem_map_insert (dmp_long_id_hash_table, wmem_strdup (wmem_file_scope(), ipm_id), GUINT_TO_POINTER ((guint)dmp.msg_id)); } - PROTO_ITEM_SET_HIDDEN (hidden_item); + proto_item_set_hidden (hidden_item); offset += ipm_id_length; if (byte_rest) { @@ -2916,7 +2916,7 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, } else if (dmp.version >= DMP_VERSION_2 && dmp.msg_id_type == ONLY_DMP_ID && dmp.msg_id < 4096) { expert_add_info(pinfo, tf, &ei_envelope_msg_id); } - PROTO_ITEM_SET_HIDDEN (hidden_item); + proto_item_set_hidden (hidden_item); offset += 2; if (dmp.version >= DMP_VERSION_2) { @@ -3122,7 +3122,7 @@ static gint dissect_dmp_message (tvbuff_t *tvb, packet_info *pinfo, tf = proto_tree_add_item (message_tree, hf_message_body_data, body_tvb, 0, body_len, ENC_NA); proto_item_set_text (tf, "User data, Length: %d", body_len); - PROTO_ITEM_SET_GENERATED (tf); + proto_item_set_generated (tf); } else { proto_tree_add_expert (message_tree, pinfo, &ei_message_body_uncompress, tvb, offset, len); } @@ -3695,7 +3695,7 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, /* Show configured national policy */ tf = proto_tree_add_uint (message_tree, hf_message_national_policy_id, tvb, offset, 0, dmp_local_nation); - PROTO_ITEM_SET_GENERATED (tf); + proto_item_set_generated (tf); } else if (dmp_sec_pol == EXTENDED_NATIONAL) { /* National Policy Identifier */ proto_tree_add_item (message_tree, hf_message_national_policy_id, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -3728,7 +3728,7 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, proto_item_append_text (en, ", Security Label: %s", label_string); tf = proto_tree_add_string (message_tree, hf_message_sec_label, tvb, loffset, offset - loffset, label_string); - PROTO_ITEM_SET_GENERATED (tf); + proto_item_set_generated (tf); } else { tf = proto_tree_add_item (message_tree, hf_message_sec_cat_val, tvb, offset, 1, ENC_BIG_ENDIAN); field_tree = proto_item_add_subtree (tf, ett_message_sec_cat); @@ -3802,7 +3802,7 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, dmp.subj_id = tvb_get_ntohs (tvb, offset); proto_tree_add_item (message_tree, hf_message_subj_id, tvb, offset, 2, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_item (message_tree, hf_dmp_id, tvb, offset, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN (hidden_item); + proto_item_set_hidden (hidden_item); offset += 2; } else if (dmp.msg_id_type == X400_MSG_ID || dmp.msg_id_type == NAT_MSG_ID) { if (dmp.msg_type == REPORT) { @@ -3814,10 +3814,10 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, } if (dmp.subj_id) { tf = proto_tree_add_uint (message_tree, hf_message_subj_id, tvb, offset, 0, dmp.subj_id); - PROTO_ITEM_SET_GENERATED (tf); + proto_item_set_generated (tf); hidden_item = proto_tree_add_uint (message_tree, hf_dmp_id, tvb, offset, 0, dmp.subj_id); - PROTO_ITEM_SET_GENERATED (hidden_item); - PROTO_ITEM_SET_HIDDEN (hidden_item); + proto_item_set_generated (hidden_item); + proto_item_set_hidden (hidden_item); } } } diff --git a/epan/dissectors/packet-dmx.c b/epan/dissectors/packet-dmx.c index b401485fc8..b5d14791c2 100644 --- a/epan/dissectors/packet-dmx.c +++ b/epan/dissectors/packet-dmx.c @@ -166,7 +166,7 @@ dissect_dmx_chan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data /* Add the real type hidden */ item = proto_tree_add_item(dmx_chan_tree, hf_dmx_chan_output_data_filter, tvb, offset, length, ENC_NA ); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); } return tvb_captured_length(tvb); } @@ -310,10 +310,10 @@ dissect_dmx_test(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data test_data_tree = proto_item_add_subtree(item, ett_dmx_test); item = proto_tree_add_boolean(test_data_tree, hf_dmx_test_data_good, tvb, offset, size, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_boolean(test_data_tree, hf_dmx_test_data_bad, tvb, offset, size, FALSE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } else { proto_item_append_text(ti, ", Data incorrect"); proto_item_append_text(item, " [incorrect]"); @@ -321,10 +321,10 @@ dissect_dmx_test(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data test_data_tree = proto_item_add_subtree(item, ett_dmx_test); item = proto_tree_add_boolean(test_data_tree, hf_dmx_test_data_good, tvb, offset, size, FALSE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_boolean(test_data_tree, hf_dmx_test_data_bad, tvb, offset, size, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } return tvb_captured_length(tvb); diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 4443398955..39c6e7f41d 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -1466,7 +1466,7 @@ dnp3_al_obj_procprefix(tvbuff_t *tvb, int offset, guint8 al_objq_prefix, guint32 case AL_OBJQL_PREFIX_NI: /* No Prefix */ prefixbytes = 0; prefix_item = proto_tree_add_uint(item_tree, hf_dnp3_al_point_index, tvb, offset, 0, *al_ptaddr); - PROTO_ITEM_SET_GENERATED(prefix_item); + proto_item_set_generated(prefix_item); break; case AL_OBJQL_PREFIX_1O: *al_ptaddr = tvb_get_guint8(tvb, offset); @@ -1749,7 +1749,7 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, { case AL_OBJQL_RANGE_SSI8: /* 8-bit Start and Stop Indices in Range Field */ num_items = ( tvb_get_guint8(tvb, offset+1) - tvb_get_guint8(tvb, offset) + 1); - PROTO_ITEM_SET_GENERATED(range_item); + proto_item_set_generated(range_item); al_ptaddr = tvb_get_guint8(tvb, offset); proto_tree_add_item(range_tree, hf_dnp3_al_range_start8, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(range_tree, hf_dnp3_al_range_stop8, tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); @@ -1757,7 +1757,7 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, break; case AL_OBJQL_RANGE_SSI16: /* 16-bit Start and Stop Indices in Range Field */ num_items = ( tvb_get_letohs(tvb, offset+2) - tvb_get_letohs(tvb, (offset)) + 1); - PROTO_ITEM_SET_GENERATED(range_item); + proto_item_set_generated(range_item); al_ptaddr = tvb_get_letohs(tvb, offset); proto_tree_add_item(range_tree, hf_dnp3_al_range_start16, tvb, offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(range_tree, hf_dnp3_al_range_stop16, tvb, offset + 2, 2, ENC_LITTLE_ENDIAN); @@ -1765,7 +1765,7 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, break; case AL_OBJQL_RANGE_SSI32: /* 32-bit Start and Stop Indices in Range Field */ num_items = ( tvb_get_letohl(tvb, offset+4) - tvb_get_letohl(tvb, offset) + 1); - PROTO_ITEM_SET_GENERATED(range_item); + proto_item_set_generated(range_item); al_ptaddr = tvb_get_letohl(tvb, offset); proto_tree_add_item(range_tree, hf_dnp3_al_range_start32, tvb, offset, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(range_tree, hf_dnp3_al_range_stop32, tvb, offset + 4, 4, ENC_LITTLE_ENDIAN); @@ -1773,21 +1773,21 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, break; case AL_OBJQL_RANGE_AA8: /* 8-bit Absolute Address in Range Field */ num_items = 1; - PROTO_ITEM_SET_GENERATED(range_item); + proto_item_set_generated(range_item); al_ptaddr = tvb_get_guint8(tvb, offset); proto_tree_add_item(range_tree, hf_dnp3_al_range_abs8, tvb, offset, 1, ENC_LITTLE_ENDIAN); rangebytes = 1; break; case AL_OBJQL_RANGE_AA16: /* 16-bit Absolute Address in Range Field */ num_items = 1; - PROTO_ITEM_SET_GENERATED(range_item); + proto_item_set_generated(range_item); al_ptaddr = tvb_get_letohs(tvb, offset); proto_tree_add_item(range_tree, hf_dnp3_al_range_abs16, tvb, offset, 2, ENC_LITTLE_ENDIAN); rangebytes = 2; break; case AL_OBJQL_RANGE_AA32: /* 32-bit Absolute Address in Range Field */ num_items = 1; - PROTO_ITEM_SET_GENERATED(range_item); + proto_item_set_generated(range_item); al_ptaddr = tvb_get_letohl(tvb, offset); proto_tree_add_item(range_tree, hf_dnp3_al_range_abs32, tvb, offset, 4, ENC_LITTLE_ENDIAN); rangebytes = 4; @@ -3290,11 +3290,11 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* /* add destination and source addresses */ proto_tree_add_item(dl_tree, hf_dnp3_dst, tvb, offset, 2, ENC_LITTLE_ENDIAN); hidden_item = proto_tree_add_item(dl_tree, hf_dnp3_addr, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset += 2; proto_tree_add_item(dl_tree, hf_dnp3_src, tvb, offset, 2, ENC_LITTLE_ENDIAN); hidden_item = proto_tree_add_item(dl_tree, hf_dnp3_addr, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset += 2; /* and header CRC */ @@ -3368,7 +3368,7 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* chk_tree = proto_tree_add_subtree_format(data_tree, tvb, offset, chk_size + 2, ett_dnp3_dl_chunk, NULL, "Data Chunk: %u", i); proto_tree_add_item(chk_tree, hf_dnp3_data_chunk, tvb, offset, chk_size, ENC_NA); chk_len_ti = proto_tree_add_uint(chk_tree, hf_dnp3_data_chunk_len, tvb, offset, 0, chk_size); - PROTO_ITEM_SET_GENERATED(chk_len_ti); + proto_item_set_generated(chk_len_ti); offset += chk_size; diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index a77a5fa35b..838668d66a 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -1490,11 +1490,11 @@ dissect_dns_query(tvbuff_t *tvb, int offset, int dns_data_offset, proto_tree_add_string(q_tree, hf_dns_qry_name, tvb, offset, used_bytes - 4, name_out); tq = proto_tree_add_uint(q_tree, hf_dns_qry_name_len, tvb, offset, name_len, name_len > 1 ? name_len : 0); - PROTO_ITEM_SET_GENERATED(tq); + proto_item_set_generated(tq); labels = qname_labels_count(name, name_len); tq = proto_tree_add_uint(q_tree, hf_dns_count_labels, tvb, offset, name_len, labels); - PROTO_ITEM_SET_GENERATED(tq); + proto_item_set_generated(tq); offset += used_bytes - 4; @@ -1766,7 +1766,7 @@ compute_key_id(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, int offset, proto_item *item; *key_id = 0; item = proto_tree_add_expert(tree, pinfo, &ei_dns_key_id_buffer_too_short, tvb, offset, size); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); return FALSE; } @@ -2351,7 +2351,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, if (compute_key_id(rr_tree, pinfo, tvb, cur_offset-4, rr_len+4, algo, &key_id)) { ti_gen = proto_tree_add_uint(rr_tree, hf_dns_key_key_id, tvb, 0, 0, key_id); - PROTO_ITEM_SET_GENERATED(ti_gen); + proto_item_set_generated(ti_gen); } if (rr_len != 0) { @@ -2565,7 +2565,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, used_bytes = get_dns_name(tvb, offset, 0, dns_data_offset, &replacement, &replacement_len); name_out = format_text(wmem_packet_scope(), replacement, replacement_len); ti_len = proto_tree_add_uint(rr_tree, hf_dns_naptr_replacement_length, tvb, offset, 0, replacement_len); - PROTO_ITEM_SET_GENERATED(ti_len); + proto_item_set_generated(ti_len); proto_tree_add_string(rr_tree, hf_dns_naptr_replacement, tvb, offset, used_bytes, name_out); @@ -3100,7 +3100,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, if (compute_key_id(rr_tree, pinfo, tvb, cur_offset-4, rr_len+4, algo, &key_id)) { ti_gen = proto_tree_add_uint(rr_tree, hf_dns_dnskey_key_id, tvb, 0, 0, key_id); - PROTO_ITEM_SET_GENERATED(ti_gen); + proto_item_set_generated(ti_gen); } proto_tree_add_item(rr_tree, hf_dns_dnskey_public_key, tvb, cur_offset, rr_len, ENC_NA); @@ -3982,16 +3982,16 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, expert_add_info_format(pinfo, transaction_item, &ei_dns_retransmit_request, "DNS query retransmission. Original request in frame %d", dns_trans->req_frame); it=proto_tree_add_uint(dns_tree, hf_dns_retransmit_request_in, tvb, 0, 0, dns_trans->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); if (!pinfo->flags.in_error_pkt) { it=proto_tree_add_boolean(dns_tree, hf_dns_retransmission, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else if (dns_trans->rep_frame) { it=proto_tree_add_uint(dns_tree, hf_dns_response_in, tvb, 0, 0, dns_trans->rep_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else { /* This is a reply */ @@ -4001,24 +4001,24 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, expert_add_info_format(pinfo, transaction_item, &ei_dns_retransmit_response, "DNS response retransmission. Original response in frame %d", dns_trans->rep_frame); it=proto_tree_add_uint(dns_tree, hf_dns_retransmit_response_in, tvb, 0, 0, dns_trans->rep_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); if (!pinfo->flags.in_error_pkt) { it=proto_tree_add_boolean(dns_tree, hf_dns_retransmission, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else { it=proto_tree_add_uint(dns_tree, hf_dns_response_to, tvb, 0, 0, dns_trans->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&delta, &pinfo->abs_ts, &dns_trans->req_time); it=proto_tree_add_time(dns_tree, hf_dns_time, tvb, 0, 0, &delta); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else { if (!retransmission) { it=proto_tree_add_boolean(dns_tree, hf_dns_unsolicited, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } } diff --git a/epan/dissectors/packet-docsis.c b/epan/dissectors/packet-docsis.c index c30b55bf5e..e043d52ad2 100644 --- a/epan/dissectors/packet-docsis.c +++ b/epan/dissectors/packet-docsis.c @@ -574,7 +574,7 @@ dissect_encrypted_frame (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, addr_tree = proto_item_add_subtree(addr_item, ett_addr); addr_item=proto_tree_add_string(addr_tree, hf_docsis_dst_resolved, tvb, 0, 6, dst_addr_name); - PROTO_ITEM_SET_GENERATED(addr_item); + proto_item_set_generated(addr_item); proto_tree_add_item(addr_tree, hf_docsis_lg, tvb, 0, 3, ENC_BIG_ENDIAN); proto_tree_add_item(addr_tree, hf_docsis_ig, tvb, 0, 3, ENC_BIG_ENDIAN); @@ -582,7 +582,7 @@ dissect_encrypted_frame (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, addr_tree = proto_item_add_subtree(addr_item, ett_addr); addr_item=proto_tree_add_string(addr_tree, hf_docsis_src_resolved, tvb, 6, 6, src_addr_name); - PROTO_ITEM_SET_GENERATED(addr_item); + proto_item_set_generated(addr_item); proto_tree_add_item(addr_tree, hf_docsis_lg, tvb, 6, 3, ENC_BIG_ENDIAN); proto_tree_add_item(addr_tree, hf_docsis_ig, tvb, 6, 3, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-dof.c b/epan/dissectors/packet-dof.c index 2663eed034..ba803168e7 100644 --- a/epan/dissectors/packet-dof.c +++ b/epan/dissectors/packet-dof.c @@ -1385,11 +1385,11 @@ static int oap_1_tree_add_alias(dof_api_data *api_data, oap_1_packet_data *oap_p /* Decode the Interface */ ti = proto_tree_add_bytes_format_value(tree, hf_oap_1_interfaceid, tvb, offset, alias_length, binding->iid, "%s", dof_iid_create_standard_string(binding->iid_length, binding->iid)); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Decode the Object ID */ ti = proto_tree_add_bytes_format_value(tree, hf_oap_1_objectid, tvb, offset, alias_length, binding->oid, "%s", dof_oid_create_standard_string(binding->oid_length, binding->oid)); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_uint_format(options_tree, hf_oap_1_alias_frame, tvb, 0, 0, binding->frame, @@ -5509,31 +5509,31 @@ static int dissect_dof_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* Add the general packet information. */ { ti = proto_tree_add_uint(dof_root, hf_2008_1_dof_session_transport, tvb, 0, 0, api_data->transport_session->transport_session_id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_boolean(dof_root, hf_2008_1_dof_is_2_node, tvb, 0, 0, api_data->transport_session->is_2_node); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_boolean(dof_root, hf_2008_1_dof_is_streaming, tvb, 0, 0, api_data->transport_session->is_streaming); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (api_data->session) { ti = proto_tree_add_uint(dof_root, hf_2008_1_dof_session, tvb, 0, 0, api_data->session->session_id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (api_data->secure_session) { ti = proto_tree_add_uint_format(dof_root, hf_2008_1_dof_session, tvb, 0, 0, api_data->secure_session->original_session_id, "DPS Session (Non-secure): %d", api_data->secure_session->original_session_id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } ti = proto_tree_add_uint(dof_root, hf_2008_1_dof_frame, tvb, 0, 0, packet->dof_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_boolean(dof_root, hf_2008_1_dof_is_from_client, tvb, 0, 0, api_data->transport_packet->is_sent_by_client); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } @@ -6524,7 +6524,7 @@ static int dissect_dnp_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo else { proto_item *item = proto_tree_add_uint_format(dnp_tree, hf_2009_9_dnp_1_srcport, tvb, 0, 0, 0, "Source Address: %u", 0); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } /* Read the dstport */ @@ -6542,7 +6542,7 @@ static int dissect_dnp_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo else { proto_item *item = proto_tree_add_uint_format(dnp_tree, hf_2009_9_dnp_1_dstport, tvb, 0, 0, 0, "Destination Address: %u", 0); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } @@ -6807,24 +6807,24 @@ static int dissect_dpp_2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo ti = proto_tree_add_uint_format(tree, hf_2008_1_dpp_sid_num, tvb, 0, 0, packet_data->sender_sid_id, "SID ID: %d", packet_data->sender_sid_id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (packet_data->sender_sid) { const gchar *SID = dof_oid_create_standard_string(packet_data->sender_sid[0], packet_data->sender_sid + 1); ti = proto_tree_add_bytes_format_value(tree, hf_2008_1_dpp_sid_str, tvb, 0, 0, packet_data->sender_sid, "%s", SID); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } ti = proto_tree_add_uint_format(tree, hf_2008_1_dpp_rid_num, tvb, 0, 0, packet_data->receiver_sid_id, "RID ID: %d", packet_data->receiver_sid_id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (packet_data->receiver_sid) { const gchar *SID = dof_oid_create_standard_string(packet_data->receiver_sid[0], packet_data->receiver_sid + 1); ti = proto_tree_add_bytes_format_value(tree, hf_2008_1_dpp_rid_str, tvb, 0, 0, packet_data->receiver_sid, "%s", SID); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (dpp_flags_included) @@ -6943,7 +6943,7 @@ static int dissect_dpp_2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo call_dissector_only(dof_oid_handle, next_tvb, pinfo, oid_tree, NULL); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } read_c4(tvb, offset, &opcnt, &opcnt_len); @@ -7793,7 +7793,7 @@ static int dissect_ccm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void else { item = proto_tree_add_uint_format(tree, hf_epp_v1_ccm_nid, tvb, 0, 0, pdata->nid, "Node ID: %u", pdata->nid); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (!secure_session->is_2_node) @@ -7808,7 +7808,7 @@ static int dissect_ccm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void else { item = proto_tree_add_uint_format(tree, hf_epp_v1_ccm_slot, tvb, 0, 0, 0, "Slot: %u", 0); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (ccm_flags & 0x01) @@ -7824,7 +7824,7 @@ static int dissect_ccm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void else { item = proto_tree_add_uint_format(tree, hf_epp_v1_ccm_pn, tvb, 0, 0, pdata->dn, "Packet Number: %u", pdata->dn); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (ccm_flags & 0x08) @@ -9309,7 +9309,7 @@ static int dissect_tep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void operation_tree = proto_item_add_subtree(ti, ett_tep_operation); ti = proto_tree_add_boolean(operation_tree, hf_tep_operation_type, tvb, offset, 0, operation); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* The flags are reserved except for OPCODE=1 & COMMAND */ if ((operation & 0x8F) == 0x01) @@ -9502,7 +9502,7 @@ static int dissect_tep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void { const gchar *SID = bytestring_to_str(NULL, rekey_data->key_data->session_key, 32, ':'); ti = proto_tree_add_bytes_format_value(tree, hf_tep_session_key, tvb, 0, 0, rekey_data->key_data->session_key, "%s", SID); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Responder Initialization - present based on whether the command was a rekey */ diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index 1d360a09e0..036ed81d71 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -4357,7 +4357,7 @@ dissect_dvbci_spdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* when a circuit is found, it always contains a valid resource id */ res_id = GPOINTER_TO_UINT(conversation_get_proto_data(conv, proto_dvbci)); res_id_it = dissect_res_id(NULL, 0, pinfo, sess_tree, res_id, TRUE); - PROTO_ITEM_SET_GENERATED(res_id_it); + proto_item_set_generated(res_id_it); } if (payload_tvb) { diff --git a/epan/dissectors/packet-e164.c b/epan/dissectors/packet-e164.c index 99f2f1fe13..32ee367fc2 100644 --- a/epan/dissectors/packet-e164.c +++ b/epan/dissectors/packet-e164.c @@ -492,7 +492,7 @@ dissect_e164_number(tvbuff_t *tvb, proto_tree *tree, int offset, int length, e16 if (e164_info.nature_of_address == E164_NA_INTERNATIONAL_NUMBER) { pi = proto_tree_add_string(tree, hf_E164_number, tvb, offset, length, e164_info.E164_number_str); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); } } diff --git a/epan/dissectors/packet-e212.c b/epan/dissectors/packet-e212.c index 40970bcb9d..2b60f30b15 100644 --- a/epan/dissectors/packet-e212.c +++ b/epan/dissectors/packet-e212.c @@ -3333,7 +3333,7 @@ dissect_e212_imsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offse expert_add_info(pinfo, item, &ei_E212_imsi_malformed); } item = proto_tree_add_string(tree, hf_e212_assoc_imsi, tvb, offset, length, imsi_str); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); subtree = proto_item_add_subtree(item, ett_e212_imsi); if(skip_first) { @@ -3359,7 +3359,7 @@ dissect_e212_utf8_imsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int expert_add_info(pinfo, item, &ei_E212_imsi_malformed); } item = proto_tree_add_string(tree, hf_e212_assoc_imsi, tvb, offset, length, imsi_str); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); subtree = proto_item_add_subtree(item, ett_e212_imsi); diff --git a/epan/dissectors/packet-echo.c b/epan/dissectors/packet-echo.c index 9a9c4e2a07..4c01838e2c 100644 --- a/epan/dissectors/packet-echo.c +++ b/epan/dissectors/packet-echo.c @@ -46,7 +46,7 @@ static int dissect_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi hidden_item = proto_tree_add_boolean(echo_tree, request ? hf_echo_request : hf_echo_response, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(echo_tree, hf_echo_data, tvb, 0, -1, ENC_NA); diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index ec8173e672..a21e87f956 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -960,7 +960,7 @@ static int dissect_kademlia_tagname(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_uint(tree, hf_kademlia_tag_name_length, tvb, offset, 2, string_length); hidden_item = proto_tree_add_uint(tree, hf_edonkey_string_length, tvb, offset, 2, string_length); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); tagname = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 2, string_length, ENC_ASCII|ENC_NA); @@ -1066,7 +1066,7 @@ static int dissect_kademlia_hash_hidden(tvbuff_t *tvb, packet_info *pinfo _U_, /* <File hash> ::= HASH (16 word MD4 digest) */ hidden_item = proto_tree_add_string(tree, hf_kademlia_hash, tvb, offset, 16, hash); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); return offset+16; } @@ -1093,7 +1093,7 @@ static int dissect_kademlia_tag_hash_hidden(tvbuff_t *tvb, packet_info *pinfo _U /* <File hash> ::= HASH (16 word MD4 digest) */ hidden_item = proto_tree_add_string(tree, hf_kademlia_tag_hash, tvb, offset, 16, hash); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); return offset+16; } @@ -1129,9 +1129,9 @@ static int dissect_kademlia_tag_string(tvbuff_t *tvb, packet_info *pinfo _U_, guint16 string_length = tvb_get_letohs(tvb, offset); hidden_item = proto_tree_add_uint(tree, hf_edonkey_string_length, tvb, offset, 2, string_length); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item_ret_string(tree, hf_edonkey_string, tvb, offset + 2, string_length, ENC_ASCII|ENC_NA, wmem_packet_scope(), string_value); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(tree, hf_kademlia_tag_string, tvb, offset + 2, string_length, ENC_ASCII|ENC_NA); return offset + 2 + string_length; @@ -2580,7 +2580,7 @@ static int dissect_kademlia_udp_message(guint8 msg_type, if (length <= 0) return offset; hidden_item = proto_tree_add_item(tree, hf_kademlia, tvb, offset, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); msg_end = offset + length; diff --git a/epan/dissectors/packet-ehdlc.c b/epan/dissectors/packet-ehdlc.c index 18817a934e..035eba05f1 100644 --- a/epan/dissectors/packet-ehdlc.c +++ b/epan/dissectors/packet-ehdlc.c @@ -237,13 +237,13 @@ dissect_ehdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U tvb, offset, 1, ENC_BIG_ENDIAN); ti = proto_tree_add_uint(ehdlc_tree, hf_ehdlc_c_r, tvb, offset, 1, c_r); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(ehdlc_tree, hf_ehdlc_sapi, tvb, offset, 1, sapi); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(ehdlc_tree, hf_ehdlc_tei, tvb, offset, 1, tei); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_item(ehdlc_tree, hf_ehdlc_data_len, tvb, offset, 2, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-eiss.c b/epan/dissectors/packet-eiss.c index db17fcf07e..373586c125 100644 --- a/epan/dissectors/packet-eiss.c +++ b/epan/dissectors/packet-eiss.c @@ -264,7 +264,7 @@ dissect_eiss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_item *msg_error; msg_error = items[PACKET_MPEG_SECT_PI__SSI]; - PROTO_ITEM_SET_GENERATED(msg_error); + proto_item_set_generated(msg_error); expert_add_info(pinfo, msg_error, &ei_eiss_invalid_section_syntax_indicator); } @@ -272,7 +272,7 @@ dissect_eiss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_item *msg_error; msg_error = items[PACKET_MPEG_SECT_PI__RESERVED]; - PROTO_ITEM_SET_GENERATED(msg_error); + proto_item_set_generated(msg_error); expert_add_info_format(pinfo, msg_error, &ei_eiss_invalid_reserved_bits, "Invalid reserved1 bits (should all be 0)"); } @@ -280,7 +280,7 @@ dissect_eiss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_item *msg_error; msg_error = items[PACKET_MPEG_SECT_PI__LENGTH]; - PROTO_ITEM_SET_GENERATED(msg_error); + proto_item_set_generated(msg_error); expert_add_info(pinfo, msg_error, &ei_eiss_invalid_section_length); } diff --git a/epan/dissectors/packet-elcom.c b/epan/dissectors/packet-elcom.c index 99402d4d23..41c58d4eca 100644 --- a/epan/dissectors/packet-elcom.c +++ b/epan/dissectors/packet-elcom.c @@ -468,7 +468,7 @@ dissect_elcom(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U hidden_item = proto_tree_add_boolean(elcom_tree, is_request ? hf_elcom_request : hf_elcom_response, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* 2 first bytes are the frame length */ offset = 0; diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 5a17e06b6e..b663728f97 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -879,7 +879,7 @@ enip_match_request( packet_info *pinfo, proto_tree *tree, enip_request_key_t *pr it = proto_tree_add_uint(tree, hf_enip_response_in, NULL, 0, 0, request_info->rep_num); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else @@ -894,11 +894,11 @@ enip_match_request( packet_info *pinfo, proto_tree *tree, enip_request_key_t *pr it = proto_tree_add_uint(tree, hf_enip_response_to, NULL, 0, 0, request_info->req_num); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &request_info->req_time); it = proto_tree_add_time(tree, hf_enip_time, NULL, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } } @@ -2319,7 +2319,7 @@ static void display_fwd_open_connection_path(enip_conn_val_t* conn_info, proto_t { proto_item* pi = NULL; proto_tree* epath_tree = proto_tree_add_subtree(tree, tvb, 0, 0, ett_connection_path_info, &pi, "Connection Path: "); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); dissect_epath(tvbIOI, pinfo, epath_tree, pi, 0, conn_info->FwdOpenPathLenBytes, TRUE, FALSE, NULL, NULL, NO_DISPLAY, NULL, FALSE); tvb_free(tvbIOI); @@ -2330,7 +2330,7 @@ static void display_connection_information(packet_info* pinfo, tvbuff_t* tvb, pr { proto_item* pi = NULL; proto_tree* conn_info_tree = proto_tree_add_subtree(tree, tvb, 0, 0, ett_connection_info, &pi, "Connection Information"); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); if (connid_type == ECIDT_O2T) { @@ -2344,16 +2344,16 @@ static void display_connection_information(packet_info* pinfo, tvbuff_t* tvb, pr display_fwd_open_connection_path(conn_info, conn_info_tree, tvb, pinfo); pi = proto_tree_add_uint(conn_info_tree, hf_cip_cm_ot_api, tvb, 0, 0, conn_info->O2Tapi); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pi = proto_tree_add_uint(conn_info_tree, hf_cip_cm_to_api, tvb, 0, 0, conn_info->T2Oapi); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pi = proto_tree_add_uint(conn_info_tree, hf_cip_connection, tvb, 0, 0, conn_info->connid); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pi = proto_tree_add_uint(conn_info_tree, hf_enip_fwd_open_in, tvb, 0, 0, conn_info->open_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } // This dissects Class 0 or Class 1 I/O. diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c index 74bb3614d8..181db6fb95 100644 --- a/epan/dissectors/packet-enttec.c +++ b/epan/dissectors/packet-enttec.c @@ -287,7 +287,7 @@ dissect_enttec_dmx_data(tvbuff_t *tvb, guint offset, proto_tree *tree) item = proto_tree_add_item(si, hf_enttec_dmx_data_data_filter, tvb, offset, length, ENC_NA ); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); offset += length; } diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 1617bf738e..c3f9068ecc 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -2053,7 +2053,7 @@ dissect_epl_pdo(struct epl_convo *convo, proto_tree *epl_tree, tvbuff_t *tvb, pa if ( payload_len < len ) { item = proto_tree_add_uint(epl_tree, hf_epl_payload_real, tvb, offset, payload_len, payload_len); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); expert_add_info(pinfo, item, &ei_real_length_differs ); } @@ -2077,12 +2077,12 @@ dissect_epl_pdo(struct epl_convo *convo, proto_tree *epl_tree, tvbuff_t *tvb, pa pdo_tree = proto_item_add_subtree(item, map->ett); item = proto_tree_add_uint_format_value(pdo_tree, hf_epl_pdo_index, payload_tvb, 0, 0, map->pdo.idx, "%04X", map->pdo.idx); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (map->info) proto_item_append_text (item, " (%s)", map->index_name); item = proto_tree_add_uint_format_value(pdo_tree, hf_epl_pdo_subindex, payload_tvb, 0, 0, map->pdo.subindex, "%02X", map->pdo.subindex); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (map->info && map->info->name != map->index_name) proto_item_append_text (item, " (%s)", map->info->name); @@ -2106,7 +2106,7 @@ dissect_epl_pdo(struct epl_convo *convo, proto_tree *epl_tree, tvbuff_t *tvb, pa proto_item_append_text (item, " bits"); - PROTO_ITEM_SET_GENERATED(meta_item); + proto_item_set_generated(meta_item); } dissect_epl_payload( @@ -2575,13 +2575,13 @@ dissect_eplpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean udp if (tree && !udpencap) { epl_dest_item = proto_tree_add_item(epl_tree, hf_epl_node, tvb, offset, 1, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(epl_dest_item); + proto_item_set_hidden(epl_dest_item); epl_dest_item = proto_tree_add_item(epl_tree, hf_epl_dest, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text (epl_dest_item, "%s", dest_str); offset += 1; epl_src_item = proto_tree_add_item(epl_tree, hf_epl_node, tvb, offset, 1, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(epl_src_item); + proto_item_set_hidden(epl_src_item); epl_src_item = proto_tree_add_item(epl_tree, hf_epl_src, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text (epl_src_item, "%s", src_str); offset += 1; @@ -2690,7 +2690,7 @@ dissect_epl_payload(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, gin if ( payload_len < len ) { item = proto_tree_add_uint(epl_tree, hf_epl_payload_real, tvb, offset, payload_len, payload_len); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); expert_add_info(pinfo, item, &ei_real_length_differs ); } @@ -3344,7 +3344,7 @@ dissect_epl_asnd_ires(struct epl_convo *convo, proto_tree *epl_tree, tvbuff_t *t if (convo->profile && convo->profile->path) { ti = proto_tree_add_string(epl_tree, hf_epl_asnd_identresponse_profile_path, tvb, offset, 2, convo->profile->path); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } offset += 4; @@ -4174,7 +4174,7 @@ dissect_object_mapping(struct profile *profile, wmem_array_t *mappings, proto_tr } else { - PROTO_ITEM_SET_HIDDEN(ti_subobj); + proto_item_set_hidden(ti_subobj); } } @@ -4423,7 +4423,7 @@ dissect_epl_sdo_command_write_multiple_by_index(struct epl_convo *convo, proto_t /* size of embedded data */ psf_item = proto_tree_add_uint_format(psf_od_tree, hf_epl_asnd_sdo_cmd_data_size, tvb, dataoffset, size, size, "Data size: %d byte", size); - PROTO_ITEM_SET_GENERATED(psf_item); + proto_item_set_generated(psf_item); /* if the frame is a PDO Mapping and the subindex is bigger than 0x00 */ if((idx == EPL_SOD_PDO_TX_MAPP && subindex > 0x00) ||(idx == EPL_SOD_PDO_RX_MAPP && subindex > 0x00)) @@ -5072,7 +5072,7 @@ dissect_epl_sdo_command_read_by_index(struct epl_convo *convo, proto_tree *epl_t { proto_item *ti; ti = proto_tree_add_uint_format_value(epl_tree, hf_epl_asnd_sdo_cmd_data_index, tvb, 0, 0, req->idx, "%04X", req->idx); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (req->info) { proto_item_append_text (ti, " (%s)", req->index_name); @@ -5080,7 +5080,7 @@ dissect_epl_sdo_command_read_by_index(struct epl_convo *convo, proto_tree *epl_t } ti = proto_tree_add_uint_format_value(epl_tree, hf_epl_asnd_sdo_cmd_data_subindex, tvb, 0, 0, req->subindex, "%02X", req->subindex); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (req->info && req->info->name != req->index_name) proto_item_append_text (ti, " (%s)", req->info->name); diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c index e0e89d212c..daa7c4e959 100644 --- a/epan/dissectors/packet-erf.c +++ b/epan/dissectors/packet-erf.c @@ -1858,12 +1858,12 @@ static void dissect_host_anchor_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* TODO: top level linking to most recent frame like we have for Host ID? */ subtree = proto_tree_add_subtree_format(tree, tvb, 0, 0, ett_erf_anchor, &pi, "Host ID: 0x%012" G_GINT64_MODIFIER "x, Anchor ID: 0x%012" G_GINT64_MODIFIER "x", host_id & ERF_EHDR_HOST_ID_MASK, anchor_id & ERF_EHDR_ANCHOR_ID_MASK); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pi = proto_tree_add_uint64(subtree, hf_erf_anchor_hostid, tvb, 0, 0, host_id & ERF_EHDR_HOST_ID_MASK); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pi = proto_tree_add_uint64(subtree, hf_erf_anchor_anchorid, tvb, 0, 0, anchor_id & ERF_EHDR_ANCHOR_ID_MASK); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); anchor_info = (erf_host_anchor_info_t*)wmem_map_lookup(erf_state.host_anchor_map, &key); @@ -1880,7 +1880,7 @@ static void dissect_host_anchor_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree if(pinfo->num != anchored_info->frame_num) { /* Don't list the frame itself */ pi = proto_tree_add_uint(subtree, hf_erf_anchor_linked, tvb, 0, 0, anchored_info->frame_num); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* XXX: Need to do this each time because pinfo is discarded. Filtering does not reset visited as it does not do a full redissect. We also might not catch all frames in the first pass (e.g. comment after record). */ mark_frame_as_depended_upon(pinfo, anchored_info->frame_num); @@ -1918,22 +1918,22 @@ dissect_host_id_source_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g hostid_tree = proto_tree_add_subtree_format(tree, tvb, 0, 0, ett_erf_source, &pi, "Host ID: 0x%012" G_GINT64_MODIFIER "x, Source ID: %u", host_id, source_id&0xFF); } - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pi = proto_tree_add_uint64(hostid_tree, hf_erf_hostid, tvb, 0, 0, host_id); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pi = proto_tree_add_uint(hostid_tree, hf_erf_sourceid, tvb, 0, 0, source_id); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); if (fnum_next != G_MAXUINT32) { pi = proto_tree_add_uint(hostid_tree, hf_erf_source_next, tvb, 0, 0, fnum_next); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* XXX: Save the surrounding nearest periodic records when we do a filtered save so we keep native ERF metadata */ mark_frame_as_depended_upon(pinfo, fnum_next); } if (fnum != G_MAXUINT32) { pi = proto_tree_add_uint(hostid_tree, hf_erf_source_prev, tvb, 0, 0, fnum); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); mark_frame_as_depended_upon(pinfo, fnum); } } diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 2c7b9f45f5..732b760d63 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -378,13 +378,13 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, addr_tree = proto_item_add_subtree(addr_item, ett_addr); addr_item=proto_tree_add_string(addr_tree, hf_eth_dst_resolved, tvb, 0, 6, dst_addr_name); - PROTO_ITEM_SET_GENERATED(addr_item); - PROTO_ITEM_SET_HIDDEN(addr_item); + proto_item_set_generated(addr_item); + proto_item_set_hidden(addr_item); proto_tree_add_ether(addr_tree, hf_eth_addr, tvb, 0, 6, dst_addr); addr_item=proto_tree_add_string(addr_tree, hf_eth_addr_resolved, tvb, 0, 6, dst_addr_name); - PROTO_ITEM_SET_GENERATED(addr_item); - PROTO_ITEM_SET_HIDDEN(addr_item); + proto_item_set_generated(addr_item); + proto_item_set_hidden(addr_item); proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 0, 3, ENC_BIG_ENDIAN); proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 0, 3, ENC_BIG_ENDIAN); @@ -392,13 +392,13 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, addr_tree = proto_item_add_subtree(addr_item, ett_addr); addr_item=proto_tree_add_string(addr_tree, hf_eth_src_resolved, tvb, 6, 6, src_addr_name); - PROTO_ITEM_SET_GENERATED(addr_item); - PROTO_ITEM_SET_HIDDEN(addr_item); + proto_item_set_generated(addr_item); + proto_item_set_hidden(addr_item); proto_tree_add_ether(addr_tree, hf_eth_addr, tvb, 6, 6, src_addr); addr_item=proto_tree_add_string(addr_tree, hf_eth_addr_resolved, tvb, 6, 6, src_addr_name); - PROTO_ITEM_SET_GENERATED(addr_item); - PROTO_ITEM_SET_HIDDEN(addr_item); + proto_item_set_generated(addr_item); + proto_item_set_hidden(addr_item); proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 6, 3, ENC_BIG_ENDIAN); proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 6, 3, ENC_BIG_ENDIAN); @@ -436,13 +436,13 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, addr_tree = proto_item_add_subtree(addr_item, ett_addr); addr_item=proto_tree_add_string(addr_tree, hf_eth_dst_resolved, tvb, 0, 6, dst_addr_name); - PROTO_ITEM_SET_GENERATED(addr_item); - PROTO_ITEM_SET_HIDDEN(addr_item); + proto_item_set_generated(addr_item); + proto_item_set_hidden(addr_item); proto_tree_add_ether(addr_tree, hf_eth_addr, tvb, 0, 6, dst_addr); addr_item=proto_tree_add_string(addr_tree, hf_eth_addr_resolved, tvb, 0, 6, dst_addr_name); - PROTO_ITEM_SET_GENERATED(addr_item); - PROTO_ITEM_SET_HIDDEN(addr_item); + proto_item_set_generated(addr_item); + proto_item_set_hidden(addr_item); proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 0, 3, ENC_BIG_ENDIAN); proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 0, 3, ENC_BIG_ENDIAN); @@ -450,13 +450,13 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, addr_tree = proto_item_add_subtree(addr_item, ett_addr); addr_item=proto_tree_add_string(addr_tree, hf_eth_src_resolved, tvb, 6, 6, src_addr_name); - PROTO_ITEM_SET_GENERATED(addr_item); - PROTO_ITEM_SET_HIDDEN(addr_item); + proto_item_set_generated(addr_item); + proto_item_set_hidden(addr_item); proto_tree_add_ether(addr_tree, hf_eth_addr, tvb, 6, 6, src_addr); addr_item=proto_tree_add_string(addr_tree, hf_eth_addr_resolved, tvb, 6, 6, src_addr_name); - PROTO_ITEM_SET_GENERATED(addr_item); - PROTO_ITEM_SET_HIDDEN(addr_item); + proto_item_set_generated(addr_item); + proto_item_set_hidden(addr_item); proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 6, 3, ENC_BIG_ENDIAN); proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 6, 3, ENC_BIG_ENDIAN); @@ -490,13 +490,13 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, addr_tree = proto_item_add_subtree(addr_item, ett_addr); addr_item = proto_tree_add_string(addr_tree, hf_eth_dst_resolved, tvb, 0, 6, dst_addr_name); - PROTO_ITEM_SET_GENERATED(addr_item); - PROTO_ITEM_SET_HIDDEN(addr_item); + proto_item_set_generated(addr_item); + proto_item_set_hidden(addr_item); proto_tree_add_ether(addr_tree, hf_eth_addr, tvb, 0, 6, dst_addr); addr_item=proto_tree_add_string(addr_tree, hf_eth_addr_resolved, tvb, 0, 6, dst_addr_name); - PROTO_ITEM_SET_GENERATED(addr_item); - PROTO_ITEM_SET_HIDDEN(addr_item); + proto_item_set_generated(addr_item); + proto_item_set_hidden(addr_item); proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 0, 3, ENC_BIG_ENDIAN); proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 0, 3, ENC_BIG_ENDIAN); @@ -507,13 +507,13 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, } addr_item=proto_tree_add_string(addr_tree, hf_eth_src_resolved, tvb, 6, 6, src_addr_name); - PROTO_ITEM_SET_GENERATED(addr_item); - PROTO_ITEM_SET_HIDDEN(addr_item); + proto_item_set_generated(addr_item); + proto_item_set_hidden(addr_item); proto_tree_add_ether(addr_tree, hf_eth_addr, tvb, 6, 6, src_addr); addr_item=proto_tree_add_string(addr_tree, hf_eth_addr_resolved, tvb, 6, 6, src_addr_name); - PROTO_ITEM_SET_GENERATED(addr_item); - PROTO_ITEM_SET_HIDDEN(addr_item); + proto_item_set_generated(addr_item); + proto_item_set_hidden(addr_item); proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 6, 3, ENC_BIG_ENDIAN); proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 6, 3, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-etv.c b/epan/dissectors/packet-etv.c index 9d7491083c..e5edf1e4ab 100644 --- a/epan/dissectors/packet-etv.c +++ b/epan/dissectors/packet-etv.c @@ -71,7 +71,7 @@ dissect_etv_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int prot proto_item *msg_error; msg_error = items[PACKET_MPEG_SECT_PI__SSI]; - PROTO_ITEM_SET_GENERATED(msg_error); + proto_item_set_generated(msg_error); expert_add_info(pinfo, msg_error, ei_section_syntax_indicator); } @@ -79,7 +79,7 @@ dissect_etv_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int prot proto_item *msg_error; msg_error = items[PACKET_MPEG_SECT_PI__RESERVED]; - PROTO_ITEM_SET_GENERATED(msg_error); + proto_item_set_generated(msg_error); expert_add_info(pinfo, msg_error, ei_reserved); } @@ -89,7 +89,7 @@ dissect_etv_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int prot proto_item *msg_error; msg_error = items[PACKET_MPEG_SECT_PI__LENGTH]; - PROTO_ITEM_SET_GENERATED(msg_error); + proto_item_set_generated(msg_error); expert_add_info(pinfo, msg_error, ei_section_length); } diff --git a/epan/dissectors/packet-evs.c b/epan/dissectors/packet-evs.c index b8dbb5b0be..957a01d2ea 100644 --- a/epan/dissectors/packet-evs.c +++ b/epan/dissectors/packet-evs.c @@ -547,7 +547,7 @@ dissect_evs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if (str) { /* A.2.1 EVS codec Compact Format */ proto_tree_add_subtree(evs_tree, tvb, offset, -1, ett_evs_header, &ti, "Framing Mode: Compact"); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* One of the protected payload sizes, no further dissection currently. XXX add handling of "Special case"*/ col_append_fstr(pinfo->cinfo, COL_INFO, ", %s ", str); @@ -643,7 +643,7 @@ dissect_evs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) /* A.2.2 EVS codec Header-Full format */ proto_tree_add_subtree(evs_tree, tvb, offset, -1, ett_evs_header, &ti, "Framing Mode: Header-full"); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /*proto_tree_add_int_format(evs_tree, hf_evs_packet_length, tvb, offset, 1, packet_len * 8, "packet_len %i bits", packet_len * 8);*/ oct = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-exported_pdu.c b/epan/dissectors/packet-exported_pdu.c index e3de07157a..b899852a81 100644 --- a/epan/dissectors/packet-exported_pdu.c +++ b/epan/dissectors/packet-exported_pdu.c @@ -215,9 +215,9 @@ dissect_exported_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* proto_tree_add_item(tag_tree, hf_exported_pdu_ipv4_src, tvb, offset, 4, ENC_BIG_ENDIAN); /* You can filter on IP by right clicking the Source/Destination columns make that work by filling the IP hf:s*/ item = proto_tree_add_item(tag_tree, hf_ip_addr, tvb, offset, 4, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_item(tag_tree, hf_ip_src, tvb, offset, 4, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); set_address_tvb(&pinfo->net_src, AT_IPv4, 4, tvb, offset); copy_address_shallow(&pinfo->src, &pinfo->net_src); @@ -226,9 +226,9 @@ dissect_exported_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* proto_tree_add_item(tag_tree, hf_exported_pdu_ipv4_dst, tvb, offset, 4, ENC_BIG_ENDIAN); /* You can filter on IP by right clicking the Source/Destination columns make that work by filling the IP hf:s*/ item = proto_tree_add_item(tag_tree, hf_ip_addr, tvb, offset, 4, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_item(tag_tree, hf_ip_dst, tvb, offset, 4, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); set_address_tvb(&pinfo->net_dst, AT_IPv4, 4, tvb, offset); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); break; @@ -236,9 +236,9 @@ dissect_exported_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* proto_tree_add_item(tag_tree, hf_exported_pdu_ipv6_src, tvb, offset, 16, ENC_NA); /* You can filter on IP by right clicking the Source/Destination columns make that work by filling the IP hf:s*/ item = proto_tree_add_item(tag_tree, hf_ipv6_addr, tvb, offset, 16, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_item(tag_tree, hf_ipv6_src, tvb, offset, 16, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); set_address_tvb(&pinfo->net_src, AT_IPv6, 16, tvb, offset); copy_address_shallow(&pinfo->src, &pinfo->net_src); break; @@ -246,9 +246,9 @@ dissect_exported_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* proto_tree_add_item(tag_tree, hf_exported_pdu_ipv6_dst, tvb, offset, 16, ENC_NA); /* You can filter on IP by right clicking the Source/Destination columns make that work by filling the IP hf:s*/ item = proto_tree_add_item(tag_tree, hf_ipv6_addr, tvb, offset, 16, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_item(tag_tree, hf_ipv6_dst, tvb, offset, 16, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); set_address_tvb(&pinfo->net_dst, AT_IPv6, 16, tvb, offset); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); break; diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c index 9e844fc6db..e213fc7860 100644 --- a/epan/dissectors/packet-f5ethtrailer.c +++ b/epan/dissectors/packet-f5ethtrailer.c @@ -1362,7 +1362,7 @@ static void render_analysis( return; pi = proto_tree_add_item(tree, hf_analysis, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); if(ad->analysis_flowreuse) { expert_add_info(pinfo, pi, &ei_f5eth_flowreuse); } @@ -1523,7 +1523,7 @@ static proto_item *displayIPv6as4( if(tvb_memeql(tvb, offset, ipv4as6prefix, sizeof(ipv4as6prefix)) == 0) { if(addrfield >= 0) { pi = proto_tree_add_item(tree, addrfield, tvb, offset+(int)sizeof(ipv4as6prefix), 4, ENC_BIG_ENDIAN); - if(hidden) PROTO_ITEM_SET_HIDDEN(pi); + if(hidden) proto_item_set_hidden(pi); } } else if(tvb_memeql(tvb, offset, f5rtdomprefix, sizeof(f5rtdomprefix)) == 0) { /* Route domain information may show up here if the traffic is between tmm and the BIG-IP @@ -1535,11 +1535,11 @@ static proto_item *displayIPv6as4( * particular ordering is used (and none of the callers currently use the return value). */ if(addrfield >= 0) { pi = proto_tree_add_item(tree, addrfield, tvb, offset+(int)sizeof(f5rtdomprefix)+2, 4, ENC_BIG_ENDIAN); - if(hidden) PROTO_ITEM_SET_HIDDEN(pi); + if(hidden) proto_item_set_hidden(pi); } if(rtdomfield >= 0) { pi = proto_tree_add_item(tree, rtdomfield, tvb, offset+(int)sizeof(f5rtdomprefix), 2, ENC_BIG_ENDIAN); - if(hidden) PROTO_ITEM_SET_HIDDEN(pi); + if(hidden) proto_item_set_hidden(pi); } } @@ -1600,14 +1600,14 @@ dissect_high_trailer( if(pop_other_fields) { displayIPv6as4(tree, hf_ip_ipaddr, -1, tvb, o, TRUE); pi = proto_tree_add_item(tree, hf_ip6_ip6addr, tvb, o, 16, ENC_NA); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); } #endif displayIPv6as4(tree, hf_peer_remote_addr, hf_peer_remote_rtdom, tvb, o, FALSE); displayIPv6as4(tree, hf_peer_ipaddr, hf_peer_rtdom, tvb, o, TRUE); proto_tree_add_item(tree, hf_peer_remote_ip6addr, tvb, o, 16, ENC_NA); pi = proto_tree_add_item(tree, hf_peer_ip6addr, tvb, o, 16, ENC_NA); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); o += 16; /* peer local address */ @@ -1615,14 +1615,14 @@ dissect_high_trailer( if(pop_other_fields) { displayIPv6as4(tree, hf_ip_ipaddr, -1, tvb, o, TRUE); pi = proto_tree_add_item(tree, hf_ip6_ip6addr, tvb, o, 16, ENC_NA); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); } #endif displayIPv6as4(tree, hf_peer_local_addr, hf_peer_local_rtdom, tvb, o, FALSE); displayIPv6as4(tree, hf_peer_ipaddr, hf_peer_rtdom, tvb, o, TRUE); proto_tree_add_item(tree, hf_peer_local_ip6addr, tvb, o, 16, ENC_NA); pi = proto_tree_add_item(tree, hf_peer_ip6addr, tvb, o, 16, ENC_NA); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); o += 16; #ifdef F5_POP_OTHERFIELDS @@ -1640,18 +1640,18 @@ dissect_high_trailer( { case IP_PROTO_TCP: pi = proto_tree_add_item(tree, hf_tcp_tcpport, tvb, o, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); break; case IP_PROTO_UDP: pi = proto_tree_add_item(tree, hf_udp_udpport, tvb, o, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); break; } } #endif proto_tree_add_item(tree, hf_peer_remote_port, tvb, o, 2, ENC_BIG_ENDIAN); pi = proto_tree_add_item(tree, hf_peer_port, tvb, o, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); o += 2; /* peer remote port */ @@ -1661,18 +1661,18 @@ dissect_high_trailer( { case IP_PROTO_TCP: pi = proto_tree_add_item(tree, hf_tcp_tcpport, tvb, o, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); break; case IP_PROTO_UDP: pi = proto_tree_add_item(tree, hf_udp_udpport, tvb, o, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); break; } } #endif proto_tree_add_item(tree, hf_peer_local_port, tvb, o, 2, ENC_BIG_ENDIAN); pi = proto_tree_add_item(tree, hf_peer_port, tvb, o, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); return(trailer_length); } /* dissect_high_trailer() */ @@ -1785,24 +1785,24 @@ dissect_med_trailer( tdata->flow = tvb_get_ntohl(tvb,o); proto_tree_add_item(tree, hf_flow_id, tvb, o, 4, ENC_BIG_ENDIAN); pi = proto_tree_add_item(tree, hf_any_flow, tvb, o, 4, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); o += 4; tdata->peer_flow = tvb_get_ntohl(tvb,o); proto_tree_add_item(tree, hf_peer_id, tvb, o, 4, ENC_BIG_ENDIAN); pi = proto_tree_add_item(tree, hf_any_flow, tvb, o, 4, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); o += 4; } else { /* After v10, flowIDs are 64bit */ tdata->flow = tvb_get_ntoh64(tvb,o); proto_tree_add_item(tree, hf_flow_id, tvb, o, 8, ENC_BIG_ENDIAN); pi = proto_tree_add_item(tree, hf_any_flow, tvb, o, 8, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); o += 8; tdata->peer_flow = tvb_get_ntoh64(tvb,o); proto_tree_add_item(tree, hf_peer_id, tvb, o, 8, ENC_BIG_ENDIAN); pi = proto_tree_add_item(tree, hf_any_flow, tvb, o, 8, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); o += 8; } tdata->flows_set = 1; @@ -2000,12 +2000,12 @@ dissect_low_trailer( tdata->flow = tvb_get_ntohl(tvb,o); proto_tree_add_item(tree, hf_flow_id, tvb, o, 4, ENC_BIG_ENDIAN); pi = proto_tree_add_item(tree, hf_any_flow, tvb, o, 4, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); o += 4; tdata->peer_flow = tvb_get_ntohl(tvb,o); proto_tree_add_item(tree, hf_peer_id, tvb, o, 4, ENC_BIG_ENDIAN); pi = proto_tree_add_item(tree, hf_any_flow, tvb, o, 4, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); o += 4; tdata->flows_set = 1; proto_tree_add_item(tree, hf_cf_flags, tvb, o, 4, ENC_BIG_ENDIAN); @@ -2020,7 +2020,7 @@ dissect_low_trailer( if(trailer_ver == 1) { pi = proto_tree_add_item(tree, hf_vipnamelen, tvb, o, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); o += 1; } proto_tree_add_item(tree, hf_vip, tvb, o, vipnamelen, ENC_ASCII|ENC_NA); @@ -2112,14 +2112,14 @@ dissect_dpt_trailer_noise_high( if(pop_other_fields) { displayIPv6as4(tree, hf_ip_ipaddr, -1, tvb, o, TRUE); pi = proto_tree_add_item(tree, hf_ip6_ip6addr, tvb, o, 16, ENC_NA); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); } #endif displayIPv6as4(tree, hf_peer_remote_addr, hf_peer_remote_rtdom, tvb, o, FALSE); displayIPv6as4(tree, hf_peer_ipaddr, hf_peer_rtdom, tvb, o, TRUE); proto_tree_add_item(tree, hf_peer_remote_ip6addr, tvb, o, 16, ENC_NA); pi = proto_tree_add_item(tree, hf_peer_ip6addr, tvb, o, 16, ENC_NA); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); o += 16; /* peer local address */ @@ -2127,14 +2127,14 @@ dissect_dpt_trailer_noise_high( if(pop_other_fields) { displayIPv6as4(tree, hf_ip_ipaddr, -1, tvb, o, TRUE); pi = proto_tree_add_item(tree, hf_ip6_ip6addr, tvb, o, 16, ENC_NA); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); } #endif displayIPv6as4(tree, hf_peer_local_addr, hf_peer_local_rtdom, tvb, o, FALSE); displayIPv6as4(tree, hf_peer_ipaddr, hf_peer_rtdom, tvb, o, TRUE); proto_tree_add_item(tree, hf_peer_local_ip6addr, tvb, o, 16, ENC_NA); pi = proto_tree_add_item(tree, hf_peer_ip6addr, tvb, o, 16, ENC_NA); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); o += 16; /* peer remote port */ @@ -2144,18 +2144,18 @@ dissect_dpt_trailer_noise_high( { case IP_PROTO_TCP: pi = proto_tree_add_item(tree, hf_tcp_tcpport, tvb, o, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); break; case IP_PROTO_UDP: pi = proto_tree_add_item(tree, hf_udp_udpport, tvb, o, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); break; } } #endif proto_tree_add_item(tree, hf_peer_remote_port, tvb, o, 2, ENC_BIG_ENDIAN); pi = proto_tree_add_item(tree, hf_peer_port, tvb, o, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); o += 2; /* peer remote port */ @@ -2165,18 +2165,18 @@ dissect_dpt_trailer_noise_high( { case IP_PROTO_TCP: pi = proto_tree_add_item(tree, hf_tcp_tcpport, tvb, o, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); break; case IP_PROTO_UDP: pi = proto_tree_add_item(tree, hf_udp_udpport, tvb, o, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); break; } } #endif proto_tree_add_item(tree, hf_peer_local_port, tvb, o, 2, ENC_BIG_ENDIAN); pi = proto_tree_add_item(tree, hf_peer_port, tvb, o, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); return(len); } /* dissect_dpt_trailer_noise_high() */ @@ -2250,12 +2250,12 @@ dissect_dpt_trailer_noise_med( tdata->flow = tvb_get_ntoh64(tvb,o); proto_tree_add_item(tree, hf_flow_id, tvb, o, 8, ENC_BIG_ENDIAN); pi = proto_tree_add_item(tree, hf_any_flow, tvb, o, 8, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); o += 8; tdata->peer_flow = tvb_get_ntoh64(tvb,o); proto_tree_add_item(tree, hf_peer_id, tvb, o, 8, ENC_BIG_ENDIAN); pi = proto_tree_add_item(tree, hf_any_flow, tvb, o, 8, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); o += 8; tdata->flows_set = 1; proto_tree_add_item(tree, hf_cf_flags2, tvb, o, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-fbzero.c b/epan/dissectors/packet-fbzero.c index 4bcfa4f6cc..16ffb63cf1 100644 --- a/epan/dissectors/packet-fbzero.c +++ b/epan/dissectors/packet-fbzero.c @@ -181,7 +181,7 @@ dissect_fb_zero_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *fb_zero_tree, total_tag_len += tag_len; ti_len = proto_tree_add_uint(tag_tree, hf_fb_zero_tag_length, tvb, offset, 4, tag_len); proto_item_append_text(ti_tag, " (l=%u)", tag_len); - PROTO_ITEM_SET_GENERATED(ti_len); + proto_item_set_generated(ti_len); offset += 4; /* Fix issue with CRT.. (Fragmentation ?) */ diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 95cea82d5a..aec8c2e916 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -886,13 +886,13 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean hidden_item = proto_tree_add_uint (fc_tree, hf_fc_ftype, tvb, offset, 1, ftype); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* XXX - use "fc_wka_vals[]" on this? */ set_address(&addr, AT_FC, 3, fchdr->d_id.data); proto_tree_add_item(fc_tree, hf_fc_did, tvb, offset+1, 3, ENC_NA); hidden_item = proto_tree_add_item (fc_tree, hf_fc_id, tvb, offset+1, 3, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_uint (fc_tree, hf_fc_csctl, tvb, offset+4, 1, fchdr->cs_ctl); @@ -900,7 +900,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean set_address(&addr, AT_FC, 3, fchdr->s_id.data); proto_tree_add_item(fc_tree, hf_fc_sid, tvb, offset+5, 3, ENC_NA); hidden_item = proto_tree_add_item (fc_tree, hf_fc_id, tvb, offset+5, 3, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); if (ftype == FC_FTYPE_LINKCTL) { if (((fchdr->r_ctl & 0x0F) == FC_LCTL_FBSYB) || @@ -1105,12 +1105,12 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean hidden_item = proto_tree_add_boolean (fc_tree, hf_fc_reassembled, tvb, offset+9, 1, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } else { hidden_item = proto_tree_add_boolean (fc_tree, hf_fc_reassembled, tvb, offset+9, 1, 0); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); next_tvb = tvb_new_subset_remaining (tvb, next_offset); call_data_dissector(next_tvb, pinfo, tree); return; @@ -1119,7 +1119,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean } else { hidden_item = proto_tree_add_boolean (fc_tree, hf_fc_reassembled, tvb, offset+9, 1, 0); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); next_tvb = tvb_new_subset_remaining (tvb, next_offset); } @@ -1187,18 +1187,18 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean if(!(fchdr->fctl&FC_FCTL_EXCHANGE_FIRST)){ proto_item *it; it=proto_tree_add_uint(fc_tree, hf_fc_exchange_first_frame, tvb, 0, 0, fc_ex->first_exchange_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); if(fchdr->fctl&FC_FCTL_EXCHANGE_LAST){ nstime_t delta_ts; nstime_delta(&delta_ts, &pinfo->abs_ts, &fc_ex->fc_time); it=proto_tree_add_time(ti, hf_fc_time, tvb, 0, 0, &delta_ts); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } if(!(fchdr->fctl&FC_FCTL_EXCHANGE_LAST)){ proto_item *it; it=proto_tree_add_uint(fc_tree, hf_fc_exchange_last_frame, tvb, 0, 0, fc_ex->last_exchange_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } tap_queue_packet(fc_tap, pinfo, fchdr); diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index 30e52cfc41..6b7d335ccd 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.c @@ -679,16 +679,16 @@ dissect_fcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) (request_data != NULL) && (request_data->itlq->first_exchange_frame)) { proto_item *it; it = proto_tree_add_uint(fcp_tree, hf_fcp_singlelun, tvb, 0, 0, proto_data->lun); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); if (request_data != NULL) { it = proto_tree_add_uint(fcp_tree, hf_fcp_request_in, tvb, 0, 0, request_data->request_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); /* only put the response time in the actual response frame */ if (r_ctl == FCP_IU_RSP) { nstime_t delta_ts; nstime_delta(&delta_ts, &pinfo->abs_ts, &request_data->request_time); it = proto_tree_add_time(ti, hf_fcp_time, tvb, 0, 0, &delta_ts); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } } @@ -697,7 +697,7 @@ dissect_fcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) (request_data != NULL) && (request_data->response_frame)) { proto_item *it; it = proto_tree_add_uint(fcp_tree, hf_fcp_response_in, tvb, 0, 0, request_data->response_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } if (els) { diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c index fd79f479b3..2241652a25 100644 --- a/epan/dissectors/packet-fddi.c +++ b/epan/dissectors/packet-fddi.c @@ -367,13 +367,13 @@ dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (fh_tree) { proto_tree_add_ether(fh_tree, hf_fddi_dst, tvb, FDDI_P_DHOST + FDDI_PADDING, 6, dst); hidden_item = proto_tree_add_ether(fh_tree, hf_fddi_addr, tvb, FDDI_P_DHOST + FDDI_PADDING, 6, dst); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* hide some bit-swapped mac address fields in the proto_tree, just in case */ hidden_item = proto_tree_add_ether(fh_tree, hf_fddi_dst, tvb, FDDI_P_DHOST + FDDI_PADDING, 6, dst_swapped); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_ether(fh_tree, hf_fddi_addr, tvb, FDDI_P_DHOST + FDDI_PADDING, 6, dst_swapped); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } /* Extract the source address, possibly bit-swapping it. */ @@ -390,13 +390,13 @@ dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (fh_tree) { proto_tree_add_ether(fh_tree, hf_fddi_src, tvb, FDDI_P_SHOST + FDDI_PADDING, 6, src); hidden_item = proto_tree_add_ether(fh_tree, hf_fddi_addr, tvb, FDDI_P_SHOST + FDDI_PADDING, 6, src); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* hide some bit-swapped mac address fields in the proto_tree, just in case */ hidden_item = proto_tree_add_ether(fh_tree, hf_fddi_src, tvb, FDDI_P_SHOST + FDDI_PADDING, 6, src_swapped); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_ether(fh_tree, hf_fddi_addr, tvb, FDDI_P_SHOST + FDDI_PADDING, 6, src_swapped); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } next_tvb = tvb_new_subset_remaining(tvb, FDDI_HEADER_SIZE + FDDI_PADDING); diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c index 31c5770fc1..b10f0ab238 100644 --- a/epan/dissectors/packet-ff.c +++ b/epan/dissectors/packet-ff.c @@ -8693,13 +8693,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FDA_MSG_SESSION_OPEN_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fda, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fda_open_sess, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fda_open_sess_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fda_open_sess_req(tvb, offset, length, pinfo, tree); @@ -8708,13 +8708,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FDA_MSG_SESSION_OPEN_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fda, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fda_open_sess, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fda_open_sess_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fda_open_sess_rsp(tvb, offset, length, pinfo, tree); @@ -8723,13 +8723,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FDA_MSG_SESSION_OPEN_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fda, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fda_open_sess, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fda_open_sess_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fda_open_sess_err(tvb, offset, length, pinfo, tree); @@ -8738,13 +8738,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FDA_MSG_SESSION_IDLE_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fda, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fda_idle, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fda_idle_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fda_idle_req(tvb, offset, length, pinfo, tree); @@ -8753,13 +8753,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FDA_MSG_SESSION_IDLE_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fda, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fda_idle, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fda_idle_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fda_idle_rsp(tvb, offset, length, pinfo, tree); @@ -8768,13 +8768,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FDA_MSG_SESSION_IDLE_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fda, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fda_idle, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fda_idle_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fda_idle_err(tvb, offset, length, pinfo, tree); @@ -8783,13 +8783,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case SM_MSG_FIND_TAG_QUERY_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_sm, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_find_tag_query, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_find_tag_query_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_sm_find_tag_query_req(tvb, offset, length, pinfo, tree); @@ -8798,13 +8798,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case SM_MSG_FIND_TAG_REPLY_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_sm, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_find_tag_reply, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_find_tag_reply_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_sm_find_tag_reply_req(tvb, offset, length, pinfo, tree); @@ -8813,13 +8813,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case SM_MSG_IDENTIFY_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_sm, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_id, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_id_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_sm_id_req(tvb, offset, length, pinfo, tree); @@ -8828,13 +8828,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case SM_MSG_IDENTIFY_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_sm, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_id, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_id_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_sm_id_rsp(tvb, offset, length, pinfo, tree, FDAAddress); @@ -8843,13 +8843,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case SM_MSG_IDENTIFY_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_sm, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_id, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_id_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_sm_id_err(tvb, offset, length, pinfo, tree); @@ -8858,13 +8858,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case SM_MSG_CLEAR_ADDRESS_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_sm, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_clear_addr, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_clear_addr_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_sm_clear_addr_req(tvb, offset, length, pinfo, tree); @@ -8873,13 +8873,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case SM_MSG_CLEAR_ADDRESS_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_sm, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_clear_addr, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_clear_addr_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_sm_clear_addr_rsp(tvb, offset, length, pinfo, tree); @@ -8888,13 +8888,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case SM_MSG_CLEAR_ADDRESS_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_sm, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_clear_addr, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_clear_addr_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_sm_clear_addr_err(tvb, offset, length, pinfo, tree); @@ -8903,13 +8903,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case SM_MSG_SET_ASSIGNMENT_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_sm, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_set_assign_info, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_set_assign_info_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_sm_set_assign_info_req(tvb, offset, length, pinfo, tree); @@ -8918,13 +8918,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case SM_MSG_SET_ASSIGNMENT_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_sm, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_set_assign_info, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_set_assign_info_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_sm_set_assign_info_rsp(tvb, offset, length, pinfo, tree); @@ -8933,13 +8933,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case SM_MSG_SET_ASSIGNMENT_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_sm, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_set_assign_info, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_set_assign_info_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_sm_set_assign_info_err(tvb, offset, length, pinfo, tree); @@ -8948,13 +8948,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case SM_MSG_CLEAR_ASSIGNMENT_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_sm, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_clear_assign_info, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_clear_assign_info_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_sm_clear_assign_info_req(tvb, offset, length, pinfo, tree); @@ -8963,13 +8963,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case SM_MSG_CLEAR_ASSIGNMENT_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_sm, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_clear_assign_info, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_clear_assign_info_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_sm_clear_assign_info_rsp(tvb, offset, length, pinfo, tree); @@ -8978,13 +8978,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case SM_MSG_CLEAR_ASSIGNMENT_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_sm, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_clear_assign_info, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_clear_assign_info_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_sm_clear_assign_info_err(tvb, offset, length, pinfo, tree); @@ -8993,13 +8993,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case SM_MSG_DEVICE_ANNUNCIATION_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_sm, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_dev_annunc, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_sm_dev_annunc_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_sm_dev_annunc_req(tvb, offset, length, pinfo, tree, FDAAddress); @@ -9008,13 +9008,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_INITIATE_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_init_req(tvb, offset, length, pinfo, tree); @@ -9023,13 +9023,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_INITIATE_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_init_rsp(tvb, offset, length, pinfo, tree); @@ -9038,13 +9038,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_INITIATE_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_init_err(tvb, offset, length, pinfo, tree); @@ -9053,13 +9053,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_ABORT_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_abort, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_abort_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_abort_req(tvb, offset, length, pinfo, tree); @@ -9068,13 +9068,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_STATUS_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_status, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_status_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_status_req(tvb, offset, length, pinfo, tree); @@ -9083,13 +9083,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_STATUS_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_status, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_status_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_status_rsp(tvb, offset, length, pinfo, tree); @@ -9098,13 +9098,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_STATUS_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_status, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_status_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_status_err(tvb, offset, length, pinfo, tree); @@ -9113,13 +9113,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_UNSOLICITED_STATUS_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_unsolicited_status, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_unsolicited_status_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_unsolicited_status_req(tvb, offset, length, pinfo, tree); @@ -9128,13 +9128,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_IDENTIFY_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_id, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_id_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_id_req(tvb, offset, length, pinfo, tree); @@ -9143,13 +9143,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_IDENTIFY_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_id, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_id_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_id_rsp(tvb, offset, length, pinfo, tree); @@ -9158,13 +9158,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_IDENTIFY_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_id, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_id_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_id_err(tvb, offset, length, pinfo, tree); @@ -9173,13 +9173,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_GET_OD_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_get_od, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_get_od_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_get_od_req(tvb, offset, length, pinfo, tree); @@ -9188,13 +9188,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_GET_OD_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_get_od, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_get_od_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_get_od_rsp(tvb, offset, length, pinfo, tree); @@ -9203,13 +9203,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_GET_OD_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_get_od, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_get_od_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_get_od_err(tvb, offset, length, pinfo, tree); @@ -9218,13 +9218,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_INITIATE_PUT_OD_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_put_od, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_put_od_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_init_put_od_req(tvb, offset, length, pinfo, tree); @@ -9233,13 +9233,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_INITIATE_PUT_OD_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_put_od, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_put_od_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_init_put_od_rsp(tvb, offset, length, pinfo, tree); @@ -9248,13 +9248,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_INITIATE_PUT_OD_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_put_od, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_put_od_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_init_put_od_err(tvb, offset, length, pinfo, tree); @@ -9263,13 +9263,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_PUT_OD_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_put_od, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_put_od_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_put_od_req(tvb, offset, length, pinfo, tree); @@ -9278,13 +9278,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_PUT_OD_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_put_od, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_put_od_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_put_od_rsp(tvb, offset, length, pinfo, tree); @@ -9293,13 +9293,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_PUT_OD_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_put_od, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_put_od_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_put_od_err(tvb, offset, length, pinfo, tree); @@ -9308,13 +9308,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_TERMINATE_PUT_OD_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_terminate_put_od, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_terminate_put_od_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_terminate_put_od_req(tvb, offset, length, pinfo, tree); @@ -9323,13 +9323,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_TERMINATE_PUT_OD_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_terminate_put_od, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_terminate_put_od_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_terminate_put_od_rsp(tvb, offset, length, pinfo, tree); @@ -9338,13 +9338,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_TERMINATE_PUT_OD_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_terminate_put_od, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_terminate_put_od_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_terminate_put_od_err(tvb, offset, length, pinfo, tree); @@ -9353,13 +9353,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_GENERIC_INITIATE_DOWNLOAD_SEQUENCE_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_gen_init_download_seq, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_gen_init_download_seq_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_generic_init_download_sequence_req( tvb, offset, length, pinfo, tree); @@ -9368,13 +9368,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_GENERIC_INITIATE_DOWNLOAD_SEQUENCE_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_gen_init_download_seq, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_gen_init_download_seq_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_generic_init_download_sequence_rsp( tvb, offset, length, pinfo, tree); @@ -9383,13 +9383,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_GENERIC_INITIATE_DOWNLOAD_SEQUENCE_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_gen_init_download_seq, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_gen_init_download_seq_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_generic_init_download_sequence_err( tvb, offset, length, pinfo, tree); @@ -9398,13 +9398,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_GENERIC_DOWNLOAD_SEGMENT_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_gen_download_seg, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_gen_download_seg_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_generic_download_segment_req(tvb, offset, length, pinfo, tree); @@ -9413,13 +9413,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_GENERIC_DOWNLOAD_SEGMENT_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_gen_download_seg, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_gen_download_seg_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_generic_download_segment_rsp(tvb, offset, length, pinfo, tree); @@ -9428,13 +9428,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_GENERIC_DOWNLOAD_SEGMENT_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_gen_download_seg, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_gen_download_seg_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_generic_download_segment_err(tvb, offset, length, pinfo, tree); @@ -9443,13 +9443,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_GENERIC_TERMINATE_DOWNLOAD_SEQUENCE_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_gen_terminate_download_seq, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_gen_terminate_download_seq_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_generic_terminate_download_sequence_req( tvb, offset, length, pinfo, tree); @@ -9458,13 +9458,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_GENERIC_TERMINATE_DOWNLOAD_SEQUENCE_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_gen_terminate_download_seq, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_gen_terminate_download_seq_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_generic_terminate_download_sequence_rsp( tvb, offset, length, pinfo, tree); @@ -9473,13 +9473,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_GENERIC_TERMINATE_DOWNLOAD_SEQUENCE_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_gen_terminate_download_seq, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_gen_terminate_download_seq_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_generic_terminate_download_sequence_err( tvb, offset, length, pinfo, tree); @@ -9488,13 +9488,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_INITIATE_DOWNLOAD_SEQUENCE_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_download_seq, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_download_seq_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_init_download_sequence_req(tvb, offset, length, pinfo, tree); @@ -9503,13 +9503,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_INITIATE_DOWNLOAD_SEQUENCE_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_download_seq, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_download_seq_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_init_download_sequence_rsp(tvb, offset, length, pinfo, tree); @@ -9518,13 +9518,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_INITIATE_DOWNLOAD_SEQUENCE_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_download_seq, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_download_seq_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_init_download_sequence_err(tvb, offset, length, pinfo, tree); @@ -9533,13 +9533,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_DOWNLOAD_SEGMENT_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_download_seg, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_download_seg_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_download_segment_req(tvb, offset, length, pinfo, tree); @@ -9548,13 +9548,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_DOWNLOAD_SEGMENT_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_download_seg, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_download_seg_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_download_segment_rsp(tvb, offset, length, pinfo, tree); @@ -9563,13 +9563,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_DOWNLOAD_SEGMENT_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_download_seg, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_download_seg_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_download_segment_err(tvb, offset, length, pinfo, tree); @@ -9578,13 +9578,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_TERMINATE_DOWNLOAD_SEQUENCE_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_terminate_download_seq, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_terminate_download_seq_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_terminate_download_sequence_req(tvb, offset, length, pinfo, tree); @@ -9593,13 +9593,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_TERMINATE_DOWNLOAD_SEQUENCE_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_terminate_download_seq, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_terminate_download_seq_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_terminate_download_sequence_rsp(tvb, offset, length, pinfo, tree); @@ -9608,13 +9608,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_TERMINATE_DOWNLOAD_SEQUENCE_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_terminate_download_seq, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_terminate_download_seq_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_terminate_download_sequence_err(tvb, offset, length, pinfo, tree); @@ -9623,13 +9623,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_INITIATE_UPLOAD_SEQUENCE_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_upload_seq, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_upload_seq_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_init_upload_seq_req(tvb, offset, length, pinfo, tree); @@ -9638,13 +9638,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_INITIATE_UPLOAD_SEQUENCE_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_upload_seq, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_upload_seq_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_init_upload_seq_rsp(tvb, offset, length, pinfo, tree); @@ -9653,13 +9653,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_INITIATE_UPLOAD_SEQUENCE_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_upload_seq, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_init_upload_seq_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_init_upload_seq_err(tvb, offset, length, pinfo, tree); @@ -9668,13 +9668,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_UPLOAD_SEGMENT_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_upload_seg, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_upload_seg_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_upload_segment_req(tvb, offset, length, pinfo, tree); @@ -9683,13 +9683,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_UPLOAD_SEGMENT_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_upload_seg, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_upload_seg_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_upload_segment_rsp(tvb, offset, length, pinfo, tree); @@ -9698,13 +9698,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_UPLOAD_SEGMENT_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_upload_seg, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_upload_seg_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_upload_segment_err(tvb, offset, length, pinfo, tree); @@ -9713,13 +9713,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_TERMINATE_UPLOAD_SEQUENCE_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_terminate_upload_seq, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_terminate_upload_seq_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_terminate_upload_seq_req(tvb, offset, length, pinfo, tree); @@ -9728,13 +9728,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_TERMINATE_UPLOAD_SEQUENCE_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_terminate_upload_seq, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_terminate_upload_seq_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_terminate_upload_seq_rsp(tvb, offset, length, pinfo, tree); @@ -9743,13 +9743,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_TERMINATE_UPLOAD_SEQUENCE_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_terminate_upload_seq, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_terminate_upload_seq_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_terminate_upload_seq_err(tvb, offset, length, pinfo, tree); @@ -9758,13 +9758,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_REQUEST_DOMAIN_DOWNLOAD_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_req_dom_download, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_req_dom_download_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_req_dom_download_req(tvb, offset, length, pinfo, tree); @@ -9773,13 +9773,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_REQUEST_DOMAIN_DOWNLOAD_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_req_dom_download, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_req_dom_download_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_req_dom_download_rsp(tvb, offset, length, pinfo, tree); @@ -9788,13 +9788,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_REQUEST_DOMAIN_DOWNLOAD_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_req_dom_download, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_req_dom_download_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_req_dom_download_err(tvb, offset, length, pinfo, tree); @@ -9803,13 +9803,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_REQUEST_DOMAIN_UPLOAD_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_req_dom_upload, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_req_dom_upload_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_req_dom_upload_req(tvb, offset, length, pinfo, tree); @@ -9818,13 +9818,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_REQUEST_DOMAIN_UPLOAD_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_req_dom_upload, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_req_dom_upload_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_req_dom_upload_rsp(tvb, offset, length, pinfo, tree); @@ -9833,13 +9833,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_REQUEST_DOMAIN_UPLOAD_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_req_dom_upload, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_req_dom_upload_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_req_dom_upload_err(tvb, offset, length, pinfo, tree); @@ -9848,13 +9848,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_CREATE_PI_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_create_pi, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_create_pi_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_create_pi_req(tvb, offset, length, pinfo, tree); @@ -9863,13 +9863,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_CREATE_PI_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_create_pi, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_create_pi_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_create_pi_rsp(tvb, offset, length, pinfo, tree); @@ -9878,13 +9878,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_CREATE_PI_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_create_pi, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_create_pi_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_create_pi_err(tvb, offset, length, pinfo, tree); @@ -9893,13 +9893,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_DELETE_PI_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_del_pi, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_del_pi_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_del_pi_req(tvb, offset, length, pinfo, tree); @@ -9908,13 +9908,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_DELETE_PI_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_del_pi, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_del_pi_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_del_pi_rsp(tvb, offset, length, pinfo, tree); @@ -9923,13 +9923,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_DELETE_PI_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_del_pi, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_del_pi_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_del_pi_err(tvb, offset, length, pinfo, tree); @@ -9938,13 +9938,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_START_PI_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_start, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_start_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_start_pi_req(tvb, offset, length, pinfo, tree); @@ -9953,13 +9953,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_START_PI_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_start, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_start_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_start_pi_rsp(tvb, offset, length, pinfo, tree); @@ -9968,13 +9968,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_START_PI_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_start, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_start_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_start_pi_err(tvb, offset, length, pinfo, tree); @@ -9983,13 +9983,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_STOP_PI_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_stop, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_stop_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_stop_pi_req(tvb, offset, length, pinfo, tree); @@ -9998,13 +9998,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_STOP_PI_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_stop, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_stop_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_stop_pi_rsp(tvb, offset, length, pinfo, tree); @@ -10013,13 +10013,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_STOP_PI_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_stop, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_stop_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_stop_pi_err(tvb, offset, length, pinfo, tree); @@ -10028,13 +10028,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_RESUME_PI_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_resume, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_resume_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_resume_pi_req(tvb, offset, length, pinfo, tree); @@ -10043,13 +10043,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_RESUME_PI_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_resume, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_resume_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_resume_pi_rsp(tvb, offset, length, pinfo, tree); @@ -10058,13 +10058,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_RESUME_PI_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_resume, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_resume_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_resume_pi_err(tvb, offset, length, pinfo, tree); @@ -10073,13 +10073,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_RESET_PI_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_reset, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_reset_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_reset_pi_req(tvb, offset, length, pinfo, tree); @@ -10088,13 +10088,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_RESET_PI_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_reset, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_reset_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_reset_pi_rsp(tvb, offset, length, pinfo, tree); @@ -10103,13 +10103,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_RESET_PI_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_reset, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_reset_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_reset_pi_err(tvb, offset, length, pinfo, tree); @@ -10118,13 +10118,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_KILL_PI_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_kill, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_kill_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_kill_pi_req(tvb, offset, length, pinfo, tree); @@ -10133,13 +10133,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_KILL_PI_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_kill, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_kill_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_kill_pi_rsp(tvb, offset, length, pinfo, tree); @@ -10148,13 +10148,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_KILL_PI_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_kill, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_kill_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_kill_pi_err(tvb, offset, length, pinfo, tree); @@ -10163,13 +10163,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_READ_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_read, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_read_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_read_req(tvb, offset, length, pinfo, tree); @@ -10178,13 +10178,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_READ_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_read, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_read_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_read_rsp(tvb, offset, length, pinfo, tree); @@ -10193,13 +10193,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_READ_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_read, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_read_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_read_err(tvb, offset, length, pinfo, tree); @@ -10208,13 +10208,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_READ_SUBINDEX_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_read_with_subidx, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_read_with_subidx_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_read_subindex_req(tvb, offset, length, pinfo, tree); @@ -10223,13 +10223,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_READ_SUBINDEX_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_read_with_subidx, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_read_with_subidx_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_read_subindex_rsp(tvb, offset, length, pinfo, tree); @@ -10238,13 +10238,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_READ_SUBINDEX_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_read_with_subidx, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_read_with_subidx_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_read_subindex_err(tvb, offset, length, pinfo, tree); @@ -10253,13 +10253,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_WRITE_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_write, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_write_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_write_req(tvb, offset, length, pinfo, tree); @@ -10268,13 +10268,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_WRITE_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_write, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_write_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_write_rsp(tvb, offset, length, pinfo, tree); @@ -10283,13 +10283,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_WRITE_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_write, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_write_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_write_err(tvb, offset, length, pinfo, tree); @@ -10298,13 +10298,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_WRITE_SUBINDEX_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_write_with_subidx, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_write_with_subidx_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_write_subindex_req(tvb, offset, length, pinfo, tree); @@ -10313,13 +10313,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_WRITE_SUBINDEX_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_write_with_subidx, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_write_with_subidx_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_write_subindex_rsp(tvb, offset, length, pinfo, tree); @@ -10328,13 +10328,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_WRITE_SUBINDEX_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_write_with_subidx, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_write_with_subidx_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_write_subindex_err(tvb, offset, length, pinfo, tree); @@ -10343,13 +10343,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_DEFINE_VARIABLE_LIST_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_def_variable_list, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_def_variable_list_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_def_variable_list_req(tvb, offset, length, pinfo, tree); @@ -10358,13 +10358,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_DEFINE_VARIABLE_LIST_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_def_variable_list, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_def_variable_list_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_def_variable_list_rsp(tvb, offset, length, pinfo, tree); @@ -10373,13 +10373,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_DEFINE_VARIABLE_LIST_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_def_variable_list, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_def_variable_list_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_def_variable_list_err(tvb, offset, length, pinfo, tree); @@ -10388,13 +10388,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_DELETE_VARIABLE_LIST_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_del_variable_list, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_del_variable_list_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_del_variable_list_req(tvb, offset, length, pinfo, tree); @@ -10403,13 +10403,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_DELETE_VARIABLE_LIST_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_del_variable_list, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_del_variable_list_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_del_variable_list_rsp(tvb, offset, length, pinfo, tree); @@ -10418,13 +10418,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_DELETE_VARIABLE_LIST_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_del_variable_list, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_del_variable_list_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_del_variable_list_err(tvb, offset, length, pinfo, tree); @@ -10433,13 +10433,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_INFO_REPORT_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_info_report, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_info_report_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_info_report_req(tvb, offset, length, pinfo, tree); @@ -10448,13 +10448,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_INFO_REPORT_SUBINDEX_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_info_report_with_subidx, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_info_report_with_subidx_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_info_report_subindex_req(tvb, offset, length, pinfo, tree); @@ -10463,13 +10463,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_INFO_REPORT_CHANGE_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_info_report_on_change, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_info_report_on_change_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_info_report_change_req(tvb, offset, length, pinfo, tree); @@ -10478,13 +10478,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_INFO_REPORT_CHANGE_SUBINDEX_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_info_report_on_change_with_subidx, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_info_report_on_change_with_subidx_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_info_report_change_subindex_req(tvb, offset, length, pinfo, tree); @@ -10493,13 +10493,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_EVENT_NOTIFICATION_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_ev_notification, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_ev_notification_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_ev_notification_req(tvb, offset, length, pinfo, tree); @@ -10508,13 +10508,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_ALTER_EVENT_CONDITION_MONITORING_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_alter_ev_condition_monitoring, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_alter_ev_condition_monitoring_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_req( tvb, offset, length, pinfo, tree); @@ -10523,13 +10523,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_ALTER_EVENT_CONDITION_MONITORING_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_alter_ev_condition_monitoring, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_alter_ev_condition_monitoring_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_rsp( tvb, offset, length, pinfo, tree); @@ -10538,13 +10538,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_ALTER_EVENT_CONDITION_MONITORING_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_alter_ev_condition_monitoring, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_alter_ev_condition_monitoring_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_err( tvb, offset, length, pinfo, tree); @@ -10553,13 +10553,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_ACKNOWLEDGE_EVENT_NOTIFICATION_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_ack_ev_notification, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_ack_ev_notification_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_ack_ev_notification_req(tvb, offset, length, pinfo, tree); @@ -10568,13 +10568,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_ACKNOWLEDGE_EVENT_NOTIFICATION_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_ack_ev_notification, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_ack_ev_notification_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_ack_ev_notification_rsp(tvb, offset, length, pinfo, tree); @@ -10583,13 +10583,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case FMS_MSG_ACKNOWLEDGE_EVENT_NOTIFICATION_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_fms, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_ack_ev_notification, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_fms_ack_ev_notification_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_fms_ack_ev_notification_err(tvb, offset, length, pinfo, tree); @@ -10598,13 +10598,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case LAN_MSG_GET_INFO_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_lr, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_get_info, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_get_info_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_lr_get_info_req(tvb, offset, length, pinfo, tree); @@ -10613,13 +10613,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case LAN_MSG_GET_INFO_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_lr, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_get_info, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_get_info_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_lr_get_info_rsp(tvb, offset, length, pinfo, tree); @@ -10628,13 +10628,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case LAN_MSG_GET_INFO_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_lr, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_get_info, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_get_info_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_lr_get_info_err(tvb, offset, length, pinfo, tree); @@ -10643,13 +10643,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case LAN_MSG_PUT_INFO_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_lr, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_put_info, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_put_info_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_lr_put_info_req(tvb, offset, length, pinfo, tree); @@ -10658,13 +10658,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case LAN_MSG_PUT_INFO_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_lr, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_put_info, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_put_info_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_lr_put_info_rsp(tvb, offset, length, pinfo, tree); @@ -10673,13 +10673,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case LAN_MSG_PUT_INFO_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_lr, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_put_info, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_put_info_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_lr_put_info_err(tvb, offset, length, pinfo, tree); @@ -10688,13 +10688,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case LAN_MSG_GET_STATISTICS_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_lr, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_get_statistics, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_get_statistics_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_lr_get_statistics_req(tvb, offset, length, pinfo, tree); @@ -10703,13 +10703,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case LAN_MSG_GET_STATISTICS_RSP: hidden_item = proto_tree_add_boolean(tree, hf_ff_lr, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_get_statistics, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_get_statistics_rsp, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_lr_get_statistics_rsp(tvb, offset, length, pinfo, tree); @@ -10718,13 +10718,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case LAN_MSG_GET_STATISTICS_ERR: hidden_item = proto_tree_add_boolean(tree, hf_ff_lr, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_get_statistics, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_get_statistics_err, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_lr_get_statistics_err(tvb, offset, length, pinfo, tree); @@ -10733,13 +10733,13 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length, case LAN_MSG_DIAG_REQ: hidden_item = proto_tree_add_boolean(tree, hf_ff_lr, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_diagnostic_msg, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(tree, hf_ff_lr_diagnostic_msg_req, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dissect_ff_msg_diagnostic_msg_req(tvb, offset, length, pinfo, tree); @@ -10778,7 +10778,7 @@ dissect_ff_msg_trailer(tvbuff_t *tvb, } hidden_item = proto_tree_add_boolean(tree, hf_ff_fda_msg_trailer, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fda_msg_trailer, NULL, "FDA Message Trailer"); @@ -10935,7 +10935,7 @@ dissect_ff_msg_hdr(tvbuff_t *tvb, } hidden_item = proto_tree_add_boolean(tree, hf_ff_fda_msg_hdr, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); sub_tree = proto_tree_add_subtree(tree, tvb, offset, 12, ett_ff_fda_msg_hdr, NULL, "FDA Message Header"); diff --git a/epan/dissectors/packet-finger.c b/epan/dissectors/packet-finger.c index ebfd319947..f3fcd17ce4 100644 --- a/epan/dissectors/packet-finger.c +++ b/epan/dissectors/packet-finger.c @@ -114,7 +114,7 @@ dissect_finger(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree && finger_trans->rep_frame) { ti = proto_tree_add_uint(finger_tree, hf_finger_response_in, tvb, 0, 0, finger_trans->rep_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } else if (tree && finger_trans->rep_frame) { proto_tree_add_item(finger_tree, hf_finger_response, tvb, 0, -1, ENC_ASCII|ENC_NA); @@ -123,12 +123,12 @@ dissect_finger(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ti = proto_tree_add_uint(finger_tree, hf_finger_response_to, tvb, 0, 0, finger_trans->req_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (pinfo->num == finger_trans->rep_frame) { nstime_delta(&ns, &pinfo->abs_ts, &finger_trans->req_time); ti = proto_tree_add_time(finger_tree, hf_finger_response_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } } diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c index d810e89567..10df2d84e1 100644 --- a/epan/dissectors/packet-fix.c +++ b/epan/dissectors/packet-fix.c @@ -362,9 +362,9 @@ dissect_fix_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da } checksum_tree = proto_item_add_subtree(item, ett_checksum); item = proto_tree_add_boolean(checksum_tree, hf_fix_checksum_good, tvb, field_offset, tag->field_len, sum_ok); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_boolean(checksum_tree, hf_fix_checksum_bad, tvb, field_offset, tag->field_len, !sum_ok); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (!sum_ok) expert_add_info(pinfo, item, &ei_fix_checksum_bad); } diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index 95a62d54b6..128d1e3351 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -688,7 +688,7 @@ dissect_fr_nlpid(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_item *hidden_item; hidden_item = proto_tree_add_uint(fr_tree, hf_fr_nlpid, tvb, offset, 1, fr_nlpid ); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } return; } diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 1b83500774..3329353f67 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -478,7 +478,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* } item = proto_tree_add_time(fh_tree, hf_frame_shift_offset, tvb, 0, 0, &(pinfo->fd->shift_offset)); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (generate_epoch_time) { proto_tree_add_time(fh_tree, hf_frame_arrival_time_epoch, tvb, @@ -492,7 +492,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* item = proto_tree_add_time(fh_tree, hf_frame_time_delta, tvb, 0, 0, &(del_cap_ts)); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (proto_field_is_referenced(tree, hf_frame_time_delta_displayed)) { @@ -502,16 +502,16 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* item = proto_tree_add_time(fh_tree, hf_frame_time_delta_displayed, tvb, 0, 0, &(del_dis_ts)); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } item = proto_tree_add_time(fh_tree, hf_frame_time_relative, tvb, 0, 0, &(pinfo->rel_ts)); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (pinfo->fd->ref_time) { ti = proto_tree_add_item(fh_tree, hf_frame_time_reference, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } @@ -536,14 +536,14 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* gcry_md_hash_buffer(GCRY_MD_MD5, digest, cp, cap_len); digest_string = bytestring_to_str(wmem_packet_scope(), digest, HASH_MD5_LENGTH, '\0'); ti = proto_tree_add_string(fh_tree, hf_frame_md5_hash, tvb, 0, 0, digest_string); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } ti = proto_tree_add_boolean(fh_tree, hf_frame_marked, tvb, 0, 0,pinfo->fd->marked); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_boolean(fh_tree, hf_frame_ignored, tvb, 0, 0,pinfo->fd->ignored); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (pinfo->rec->rec_type == REC_TYPE_PACKET) { /* Check for existences of P2P pseudo header */ @@ -708,7 +708,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* } ensure_tree_item(fh_tree, 1); ti = proto_tree_add_string(fh_tree, hf_frame_protocols, tvb, 0, 0, wmem_strbuf_get_str(val)); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Call postdissectors if we have any (while trying to avoid another @@ -773,11 +773,11 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* ensure_tree_item(fh_tree, 1); item = proto_tree_add_string(fh_tree, hf_frame_color_filter_name, tvb, 0, 0, color_filter->filter_name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); ensure_tree_item(fh_tree, 1); item = proto_tree_add_string(fh_tree, hf_frame_color_filter_text, tvb, 0, 0, color_filter->filter_text); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } tap_queue_packet(frame_tap, pinfo, NULL); diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c index d16933b1ac..a892e193b2 100644 --- a/epan/dissectors/packet-ftp.c +++ b/epan/dissectors/packet-ftp.c @@ -912,10 +912,10 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) hidden_item = proto_tree_add_boolean(ftp_tree, hf_ftp_request, tvb, 0, 0, is_request); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_boolean(ftp_tree, hf_ftp_response, tvb, 0, 0, is_request == FALSE); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Put the line into the protocol tree. */ ti = proto_tree_add_format_text(ftp_tree, tvb, 0, next_offset); @@ -1195,13 +1195,13 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) memcpy(&addr, ftp_ip_address.data, 4); addr_it = proto_tree_add_ipv4(reqresp_tree, hf_ftp_epsv_ip, tvb, 0, 0, addr); - PROTO_ITEM_SET_GENERATED(addr_it); + proto_item_set_generated(addr_it); } else if (ftp_ip_address.type == AT_IPv6) { addr_it = proto_tree_add_ipv6(reqresp_tree, hf_ftp_epsv_ipv6, tvb, 0, 0, (const ws_in6_addr *)ftp_ip_address.data); - PROTO_ITEM_SET_GENERATED(addr_it); + proto_item_set_generated(addr_it); } proto_tree_add_uint(reqresp_tree, @@ -1245,7 +1245,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if (ftp_packet_data->current_working_directory) { proto_item *cwd_ti = proto_tree_add_string(tree, hf_ftp_current_working_directory, tvb, 0, 0, wmem_strbuf_get_str(ftp_packet_data->current_working_directory)); - PROTO_ITEM_SET_GENERATED(cwd_ti); + proto_item_set_generated(cwd_ti); } } @@ -1260,22 +1260,22 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) /* Number of frames */ ti = proto_tree_add_uint(tree, hf_ftp_command_response_frames, tvb, 0, 0, ftp_data->frames_seen); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Number of bytes */ ti = proto_tree_add_uint(tree, hf_ftp_command_response_bytes, tvb, 0, 0, ftp_data->bytes_seen); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* First frame */ ti = proto_tree_add_uint(tree, hf_ftp_command_response_first_frame_num, tvb, 0, 0, ftp_data->first_frame_num); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Last frame */ ti = proto_tree_add_uint(tree, hf_ftp_command_response_last_frame_num, tvb, 0, 0, ftp_data->last_frame_num); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Length of stream */ if (ftp_data->frames_seen > 1) { @@ -1289,29 +1289,29 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) gint gap_ms = (seconds*1000) + ((nseconds+500000) / 1000000); ti = proto_tree_add_uint(tree, hf_ftp_command_response_duration, tvb, 0, 0, gap_ms); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Bitrate (kbps)*/ guint bitrate = (guint)(((ftp_data->bytes_seen*8.0)/(gap_ms/1000.0))/1000); ti = proto_tree_add_uint(tree, hf_ftp_command_response_kbps, tvb, offset, 0, bitrate); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } ti = proto_tree_add_uint(tree, hf_ftp_command_setup_frame, tvb, 0, 0, ftp_data->setup_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Show this only under the setup frame */ if (pinfo->num == ftp_data->setup_frame) { ti = proto_tree_add_string(tree, hf_ftp_command_command, tvb, 0, 0, ftp_data->command); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(tree, hf_ftp_command_command_frame, tvb, 0, 0, ftp_data->command_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } } @@ -1343,7 +1343,7 @@ dissect_ftpdata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data /* Link back to FTP frame where this conversation was created */ ti = proto_tree_add_uint(tree, hf_ftp_data_setup_frame, tvb, 0, 0, p_conv->setup_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); p_ftp_data_conv = (ftp_data_conversation_t*)conversation_get_proto_data(p_conv, proto_ftp_data); @@ -1370,26 +1370,26 @@ dissect_ftpdata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data ti = proto_tree_add_string(tree, hf_ftp_data_setup_method, tvb, 0, 0, p_ftp_data_conv->setup_method); col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)", p_ftp_data_conv->setup_method); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Show command in info column */ if (p_ftp_data_conv->command) { ti = proto_tree_add_string(tree, hf_ftp_data_command, tvb, 0, 0, p_ftp_data_conv->command); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)", p_ftp_data_conv->command); proto_tree_add_uint(tree, hf_ftp_data_command_frame, tvb, 0, 0, p_ftp_data_conv->command_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Show current working directory */ if (p_ftp_data_conv->current_working_directory) { ti = proto_tree_add_string(tree, hf_ftp_data_current_working_directory, tvb, 0, 0, wmem_strbuf_get_str(p_ftp_data_conv->current_working_directory)); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } } diff --git a/epan/dissectors/packet-gadu-gadu.c b/epan/dissectors/packet-gadu-gadu.c index 20bdce9213..ef9a576b90 100644 --- a/epan/dissectors/packet-gadu-gadu.c +++ b/epan/dissectors/packet-gadu-gadu.c @@ -655,7 +655,7 @@ dissect_gadu_gadu_login_protocol(tvbuff_t *tvb, proto_tree *tree, int offset) protocol = tvb_get_letohl(tvb, offset) & 0xff; proto_tree_add_item(tree, &hfi_gadu_gadu_login_protocol, tvb, offset, 4, ENC_LITTLE_ENDIAN); ti = proto_tree_add_string(tree, &hfi_gadu_gadu_login_version, tvb, offset, 4, val_to_str(protocol, gadu_gadu_version_vals, "Unknown (0x%x)")); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); offset += 4; return offset; @@ -678,7 +678,7 @@ dissect_gadu_gadu_login(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset += 4; ti = proto_tree_add_uint(tree, &hfi_gadu_gadu_login_hash_type, tvb, 0, 0, GG_LOGIN_HASH_GG32); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* hash is 32-bit number written in LE */ _tvb_memcpy_reverse(tvb, hash, offset, 4); @@ -927,15 +927,15 @@ dissect_gadu_gadu_recv_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if ((conv = gadu_gadu_get_conversation_data(pinfo))) { ti = proto_tree_add_uint(tree, &hfi_gadu_gadu_msg_recipient, tvb, 0, 0, conv->uin); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(tree, &hfi_gadu_gadu_msg_uin, tvb, 0, 0, conv->uin); - PROTO_ITEM_SET_GENERATED(ti); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_generated(ti); + proto_item_set_hidden(ti); } ti = proto_tree_add_item(tree, &hfi_gadu_gadu_msg_uin, tvb, offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); proto_tree_add_item(tree, &hfi_gadu_gadu_msg_sender, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; @@ -964,24 +964,24 @@ dissect_gadu_gadu_send_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, col_set_str(pinfo->cinfo, COL_INFO, "Send message (< 8.0)"); ti = proto_tree_add_item(tree, &hfi_gadu_gadu_msg_uin, tvb, offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); proto_tree_add_item(tree, &hfi_gadu_gadu_msg_recipient, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; if ((conv = gadu_gadu_get_conversation_data(pinfo))) { ti = proto_tree_add_uint(tree, &hfi_gadu_gadu_msg_sender, tvb, 0, 0, conv->uin); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(tree, &hfi_gadu_gadu_msg_uin, tvb, 0, 0, conv->uin); - PROTO_ITEM_SET_GENERATED(ti); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_generated(ti); + proto_item_set_hidden(ti); } proto_tree_add_item(tree, &hfi_gadu_gadu_msg_seq, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; ti = proto_tree_add_time(tree, &hfi_gadu_gadu_msg_time, tvb, 0, 0, &(pinfo->abs_ts)); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_item(tree, &hfi_gadu_gadu_msg_class, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; @@ -1003,15 +1003,15 @@ dissect_gadu_gadu_recv_msg80(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree if ((conv = gadu_gadu_get_conversation_data(pinfo))) { ti = proto_tree_add_uint(tree, &hfi_gadu_gadu_msg_recipient, tvb, 0, 0, conv->uin); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(tree, &hfi_gadu_gadu_msg_uin, tvb, 0, 0, conv->uin); - PROTO_ITEM_SET_GENERATED(ti); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_generated(ti); + proto_item_set_hidden(ti); } ti = proto_tree_add_item(tree, &hfi_gadu_gadu_msg_uin, tvb, offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); proto_tree_add_item(tree, &hfi_gadu_gadu_msg_sender, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; @@ -1044,24 +1044,24 @@ dissect_gadu_gadu_send_msg80(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree col_set_str(pinfo->cinfo, COL_INFO, "Send message (8.0)"); ti = proto_tree_add_item(tree, &hfi_gadu_gadu_msg_uin, tvb, offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); proto_tree_add_item(tree, &hfi_gadu_gadu_msg_recipient, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; if ((conv = gadu_gadu_get_conversation_data(pinfo))) { ti = proto_tree_add_uint(tree, &hfi_gadu_gadu_msg_sender, tvb, 0, 0, conv->uin); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(tree, &hfi_gadu_gadu_msg_uin, tvb, 0, 0, conv->uin); - PROTO_ITEM_SET_GENERATED(ti); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_generated(ti); + proto_item_set_hidden(ti); } proto_tree_add_item(tree, &hfi_gadu_gadu_msg_seq, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; ti = proto_tree_add_time(tree, &hfi_gadu_gadu_msg_time, tvb, 0, 0, &(pinfo->abs_ts)); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_item(tree, &hfi_gadu_gadu_msg_class, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; @@ -1455,7 +1455,7 @@ dissect_gadu_gadu_userlist_request80(tvbuff_t *tvb, packet_info *pinfo, proto_tr offset += 1; ti = proto_tree_add_uint(tree, &hfi_gadu_gadu_userlist_format, tvb, 0, 0, GG_USERLIST100_FORMAT_TYPE_GG100); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); switch (type) { case GG_USERLIST_PUT: diff --git a/epan/dissectors/packet-geneve.c b/epan/dissectors/packet-geneve.c index c2e025c852..d662749ca4 100644 --- a/epan/dissectors/packet-geneve.c +++ b/epan/dissectors/packet-geneve.c @@ -117,7 +117,7 @@ dissect_unknown_option(tvbuff_t *tvb, proto_tree *opts_tree, int offset, proto_item_append_text(type_item, " (%s)", critical); hidden_item = proto_tree_add_item(opt_tree, hf_geneve_option_type_critical, tvb, offset, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset += 1; flags = tvb_get_guint8(tvb, offset) >> OPT_FLAGS_SHIFT; @@ -129,7 +129,7 @@ dissect_unknown_option(tvbuff_t *tvb, proto_tree *opts_tree, int offset, if (flags) { proto_item_append_text(flag_item, " (RSVD)"); } else { - PROTO_ITEM_SET_HIDDEN(flag_item); + proto_item_set_hidden(flag_item); } proto_tree_add_uint(opt_tree, hf_geneve_option_length, tvb, offset, 1, len); @@ -248,7 +248,7 @@ dissect_geneve(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ rsvd_item = proto_tree_add_item(geneve_tree, hf_geneve_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); if (!tvb_get_guint8(tvb, offset)) { - PROTO_ITEM_SET_HIDDEN(rsvd_item); + proto_item_set_hidden(rsvd_item); } offset += 1; diff --git a/epan/dissectors/packet-geonw.c b/epan/dissectors/packet-geonw.c index 26aa762ec4..f61135df4e 100644 --- a/epan/dissectors/packet-geonw.c +++ b/epan/dissectors/packet-geonw.c @@ -343,9 +343,9 @@ dissect_btpa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ // Add hidden port field hidden_item = proto_tree_add_item(btpa_tree, hf_btpa_port, tvb, 0, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item(btpa_tree, hf_btpa_port, tvb, 2, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); btpah->btp_psrc = src_port; btpah->btp_pdst = dst_port; @@ -731,7 +731,7 @@ static geonw_transaction_t *transaction_start(packet_info * pinfo, proto_tree * if (PINFO_FD_VISITED(pinfo)) { /* No response found - add field and expert info */ it = proto_tree_add_item(tree, hf_geonw_no_resp, NULL, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); col_append_fstr(pinfo->cinfo, COL_INFO, " (no response found!)"); @@ -745,7 +745,7 @@ static geonw_transaction_t *transaction_start(packet_info * pinfo, proto_tree * /* Print state tracking in the tree */ if (geonw_trans->resp_frame) { it = proto_tree_add_uint(tree, hf_geonw_resp_in, NULL, 0, 0, geonw_trans->resp_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); col_append_frame_number(pinfo, COL_INFO, " (reply in %u)", geonw_trans->resp_frame); } @@ -819,13 +819,13 @@ static geonw_transaction_t *transaction_end(packet_info * pinfo, proto_tree * tr it = proto_tree_add_uint(tree, hf_geonw_resp_to, NULL, 0, 0, geonw_trans->rqst_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &geonw_trans->rqst_time); geonw_trans->resp_time = ns; resp_time = nstime_to_msec(&ns); it = proto_tree_add_double_format_value(tree, hf_geonw_resptime, NULL, 0, 0, resp_time, "%.3f ms", resp_time); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); col_append_frame_number(pinfo, COL_INFO, " (request in %d)", geonw_trans->rqst_frame); @@ -2515,7 +2515,7 @@ dissect_geonw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U // SN(P) is not greater than SN(SO) // P is a duplicate ti = proto_tree_add_item(geonw_tree, hf_geonw_analysis_flags, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); expert_add_info(pinfo, ti, &ei_geonw_analysis_duplicate); col_prepend_fence_fstr(pinfo->cinfo, COL_INFO, "[Duplicate packet] "); } @@ -2543,7 +2543,7 @@ dissect_geonw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U } else { // P is a duplicate ti = proto_tree_add_item(geonw_tree, hf_geonw_analysis_flags, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); expert_add_info(pinfo, ti, &ei_geonw_analysis_duplicate); col_prepend_fence_fstr(pinfo->cinfo, COL_INFO, "[Duplicate packet] "); } diff --git a/epan/dissectors/packet-gfp.c b/epan/dissectors/packet-gfp.c index 78a59fb2de..daff189d2f 100644 --- a/epan/dissectors/packet-gfp.c +++ b/epan/dissectors/packet-gfp.c @@ -303,16 +303,16 @@ dissect_gfp_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_t fcs_ti = proto_tree_add_uint_format_value(gfp_tree, hf_gfp_fcs, tvb, *offset+payload_len, 4, fcs, "0x%08x [correct]", fcs); fcs_tree = proto_item_add_subtree(fcs_ti, ett_gfp_fcs); fcs_ti = proto_tree_add_boolean(fcs_tree, hf_gfp_fcs_good, tvb, *offset+payload_len, 4, TRUE); - PROTO_ITEM_SET_GENERATED(fcs_ti); + proto_item_set_generated(fcs_ti); fcs_ti = proto_tree_add_boolean(fcs_tree, hf_gfp_fcs_bad, tvb, *offset+payload_len, 4, FALSE); - PROTO_ITEM_SET_GENERATED(fcs_ti); + proto_item_set_generated(fcs_ti); } else { fcs_ti = proto_tree_add_uint_format_value(gfp_tree, hf_gfp_fcs, tvb, *offset+payload_len, 4, fcs, "0x%08x [incorrect, should be 0x%08x]", fcs, fcs_calc); fcs_tree = proto_item_add_subtree(fcs_ti, ett_gfp_fcs); fcs_ti = proto_tree_add_boolean(fcs_tree, hf_gfp_fcs_good, tvb, *offset+payload_len, 4, FALSE); - PROTO_ITEM_SET_GENERATED(fcs_ti); + proto_item_set_generated(fcs_ti); fcs_ti = proto_tree_add_boolean(fcs_tree, hf_gfp_fcs_bad, tvb, *offset+payload_len, 4, TRUE); - PROTO_ITEM_SET_GENERATED(fcs_ti); + proto_item_set_generated(fcs_ti); expert_add_info(pinfo, fcs_ti, &ei_gfp_fcs_bad); } /* Method 2: */ diff --git a/epan/dissectors/packet-gias.c b/epan/dissectors/packet-gias.c index ec1755a5f9..043be4aaa8 100644 --- a/epan/dissectors/packet-gias.c +++ b/epan/dissectors/packet-gias.c @@ -6641,7 +6641,7 @@ process_RequestOperation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, M } /* fill-up the field */ pi=proto_tree_add_string(ptree, hf_operationrequest, tvb, 0, 0, operation); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); return pi; } diff --git a/epan/dissectors/packet-gift.c b/epan/dissectors/packet-gift.c index 089f08d835..014f2d294d 100644 --- a/epan/dissectors/packet-gift.c +++ b/epan/dissectors/packet-gift.c @@ -72,7 +72,7 @@ dissect_gift(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ } else { hidden_item = proto_tree_add_boolean(gift_tree, hf_gift_response, tvb, 0, 0, TRUE); } - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); ti = proto_tree_add_format_text(gift_tree, tvb, offset, next_offset - offset); cmd_tree = proto_item_add_subtree(ti, ett_gift_cmd); diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c index 25970dbe36..78269342fd 100644 --- a/epan/dissectors/packet-glusterfs.c +++ b/epan/dissectors/packet-glusterfs.c @@ -516,7 +516,7 @@ gluster_rpc_dissect_dict(proto_tree *tree, tvbuff_t *tvb, int hfindex, int offse roundup = rpc_roundup(len) - len; ti = proto_tree_add_item_ret_uint(subtree, hf_gluster_dict_size, tvb, offset, 4, ENC_BIG_ENDIAN, &len); proto_item_append_text(ti, " (%d bytes inc. RPC-roundup)", rpc_roundup(len)); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); offset += 4; if (len == 0) @@ -580,7 +580,7 @@ gluster_rpc_dissect_dict(proto_tree *tree, tvbuff_t *tvb, int hfindex, int offse if (roundup) { ti = proto_tree_add_item(subtree, hf_gluster_rpc_roundup_bytes, tvb, offset, -1, ENC_NA); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); offset += roundup; } diff --git a/epan/dissectors/packet-gquic.c b/epan/dissectors/packet-gquic.c index 4454a37976..95b711ab77 100644 --- a/epan/dissectors/packet-gquic.c +++ b/epan/dissectors/packet-gquic.c @@ -1374,7 +1374,7 @@ dissect_gquic_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *gquic_tree, gui total_tag_len += tag_len; ti_len = proto_tree_add_uint(tag_tree, hf_gquic_tag_length, tvb, offset, 4, tag_len); proto_item_append_text(ti_tag, " (l=%u)", tag_len); - PROTO_ITEM_SET_GENERATED(ti_len); + proto_item_set_generated(ti_len); offset += 4; /* Fix issue with CRT.. (Fragmentation ?) */ @@ -1663,7 +1663,7 @@ dissect_gquic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *gquic_tr guint32 pad_len = tvb_reported_length_remaining(tvb, offset); ti_pad_len = proto_tree_add_uint(ft_tree, hf_gquic_frame_type_padding_length, tvb, offset, 0, pad_len); - PROTO_ITEM_SET_GENERATED(ti_pad_len); + proto_item_set_generated(ti_pad_len); proto_item_append_text(ti_ft, " Length: %u", pad_len); proto_tree_add_item(ft_tree, hf_gquic_frame_type_padding, tvb, offset, -1, ENC_NA); offset += pad_len; diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c index 74af3f1834..bd43ae3c27 100644 --- a/epan/dissectors/packet-gsm_a_bssmap.c +++ b/epan/dissectors/packet-gsm_a_bssmap.c @@ -1892,7 +1892,7 @@ be_l3_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, else if ((cell_discriminator & 0x0f) < 8) { ti = proto_tree_add_uint(tree, hf_gsm_a_bssmap_cell_discriminator, l3_tvb, curr_offset, 1, cell_discriminator); /* cell_discriminator is a preference, so value should be known, but keeping presence of field consistent for filtering */ - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); /* GSM */ call_dissector(dtap_handle, l3_tvb, pinfo, g_tree); @@ -1900,7 +1900,7 @@ be_l3_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, else if ((cell_discriminator & 0x0f) < 13) { ti = proto_tree_add_uint(tree, hf_gsm_a_bssmap_cell_discriminator, l3_tvb, curr_offset, 1, cell_discriminator); /* cell_discriminator is a preference, so value should be known, but keeping presence of field consistent for filtering */ - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); /* UMTS or CDMA 2000 */ dissect_rrc_HandoverToUTRANCommand_PDU(l3_tvb, pinfo, g_tree, NULL); diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c index e0beb6e3a2..78a4539741 100644 --- a/epan/dissectors/packet-gsm_a_common.c +++ b/epan/dissectors/packet-gsm_a_common.c @@ -974,8 +974,8 @@ dissect_geographical_description(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr } osm_uri = wmem_strdup_printf(wmem_packet_scope(), "https://www.openstreetmap.org/?mlat=%s&mlon=%s&zoom=12", deg_lat_str, deg_lon_str); loc_uri_item = proto_tree_add_string(tree, hf_gsm_a_geo_loc_osm_uri, tvb, loc_offset, 6, osm_uri); - PROTO_ITEM_SET_URL(loc_uri_item); - PROTO_ITEM_SET_GENERATED(loc_uri_item); + proto_item_set_url(loc_uri_item); + proto_item_set_generated(loc_uri_item); break; case POLYGON: /* Polygon */ diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c index 99c2f02200..c958f734c1 100644 --- a/epan/dissectors/packet-gsm_a_gm.c +++ b/epan/dissectors/packet-gsm_a_gm.c @@ -4555,7 +4555,7 @@ de_sm_pco(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, g link_dir = pinfo->link_dir; generated_item = proto_tree_add_int(tree, hf_gsm_a_gm_link_dir, tvb, curr_offset, 0, link_dir); - PROTO_ITEM_SET_GENERATED(generated_item); + proto_item_set_generated(generated_item); /* 1 ext 0 0 0 0 Spare Configuration protocol */ diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c index c8ba5a606c..f12b04bf01 100644 --- a/epan/dissectors/packet-gsm_a_rr.c +++ b/epan/dissectors/packet-gsm_a_rr.c @@ -3388,7 +3388,7 @@ de_tbf_starting_time(tvbuff_t *tvb, proto_tree *tree, guint32 bit_offset) rfn = (guint16)((51 * t) + t3 + (51 * 26 * t1)); item = proto_tree_add_uint(tree, hf_gsm_a_rr_tbf_starting_time, tvb, bit_offset >> 3, ((curr_bit_offset - bit_offset) >> 3) + 1, rfn); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); return(curr_bit_offset - bit_offset); } @@ -5213,7 +5213,7 @@ de_rr_req_ref(tvbuff_t *tvb, proto_tree *subtree, packet_info *pinfo _U_, guint3 proto_tree_add_item(subtree, hf_gsm_a_rr_T2, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; item = proto_tree_add_uint(subtree, hf_gsm_a_rr_rfn, tvb, curr_offset-2, 2, rfn); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); return(curr_offset - offset); } @@ -8517,7 +8517,7 @@ de_rr_starting_time(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui proto_tree_add_item(tree, hf_gsm_a_rr_T2, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; item = proto_tree_add_uint(tree, hf_gsm_a_rr_rfn, tvb, curr_offset-2, 2, rfn); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); return(curr_offset - offset); } /* diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 1b3277d421..c9cd42d6b2 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -4257,7 +4257,7 @@ dissect_gsm_map_IMSI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U return offset; /* Hide the octet string default printout */ - PROTO_ITEM_SET_HIDDEN(actx->created_item); + proto_item_set_hidden(actx->created_item); imsi_str = dissect_e212_imsi(parameter_tvb, actx->pinfo, tree, 0, tvb_reported_length(parameter_tvb), FALSE); if (!PINFO_FD_VISITED(actx->pinfo)) @@ -6588,7 +6588,7 @@ dissect_gsm_map_sm_SM_RP_SMEA(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int if (payload_tvb) { guint32 tvb_offset = 0; - PROTO_ITEM_SET_HIDDEN(actx->created_item); + proto_item_set_hidden(actx->created_item); dis_field_addr(payload_tvb, actx->pinfo, tree, &tvb_offset, "SM-RP-SMEA"); } diff --git a/epan/dissectors/packet-gsm_osmux.c b/epan/dissectors/packet-gsm_osmux.c index c0f042c956..07e1646b4d 100644 --- a/epan/dissectors/packet-gsm_osmux.c +++ b/epan/dissectors/packet-gsm_osmux.c @@ -252,7 +252,7 @@ static void finish_process_pkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr osmuxh->stream = get_stream(pinfo, osmuxh->circuit_id); ti = proto_tree_add_uint(tree, hf_osmux_stream_id, tvb, 0, 0, osmuxh->stream->id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); tap_queue_packet(osmux_tap, pinfo, osmuxh); } diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c index 9dd85f5e5c..4dbb5cff62 100644 --- a/epan/dissectors/packet-gssapi.c +++ b/epan/dissectors/packet-gssapi.c @@ -276,7 +276,7 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } else { proto_item *it; it=proto_tree_add_uint(tree, hf_gssapi_reassembled_in, tvb, 0, 0, fi->reassembled_in); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); goto done; } } diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 572cfd83dc..001ca94985 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -3849,15 +3849,15 @@ gtp_match_response(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gint if (gcrp->is_request) { it = proto_tree_add_uint(tree, hf_gtp_response_in, tvb, 0, 0, gcrp->rep_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { nstime_t ns; it = proto_tree_add_uint(tree, hf_gtp_response_to, tvb, 0, 0, gcrp->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &gcrp->req_time); it = proto_tree_add_time(tree, hf_gtp_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); if (g_gtp_session) { if (!PINFO_FD_VISITED(pinfo) && gtp_version == 1) { /* GTP session */ @@ -8803,7 +8803,7 @@ track_gtp_session(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gtp_hd session = (guint32*)g_hash_table_lookup(session_table, &pinfo->num); if (session) { it = proto_tree_add_uint(tree, hf_gtp_session, tvb, 0, 0, *session); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index e2821fb2db..c11716350d 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -4279,7 +4279,7 @@ dissect_gtpv2_mm_context_eps_qq(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre qua_tree = proto_item_add_subtree(qua_item, ett_gtpv2_qua); offset = dissect_gtpv2_authentication_quadruplets(tvb, qua_tree, offset, nr_qua); }else { - PROTO_ITEM_SET_GENERATED(qua_item); + proto_item_set_generated(qua_item); } qui_item = proto_tree_add_uint(tree, hf_gtpv2_authentication_quintuplets, tvb, offset, 0, nr_qui); @@ -4287,7 +4287,7 @@ dissect_gtpv2_mm_context_eps_qq(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre qui_tree = proto_item_add_subtree(qui_item, ett_gtpv2_qui); offset = dissect_gtpv2_authentication_quintuplets(tvb, qui_tree, offset, nr_qui); }else{ - PROTO_ITEM_SET_GENERATED(qui_item); + proto_item_set_generated(qui_item); } /* (h+1) to (h+2) DRX parameter */ @@ -7387,15 +7387,15 @@ gtpv2_match_response(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gin if (gcrp->is_request) { it = proto_tree_add_uint(tree, hf_gtpv2_response_in, tvb, 0, 0, gcrp->rep_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { nstime_t ns; it = proto_tree_add_uint(tree, hf_gtpv2_response_to, tvb, 0, 0, gcrp->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &gcrp->req_time); it = proto_tree_add_time(tree, hf_gtpv2_response_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); if (g_gtp_session && !PINFO_FD_VISITED(pinfo)) { /* GTP session */ /* If it's not already in the list */ @@ -7428,7 +7428,7 @@ track_gtpv2_session(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gtpv session = (guint32*)g_hash_table_lookup(session_table, &pinfo->num); if (session) { it = proto_tree_add_uint(tree, hf_gtpv2_session, tvb, 0, 0, *session); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index b6a8502daa..7b6bd5cce9 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -1679,7 +1679,7 @@ static void dissect_writemem_cmd(proto_tree *gvcp_telegram_tree, tvbuff_t *tvb, { proto_item *item = NULL; item = proto_tree_add_uint(gvcp_telegram_tree, hf_gvcp_response_in, tvb, 0, 0, gvcp_trans->rep_frame); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (try_val_to_str(addr, bootstrapregisternames) != NULL) @@ -2164,7 +2164,7 @@ static void dissect_writemem_ack(proto_tree *gvcp_telegram_tree, tvbuff_t *tvb, if (gvcp_trans && gvcp_trans->req_frame) { item = proto_tree_add_uint(gvcp_telegram_tree, hf_gvcp_response_to, tvb, 0, 0, gvcp_trans->req_frame); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } gvcp_telegram_tree = proto_tree_add_subtree(gvcp_telegram_tree, tvb, startoffset, length, @@ -2421,7 +2421,7 @@ static int dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi if (gvcp_trans->rep_frame) { item = proto_tree_add_uint(gvcp_telegram_tree, hf_gvcp_response_in, tvb, 0, 0, gvcp_trans->rep_frame); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } @@ -2494,7 +2494,7 @@ static int dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi if (gvcp_trans->req_frame) { item = proto_tree_add_uint(gvcp_telegram_tree, hf_gvcp_response_to, tvb, 0, 0, gvcp_trans->req_frame); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index ad859bcf0b..5ff7e81412 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -645,7 +645,7 @@ dissect_mux_al_pdu( tvbuff_t *tvb, packet_info *pinfo, proto_tree *vc_tree, al_tree = proto_item_add_subtree (al_item, ett_h223_al1); if(lc_params->al_type == al1Framed) { hidden_item = proto_tree_add_boolean(al_tree, hf_h223_al1_framed, tvb, 0, 1, TRUE ); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } next_tvb = tvb; al_subitem = proto_tree_add_item(al_tree, hf_h223_al_payload, next_tvb, 0, -1, ENC_NA); @@ -662,7 +662,7 @@ dissect_mux_al_pdu( tvbuff_t *tvb, packet_info *pinfo, proto_tree *vc_tree, tvb, 0, -1, ENC_NA); al_tree = proto_item_add_subtree (al_item, ett_h223_al2); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); /* check minimum payload length */ if(len < (al2_sequenced?2U:1U)) @@ -1022,7 +1022,7 @@ dissect_mux_pdu( tvbuff_t *tvb, packet_info *pinfo, guint32 pkt_offset, } item = proto_tree_add_uint(hdr_tree,hf_h223_mux_correctedhdr,tvb,0,3, correct_hdr); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); proto_tree_add_uint(hdr_tree,hf_h223_mux_mc,tvb,0,1,mc); proto_tree_add_uint(hdr_tree,hf_h223_mux_mpl,tvb,0,2,mpl); } diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 63fbae7b00..5a8d49228f 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -3887,7 +3887,7 @@ dissect_h225_GenericIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac gefx = gef_ctx_get(actx->private_data); if (gefx) { ti = proto_tree_add_string(tree, hf_h225_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); dissector_try_string_new(gef_name_dissector_table, gefx->key, tvb_new_subset_length_caplen(tvb, offset>>3, 0, 0), actx->pinfo, tree, FALSE, actx); } actx->private_data = gefx; /* subdissector could overwrite it */ @@ -3910,7 +3910,7 @@ dissect_h225_T_raw(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot gefx = gef_ctx_get(actx->private_data); if (gefx) { ti = proto_tree_add_string(tree, hf_h225_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, actx->pinfo, tree, actx); } @@ -11930,7 +11930,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre Mark it as such. */ pi->is_duplicate = TRUE; hidden_item = proto_tree_add_uint(tree, hf_h225_ras_dup, tvb, 0,0, pi->requestSeqNum); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } break; } @@ -11947,7 +11947,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre proto_tree_add_uint_format(tree, hf_h225_ras_rsp_frame, tvb, 0, 0, h225ras_call->rsp_num, "The response to this request is in frame %u", h225ras_call->rsp_num); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* end of request message handling*/ @@ -11983,7 +11983,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre if (msg_category == 3 || msg_category == 5) { pi->guid = h225ras_call->guid; hidden_item = proto_tree_add_guid(tree, hf_h225_guid, tvb, 0, GUID_LEN, &pi->guid); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } if (h225ras_call->rsp_num == 0) { @@ -12000,7 +12000,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre Mark it as such. */ pi->is_duplicate = TRUE; hidden_item = proto_tree_add_uint(tree, hf_h225_ras_dup, tvb, 0,0, pi->requestSeqNum); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } } @@ -12012,7 +12012,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* Indicate the frame to which this is a reply. */ ti = proto_tree_add_uint_format(tree, hf_h225_ras_req_frame, tvb, 0, 0, h225ras_call->req_num, "This is a response to a request in frame %u", h225ras_call->req_num); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Calculate RAS Service Response Time */ nstime_delta(&delta, &pinfo->abs_ts, &h225ras_call->req_time); @@ -12020,7 +12020,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* display Ras Service Response Time and make it filterable */ ti = proto_tree_add_time(tree, hf_h225_ras_deltatime, tvb, 0, 0, &(pi->delta_time)); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } } diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c index 747727795d..0e4fdf47e9 100644 --- a/epan/dissectors/packet-h235.c +++ b/epan/dissectors/packet-h235.c @@ -546,7 +546,7 @@ dissect_h235_ENCRYPTED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, #line 63 "./asn1/h235/h235.cnf" proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset>>3, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h235_ENCRYPTED, ENCRYPTED_sequence); @@ -578,7 +578,7 @@ dissect_h235_SIGNED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro #line 58 "./asn1/h235/h235.cnf" proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset>>3, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h235_SIGNED, SIGNED_sequence); @@ -743,7 +743,7 @@ dissect_h235_ClearToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, #line 74 "./asn1/h235/h235.cnf" proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset>>3, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h235_ClearToken, ClearToken_sequence); @@ -764,7 +764,7 @@ dissect_h235_HASHED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro #line 68 "./asn1/h235/h235.cnf" proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset>>3, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h235_HASHED, HASHED_sequence); @@ -840,7 +840,7 @@ dissect_h235_CryptoToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ #line 80 "./asn1/h235/h235.cnf" proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset>>3, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h235_CryptoToken, CryptoToken_choice, diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index 8a024e6de4..3edcac78bc 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -3607,7 +3607,7 @@ dissect_h245_CapabilityIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t gefx = gef_ctx_get(actx->private_data); if (gefx) { ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); dissector_try_string(gef_name_dissector_table, gefx->key, tvb_new_subset_length_caplen(tvb, offset>>3, 0, 0), actx->pinfo, tree, actx); } actx->private_data = gefx; /* subdissector could overwrite it */ @@ -3675,7 +3675,7 @@ dissect_h245_ParameterIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * gefx = gef_ctx_get(actx->private_data); if (gefx) { ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); dissector_try_string_new(gef_name_dissector_table, gefx->key, tvb_new_subset_length_caplen(tvb, offset>>3, 0, 0), actx->pinfo, tree, FALSE, actx); } actx->private_data = gefx; /* subdissector could overwrite it */ @@ -3703,7 +3703,7 @@ dissect_h245_T_booleanArray(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx buf[0] = value; value_tvb = tvb_new_child_real_data(tvb, buf, sizeof(guint8), sizeof(guint8)); ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); add_new_data_source(actx->pinfo, value_tvb, "booleanArray"); dissector_try_string_new(gef_content_dissector_table, gefx->key, value_tvb, actx->pinfo, tree, FALSE, actx); } @@ -3732,7 +3732,7 @@ dissect_h245_T_unsignedMin(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ phton16(buf, value); value_tvb = tvb_new_child_real_data(tvb, buf, sizeof(guint16), sizeof(guint16)); ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); add_new_data_source(actx->pinfo, value_tvb, "unsignedMin"); dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, actx->pinfo, tree, actx); } @@ -3761,7 +3761,7 @@ dissect_h245_T_unsignedMax(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ phton16(buf, value); value_tvb = tvb_new_child_real_data(tvb, buf, sizeof(guint16), sizeof(guint16)); ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); add_new_data_source(actx->pinfo, value_tvb, "unsignedMax"); dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, actx->pinfo, tree, actx); } @@ -3790,7 +3790,7 @@ dissect_h245_T_unsigned32Min(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx phton32(buf, value); value_tvb = tvb_new_child_real_data(tvb, buf, sizeof(guint32), sizeof(guint32)); ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); add_new_data_source(actx->pinfo, value_tvb, "unsigned32Min"); dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, actx->pinfo, tree, actx); } @@ -3819,7 +3819,7 @@ dissect_h245_T_unsigned32Max(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx phton32(buf, value); value_tvb = tvb_new_child_real_data(tvb, buf, sizeof(guint32), sizeof(guint32)); ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); add_new_data_source(actx->pinfo, value_tvb, "unsigned32Max"); dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, actx->pinfo, tree, actx); } @@ -3843,7 +3843,7 @@ dissect_h245_T_octetString(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ gefx = gef_ctx_get(actx->private_data); if (gefx) { ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, actx->pinfo, tree, actx); } @@ -4007,7 +4007,7 @@ dissect_h245_T_nonCollapsingRaw(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a gefx = gef_ctx_get(actx->private_data); if (gefx) { ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, actx->pinfo, tree, actx); } actx->private_data = parent_gefx; @@ -14256,7 +14256,7 @@ dissect_h245_T_returnedFunction(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a saved_h245_pi = h245_pi; h245_pi = NULL; subtree = proto_tree_add_subtree(tree, next_tvb, 0, -1, ett_h245_returnedFunction, &item, "The returned function"); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); dissect_h245_MultimediaSystemControlMessage(next_tvb, 0, actx, subtree, hf_h245_pdu_type); h245_pi = saved_h245_pi; } diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 809970fcae..62d901df0e 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -1245,7 +1245,7 @@ void gcp_analyze_msg(proto_tree* gcp_tree, packet_info* pinfo, tvbuff_t* gcp_tvb proto_tree* ctx_tree = proto_item_add_subtree(ctx_item,ids->ett.ctx); gcp_terms_t *ctx_term; - PROTO_ITEM_SET_GENERATED(ctx_item); + proto_item_set_generated(ctx_item); if (ctx->cmds) { proto_tree* history_tree = proto_tree_add_subtree(ctx_tree,gcp_tvb,0,0,ids->ett.ctx_cmds,NULL,"[ Command History ]"); @@ -1253,7 +1253,7 @@ void gcp_analyze_msg(proto_tree* gcp_tree, packet_info* pinfo, tvbuff_t* gcp_tvb for (c = ctx->cmds; c; c = c->next) { proto_item* cmd_item = proto_tree_add_uint(history_tree,ids->hf.ctx_cmd,gcp_tvb,0,0,c->cmd->msg->framenum); if (c->cmd->str) proto_item_append_text(cmd_item," %s ",c->cmd->str); - PROTO_ITEM_SET_GENERATED(cmd_item); + proto_item_set_generated(cmd_item); if (c->cmd->error) { expert_add_info(pinfo, cmd_item, command_err); } @@ -1268,21 +1268,21 @@ void gcp_analyze_msg(proto_tree* gcp_tree, packet_info* pinfo, tvbuff_t* gcp_tvb proto_item* pi = proto_tree_add_string(terms_tree,ids->hf.ctx_term,gcp_tvb,0,0,ctx_term->term->str); proto_tree* term_tree = proto_item_add_subtree(pi,ids->ett.ctx_term); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); if (ctx_term->term->type) { pi = proto_tree_add_uint(term_tree,ids->hf.ctx_term_type,gcp_tvb,0,0,ctx_term->term->type); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (ctx_term->term->bir) { pi = proto_tree_add_string(term_tree,ids->hf.ctx_term_bir,gcp_tvb,0,0,ctx_term->term->bir); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (ctx_term->term->nsap) { pi = proto_tree_add_string(term_tree,ids->hf.ctx_term_nsap,gcp_tvb,0,0,ctx_term->term->nsap); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (ctx_term->term->bir && ctx_term->term->nsap) { @@ -6119,7 +6119,7 @@ dissect_h248(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ guint32 magic_num = 0, offset = 0; magic_num = tvb_get_ntohl(tvb, offset); hidden_item = proto_tree_add_uint(tree, hf_248_magic_num, tvb, offset, 4, magic_num); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); if( dissector_try_uint(subdissector_table, magic_num, tvb, pinfo, tree) ) { return tvb_captured_length(tvb); } diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c index 66c8ced71b..e7c06ea332 100644 --- a/epan/dissectors/packet-h248_annex_c.c +++ b/epan/dissectors/packet-h248_annex_c.c @@ -827,7 +827,7 @@ static void dissect_h248_annexc_SDP_C(proto_tree* tree, tvbuff_t* tvb, packet_in if (param_tvb){ ti = proto_tree_add_item(tree, hf_h248_sdp_connection_info, param_tvb, 0, -1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } @@ -856,7 +856,7 @@ static void dissect_h248_annexc_SDP_M(proto_tree* tree, tvbuff_t* tvb, packet_in gboolean port_valid; port_valid = ws_strtoi32(port_str, NULL, &port); ti = proto_tree_add_uint(tree, hf_h248_sdp_media_port, param_tvb, offset, tokenlen, port); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (!port_valid) proto_tree_add_expert(tree, pinfo, &ei_h248_sdp_media_port_invalid, param_tvb, offset, tokenlen); diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c index f5cae070d1..a5be661718 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -965,7 +965,7 @@ dissect_h450_H4501SupplementaryService(tvbuff_t *tvb _U_, int offset _U_, asn1_c proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h450, tvb, offset, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h450_H4501SupplementaryService, h450_H4501SupplementaryService_sequence); @@ -4723,7 +4723,7 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data return offset; hidden_item = proto_tree_add_uint(tree, hf_h450_operation, tvb, 0, 0, opcode); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); p = try_val_to_str(opcode, VALS(h450_str_operation)); if (p) { proto_item_append_text(rctx->d.code_item, " - %s", p); @@ -4768,7 +4768,7 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data return offset; hidden_item = proto_tree_add_uint(tree, hf_h450_operation, tvb, 0, 0, opcode); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); p = try_val_to_str(opcode, VALS(h450_str_operation)); if (p) { proto_item_append_text(rctx->d.code_item, " - %s", p); @@ -4813,7 +4813,7 @@ dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data return offset; hidden_item = proto_tree_add_uint(tree, hf_h450_error, tvb, 0, 0, errcode); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); p = try_val_to_str(errcode, VALS(h450_str_error)); if (p) { proto_item_append_text(rctx->d.code_item, " - %s", p); diff --git a/epan/dissectors/packet-hci_h1.c b/epan/dissectors/packet-hci_h1.c index 125f3814bf..e44f2dca3d 100644 --- a/epan/dissectors/packet-hci_h1.c +++ b/epan/dissectors/packet-hci_h1.c @@ -92,7 +92,7 @@ dissect_hci_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) "Unknown 0x%02x")); ti = proto_tree_add_int(hci_h1_tree, hf_hci_h1_direction, tvb, 0, 0, pinfo->p2p_dir); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); next_tvb = tvb_new_subset_remaining(tvb, 0); if (!dissector_try_uint_new(hci_h1_table, type, next_tvb, pinfo, tree, TRUE, bluetooth_data)) { diff --git a/epan/dissectors/packet-hci_h4.c b/epan/dissectors/packet-hci_h4.c index ca047e0e75..ba232de17b 100644 --- a/epan/dissectors/packet-hci_h4.c +++ b/epan/dissectors/packet-hci_h4.c @@ -85,7 +85,7 @@ dissect_hci_h4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) main_tree = proto_item_add_subtree(main_item, ett_hci_h4); sub_item = proto_tree_add_uint(main_tree, hf_hci_h4_direction, tvb, 0, 0, pinfo->p2p_dir); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); proto_tree_add_item(main_tree, hf_hci_h4_type, tvb, 0, 1, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-hci_mon.c b/epan/dissectors/packet-hci_mon.c index c6bce208cd..95536b2737 100644 --- a/epan/dissectors/packet-hci_mon.c +++ b/epan/dissectors/packet-hci_mon.c @@ -129,10 +129,10 @@ dissect_hci_mon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } sub_item = proto_tree_add_uint(hci_mon_tree, hf_adapter_id, tvb, offset, 0, adapter_id); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); sub_item = proto_tree_add_uint(hci_mon_tree, hf_opcode, tvb, offset, 0, opcode); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); col_append_fstr(pinfo->cinfo, COL_INFO, "Adapter Id: %u, Opcode: %s", adapter_id, val_to_str_ext_const(opcode, &hci_mon_opcode_vals_ext, "Unknown")); diff --git a/epan/dissectors/packet-hci_usb.c b/epan/dissectors/packet-hci_usb.c index 923ad27c49..0e7a5c86f8 100644 --- a/epan/dissectors/packet-hci_usb.c +++ b/epan/dissectors/packet-hci_usb.c @@ -203,12 +203,12 @@ dissect_hci_usb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) reassembled = fragment_get_reassembled_id(&hci_usb_reassembly_table, pinfo, session_id); if (reassembled && pinfo->num < reassembled->reassembled_in) { pitem = proto_tree_add_item(ttree, hf_bthci_usb_packet_fragment, tvb, offset, -1, ENC_NA); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); col_append_str(pinfo->cinfo, COL_INFO, " Fragment"); } else if (reassembled && pinfo->num == reassembled->reassembled_in) { pitem = proto_tree_add_item(ttree, hf_bthci_usb_packet_complete, tvb, offset, -1, ENC_NA); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); if (reassembled->len > (guint) tvb_reported_length_remaining(tvb, offset)) { next_tvb = process_reassembled_data(tvb, 0, pinfo, @@ -231,7 +231,7 @@ dissect_hci_usb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } } else { pitem = proto_tree_add_item(ttree, hf_bthci_usb_packet_unknown_fragment, tvb, offset, -1, ENC_NA); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); } if (usb_conv_info->endpoint == 0x03) { diff --git a/epan/dissectors/packet-hdcp.c b/epan/dissectors/packet-hdcp.c index b566099e44..73c0b3f1d3 100644 --- a/epan/dissectors/packet-hdcp.c +++ b/epan/dissectors/packet-hdcp.c @@ -122,7 +122,7 @@ dissect_hdcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ val_to_str_const(hdcp_trans->rqst_type, hdcp_reg, "unknown (0x%x)"), hdcp_trans->resp_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else { @@ -178,7 +178,7 @@ dissect_hdcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ hdcp_trans->rqst_frame, val_to_str_const(hdcp_trans->rqst_type, hdcp_reg, "unknown (0x%x)")); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); switch (hdcp_trans->rqst_type) { case REG_BKSV: b_ksv = tvb_get_letoh40(tvb, diff --git a/epan/dissectors/packet-hiqnet.c b/epan/dissectors/packet-hiqnet.c index 004d8a81b3..211c4b9270 100644 --- a/epan/dissectors/packet-hiqnet.c +++ b/epan/dissectors/packet-hiqnet.c @@ -693,13 +693,13 @@ dissect_hiqnet_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da offset += 4; proto_tree_add_item(hiqnet_header_tree, hf_hiqnet_sourcedev, tvb, offset, 2, ENC_BIG_ENDIAN); item = proto_tree_add_item(hiqnet_header_tree, hf_hiqnet_devaddr, tvb, offset, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); offset += 2; hiqnet_display_vdobjectaddr(hiqnet_header_tree, hf_hiqnet_sourceaddr, tvb, offset); offset += 4; proto_tree_add_item(hiqnet_header_tree, hf_hiqnet_destdev, tvb, offset, 2, ENC_BIG_ENDIAN); item = proto_tree_add_item(hiqnet_header_tree, hf_hiqnet_devaddr, tvb, offset, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); offset += 2; hiqnet_display_vdobjectaddr(hiqnet_header_tree, hf_hiqnet_destaddr, tvb, offset); offset += 4; diff --git a/epan/dissectors/packet-hislip.c b/epan/dissectors/packet-hislip.c index c2f822b7af..94667c5183 100644 --- a/epan/dissectors/packet-hislip.c +++ b/epan/dissectors/packet-hislip.c @@ -748,7 +748,7 @@ dissect_hislip_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void proto_item_append_text(hislip_data.hislip_item," (Asynchron)"); it = proto_tree_add_item(hislip_tree, hf_hislip_asyn, tvb, 0, 0, ENC_NA); } - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); switch(hislip_data.messagetype) { @@ -777,14 +777,14 @@ dissect_hislip_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void if(hislip_trans && hislip_trans->rep_frame != 0) { it = proto_tree_add_uint(hislip_tree, hf_hislip_response, tvb, 0, 0, hislip_trans->rep_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } /*Retransmisson*/ if((frame_number = search_for_retransmission(hislip_info->pdus, &hislip_data , pinfo->num))!=0) { it = proto_tree_add_uint( hislip_tree, hf_hislip_retransmission, tvb, 0, 0, frame_number); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } break; @@ -804,7 +804,7 @@ dissect_hislip_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void hislip_trans->rep_frame = pinfo->num; oldcontrolvalue = hislip_trans->controltype; it = proto_tree_add_uint( hislip_tree, hf_hislip_request,tvb, 0, 0, hislip_trans->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } break; diff --git a/epan/dissectors/packet-hl7.c b/epan/dissectors/packet-hl7.c index 901f7f94e7..1861e62ca8 100644 --- a/epan/dissectors/packet-hl7.c +++ b/epan/dissectors/packet-hl7.c @@ -749,7 +749,7 @@ parse_msh(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset, hidden_item = proto_tree_add_item(tree, hf_hl7_message_type, tvb, offset, 3, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } if (tvb_get_guint8(tvb, offset + 3) == msh->component_separator) { msh->trigger_event[0] = tvb_get_guint8(tvb, offset + 4); @@ -761,7 +761,7 @@ parse_msh(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset, hidden_item = proto_tree_add_item(tree, hf_hl7_event_type, tvb, offset + 4, 3, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } } } diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c index 22909cdc76..f2c19447f7 100644 --- a/epan/dissectors/packet-homeplug.c +++ b/epan/dissectors/packet-homeplug.c @@ -1020,7 +1020,7 @@ static void dissect_homeplug_ns(ptvcursor_t * cursor, packet_info * pinfo) { ti = proto_tree_add_boolean(ptvcursor_tree(cursor), hf_homeplug_ns_extended, ptvcursor_tvbuff(cursor), 0, 0, extended); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ptvcursor_add_no_advance(cursor, hf_homeplug_ns_netw_ctrl_ac, 1, ENC_BIG_ENDIAN); ptvcursor_add(cursor, hf_homeplug_ns_netw_ctrl_icid, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 4c0e5c9f1e..4ee11d234e 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -1390,8 +1390,8 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo, hf_http_request_full_uri, tvb, 0, 0, uri); - PROTO_ITEM_SET_URL(e_ti); - PROTO_ITEM_SET_GENERATED(e_ti); + proto_item_set_url(e_ti); + proto_item_set_generated(e_ti); } } @@ -1414,45 +1414,45 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo, case HTTP_NOTIFICATION: hidden_item = proto_tree_add_boolean(http_tree, hf_http_notification, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); break; case HTTP_RESPONSE: hidden_item = proto_tree_add_boolean(http_tree, hf_http_response, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); if (curr) { nstime_t delta; pi = proto_tree_add_uint_format(http_tree, hf_http_response_number, tvb, 0, 0, curr->number, "HTTP response %u/%u", curr->number, conv_data->req_res_num); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); if (! nstime_is_unset(&(curr->req_ts))) { nstime_delta(&delta, &pinfo->abs_ts, &(curr->req_ts)); pi = proto_tree_add_time(http_tree, hf_http_time, tvb, 0, 0, &delta); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } } if (prev && prev->req_framenum) { pi = proto_tree_add_uint(http_tree, hf_http_prev_request_in, tvb, 0, 0, prev->req_framenum); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (prev && prev->res_framenum) { pi = proto_tree_add_uint(http_tree, hf_http_prev_response_in, tvb, 0, 0, prev->res_framenum); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (curr && curr->req_framenum) { pi = proto_tree_add_uint(http_tree, hf_http_request_in, tvb, 0, 0, curr->req_framenum); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (next && next->req_framenum) { pi = proto_tree_add_uint(http_tree, hf_http_next_request_in, tvb, 0, 0, next->req_framenum); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (next && next->res_framenum) { pi = proto_tree_add_uint(http_tree, hf_http_next_response_in, tvb, 0, 0, next->res_framenum); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } /* @@ -1465,7 +1465,7 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo, else { pi = proto_tree_add_string(http_tree, hf_http_response_for_uri, tvb, 0, 0, conv_data->request_uri); } - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } break; @@ -1473,23 +1473,23 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo, case HTTP_REQUEST: hidden_item = proto_tree_add_boolean(http_tree, hf_http_request, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); if (curr) { pi = proto_tree_add_uint_format(http_tree, hf_http_request_number, tvb, 0, 0, curr->number, "HTTP request %u/%u", curr->number, conv_data->req_res_num); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (prev && prev->req_framenum) { pi = proto_tree_add_uint(http_tree, hf_http_prev_request_in, tvb, 0, 0, prev->req_framenum); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (curr && curr->res_framenum) { pi = proto_tree_add_uint(http_tree, hf_http_response_in, tvb, 0, 0, curr->res_framenum); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (next && next->req_framenum) { pi = proto_tree_add_uint(http_tree, hf_http_next_request_in, tvb, 0, 0, next->req_framenum); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } break; @@ -2031,7 +2031,7 @@ basic_response_dissector(tvbuff_t *tvb, proto_tree *tree, int offset, tvb, offset, 3, val_to_str(stat_info->response_code, vals_http_status_code, "Unknown (%d)")); - PROTO_ITEM_SET_GENERATED(r_ti); + proto_item_set_generated(r_ti); /* Advance to the start of the next token. */ offset += (int) (next_token - line); @@ -2437,11 +2437,11 @@ http_payload_subdissector(tvbuff_t *tvb, proto_tree *tree, item = proto_tree_add_string(proxy_tree, hf_http_proxy_connect_host, tvb, 0, 0, strings[0]); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(proxy_tree, hf_http_proxy_connect_port, tvb, 0, 0, (guint32)strtol(strings[1], NULL, 10) ); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } uri_port = (int)strtol(strings[1], NULL, 10); /* Convert string to a base-10 integer */ @@ -3029,7 +3029,7 @@ process_header(tvbuff_t *tvb, int offset, int next_offset, ENC_NA|ENC_ASCII); proto_item_set_text(it, "%s", format_text(wmem_packet_scope(), line, len)); - PROTO_ITEM_SET_HIDDEN(it); + proto_item_set_hidden(it); } } } @@ -3063,7 +3063,7 @@ process_header(tvbuff_t *tvb, int offset, int next_offset, tvb, offset, len, ENC_NA|ENC_ASCII); proto_item_set_text(it, "%d", tmp); - PROTO_ITEM_SET_HIDDEN(it); + proto_item_set_hidden(it); } break; default: @@ -3080,7 +3080,7 @@ process_header(tvbuff_t *tvb, int offset, int next_offset, ENC_NA|ENC_ASCII); proto_item_set_text(it, "%s", format_text(wmem_packet_scope(), line, len)); - PROTO_ITEM_SET_HIDDEN(it); + proto_item_set_hidden(it); } } } else @@ -3173,7 +3173,7 @@ process_header(tvbuff_t *tvb, int offset, int next_offset, header_tree = proto_item_add_subtree(hdr_item, ett_http_header_item); tree_item = proto_tree_add_uint64(header_tree, hf_http_content_length, tvb, offset, len, eh_ptr->content_length); - PROTO_ITEM_SET_GENERATED(tree_item); + proto_item_set_generated(tree_item); if (eh_ptr->transfer_encoding != HTTP_TE_NONE) { expert_add_info(pinfo, hdr_item, &ei_http_te_and_length); } @@ -3381,7 +3381,7 @@ check_auth_citrixbasic(proto_item *hdr_item, tvbuff_t *tvb, gchar *value, int of offset += (int)hdrlen + 15; hidden_item = proto_tree_add_boolean(hdr_tree, hf_http_citrix, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); if(strncmp(value, "username=\"", 10) == 0) { value += 10; @@ -3396,7 +3396,7 @@ check_auth_citrixbasic(proto_item *hdr_item, tvbuff_t *tvb, gchar *value, int of } pi = proto_tree_add_string(hdr_tree, hf_http_citrix_user, tvb, offset , data_len - 1, data_val); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); value += data_len; offset += data_len; } @@ -3414,7 +3414,7 @@ check_auth_citrixbasic(proto_item *hdr_item, tvbuff_t *tvb, gchar *value, int of } pi = proto_tree_add_string(hdr_tree, hf_http_citrix_domain, tvb, offset, data_len - 1, data_val); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); value += data_len; offset += data_len; } @@ -3432,7 +3432,7 @@ check_auth_citrixbasic(proto_item *hdr_item, tvbuff_t *tvb, gchar *value, int of } pi = proto_tree_add_string(hdr_tree, hf_http_citrix_passwd, tvb, offset, data_len - 1, data_val); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); value += data_len; offset += data_len; } @@ -3450,7 +3450,7 @@ check_auth_citrixbasic(proto_item *hdr_item, tvbuff_t *tvb, gchar *value, int of } pi = proto_tree_add_string(hdr_tree, hf_http_citrix_session, tvb, offset, data_len - 1, data_val); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } } return TRUE; diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c index 8966fb5afc..331ec4ac37 100644 --- a/epan/dissectors/packet-http2.c +++ b/epan/dissectors/packet-http2.c @@ -1768,7 +1768,7 @@ inflate_http2_header_block(tvbuff_t *tvb, packet_info *pinfo, guint offset, add_new_data_source(pinfo, header_tvb, "Decompressed Header"); ti = proto_tree_add_uint(tree, hf_http2_header_length, header_tvb, hoffset, 1, header_len); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (header_data->header_size_attempted > 0) { expert_add_info_format(pinfo, ti, &ei_http2_header_size, @@ -1778,7 +1778,7 @@ inflate_http2_header_block(tvbuff_t *tvb, packet_info *pinfo, guint offset, } ti = proto_tree_add_uint(tree, hf_http2_header_count, header_tvb, hoffset, 1, wmem_array_get_count(headers)); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (header_data->header_lines_exceeded) { expert_add_info(pinfo, ti, &ei_http2_header_lines); @@ -1826,7 +1826,7 @@ inflate_http2_header_block(tvbuff_t *tvb, packet_info *pinfo, guint offset, header_unescaped = g_uri_unescape_string(header_value, NULL); if (header_unescaped != NULL) { ti = proto_tree_add_string(header_tree, hf_http2_header_unescaped, header_tvb, hoffset, header_value_length, header_unescaped); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); g_free(header_unescaped); } hoffset += header_value_length; @@ -1955,7 +1955,7 @@ dissect_frame_padding(tvbuff_t *tvb, guint16 *padding, proto_tree *http2_tree, pad_len ++; } ti = proto_tree_add_uint(http2_tree, hf_http2_pad_length, tvb, offset-pad_len, pad_len, *padding); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); return offset; } @@ -1977,7 +1977,7 @@ dissect_frame_prio(tvbuff_t *tvb, proto_tree *http2_tree, guint offset, guint8 f weight = tvb_get_guint8(tvb, offset); /* 6.2: Weight: An 8-bit weight for the stream; Add one to the value to obtain a weight between 1 and 256 */ ti = proto_tree_add_uint(http2_tree, hf_http2_weight_real, tvb, offset, 1, weight+1); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); offset++; } diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index 95251ddb89..d00acd16c1 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -1546,7 +1546,7 @@ static guint32 dissect_ies(tvbuff_t *tvb, packet_info *pinfo, guint32 offset, /* Retrieve the text from the item we added, and append it to the main IE * item */ - if (ie_item && !PROTO_ITEM_IS_HIDDEN(ti)) { + if (ie_item && !proto_item_is_hidden(ti)) { field_info *ie_finfo = PITEM_FINFO(ie_item); /* if the representation of the item has already been set, use that; @@ -1739,12 +1739,12 @@ static void iax2_add_ts_fields(packet_info *pinfo, proto_tree *iax2_tree, tvbuff if (iax2_tree) { item = proto_tree_add_time(iax2_tree, hf_iax2_absts, tvb, 0, 0, &iax_packet->abstime); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); nstime_delta(&lateness, &pinfo->abs_ts, &iax_packet->abstime); item = proto_tree_add_time(iax2_tree, hf_iax2_lateness, tvb, 0, 0, &lateness); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } @@ -1813,7 +1813,7 @@ dissect_fullpacket(tvbuff_t *tvb, guint32 offset, proto_item *item = proto_tree_add_uint(iax2_tree, hf_iax2_callno, tvb, 0, 4, iax_call->forward_circuit_ids[0]); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } proto_tree_add_uint(iax2_tree, hf_iax2_ts, tvb, offset+2, 4, ts); @@ -1876,7 +1876,7 @@ dissect_fullpacket(tvbuff_t *tvb, guint32 offset, proto_item *item; proto_tree_add_item(packet_type_tree, hf_iax2_voice_csub, tvb, offset+9, 1, ENC_BIG_ENDIAN); item = proto_tree_add_uint64(packet_type_tree, hf_iax2_voice_codec, tvb, offset+9, 1, CODEC_MASK(codec)); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } offset += 10; @@ -1902,7 +1902,7 @@ dissect_fullpacket(tvbuff_t *tvb, guint32 offset, proto_tree_add_item(packet_type_tree, hf_iax2_video_csub, tvb, offset+9, 1, ENC_BIG_ENDIAN); proto_tree_add_item(packet_type_tree, hf_iax2_marker, tvb, offset+9, 1, ENC_BIG_ENDIAN); item = proto_tree_add_uint64(packet_type_tree, hf_iax2_video_codec, tvb, offset+9, 1, CODEC_MASK(codec)); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } offset += 10; @@ -1954,7 +1954,7 @@ dissect_fullpacket(tvbuff_t *tvb, guint32 offset, if (urllen > 0) { proto_item *pi = proto_tree_add_item(packet_type_tree, hf_iax2_html_url, tvb, offset, urllen, ENC_UTF_8|ENC_NA); - PROTO_ITEM_SET_URL(pi); + proto_item_set_url(pi); offset += urllen; } } @@ -2030,7 +2030,7 @@ static guint32 dissect_minivideopacket(tvbuff_t *tvb, guint32 offset, item = proto_tree_add_uint(iax2_tree, hf_iax2_callno, tvb, 0, 4, iax_packet->call_data->forward_circuit_ids[0]); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } proto_tree_add_item(iax2_tree, hf_iax2_minividts, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -2072,7 +2072,7 @@ static guint32 dissect_minipacket(tvbuff_t *tvb, guint32 offset, guint16 scallno if (iax_packet->call_data) { item = proto_tree_add_uint(iax2_tree, hf_iax2_callno, tvb, 0, 4, iax_packet->call_data->forward_circuit_ids[0]); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } proto_tree_add_uint(iax2_tree, hf_iax2_minits, tvb, offset, 2, ts); @@ -2277,7 +2277,7 @@ static guint32 dissect_trunkpacket(tvbuff_t *tvb, guint32 offset, if (iax2_tree) { /* number of items */ nc = proto_tree_add_uint(iax2_tree, hf_iax2_trunk_ncalls, NULL, 0, 0, ncalls); - PROTO_ITEM_SET_GENERATED(nc); + proto_item_set_generated(nc); } col_add_fstr(pinfo->cinfo, COL_INFO, "Trunk packet with %d media frame%s for %d call%s", @@ -2489,7 +2489,7 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr iax_tree_item = proto_tree_add_uint(tree, hf_iax2_reassembled_in, tvb, deseg_offset, tvb_reported_length_remaining(tvb, deseg_offset), fd_head->reassembled_in); - PROTO_ITEM_SET_GENERATED(iax_tree_item); + proto_item_set_generated(iax_tree_item); } else { /* this fragment is never reassembled */ proto_tree_add_item(tree, hf_iax2_fragment_unfinished, tvb, deseg_offset, -1, ENC_NA); diff --git a/epan/dissectors/packet-icap.c b/epan/dissectors/packet-icap.c index 6c3a6643ad..063fc6782c 100644 --- a/epan/dissectors/packet-icap.c +++ b/epan/dissectors/packet-icap.c @@ -198,25 +198,25 @@ is_icap_header: case ICAP_OPTIONS: hidden_item = proto_tree_add_boolean(icap_tree, hf_icap_options, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); break; case ICAP_REQMOD: hidden_item = proto_tree_add_boolean(icap_tree, hf_icap_reqmod, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); break; case ICAP_RESPMOD: hidden_item = proto_tree_add_boolean(icap_tree, hf_icap_respmod, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); break; case ICAP_RESPONSE: hidden_item = proto_tree_add_boolean(icap_tree, hf_icap_response, tvb, 0, 0, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); break; case ICAP_OTHER: diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index 3681a21cf9..80e9069e99 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -1176,7 +1176,7 @@ static icmp_transaction_t *transaction_start(packet_info * pinfo, /* No response found - add field and expert info */ it = proto_tree_add_item(tree, hf_icmp_no_resp, NULL, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); col_append_fstr(pinfo->cinfo, COL_INFO, " (no response found!)"); @@ -1193,7 +1193,7 @@ static icmp_transaction_t *transaction_start(packet_info * pinfo, if (icmp_trans->resp_frame) { it = proto_tree_add_uint(tree, hf_icmp_resp_in, NULL, 0, 0, icmp_trans->resp_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); col_append_frame_number(pinfo, COL_INFO, " (reply in %u)", icmp_trans->resp_frame); @@ -1288,7 +1288,7 @@ static icmp_transaction_t *transaction_end(packet_info * pinfo, it = proto_tree_add_uint(tree, hf_icmp_resp_to, NULL, 0, 0, icmp_trans->rqst_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &icmp_trans->rqst_time); icmp_trans->resp_time = ns; @@ -1296,7 +1296,7 @@ static icmp_transaction_t *transaction_end(packet_info * pinfo, it = proto_tree_add_double_format_value(tree, hf_icmp_resptime, NULL, 0, 0, resp_time, "%.3f ms", resp_time); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); col_append_frame_number(pinfo, COL_INFO, " (request in %d)", icmp_trans->rqst_frame); @@ -1529,7 +1529,7 @@ dissect_icmp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data) proto_tree_add_item(icmp_tree, hf_icmp_length, tvb, 5, 1, ENC_BIG_ENDIAN); ti = proto_tree_add_uint(icmp_tree, hf_icmp_length_original_datagram, tvb, 5, 1, icmp_original_dgram_length * 4); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (icmp_code == ICMP_FRAG_NEEDED) { proto_tree_add_item(icmp_tree, hf_icmp_mtu, tvb, 6, 2, ENC_BIG_ENDIAN); } else { @@ -1557,7 +1557,7 @@ dissect_icmp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data) proto_tree_add_item(icmp_tree, hf_icmp_length, tvb, 5, 1, ENC_BIG_ENDIAN); ti = proto_tree_add_uint(icmp_tree, hf_icmp_length_original_datagram, tvb, 5, 1, icmp_original_dgram_length * 4); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_item(icmp_tree, hf_icmp_unused, tvb, 6, 2, ENC_NA); } else { proto_tree_add_item(icmp_tree, hf_icmp_unused, tvb, 4, 4, ENC_NA); @@ -1574,7 +1574,7 @@ dissect_icmp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data) proto_tree_add_item(icmp_tree, hf_icmp_length, tvb, 5, 1, ENC_BIG_ENDIAN); ti = proto_tree_add_uint(icmp_tree, hf_icmp_length_original_datagram, tvb, 5, 1, icmp_original_dgram_length * 4); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_item(icmp_tree, hf_icmp_unused, tvb, 6, 2, ENC_NA); } else { proto_tree_add_item(icmp_tree, hf_icmp_unused, tvb, 4, 4, ENC_NA); @@ -1744,7 +1744,7 @@ dissect_icmp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data) hf_icmp_data_time_relative, tvb, 8, 8, &time_relative); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); call_data_dissector(tvb_new_subset_remaining(tvb, 8 + 8), pinfo, icmp_tree); diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index c82a283141..e89cf1b5b7 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -1492,7 +1492,7 @@ static icmp_transaction_t *transaction_start(packet_info *pinfo, proto_tree *tre /* No response found - add field and expert info */ it = proto_tree_add_item(tree, hf_icmpv6_no_resp, NULL, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); col_append_fstr(pinfo->cinfo, COL_INFO, " (no response found!)"); @@ -1511,7 +1511,7 @@ static icmp_transaction_t *transaction_start(packet_info *pinfo, proto_tree *tre if (tree) { it = proto_tree_add_uint(tree, hf_icmpv6_resp_in, NULL, 0, 0, icmpv6_trans->resp_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } col_append_frame_number(pinfo, COL_INFO, " (reply in %d)", icmpv6_trans->resp_frame); } @@ -1594,7 +1594,7 @@ static icmp_transaction_t *transaction_end(packet_info *pinfo, proto_tree *tree, if (tree) { it = proto_tree_add_uint(tree, hf_icmpv6_resp_to, NULL, 0, 0, icmpv6_trans->rqst_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } nstime_delta(&ns, &pinfo->abs_ts, &icmpv6_trans->rqst_time); @@ -1603,7 +1603,7 @@ static icmp_transaction_t *transaction_end(packet_info *pinfo, proto_tree *tree, resp_time = nstime_to_msec(&ns); it = proto_tree_add_double_format_value(tree, hf_icmpv6_resptime, NULL, 0, 0, resp_time, "%.3f ms", resp_time); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } col_append_frame_number(pinfo, COL_INFO, " (request in %d)", @@ -1662,7 +1662,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree if(opt_len == 8){ proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_linkaddr_mac, tvb, opt_offset, 6, ENC_NA); ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_src_linkaddr_mac, tvb, opt_offset, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti_opt); + proto_item_set_hidden(ti_opt); link_str = tvb_ether_to_str(tvb, opt_offset); col_append_fstr(pinfo->cinfo, COL_INFO, " from %s", link_str); @@ -1671,11 +1671,11 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree }else if(opt_len == 16 && tvb_get_ntohl(tvb, opt_offset + 8) == 0 && tvb_get_ntohs(tvb, opt_offset + 12) == 0){ proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_linkaddr_eui64, tvb, opt_offset, 8, ENC_BIG_ENDIAN); ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_src_linkaddr_eui64, tvb, opt_offset, 8, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti_opt); + proto_item_set_hidden(ti_opt); ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_linkaddr, tvb, opt_offset, 8, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti_opt); + proto_item_set_hidden(ti_opt); ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_src_linkaddr, tvb, opt_offset, 8, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti_opt); + proto_item_set_hidden(ti_opt); /* Padding: 6 bytes */ proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset + 8, 6, ENC_NA); @@ -1686,7 +1686,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree }else{ proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_linkaddr, tvb, opt_offset, opt_len-2, ENC_NA); ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_src_linkaddr, tvb, opt_offset, opt_len-2, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti_opt); + proto_item_set_hidden(ti_opt); } opt_offset += opt_len; @@ -1699,7 +1699,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree if(opt_len == 8){ proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_linkaddr_mac, tvb, opt_offset, 6, ENC_NA); ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_target_linkaddr_mac, tvb, opt_offset, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti_opt); + proto_item_set_hidden(ti_opt); link_str = tvb_ether_to_str(tvb, opt_offset); col_append_fstr(pinfo->cinfo, COL_INFO, " is at %s", link_str); @@ -1709,7 +1709,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree }else if(opt_len == 16 && tvb_get_ntohl(tvb, opt_offset + 8) == 0 && tvb_get_ntohs(tvb, opt_offset + 12) == 0){ proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_linkaddr_eui64, tvb, opt_offset, 8, ENC_BIG_ENDIAN); ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_target_linkaddr_eui64, tvb, opt_offset, 8, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti_opt); + proto_item_set_hidden(ti_opt); /* Padding: 6 bytes */ proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset + 8, 6, ENC_NA); @@ -1720,7 +1720,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree }else{ proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_linkaddr, tvb, opt_offset, opt_len-2, ENC_NA); ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_target_linkaddr, tvb, opt_offset, opt_len-2, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti_opt); + proto_item_set_hidden(ti_opt); } opt_offset += opt_len; break; @@ -2505,7 +2505,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree proto_item *ti_cp; ti_cp = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_captive_portal, tvb, opt_offset, opt_len-2, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_URL(ti_cp); + proto_item_set_url(ti_cp); opt_offset += opt_len - 2; } diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c index c55f036f97..dec30bcf72 100644 --- a/epan/dissectors/packet-icq.c +++ b/epan/dissectors/packet-icq.c @@ -1061,7 +1061,7 @@ dissect_icqv5Client(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) icq_header_tree = proto_tree_add_subtree(tree, tvb, 0, ICQ5_CL_HDRSIZE, ett_icq_header, NULL, "Header"); ti = proto_tree_add_boolean(icq_header_tree, hf_icq_type, tvb, 0, 0, ICQ5_CLIENT); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_item(icq_header_tree, hf_icq_version, tvb, ICQ_VERSION, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(icq_header_tree, hf_icq_uin, tvb, ICQ5_CL_UIN, 4, ENC_LITTLE_ENDIAN); @@ -1071,7 +1071,7 @@ dissect_icqv5Client(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(icq_header_tree, hf_icq_seqnum2, decr_tvb, ICQ5_CL_SEQNUM2, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(icq_header_tree, hf_icq_checkcode, tvb, ICQ5_CL_CHECKCODE, 4, ENC_LITTLE_ENDIAN); ti = proto_tree_add_uint(icq_header_tree, hf_icq_checkcode_key, tvb, ICQ5_CL_CHECKCODE, 4, key); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); icq_body_tree = proto_tree_add_subtree(tree, decr_tvb, ICQ5_CL_HDRSIZE, pktsize - ICQ5_CL_HDRSIZE, ett_icq_body, NULL, "Body"); @@ -1138,7 +1138,7 @@ dissect_icqv5Server(tvbuff_t *tvb, int offset, packet_info *pinfo, icq_header_tree = proto_tree_add_subtree(tree, tvb, offset, ICQ5_SRV_HDRSIZE, ett_icq_header, NULL, "Header"); ti = proto_tree_add_boolean(icq_header_tree, hf_icq_type, tvb, 0, 0, ICQ5_SERVER); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_item(icq_header_tree, hf_icq_version, tvb, offset + ICQ_VERSION, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(icq_header_tree, hf_icq_sessionid, tvb, offset + ICQ5_SRV_SESSIONID, 4, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c index c7f596e61c..604ceab8e7 100644 --- a/epan/dissectors/packet-iec104.c +++ b/epan/dissectors/packet-iec104.c @@ -1259,7 +1259,7 @@ static int dissect_iec104asdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre proto_item *ti; asdu_info_obj_addr++; ti = proto_tree_add_uint(trSignal, hf_ioa, tvb, 0, 0, asdu_info_obj_addr); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else { /* SQ=0, info obj addr given */ /* -------- Information object address */ /* check length */ diff --git a/epan/dissectors/packet-ieee80211-radio.c b/epan/dissectors/packet-ieee80211-radio.c index 7e0252581e..d8817f1dee 100644 --- a/epan/dissectors/packet-ieee80211-radio.c +++ b/epan/dissectors/packet-ieee80211-radio.c @@ -1170,7 +1170,7 @@ dissect_wlan_radio_phdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if (have_duration) { proto_item *item = proto_tree_add_uint(radio_tree, hf_wlan_radio_duration, tvb, 0, 0, duration); proto_tree *d_tree = proto_item_add_subtree(item, ett_wlan_radio_duration); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (assumed_short_preamble) expert_add_info(pinfo, item, &ei_wlan_radio_assumed_short_preamble); @@ -1185,7 +1185,7 @@ dissect_wlan_radio_phdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if (preamble) { p_item = proto_tree_add_uint(d_tree, hf_wlan_radio_preamble, tvb, 0, 0, preamble); - PROTO_ITEM_SET_GENERATED(p_item); + proto_item_set_generated(p_item); } if (wlan_radio_info->aggregate) { proto_tree *agg_tree; @@ -1193,25 +1193,25 @@ dissect_wlan_radio_phdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, p_item = proto_tree_add_none_format(d_tree, hf_wlan_radio_aggregate, tvb, 0, 0, "This MPDU is part of an A-MPDU"); agg_tree = proto_item_add_subtree(item, ett_wlan_radio_aggregate); - PROTO_ITEM_SET_GENERATED(p_item); + proto_item_set_generated(p_item); if (wlan_radio_info->aggregate->duration) { proto_item *aitem = proto_tree_add_uint(agg_tree, hf_wlan_radio_aggregate_duration, tvb, 0, 0, wlan_radio_info->aggregate->duration); - PROTO_ITEM_SET_GENERATED(aitem); + proto_item_set_generated(aitem); } } if (wlan_radio_info->ifs) { p_item = proto_tree_add_int64(d_tree, hf_wlan_radio_ifs, tvb, 0, 0, wlan_radio_info->ifs); - PROTO_ITEM_SET_GENERATED(p_item); + proto_item_set_generated(p_item); /* TODO: warnings on unusual IFS values (too small or negative) */ } if (wlan_radio_info->start_tsf) { p_item = proto_tree_add_uint64(d_tree, hf_wlan_radio_start_tsf, tvb, 0, 0, wlan_radio_info->start_tsf); - PROTO_ITEM_SET_GENERATED(p_item); + proto_item_set_generated(p_item); } if (wlan_radio_info->end_tsf) { p_item = proto_tree_add_uint64(d_tree, hf_wlan_radio_end_tsf, tvb, 0, 0, wlan_radio_info->end_tsf); - PROTO_ITEM_SET_GENERATED(p_item); + proto_item_set_generated(p_item); } } } /* if (have_data_rate) */ diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c index 229c99dbb8..4efcd77d60 100644 --- a/epan/dissectors/packet-ieee80211-radiotap.c +++ b/epan/dissectors/packet-ieee80211-radiotap.c @@ -2583,7 +2583,7 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* u hf_radiotap_datarate, tvb, offset, 3, rate, "Data Rate: %.1f Mb/s", rate); - PROTO_ITEM_SET_GENERATED(rate_ti); + proto_item_set_generated(rate_ti); } } break; @@ -2814,7 +2814,7 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* u nsts = nss; nsts_ti = proto_tree_add_uint(user_tree, hf_radiotap_vht_nsts[user], tvb, offset + 4 + user, 1, nsts); - PROTO_ITEM_SET_GENERATED(nsts_ti); + proto_item_set_generated(nsts_ti); } proto_tree_add_item(user_tree, hf_radiotap_vht_coding[user], tvb, offset + 8, 1,ENC_LITTLE_ENDIAN); @@ -2828,7 +2828,7 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* u hf_radiotap_vht_datarate[user], tvb, offset, 12, rate, "Data Rate: %.1f Mb/s", rate); - PROTO_ITEM_SET_GENERATED(rate_ti); + proto_item_set_generated(rate_ti); if (ieee80211_vhtvalid[mcs].valid[bandwidth][nss-1] == FALSE) expert_add_info(pinfo, rate_ti, &ei_radiotap_invalid_data_rate); @@ -2927,7 +2927,7 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* u hf_radiotap_fcs_bad, tvb, hdr_fcs_offset, 4, TRUE); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } } else { proto_item_append_text(hdr_fcs_ti, diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index fbe1e3ba22..b6c38697d4 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -7658,7 +7658,7 @@ dissect_hs20_subscription_remediation(tvbuff_t *tvb, packet_info *pinfo _U_, pi = proto_tree_add_item(tree, hf_hs20_subscription_remediation_server_url, tvb, offset, url_len, ENC_ASCII|ENC_NA); offset += url_len; - PROTO_ITEM_SET_URL(pi); + proto_item_set_url(pi); proto_tree_add_item(tree, hf_hs20_subscription_remediation_server_method, tvb, offset, 1, ENC_NA); offset++; @@ -7691,7 +7691,7 @@ dissect_hs20_deauthentication_imminent(tvbuff_t *tvb, packet_info *pinfo _U_, pi = proto_tree_add_item(tree, hf_hs20_deauth_imminent_reason_url, tvb, offset, url_len, ENC_ASCII|ENC_NA); offset += url_len; - PROTO_ITEM_SET_URL(pi); + proto_item_set_url(pi); } return offset; } @@ -8003,7 +8003,7 @@ dissect_hs20_osu_provider(proto_tree *tree, tvbuff_t *tvb, uri_pi = proto_tree_add_item(prov_tree, hf_hs20_osu_server_uri, tvb, offset, osu_server_uri_len, ENC_ASCII|ENC_NA); offset += osu_server_uri_len; - PROTO_ITEM_SET_URL(uri_pi); + proto_item_set_url(uri_pi); osu_method_list_len = tvb_get_guint8(tvb, offset); proto_tree_add_item(prov_tree, hf_hs20_osu_method_list_len, tvb, offset, 1, @@ -8264,7 +8264,7 @@ dissect_anqp_venue_url(proto_tree *tree, tvbuff_t *tvb, int offset, int end) url_pi = proto_tree_add_item(venue_url, hf_hs20_anqp_venue_url, tvb, offset, url_duple_len -1, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_URL(url_pi); + proto_item_set_url(url_pi); offset += (url_duple_len - 1); @@ -17521,9 +17521,9 @@ dissect_frame_control(proto_tree *tree, tvbuff_t *tvb, guint32 option_flags, if(IS_FRAME_EXTENSION(fcf) == 0) { proto_tree_add_item(flag_tree, hf_ieee80211_fc_data_ds, tvb, offset, 1, ENC_NA); hidden_item = proto_tree_add_item(flag_tree, hf_ieee80211_fc_to_ds, tvb, offset, 1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item(flag_tree, hf_ieee80211_fc_from_ds, tvb, offset, 1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(flag_tree, hf_ieee80211_fc_more_frag, tvb, offset, 1, ENC_NA); ti = proto_tree_add_item(flag_tree, hf_ieee80211_fc_retry, tvb, offset, 1, ENC_NA); if( IS_RETRY(flags) ) @@ -22760,13 +22760,13 @@ dissect_ieee80211_block_ack(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_NA); hidden_item = proto_tree_add_string(tree, hf_ieee80211_addr_ta_resolved, tvb, offset, 6, ether_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item(tree, hf_ieee80211_addr, tvb, offset, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_string(tree, hf_ieee80211_addr_resolved, tvb, offset, 6, ether_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset += 6; dissect_ieee80211_block_ack_details(tvb, pinfo, tree, offset, isDMG, is_req, has_fcs); @@ -23181,13 +23181,13 @@ dissect_ieee80211_he_trigger(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_NA); hidden_item = proto_tree_add_string(tree, hf_ieee80211_addr_ta_resolved, tvb, offset, 6, ether_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item(tree, hf_ieee80211_addr, tvb, offset, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_string(tree, hf_ieee80211_addr_resolved, tvb, offset, 6, ether_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset += 6; length += 6; @@ -23349,13 +23349,13 @@ dissect_ieee80211_vht_he_ndp_annc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_NA); hidden_item = proto_tree_add_string(tree, hf_ieee80211_addr_ta_resolved, tvb, offset, 6, ether_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item(tree, hf_ieee80211_addr, tvb, offset, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_string(tree, hf_ieee80211_addr_resolved, tvb, offset, 6, ether_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset += 6; dialog_token = tvb_get_guint8(tvb, offset); @@ -23748,11 +23748,11 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, const gchar *ether_name = tvb_get_ether_name(tvb, 4); proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ra, tvb, 4, 6, ENC_NA); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_ra_resolved, tvb, 4, 6, ether_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, 4, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, 4, 6, ether_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } switch (FCF_FRAME_TYPE (fcf)) @@ -23789,18 +23789,18 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, ra_da_name = tvb_get_ether_name(tvb, 4); proto_tree_add_item(hdr_tree, hf_ieee80211_addr_da, tvb, 4, 6, ENC_NA); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_da_resolved, tvb, 4, 6, ra_da_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, 10, 6, ENC_NA); ta_sa_name = tvb_get_ether_name(tvb, 10); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_ta_resolved, tvb, 10, 6, ta_sa_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(hdr_tree, hf_ieee80211_addr_sa, tvb, 10, 6, ENC_NA); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_sa_resolved, tvb, 10, 6, ta_sa_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(hdr_tree, hf_ieee80211_addr_bssid, tvb, 16, 6, ENC_NA); bssid_name = tvb_get_ether_name(tvb, 16); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_bssid_resolved, tvb, 16, 6, bssid_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* FIXME: With mgmt frames FROM_TO_DS is always 0, perhaps compare address to bssid instead? */ if ((flags & FROM_TO_DS) == FLAG_FROM_DS) { /* Receiver address */ @@ -23812,17 +23812,17 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(hdr_tree, hf_ieee80211_addr_staa, tvb, sta_addr_offset, 6, ENC_NA); station_name = tvb_get_ether_name(tvb, sta_addr_offset); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_staa_resolved, tvb, sta_addr_offset, 6, station_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } /* add items for wlan.addr filter */ hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, 10, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, 10, 6, ta_sa_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, 16, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, 16, 6, bssid_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(hdr_tree, hf_ieee80211_seq_number, tvb, 22, 2, ENC_LITTLE_ENDIAN); } @@ -23864,7 +23864,7 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, const gchar *ether_name = tvb_get_ether_name(tvb, 4); proto_tree_add_item(hdr_tree, hf_ieee80211_addr_bssid, tvb, 4, 6, ENC_NA); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_bssid_resolved, tvb, 4, 6, ether_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } } @@ -23902,11 +23902,11 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, const gchar *ether_name = tvb_get_ether_name(tvb, offset); proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_NA); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_ta_resolved, tvb, offset, 6, ether_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, offset, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, offset, 6, ether_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset += 6; } break; @@ -23924,16 +23924,16 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, if (isDMG) { proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_NA); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_ta_resolved, tvb, offset, 6, ether_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } else { proto_tree_add_item(hdr_tree, hf_ieee80211_addr_bssid, tvb, offset, 6, ENC_NA); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_bssid_resolved, tvb, offset, 6, ether_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, offset, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, offset, 6, ether_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset += 6; } break; @@ -23958,11 +23958,11 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_NA); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_ta_resolved, tvb, offset, 6, ether_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, offset, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, offset, 6, ether_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset += 6; proto_tree_add_item(hdr_tree, hf_ieee80211_beamform_feedback_seg_retrans_bitmap, tvb, offset, 1, ENC_NA); @@ -23992,11 +23992,11 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, const gchar *ether_name = tvb_get_ether_name(tvb, offset); proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_NA); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_ta_resolved, tvb, offset, 6, ether_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, offset, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, offset, 6, ether_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset += 6; } break; @@ -24180,39 +24180,39 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, ta_offset, 6, ENC_NA); ta_name = tvb_get_ether_name(tvb, ta_offset); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_ta_resolved, tvb, ta_offset, 6, ta_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* TA is always in the wlan.addr filter */ hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, ta_offset, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, ta_offset, 6, ta_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); if (da_offset) { proto_tree_add_item(hdr_tree, hf_ieee80211_addr_da, tvb, da_offset, 6, ENC_NA); da_name = tvb_get_ether_name(tvb, da_offset); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_da_resolved, tvb, da_offset, 6, da_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } if (sa_offset) { proto_tree_add_item(hdr_tree, hf_ieee80211_addr_sa, tvb, sa_offset, 6, ENC_NA); sa_name = tvb_get_ether_name(tvb, sa_offset); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_sa_resolved, tvb, sa_offset, 6, sa_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } if (bssid_offset) { proto_tree_add_item(hdr_tree, hf_ieee80211_addr_bssid, tvb, bssid_offset, 6, ENC_NA); bssid_name = tvb_get_ether_name(tvb, bssid_offset); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_bssid_resolved, tvb, bssid_offset, 6, bssid_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } if (addr_type == DATA_ADDR_T4 && is_amsdu) { proto_tree_add_item(hdr_tree, hf_ieee80211_addr_bssid, tvb, 24, 6, ENC_NA); bssid2_name = tvb_get_ether_name(tvb, 24); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_bssid_resolved, tvb, 24, 6, bssid2_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } if ((flags & FROM_TO_DS) == FLAG_FROM_DS) { /* Receiver address */ @@ -24224,7 +24224,7 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(hdr_tree, hf_ieee80211_addr_staa, tvb, sta_addr_offset, 6, ENC_NA); station_name = tvb_get_ether_name(tvb, sta_addr_offset); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_staa_resolved, tvb, sta_addr_offset, 6, station_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } proto_tree_add_item(hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(hdr_tree, hf_ieee80211_seq_number, tvb, 22, 2, ENC_LITTLE_ENDIAN); @@ -24232,27 +24232,27 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, /* add 3rd and 4th address for wlan.addr filter */ if (sa_offset >= 16) { hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, sa_offset, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, sa_offset, 6, sa_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } if (da_offset >= 16 && da_offset != sa_offset) { hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, da_offset, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, da_offset, 6, da_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } if (bssid_offset >= 16 && bssid_offset != sa_offset && bssid_offset != da_offset) { hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, bssid_offset, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, bssid_offset, 6, bssid_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } if (addr_type == DATA_ADDR_T4 && is_amsdu) { hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, 24, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, 24, 6, bssid2_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } break; } @@ -24267,7 +24267,7 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, if (tree) { proto_tree_add_item(hdr_tree, hf_ieee80211_addr_bssid, tvb, 4, 6, ENC_NA); hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, 4, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } break; } @@ -24375,7 +24375,7 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(qos_tree, hf_ieee80211_qos_tid, tvb, qosoff, 2, ENC_LITTLE_ENDIAN); qos_ti = proto_tree_add_item(qos_tree, hf_ieee80211_qos_priority, tvb, qosoff, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_GENERATED(qos_ti); + proto_item_set_generated(qos_ti); if (FLAGS_DS_STATUS(flags) == (FLAG_FROM_DS|FLAG_TO_DS)) { /* mesh frame */ @@ -24547,9 +24547,9 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, item=proto_tree_add_none_format(hdr_tree, hf_ieee80211_fc_analysis_retransmission, tvb, 0, 0, "Retransmitted frame"); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item=proto_tree_add_uint(hdr_tree, hf_ieee80211_fc_analysis_retransmission_frame, tvb, 0, 0, fnum); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } next_tvb = tvb_new_subset_length_caplen(tvb, hdr_len, len, reported_len); call_data_dissector(next_tvb, pinfo, tree); @@ -24671,17 +24671,17 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, if (key == 0) { /* encrypted with pairwise key */ ti = proto_tree_add_string(wep_tree, hf_ieee80211_fc_analysis_tk, tvb, 0, 0, out_buff); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Also add the PMK used to to decrypt the packet. (PMK==PSK) */ bytes_to_hexstr(out_buff, used_key.KeyData.Wpa.Psk, DOT11DECRYPT_WPA_PSK_LEN); /* 32 bytes */ out_buff[2*DOT11DECRYPT_WPA_PSK_LEN] = '\0'; ti = proto_tree_add_string(wep_tree, hf_ieee80211_fc_analysis_pmk, tvb, 0, 0, out_buff); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else { /* Encrypted with Group Key */ ti = proto_tree_add_string(wep_tree, hf_ieee80211_fc_analysis_gtk, tvb, 0, 0, out_buff); /* GTK is stored in PTK at offset 32 bytes and 16 bytes long */ - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } } @@ -24965,12 +24965,12 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, resolve_name = tvb_get_ether_name(next_tvb, msdu_offset); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_da_resolved, next_tvb, msdu_offset, 6, resolve_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(subframe_tree, hf_ieee80211_addr_sa, next_tvb, msdu_offset+6, 6, ENC_NA); resolve_name = tvb_get_ether_name(next_tvb, msdu_offset+6); hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_sa_resolved, next_tvb, msdu_offset+6, 6, resolve_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(subframe_tree, hf_ieee80211_amsdu_length, next_tvb, msdu_offset+12, 2, ENC_BIG_ENDIAN); msdu_offset += 14; @@ -25514,7 +25514,7 @@ dissect_wlan_rsna_eapol_wpa_or_rsn_key(tvbuff_t *tvb, packet_info *pinfo, proto_ } } - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); guint16 keydes_version = tvb_get_ntohs(tvb, offset) & KEY_INFO_KEYDES_VERSION_MASK; proto_tree_add_bitmask_with_flags(tree, tvb, offset, hf_wlan_rsna_eapol_wpa_keydes_keyinfo, @@ -25590,12 +25590,12 @@ dissect_wlan_rsna_eapol_wpa_or_rsn_key(tvbuff_t *tvb, packet_info *pinfo, proto_ bytes_to_hexstr(out_buff, eapol->used_key.KeyData.Wpa.Ptk, 16); /* KCK is stored in PTK at offset 0 */ out_buff[2*16] = '\0'; ti = proto_tree_add_string(keydes_tree, hf_ieee80211_fc_analysis_kck, tvb, 0, 0, out_buff); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); bytes_to_hexstr(out_buff, eapol->used_key.KeyData.Wpa.Ptk+16, 16); /* KEK is stored in PTK at offset 16 */ out_buff[2*16] = '\0'; ti = proto_tree_add_string(keydes_tree, hf_ieee80211_fc_analysis_kek, tvb, 0, 0, out_buff); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } else { keydes_tree = proto_item_add_subtree(ti, ett_wlan_rsna_eapol_keydes_data); diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 1a6b03e1a2..bad6174b43 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -1338,7 +1338,7 @@ static ieee802154_transaction_t *transaction_start(packet_info *pinfo, proto_tre if (PINFO_FD_VISITED(pinfo)) { /* No ACK found - add field and expert info */ it = proto_tree_add_item(tree, hf_ieee802154_no_ack, NULL, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); expert_add_info_format(pinfo, it, &ei_ieee802154_ack_not_found, "No ack found to ack request in frame %u", pinfo->num); } @@ -1349,7 +1349,7 @@ static ieee802154_transaction_t *transaction_start(packet_info *pinfo, proto_tre /* Print state tracking in the tree */ if (ieee802154_trans->ack_frame) { it = proto_tree_add_uint(tree, hf_ieee802154_ack_in, NULL, 0, 0, ieee802154_trans->ack_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } return ieee802154_trans; @@ -1425,7 +1425,7 @@ static ieee802154_transaction_t *transaction_end(packet_info *pinfo, proto_tree if (!ieee802154_trans) { /* No ack request found - add field and expert info */ it = proto_tree_add_item(tree, hf_ieee802154_no_ack_request, NULL, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); expert_add_info_format(pinfo, it, &ei_ieee802154_ack_request_not_found, "No ack request found to ack in frame %u", pinfo->num); return NULL; @@ -1434,13 +1434,13 @@ static ieee802154_transaction_t *transaction_end(packet_info *pinfo, proto_tree /* Print state tracking in the tree */ it = proto_tree_add_uint(tree, hf_ieee802154_ack_to, NULL, 0, 0, ieee802154_trans->rqst_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &ieee802154_trans->rqst_time); ieee802154_trans->ack_time = ns; ack_time = nstime_to_msec(&ns); it = proto_tree_add_double_format_value(tree, hf_ieee802154_ack_time, NULL, 0, 0, ack_time, "%.3f ms", ack_time); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); return ieee802154_trans; @@ -1569,7 +1569,7 @@ void dissect_ieee802154_aux_sec_header_and_key(tvbuff_t *tvb, packet_info *pinfo packet->key_source.addr32 = tvb_get_ntohl(tvb, *offset); proto_tree_add_uint64(field_tree, hf_ieee802154_aux_sec_key_source, tvb, *offset, 4, packet->key_source.addr32); hidden_item = proto_tree_add_item(field_tree, hf_ieee802154_aux_sec_key_source_bytes, tvb, *offset, 4, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_item_set_len(ti, 1 + 4); (*offset) += 4; } @@ -1577,7 +1577,7 @@ void dissect_ieee802154_aux_sec_header_and_key(tvbuff_t *tvb, packet_info *pinfo packet->key_source.addr64 = tvb_get_ntoh64(tvb, *offset); proto_tree_add_uint64(field_tree, hf_ieee802154_aux_sec_key_source, tvb, *offset, 8, packet->key_source.addr64); hidden_item = proto_tree_add_item(field_tree, hf_ieee802154_aux_sec_key_source_bytes, tvb, *offset, 8, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_item_set_len(ti, 1 + 8); (*offset) += 8; } @@ -1624,7 +1624,7 @@ tvbuff_t *decrypt_ieee802154_payload(tvbuff_t * tvb, guint offset, packet_info * /* Store the key number used for retrieval */ ti = proto_tree_add_uint(key_tree, hf_ieee802154_key_number, tvb, 0, 0, decrypt_info->key_number); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); return payload_tvb; } @@ -2087,7 +2087,7 @@ dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g * help with filter. Be sure not to make it visible though. */ proto_item *ti = proto_tree_add_boolean_format_value(ieee802154_tree, hf_ieee802154_fcs_ok, tvb, 0, 0, fcs_ok, "Unknown"); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); } } @@ -2171,7 +2171,7 @@ ieee802154_dissect_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g /* Add the packet length to the filter field */ hidden_item = proto_tree_add_uint(ieee802154_tree, hf_ieee802154_frame_length, NULL, 0, 0, tvb_reported_length(tvb)); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Frame Control Field */ dissect_ieee802154_fcf(tvb, pinfo, ieee802154_tree, packet, &offset); @@ -2441,8 +2441,8 @@ ieee802154_dissect_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g proto_tree_add_uint(ieee802154_tree, hf_ieee802154_dst16, tvb, offset, 2, packet->dst16); proto_item_append_text(proto_root, ", Dst: %s", dst_addr); ti = proto_tree_add_uint(ieee802154_tree, hf_ieee802154_addr16, tvb, offset, 2, packet->dst16); - PROTO_ITEM_SET_GENERATED(ti); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_generated(ti); + proto_item_set_hidden(ti); col_append_fstr(pinfo->cinfo, COL_INFO, ", Dst: %s", dst_addr); offset += 2; @@ -2467,8 +2467,8 @@ ieee802154_dissect_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g proto_tree_add_item(ieee802154_tree, hf_ieee802154_dst64, tvb, offset, 8, ENC_LITTLE_ENDIAN); proto_item_append_text(proto_root, ", Dst: %s", eui64_to_display(wmem_packet_scope(), packet->dst64)); ti = proto_tree_add_item(ieee802154_tree, hf_ieee802154_addr64, tvb, offset, 8, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_GENERATED(ti); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_generated(ti); + proto_item_set_hidden(ti); } col_append_fstr(pinfo->cinfo, COL_INFO, ", Dst: %s", eui64_to_display(wmem_packet_scope(), packet->dst64)); offset += 8; @@ -2521,17 +2521,17 @@ ieee802154_dissect_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g proto_tree_add_uint(ieee802154_tree, hf_ieee802154_src16, tvb, offset, 2, packet->src16); proto_item_append_text(proto_root, ", Src: %s", src_addr); ti = proto_tree_add_uint(ieee802154_tree, hf_ieee802154_addr16, tvb, offset, 2, packet->src16); - PROTO_ITEM_SET_GENERATED(ti); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_generated(ti); + proto_item_set_hidden(ti); if (ieee_hints && ieee_hints->map_rec) { /* Display inferred source address info */ ti = proto_tree_add_eui64(ieee802154_tree, hf_ieee802154_src64, tvb, offset, 0, ieee_hints->map_rec->addr64); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_eui64(ieee802154_tree, hf_ieee802154_addr64, tvb, offset, 0, ieee_hints->map_rec->addr64); - PROTO_ITEM_SET_GENERATED(ti); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_generated(ti); + proto_item_set_hidden(ti); if ( ieee_hints->map_rec->start_fnum ) { ti = proto_tree_add_uint(ieee802154_tree, hf_ieee802154_src64_origin, tvb, 0, 0, @@ -2541,7 +2541,7 @@ ieee802154_dissect_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g ti = proto_tree_add_uint_format_value(ieee802154_tree, hf_ieee802154_src64_origin, tvb, 0, 0, ieee_hints->map_rec->start_fnum, "Pre-configured"); } - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } @@ -2569,8 +2569,8 @@ ieee802154_dissect_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g proto_tree_add_item(ieee802154_tree, hf_ieee802154_src64, tvb, offset, 8, ENC_LITTLE_ENDIAN); proto_item_append_text(proto_root, ", Src: %s", eui64_to_display(wmem_packet_scope(), packet->src64)); ti = proto_tree_add_item(ieee802154_tree, hf_ieee802154_addr64, tvb, offset, 8, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_GENERATED(ti); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_generated(ti); + proto_item_set_hidden(ti); } col_append_fstr(pinfo->cinfo, COL_INFO, ", Src: %s", eui64_to_display(wmem_packet_scope(), packet->src64)); @@ -2681,7 +2681,7 @@ ieee802154_decrypt_payload(tvbuff_t *tvb, guint mhr_len, packet_info *pinfo, pro case DECRYPT_PACKET_SUCCEEDED: { proto_item *pi = proto_tree_add_uint(ieee802154_tree, hf_ieee802154_key_number, tvb, 0, 0, decrypt_info.key_number); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); break; } case DECRYPT_NOT_ENCRYPTED: @@ -2853,7 +2853,7 @@ ieee802154_dissect_fcs(tvbuff_t *tvb, proto_tree *ieee802154_tree, guint fcs_len } /* To Help with filtering, add the fcs_ok field to the tree. */ ti = proto_tree_add_boolean(ieee802154_tree, hf_ieee802154_fcs_ok, tvb, offset, 2, (guint32) fcs_ok); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); } else { guint32 fcs = tvb_get_letohl(tvb, offset); @@ -2867,7 +2867,7 @@ ieee802154_dissect_fcs(tvbuff_t *tvb, proto_tree *ieee802154_tree, guint fcs_len } /* To Help with filtering, add the fcs_ok field to the tree. */ ti = proto_tree_add_boolean(ieee802154_tree, hf_ieee802154_fcs_ok, tvb, offset, 2, (guint32) fcs_ok); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); } } } /* ieee802154_dissect_fcs */ @@ -3134,14 +3134,14 @@ dissect_ieee802154_tap_tlvs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (slot_start_ts && frame_start_ts) { delta_us = (double)(frame_start_ts - slot_start_ts) / 1000; ti = proto_tree_add_double_format_value(tree, hf_ieee802154_frame_start_offset, NULL, 0, 0, delta_us, "%.3f %s", delta_us, units_microseconds.singular); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* if we have both start and end frame timestamp, show frame duration */ if (frame_start_ts && frame_end_ts) { delta_us = (double)(frame_end_ts - frame_start_ts) / 1000; ti = proto_tree_add_double_format_value(tree, hf_ieee802154_frame_duration, NULL, 0, 0, delta_us, "%.3f %s", delta_us, units_microseconds.singular); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* if we have start of slot, timeslot length, and end of frame timestamp, show frame overflow (+ve) or underflow (-ve) */ @@ -3150,7 +3150,7 @@ dissect_ieee802154_tap_tlvs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) delta_us = (double)(frame_end_ts - slot_start_ts) / 1000; delta_us -= timeslot_length; ti = proto_tree_add_double_format_value(tree, hf_ieee802154_frame_end_offset, NULL, 0, 0, delta_us, "%.3f %s", delta_us, units_microseconds.singular); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } return (ieee802154_fcs_type_t)tap_fcs_type; diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c index b0cfa05bf6..63cf34e78f 100644 --- a/epan/dissectors/packet-igmp.c +++ b/epan/dissectors/packet-igmp.c @@ -315,7 +315,7 @@ dissect_igmp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int* of /* version of IGMP protocol */ ti = proto_tree_add_uint(igmp_tree, hf_version, tvb, 0, 0, version); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* type of command */ proto_tree_add_item(igmp_tree, hf_type, tvb, 0, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-imap.c b/epan/dissectors/packet-imap.c index dbba087f93..bee8443650 100644 --- a/epan/dissectors/packet-imap.c +++ b/epan/dissectors/packet-imap.c @@ -168,7 +168,7 @@ imap_match_request(packet_info *pinfo, proto_tree *tree, imap_request_key_t *req { it = proto_tree_add_uint(tree, hf_imap_response_in, NULL, 0, 0, request_info->rep_num); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else @@ -179,11 +179,11 @@ imap_match_request(packet_info *pinfo, proto_tree *tree, imap_request_key_t *req nstime_t ns; it = proto_tree_add_uint(tree, hf_imap_response_to, NULL, 0, 0, request_info->req_num); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &request_info->req_time); it = proto_tree_add_time(tree, hf_imap_time, NULL, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } } @@ -362,7 +362,7 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ imap_tree = proto_item_add_subtree(ti, ett_imap); hidden_item = proto_tree_add_boolean(imap_tree, hf_imap_isrequest, tvb, 0, 0, is_request); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); while(tvb_offset_exists(tvb, offset)) { @@ -464,7 +464,7 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_tree_add_string(reqresp_tree, (is_request) ? hf_imap_request_tag : hf_imap_response_tag, tvb, offset, tokenlen, tag); hidden_item = proto_tree_add_string(reqresp_tree, hf_imap_tag, tvb, offset, tokenlen, tag); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); linelen -= (next_token-offset); offset = next_token; @@ -492,7 +492,7 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (tokenlen != 0) { proto_tree_add_item(reqresp_tree, hf_imap_request_command, tvb, uid_offset, uid_tokenlen, ENC_ASCII|ENC_NA); hidden_item = proto_tree_add_item(reqresp_tree, hf_imap_command, tvb, offset, tokenlen, ENC_ASCII | ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* * Save command string to do specialized processing. @@ -512,7 +512,7 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_tree_add_item(reqresp_tree, (is_request) ? hf_imap_request_command : hf_imap_response_status, tvb, offset, tokenlen, ENC_ASCII|ENC_NA); if (is_request) { hidden_item = proto_tree_add_item(reqresp_tree, hf_imap_command, tvb, offset, tokenlen, ENC_ASCII | ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* * Save command string to do specialized processing. @@ -573,7 +573,7 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (commandlen > 0) { proto_tree_add_item(reqresp_tree, hf_imap_response_command, tvb, command_offset, commandlen, ENC_ASCII | ENC_NA); hidden_item = proto_tree_add_item(reqresp_tree, hf_imap_command, tvb, command_offset, commandlen, ENC_ASCII | ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } } diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 4dc7623f04..b7008393d6 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -599,7 +599,7 @@ add_geoip_info_entry(proto_tree *tree, tvbuff_t *tvb, gint offset, ws_in4_addr i int addr_offset = offset + isdst ? IPH_DST : IPH_SRC; int dir_hf = isdst ? hf_geoip_dst_summary : hf_geoip_src_summary; proto_item *geoip_info_item = proto_tree_add_string(tree, dir_hf, tvb, addr_offset, 4, wmem_strbuf_finalize(summary)); - PROTO_ITEM_SET_GENERATED(geoip_info_item); + proto_item_set_generated(geoip_info_item); proto_tree *geoip_info_tree = proto_item_add_subtree(geoip_info_item, ett_geoip_info); proto_item *item; @@ -607,57 +607,57 @@ add_geoip_info_entry(proto_tree *tree, tvbuff_t *tvb, gint offset, ws_in4_addr i if (lookup->city) { dir_hf = isdst ? hf_geoip_dst_city : hf_geoip_src_city; item = proto_tree_add_string(geoip_info_tree, dir_hf, tvb, addr_offset, 4, lookup->city); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_string(geoip_info_tree, hf_geoip_city, tvb, addr_offset, 4, lookup->city); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (lookup->country) { dir_hf = isdst ? hf_geoip_dst_country : hf_geoip_src_country; item = proto_tree_add_string(geoip_info_tree, dir_hf, tvb, addr_offset, 4, lookup->country); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_string(geoip_info_tree, hf_geoip_country, tvb, addr_offset, 4, lookup->country); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (lookup->country_iso) { dir_hf = isdst ? hf_geoip_dst_country_iso : hf_geoip_src_country_iso; item = proto_tree_add_string(geoip_info_tree, dir_hf, tvb, addr_offset, 4, lookup->country_iso); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_string(geoip_info_tree, hf_geoip_country_iso, tvb, addr_offset, 4, lookup->country_iso); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (lookup->as_number > 0) { dir_hf = isdst ? hf_geoip_dst_as_number : hf_geoip_src_as_number; item = proto_tree_add_uint(geoip_info_tree, dir_hf, tvb, addr_offset, 4, lookup->as_number); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(geoip_info_tree, hf_geoip_as_number, tvb, addr_offset, 4, lookup->as_number); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (lookup->as_org) { dir_hf = isdst ? hf_geoip_dst_as_org : hf_geoip_src_as_org; item = proto_tree_add_string(geoip_info_tree, dir_hf, tvb, addr_offset, 4, lookup->as_org); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_string(geoip_info_tree, hf_geoip_as_org, tvb, addr_offset, 4, lookup->as_org); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (lookup->latitude >= -90.0 && lookup->latitude <= 90.0) { dir_hf = isdst ? hf_geoip_dst_latitude : hf_geoip_src_latitude; item = proto_tree_add_double(geoip_info_tree, dir_hf, tvb, addr_offset, 4, lookup->latitude); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_double(geoip_info_tree, hf_geoip_latitude, tvb, addr_offset, 4, lookup->latitude); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (lookup->longitude >= -180.0 && lookup->longitude <= 180.0) { dir_hf = isdst ? hf_geoip_dst_longitude : hf_geoip_src_longitude; item = proto_tree_add_double(geoip_info_tree, dir_hf, tvb, addr_offset, 4, lookup->longitude); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_double(geoip_info_tree, hf_geoip_longitude, tvb, addr_offset, 4, lookup->longitude); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } @@ -1146,8 +1146,8 @@ dissect_option_route(proto_tree *tree, tvbuff_t *tvb, int offset, int hf, else proto_tree_add_ipv4(tree, hf, tvb, offset, 4, route); ti = proto_tree_add_string(tree, hf_host, tvb, offset, 4, get_hostname(route)); - PROTO_ITEM_SET_GENERATED(ti); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_generated(ti); + proto_item_set_hidden(ti); } static int @@ -1198,15 +1198,15 @@ dissect_ipopt_route(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int pro offset + optoffset, 4, addr); item = proto_tree_add_ipv4(field_tree, hf_ip_addr, tvb, offset + optoffset, 4, addr); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_string(field_tree, hf_ip_dst_host, tvb, offset + optoffset, 4, dst_host); - PROTO_ITEM_SET_GENERATED(item); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_generated(item); + proto_item_set_hidden(item); item = proto_tree_add_string(field_tree, hf_ip_host, tvb, offset + optoffset, 4, dst_host); - PROTO_ITEM_SET_GENERATED(item); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_generated(item); + proto_item_set_hidden(item); } else if ((optoffset + 1) < ptr) { /* This is also a recorded route */ dissect_option_route(field_tree, tvb, offset + optoffset, hf_ip_rec_rt, @@ -1514,7 +1514,7 @@ dissect_ipopt_qs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * dat ttl_diff = (iph->ip_ttl - tvb_get_guint8(tvb, offset + 1) % 256); ti = proto_tree_add_uint(field_tree, hf_ip_opt_qs_ttl_diff, tvb, offset + 1, 1, ttl_diff); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_item_append_text(tf, ", %s, QS TTL %u, QS TTL diff %u", val_to_str_ext(rate, &qs_rate_vals_ext, "Unknown (%u)"), tvb_get_guint8(tvb, offset + 1), ttl_diff); @@ -1986,7 +1986,7 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* iph->ip_len, "%u bytes (reported as 0, presumed to be because of \"TCP segmentation offload\" (TSO))", iph->ip_len); - PROTO_ITEM_SET_GENERATED(tf); + proto_item_set_generated(tf); } } else { /* TSO support not enabled, or non-zero length, so treat it as an error. */ @@ -2070,13 +2070,13 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* may have a legitimate reason for wanting it filtered */ item = proto_tree_add_uint(ip_tree, hf_ip_checksum_calculated, tvb, offset + 10, 2, iph->ip_sum); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } else { proto_item_append_text(item, "(may be caused by \"IP checksum offload\"?)"); item = proto_tree_add_uint(ip_tree, hf_ip_checksum_calculated, tvb, offset + 10, 2, in_cksum_shouldbe(iph->ip_sum, ipsum)); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } else { ipsum = 0; @@ -2089,7 +2089,7 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* "validation disabled"); item = proto_tree_add_uint(ip_tree, hf_ip_checksum_status, tvb, offset + 10, 0, PROTO_CHECKSUM_E_UNVERIFIED); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } src32 = tvb_get_ntohl(tvb, offset + IPH_SRC); set_address_tvb(&pinfo->net_src, AT_IPv4, 4, tvb, offset + IPH_SRC); @@ -2105,15 +2105,15 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* } proto_tree_add_ipv4(ip_tree, hf_ip_src, tvb, offset + 12, 4, addr); item = proto_tree_add_ipv4(ip_tree, hf_ip_addr, tvb, offset + 12, 4, addr); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_string(ip_tree, hf_ip_src_host, tvb, offset + 12, 4, src_host); - PROTO_ITEM_SET_GENERATED(item); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_generated(item); + proto_item_set_hidden(item); item = proto_tree_add_string(ip_tree, hf_ip_host, tvb, offset + 12, 4, src_host); - PROTO_ITEM_SET_GENERATED(item); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_generated(item); + proto_item_set_hidden(item); } /* If there's an IP strict or loose source routing option, then the final @@ -2180,22 +2180,22 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* proto_tree_add_ipv4(ip_tree, hf_ip_cur_rt, tvb, offset + 16, 4, cur_rt); item = proto_tree_add_string(ip_tree, hf_ip_cur_rt_host, tvb, offset + 16, 4, get_hostname(cur_rt)); - PROTO_ITEM_SET_GENERATED(item); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_generated(item); + proto_item_set_hidden(item); } else { proto_tree_add_ipv4(ip_tree, hf_ip_dst, tvb, offset + 16, 4, addr); item = proto_tree_add_ipv4(ip_tree, hf_ip_addr, tvb, offset + 16, 4, addr); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_string(ip_tree, hf_ip_dst_host, tvb, offset + 16, 4, dst_host); - PROTO_ITEM_SET_GENERATED(item); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_generated(item); + proto_item_set_hidden(item); item = proto_tree_add_string(ip_tree, hf_ip_host, tvb, offset + 16 + dst_off, 4, dst_host); - PROTO_ITEM_SET_GENERATED(item); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_generated(item); + proto_item_set_hidden(item); } if (ip_use_geoip) { diff --git a/epan/dissectors/packet-ipmi-picmg.c b/epan/dissectors/packet-ipmi-picmg.c index 6a5c101685..4c4ea5913c 100644 --- a/epan/dissectors/packet-ipmi-picmg.c +++ b/epan/dissectors/packet-ipmi-picmg.c @@ -2024,7 +2024,7 @@ rs2f(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) } ti = proto_tree_add_uint_format_value(tree, hf_ipmi_picmg_2f_comp_prop, tvb, 0, 0, pno, "%s (0x%02x)", desc, pno); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (pno < array_length(compprops)) { compprops[pno].intrp(tvb, tree); } else { diff --git a/epan/dissectors/packet-ipmi-se.c b/epan/dissectors/packet-ipmi-se.c index 6d3b5814ba..b6f725077d 100644 --- a/epan/dissectors/packet-ipmi-se.c +++ b/epan/dissectors/packet-ipmi-se.c @@ -1833,7 +1833,7 @@ parse_platform_event(tvbuff_t *tvb, proto_tree *tree) || (si->intrp2 && si->intrp2(tree, next_tvb, si, b2, offs, d))) { /* One of them succeeded. */ ti = proto_tree_add_item(tree, hf_ipmi_se_evt_data2, next_tvb, 0, 1, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); } else { /* Just add as hex */ proto_tree_add_item(tree, hf_ipmi_se_evt_data2, next_tvb, 0, 1, ENC_LITTLE_ENDIAN); @@ -1850,7 +1850,7 @@ parse_platform_event(tvbuff_t *tvb, proto_tree *tree) || (si->intrp3 && si->intrp3(tree, next_tvb, si, b3, offs, d))) { /* One of them succeeded. */ ti = proto_tree_add_item(tree, hf_ipmi_se_evt_data3, next_tvb, 0, 1, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); } else { /* Just add as hex */ proto_tree_add_item(tree, hf_ipmi_se_evt_data3, next_tvb, 0, 1, ENC_LITTLE_ENDIAN); @@ -2322,7 +2322,7 @@ rs13(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_uint_format_value(tree, hf_ipmi_se_13_parameter, tvb, 0, 0, pno, "%s", desc); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (tvb_captured_length(tvb) > 1) { if (pno < array_length(conf_params)) { diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c index 2da70d6f4a..2b68bdfc14 100644 --- a/epan/dissectors/packet-ipmi.c +++ b/epan/dissectors/packet-ipmi.c @@ -571,7 +571,7 @@ dissect_ipmi_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb, 0, 0, rs_data->matched_frame_num); /* mark field as a generated one */ - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* calculate delta time */ nstime_delta(&ns, &pinfo->abs_ts, @@ -583,7 +583,7 @@ dissect_ipmi_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb, 0, 0, &ns); /* mark field as a generated one */ - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } else { /* get current command data */ @@ -596,7 +596,7 @@ dissect_ipmi_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb, 0, 0, rq_data->matched_frame_num); /* mark field as a generated one */ - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } } diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index 039d4e6348..db64e9a582 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.c @@ -478,7 +478,7 @@ dissect_ipp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) it = proto_tree_add_uint(ipp_tree, hf_ipp_response_in, tvb, 0, 0, ipp_trans->rep_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else { /* This is a response */ @@ -488,11 +488,11 @@ dissect_ipp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) it = proto_tree_add_uint(ipp_tree, hf_ipp_response_to, tvb, 0, 0, ipp_trans->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &ipp_trans->req_time); it = proto_tree_add_time(ipp_tree, hf_ipp_response_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 7374a5150c..61afbbf72b 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -517,12 +517,12 @@ static void show_esp_sequence_info(guint32 spi, guint32 sequence_number, proto_item_append_text(sn_ti, " (%u SNs missing)", sequence_number - (status->previousSequenceNumber+1)); } - PROTO_ITEM_SET_GENERATED(sn_ti); + proto_item_set_generated(sn_ti); /* Link back to previous frame for SPI */ frame_ti = proto_tree_add_uint(tree, hf_esp_sequence_analysis_previous_frame, tvb, 0, 0, status->previousFrameNum); - PROTO_ITEM_SET_GENERATED(frame_ti); + proto_item_set_generated(frame_ti); /* Expert info */ if (sequence_number == status->previousSequenceNumber) { @@ -1260,11 +1260,11 @@ dissect_esp_authentication(proto_tree *tree, tvbuff_t *tvb, gint len, gint esp_a item = proto_tree_add_boolean(icv_tree, hf_esp_icv_good, tvb, len - esp_auth_len, esp_auth_len, good); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_boolean(icv_tree, hf_esp_icv_bad, tvb, len - esp_auth_len, esp_auth_len, bad); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } static int diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 3ad61fcec9..0e35357934 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -743,7 +743,7 @@ add_geoip_info_entry(proto_tree *tree, tvbuff_t *tvb, gint offset, const ws_in6_ int addr_offset = offset + isdst ? IP6H_DST : IP6H_SRC; int dir_hf = isdst ? hf_geoip_dst_summary : hf_geoip_src_summary; proto_item *geoip_info_item = proto_tree_add_string(tree, dir_hf, tvb, addr_offset, 16, wmem_strbuf_finalize(summary)); - PROTO_ITEM_SET_GENERATED(geoip_info_item); + proto_item_set_generated(geoip_info_item); proto_tree *geoip_info_tree = proto_item_add_subtree(geoip_info_item, ett_geoip_info); proto_item *item; @@ -751,57 +751,57 @@ add_geoip_info_entry(proto_tree *tree, tvbuff_t *tvb, gint offset, const ws_in6_ if (lookup->city) { dir_hf = isdst ? hf_geoip_dst_city : hf_geoip_src_city; item = proto_tree_add_string(geoip_info_tree, dir_hf, tvb, addr_offset, 16, lookup->city); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_string(geoip_info_tree, hf_geoip_city, tvb, addr_offset, 16, lookup->city); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (lookup->country) { dir_hf = isdst ? hf_geoip_dst_country : hf_geoip_src_country; item = proto_tree_add_string(geoip_info_tree, dir_hf, tvb, addr_offset, 16, lookup->country); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_string(geoip_info_tree, hf_geoip_country, tvb, addr_offset, 16, lookup->country); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (lookup->country_iso) { dir_hf = isdst ? hf_geoip_dst_country_iso : hf_geoip_src_country_iso; item = proto_tree_add_string(geoip_info_tree, dir_hf, tvb, addr_offset, 16, lookup->country_iso); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_string(geoip_info_tree, hf_geoip_country_iso, tvb, addr_offset, 16, lookup->country_iso); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (lookup->as_number > 0) { dir_hf = isdst ? hf_geoip_dst_as_number : hf_geoip_src_as_number; item = proto_tree_add_uint(geoip_info_tree, dir_hf, tvb, addr_offset, 16, lookup->as_number); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(geoip_info_tree, hf_geoip_as_number, tvb, addr_offset, 16, lookup->as_number); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (lookup->as_org) { dir_hf = isdst ? hf_geoip_dst_as_org : hf_geoip_src_as_org; item = proto_tree_add_string(geoip_info_tree, dir_hf, tvb, addr_offset, 16, lookup->as_org); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_string(geoip_info_tree, hf_geoip_as_org, tvb, addr_offset, 16, lookup->as_org); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (lookup->latitude >= -90.0 && lookup->latitude <= 90.0) { dir_hf = isdst ? hf_geoip_dst_latitude : hf_geoip_src_latitude; item = proto_tree_add_double(geoip_info_tree, dir_hf, tvb, addr_offset, 16, lookup->latitude); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_double(geoip_info_tree, hf_geoip_latitude, tvb, addr_offset, 16, lookup->latitude); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (lookup->longitude >= -180.0 && lookup->longitude <= 180.0) { dir_hf = isdst ? hf_geoip_dst_longitude : hf_geoip_src_longitude; item = proto_tree_add_double(geoip_info_tree, dir_hf, tvb, addr_offset, 16, lookup->longitude); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_double(geoip_info_tree, hf_geoip_longitude, tvb, addr_offset, 16, lookup->longitude); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } @@ -1004,7 +1004,7 @@ dissect_routing6_rpl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * rpl_addr_count = (((rt->hdr.ip6r_len * 8) - pad - (16 - cmprE)) / (16 - cmprI)) + 1; } ti = proto_tree_add_int(tree, hf_ipv6_routing_rpl_addr_count, tvb, offset, 2, rpl_addr_count); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (rpl_addr_count < 0) { /* This error should always be reported */ expert_add_info_format(pinfo, ti, &ei_ipv6_routing_rpl_addr_count_ge0, "Calculated total address count must be greater than or equal to 0, instead was %d", rpl_addr_count); @@ -1032,7 +1032,7 @@ dissect_routing6_rpl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * tvb_memcpy(tvb, &rpl_fulladdr.bytes[16-cmprX], offset, cmprX); ti = _proto_tree_add_ipv6_vector_address(tree, hf_ipv6_routing_rpl_fulladdr, tvb, offset, cmprX, &rpl_fulladdr, idx); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); offset += cmprX; /* IPv6 Source and Destination addresses of the encapsulating datagram (MUST) not appear in the SRH*/ @@ -1148,7 +1148,7 @@ dissect_routing6_srh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * rthdr_srh_addr_tree = proto_tree_add_subtree_format(tree, tvb, offstart, srh_addr_count * IPv6_ADDR_SIZE, ett_ipv6_routing_srh_vect, &ti, "Segments in Traversal Order"); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); offset -= IPv6_ADDR_SIZE; for (idx = srh_first_seg; offset >= offstart; offset -= IPv6_ADDR_SIZE, idx--) { addr = tvb_get_ptr_ipv6(tvb, offset); @@ -1208,9 +1208,9 @@ dissect_routing6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data proto_item_set_len(pi, total_len); ti = proto_tree_add_uint(rt_tree, hf_ipv6_routing_len_oct, tvb, offset, 1, total_len); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (ipv6_exthdr_hide_len_oct_field) { - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); proto_item_append_text(ti_hdr_len, " (%d bytes)", total_len); } p_ipv6_pinfo_add_len(pinfo, total_len); @@ -1491,7 +1491,7 @@ dissect_opt_quickstart(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tre ttl_diff = (iph->ip6_hop - qs_ttl) % 256; ti = proto_tree_add_uint(opt_tree, hf_ipv6_opt_qs_ttl_diff, tvb, offset, 1, ttl_diff); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_item_append_text(pi, ", QS TTL diff %u", ttl_diff); } offset += 1; @@ -1890,9 +1890,9 @@ dissect_opts(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info *pinfo, ws ti_len = proto_tree_add_item(exthdr_tree, hf_exthdr_item_len, tvb, offset, 1, ENC_BIG_ENDIAN); ti = proto_tree_add_uint(exthdr_tree, hf_exthdr_item_len_oct, tvb, offset, 1, len); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (ipv6_exthdr_hide_len_oct_field) { - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); proto_item_append_text(ti_len, " (%d bytes)", len); } offset += 1; @@ -2087,23 +2087,23 @@ add_ipv6_address(proto_tree *tree, tvbuff_t *tvb, int offset, proto_tree_add_item(tree, hf_addr, tvb, offset, IPv6_ADDR_SIZE, ENC_NA); ti = proto_tree_add_item(tree, hf_ipv6_addr, tvb, offset, IPv6_ADDR_SIZE, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); set_address_ipv6_tvb(&addr, tvb, offset); name = address_to_display(wmem_packet_scope(), &addr); ti = proto_tree_add_string(tree, hf_host, tvb, offset, IPv6_ADDR_SIZE, name); - PROTO_ITEM_SET_GENERATED(ti); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_generated(ti); + proto_item_set_hidden(ti); ti = proto_tree_add_string(tree, hf_ipv6_host, tvb, offset, IPv6_ADDR_SIZE, name); - PROTO_ITEM_SET_GENERATED(ti); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_generated(ti); + proto_item_set_hidden(ti); } #define ADDRESS_SET_GENERATED_HIDDEN(ti) \ G_STMT_START { \ - PROTO_ITEM_SET_GENERATED(ti); \ - if (i > 0) PROTO_ITEM_SET_HIDDEN(ti); \ + proto_item_set_generated(ti); \ + if (i > 0) proto_item_set_hidden(ti); \ } G_STMT_END /* RFC 3056 section 2 */ @@ -2254,7 +2254,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ pi = proto_tree_add_item(ipv6_tree, hf_ip_version, tvb, offset + IP6H_CTL_VFC, 1, ENC_BIG_ENDIAN); proto_item_append_text(pi, " [This field makes the filter match on \"ip.version == 6\" possible]"); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); if (version != 6) { col_add_fstr(pinfo->cinfo, COL_INFO, "Bogus IPv6 version (%u, must be 6)", version); @@ -2304,7 +2304,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ "%u bytes (reported as 0, presumed to be because " "of \"TCP segmentation offload\" (TSO))", ip6_plen); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } else { ti_ipv6_plen = proto_tree_add_item(ipv6_tree, hf_ipv6_plen, tvb, offset + IP6H_CTL_PLEN, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index 85859dd666..2063f0f5bb 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -326,14 +326,14 @@ dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) str=address_to_str(wmem_packet_scope(), &pinfo->net_src); hidden_item = proto_tree_add_string(ipx_tree, hf_ipx_src, tvb, 0, 0, str); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_string(ipx_tree, hf_ipx_addr, tvb, 0, 0, str); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); str=address_to_str(wmem_packet_scope(), &pinfo->net_dst); hidden_item = proto_tree_add_string(ipx_tree, hf_ipx_dst, tvb, 0, 0, str); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_string(ipx_tree, hf_ipx_addr, tvb, 0, 0, str); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_checksum(ipx_tree, tvb, 0, hf_ipx_checksum, -1, NULL, pinfo, 0, ENC_BIG_ENDIAN, PROTO_CHECKSUM_NO_FLAGS); proto_tree_add_uint(ipx_tree, hf_ipx_len, tvb, 2, 2, ipxh->ipx_length); @@ -348,15 +348,15 @@ dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) ipx_dnet); hidden_item = proto_tree_add_ipxnet(ipx_tree, hf_ipx_net, tvb, 6, 4, ipx_dnet); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(ipx_tree, hf_ipx_dnode, tvb, 10, 6, ENC_NA); hidden_item = proto_tree_add_item(ipx_tree, hf_ipx_node, tvb, 10, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_uint(ipx_tree, hf_ipx_dsocket, tvb, 16, 2, ipxh->ipx_dsocket); hidden_item = proto_tree_add_uint(ipx_tree, hf_ipx_socket, tvb, 16, 2, ipxh->ipx_dsocket); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Source */ ipx_snet = tvb_get_ntohl(tvb, 18); @@ -364,15 +364,15 @@ dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) ipx_snet); hidden_item = proto_tree_add_ipxnet(ipx_tree, hf_ipx_net, tvb, 18, 4, ipx_snet); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(ipx_tree, hf_ipx_snode, tvb, 22, 6, ENC_NA); hidden_item = proto_tree_add_item(ipx_tree, hf_ipx_node, tvb, 22, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_uint(ipx_tree, hf_ipx_ssocket, tvb, 28, 2, ipxh->ipx_ssocket); hidden_item = proto_tree_add_uint(ipx_tree, hf_ipx_socket, tvb, 28, 2, ipxh->ipx_ssocket); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Make the next tvbuff */ next_tvb = tvb_new_subset_remaining(tvb, IPX_HEADER_LEN); @@ -897,13 +897,13 @@ dissect_ipxrip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ hidden_item = proto_tree_add_boolean(rip_tree, hf_ipxrip_request, tvb, 0, 2, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); break; case IPX_RIP_RESPONSE: hidden_item = proto_tree_add_boolean(rip_tree, hf_ipxrip_response, tvb, 0, 2, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); break; } @@ -1225,14 +1225,14 @@ dissect_ipxsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ hidden_item = proto_tree_add_boolean(sap_tree, hf_sap_response, tvb, 0, 2, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); break; case IPX_SAP_GENERAL_RESPONSE: case IPX_SAP_NEAREST_RESPONSE: hidden_item = proto_tree_add_boolean(sap_tree, hf_sap_request, tvb, 0, 2, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); break; } diff --git a/epan/dissectors/packet-irc.c b/epan/dissectors/packet-irc.c index 04a939fcdb..ebfac32bf9 100644 --- a/epan/dissectors/packet-irc.c +++ b/epan/dissectors/packet-irc.c @@ -326,7 +326,7 @@ dissect_irc_response(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int of { num_command = ((tvb_get_guint8(tvb, offset)-0x30)*100) + ((tvb_get_guint8(tvb, offset+1)-0x30)*10) + (tvb_get_guint8(tvb, offset+2)-0x30); hidden_item = proto_tree_add_uint(response_tree, hf_irc_response_num_command, tvb, offset, end_offset-offset, num_command); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } return; } @@ -342,7 +342,7 @@ dissect_irc_response(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int of { num_command = ((tvb_get_guint8(tvb, offset)-0x30)*100) + ((tvb_get_guint8(tvb, offset+1)-0x30)*10) + (tvb_get_guint8(tvb, offset+2)-0x30); hidden_item = proto_tree_add_uint(response_tree, hf_irc_response_num_command, tvb, offset, eoc_offset-offset, num_command); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } offset = eoc_offset+1; diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 130fe4295c..39f7ae9865 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -4197,7 +4197,7 @@ dissect_cert(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp length -= 20; ti_url = proto_tree_add_item(tree, hf_isakmp_cert_x509_url, tvb, offset, length, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_URL(ti_url); + proto_item_set_url(ti_url); } break; default: diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c index 29c0ace2d1..f1f5848955 100644 --- a/epan/dissectors/packet-isl.c +++ b/epan/dissectors/packet-isl.c @@ -151,7 +151,7 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len) ti = proto_tree_add_item(fh_tree, hf_isl_dst, tvb, 0, 6, ENC_NA); hidden_item = proto_tree_add_item(fh_tree, hf_isl_addr, tvb, 0, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); dst_tree = proto_item_add_subtree(ti, ett_isl_dst); proto_tree_add_item(dst_tree, hf_isl_type, tvb, 5, 1, ENC_BIG_ENDIAN); @@ -169,7 +169,7 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len) } proto_tree_add_item(fh_tree, hf_isl_src, tvb, 6, 6, ENC_NA); hidden_item = proto_tree_add_item(fh_tree, hf_isl_addr, tvb, 6, 6, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } length = tvb_get_ntohs(tvb, 12); if (tree) diff --git a/epan/dissectors/packet-iso14443.c b/epan/dissectors/packet-iso14443.c index 9a6b299ac8..a8d25e1c95 100644 --- a/epan/dissectors/packet-iso14443.c +++ b/epan/dissectors/packet-iso14443.c @@ -395,7 +395,7 @@ dissect_iso14443_cmd_type_wupa(tvbuff_t *tvb, packet_info *pinfo, proto_item *pi_uid_size; pi_uid_size = proto_tree_add_uint(tree, hf_iso14443_uid_size, tvb, offset+1, 1, uid_size); - PROTO_ITEM_SET_GENERATED(pi_uid_size); + proto_item_set_generated(pi_uid_size); } else { expert_add_info(pinfo, pi_uid, &ei_iso14443_uid_inval_size); @@ -472,7 +472,7 @@ static int dissect_iso14443_atqb(tvbuff_t *tvb, gint offset, if (max_frame_size_code < LEN_CODE_MAX) { pi = proto_tree_add_uint(prot_inf_tree, hf_iso14443_max_frame_size, tvb, offset, 1, code_to_len[max_frame_size_code]); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } prot_type_it = proto_tree_add_item(prot_inf_tree, hf_iso14443_prot_type, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -727,7 +727,7 @@ static int dissect_iso14443_ats(tvbuff_t *tvb, gint offset, if (fsci < LEN_CODE_MAX) { pi = proto_tree_add_uint(t0_tree, hf_iso14443_fsc, tvb, offset, 1, code_to_len[fsci]); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } offset++; } @@ -809,7 +809,7 @@ dissect_iso14443_cmd_type_ats(tvbuff_t *tvb, packet_info *pinfo, if (fsdi < LEN_CODE_MAX) { pi = proto_tree_add_uint(tree, hf_iso14443_fsd, tvb, offset, 1, code_to_len[fsdi]); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } cid = tvb_get_guint8(tvb, offset) & 0x0F; proto_tree_add_uint_bits_format_value(tree, hf_iso14443_cid, @@ -878,7 +878,7 @@ static int dissect_iso14443_attrib(tvbuff_t *tvb, gint offset, if (max_frame_size_code < LEN_CODE_MAX) { pi = proto_tree_add_uint(p2_tree, hf_iso14443_max_frame_size, tvb, offset, 1, code_to_len[max_frame_size_code]); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } offset++; @@ -1207,7 +1207,7 @@ iso14443_get_transaction(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) iso14443_trans->resp_frame!=0) { it = proto_tree_add_uint(tree, hf_iso14443_resp_in, NULL, 0, 0, iso14443_trans->resp_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else { @@ -1231,7 +1231,7 @@ iso14443_get_transaction(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (iso14443_trans && iso14443_trans->resp_frame == pinfo->num) { it = proto_tree_add_uint(tree, hf_iso14443_resp_to, NULL, 0, 0, iso14443_trans->rqst_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } diff --git a/epan/dissectors/packet-iso7816.c b/epan/dissectors/packet-iso7816.c index 001112dd83..1c18f83517 100644 --- a/epan/dissectors/packet-iso7816.c +++ b/epan/dissectors/packet-iso7816.c @@ -531,7 +531,7 @@ dissect_iso7816_params(guint8 ins, tvbuff_t *tvb, gint offset, break; } - PROTO_ITEM_SET_GENERATED(p1_p2_it); + proto_item_set_generated(p1_p2_it); return 2; } @@ -566,7 +566,7 @@ dissect_iso7816_cmd_apdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) trans_ti = proto_tree_add_uint_format(tree, hf_iso7816_resp_in, NULL, 0, 0, iso7816_trans->resp_frame, "Response in frame %d", iso7816_trans->resp_frame); - PROTO_ITEM_SET_GENERATED(trans_ti); + proto_item_set_generated(trans_ti); } } else { @@ -660,7 +660,7 @@ dissect_iso7816_resp_apdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) NULL, 0, 0, iso7816_trans->cmd_frame, "Response to frame %d (%s)", iso7816_trans->cmd_frame, cmd_ins_str); - PROTO_ITEM_SET_GENERATED(trans_ti); + proto_item_set_generated(trans_ti); col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "(to %s)", cmd_ins_str); diff --git a/epan/dissectors/packet-isobus-vt.c b/epan/dissectors/packet-isobus-vt.c index 28d12d81f5..b1c9763abd 100644 --- a/epan/dissectors/packet-isobus-vt.c +++ b/epan/dissectors/packet-isobus-vt.c @@ -845,7 +845,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio ti = proto_tree_add_item(tree, hf_isobus_vt, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); proto_tree_add_item_ret_uint(tree, hf_isobus_vt_command, tvb, offset, 1, ENC_LITTLE_ENDIAN, &function_id); @@ -865,14 +865,14 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_softkey_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, hf_isobus_vt_softkey_parentobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &parent_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item(tree, @@ -895,14 +895,14 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_button_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, hf_isobus_vt_button_parentobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &parent_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item(tree, @@ -948,7 +948,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_vtselectinputobject_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item(tree, @@ -972,7 +972,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_vtescmessage_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(direction == vt_to_ecu) @@ -1004,7 +1004,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_vtchgnumval_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; offset += 1; /* byte 4 is reserved */ @@ -1032,7 +1032,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_vtchgactivemask_maskobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &mask_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(direction == vt_to_ecu) @@ -1056,14 +1056,14 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_vtchgactivemask_errorobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &error_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, hf_isobus_vt_vtchgactivemask_errorobjectidparent, tvb, offset, 2, ENC_LITTLE_ENDIAN, &error_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); if(error_codes) { @@ -1097,7 +1097,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_vtchgstrval_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, @@ -1128,7 +1128,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_chgstrval_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); col_append_fstr(pinfo->cinfo, COL_INFO, "VT String value change of %s acknowledged", get_object_id_string(object_id)); @@ -1143,7 +1143,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_vtonuserlayouthideshow_objectid_1, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id[0]); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, @@ -1154,7 +1154,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_vtonuserlayouthideshow_objectid_2, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id[1]); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, @@ -1207,14 +1207,14 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_endofobjectpool_faultyparentobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item(tree, hf_isobus_vt_endofobjectpool_faultyobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; ti = proto_tree_add_item_ret_uint(tree, @@ -1260,7 +1260,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_auxiliaryassignmenttype1_objectidauxinputdevice, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); if(direction == ecu_to_vt) { @@ -1345,14 +1345,14 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_preferredassignment_auxinputunit_preferredfunctions_auxfunctionobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &auxiliary_function_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(preferred_function_subtree, hf_isobus_vt_preferredassignment_auxinputunit_preferredfunctions_auxinputobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &auxiliary_input_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_item_set_text(preferred_function_item, "Auxiliary Function %s connects to Auxiliary Input %s", @@ -1384,7 +1384,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_preferredassignment_faultyauxiliaryfunctionobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &faulty_auxiliary_function_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); if(error_codes) { @@ -1441,17 +1441,17 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio flags_subtree = proto_item_add_subtree(ti, ett_isobus_vt_auxiliaryassignmenttype2_flags); ti = proto_tree_add_item(flags_subtree, hf_isobus_vt_auxiliaryassignmenttype2_flags_preferredassignment, tvb, offset, 1, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_item(flags_subtree, hf_isobus_vt_auxiliaryassignmenttype2_flags_auxiliaryfunctiontype, tvb, offset, 1, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); offset += 1; proto_tree_add_item_ret_uint(tree, hf_isobus_vt_auxiliaryassignmenttype2_auxinputobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &auxiliary_input_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; } @@ -1459,7 +1459,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_auxiliaryassignmenttype2_auxfunctionobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &auxiliary_function_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(direction == vt_to_ecu) @@ -1501,7 +1501,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_auxiliaryinputstatustype2enable_auxiliaryinputobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &auxiliary_input_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(direction == ecu_to_vt) @@ -1561,7 +1561,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_auxiliaryinputtype2status_auxiliaryinputobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &auxiliary_input_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, @@ -1577,10 +1577,10 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio operating_state_subtree = proto_item_add_subtree(ti, ett_isobus_vt_auxiliaryinputtype2status_operatingstate); ti = proto_tree_add_item(operating_state_subtree, hf_isobus_vt_auxiliaryinputtype2status_operatingstate_learnmodeactive, tvb, offset, 1, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_item(operating_state_subtree, hf_isobus_vt_auxiliaryinputtype2status_operatingstate_inputactivatedinlearnmode, tvb, offset, 1, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); col_append_fstr(pinfo->cinfo, COL_INFO, "State of input %s value 1 = 0x%X value 2 = 0x%X.", get_object_id_string(auxiliary_input_object_id), value_1, value_2); @@ -1663,7 +1663,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_esc_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; ti = proto_tree_add_item_ret_uint(tree, @@ -1696,7 +1696,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_hideshowobj_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, @@ -1762,7 +1762,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_enabledisableobj_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, @@ -1830,7 +1830,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_selectinputobject_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(direction == ecu_to_vt) @@ -1980,14 +1980,14 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changechildlocation_parentobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &parent_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, hf_isobus_vt_changechildlocation_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(direction == ecu_to_vt) @@ -2038,7 +2038,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changesize_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(direction == ecu_to_vt) @@ -2087,7 +2087,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changebackgroundcolour_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, @@ -2135,7 +2135,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_chgnumval_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(direction == vt_to_ecu) @@ -2184,7 +2184,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changeendpoint_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(direction == ecu_to_vt) @@ -2215,7 +2215,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changefontattributes_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(direction == ecu_to_vt) @@ -2276,7 +2276,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changelineattributes_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(direction == ecu_to_vt) @@ -2329,7 +2329,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changefillattributes_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(direction == ecu_to_vt) @@ -2346,7 +2346,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changefillattributes_fillpatternobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); col_append_fstr(pinfo->cinfo, COL_INFO, "Change fill attributes of %s", get_object_id_string(object_id)); } @@ -2389,7 +2389,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changeactivemask_workingset, tvb, offset, 2, ENC_LITTLE_ENDIAN, &working_set_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; } else @@ -2401,7 +2401,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changeactivemask_newactivemask, tvb, offset, 2, ENC_LITTLE_ENDIAN, &new_active_mask_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(direction == vt_to_ecu) @@ -2449,14 +2449,14 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changesoftkeymask_datamaskobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &data_mask_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, hf_isobus_vt_changesoftkeymask_newsoftkeymaskobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &new_soft_key_mask_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(direction == vt_to_ecu) @@ -2501,7 +2501,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changeattributes_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, @@ -2555,7 +2555,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changepriority_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, @@ -2600,7 +2600,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changelistitem_listobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &list_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, @@ -2611,7 +2611,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changelistitem_newobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &new_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(direction == vt_to_ecu) @@ -2691,7 +2691,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_chgstrval_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, @@ -2721,7 +2721,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_chgstrval_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; ti = proto_tree_add_item_ret_uint(tree, @@ -2757,7 +2757,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changechildposition_parentobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &parent_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; @@ -2765,7 +2765,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changechildposition_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(direction == ecu_to_vt) @@ -2818,14 +2818,14 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changeobjectlabel_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, hf_isobus_vt_changeobjectlabel_stringobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &string_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item(tree, @@ -2836,7 +2836,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changeobjectlabel_graphicobjectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); col_append_fstr(pinfo->cinfo, COL_INFO, "Change object label of %s to string %s", get_object_id_string(object_id), get_object_id_string(string_object_id)); @@ -2880,7 +2880,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changepolygonpoint_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(direction == ecu_to_vt) @@ -2933,7 +2933,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_changepolygonscale_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, @@ -2983,7 +2983,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_graphicscontext_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, @@ -3054,7 +3054,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_graphicscontext_setlineattributesobjectid_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &line_attr_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); col_append_fstr(pinfo->cinfo, COL_INFO, "Set Line Attributes to %s", get_object_id_string(line_attr_object_id)); @@ -3068,7 +3068,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_graphicscontext_setfillattributesobjectid_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &fill_attr_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); col_append_fstr(pinfo->cinfo, COL_INFO, "Set Fill Attributes to %s", get_object_id_string(fill_attr_object_id)); @@ -3082,7 +3082,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_graphicscontext_setfontattributesobjectid_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &font_attr_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); col_append_fstr(pinfo->cinfo, COL_INFO, "Set Font Attributes to %s", get_object_id_string(font_attr_object_id)); @@ -3296,7 +3296,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_graphicscontext_drawvtobject_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &draw_object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); col_append_fstr(pinfo->cinfo, COL_INFO, "Draw VT %s at graphics cursor", get_object_id_string(draw_object_id)); @@ -3310,7 +3310,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_graphicscontext_copycanvastopicturegraphic_objectidpicturegraphic, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id_picture_graphic); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); col_append_fstr(pinfo->cinfo, COL_INFO, "Copy canvas to picture graphics %s", get_object_id_string(object_id_picture_graphic)); @@ -3324,7 +3324,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_graphicscontext_copyviewporttopicturegraphic_objectidpicturegraphic, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id_picture_graphic); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); col_append_fstr(pinfo->cinfo, COL_INFO, "Copy viewport to picture graphics %s", get_object_id_string(object_id_picture_graphic)); @@ -3346,7 +3346,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_getattributevalue_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); } else { @@ -3377,7 +3377,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_getattributevalue_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; ti = proto_tree_add_item_ret_uint(tree, @@ -3409,7 +3409,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_selectcolourmap_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(direction == vt_to_ecu) @@ -3465,7 +3465,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_executeextendedmacro_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(direction == vt_to_ecu) @@ -3515,7 +3515,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_lockunlockmask_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; if(command == MASK_LOCK) @@ -3597,7 +3597,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_executemacro_objectid, tvb, offset, 1, ENC_LITTLE_ENDIAN, &object_id); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 1, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 1; if(direction == vt_to_ecu) @@ -4250,14 +4250,14 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio hf_isobus_vt_vtstatus_objectiddatamask, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id_data_mask); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; proto_tree_add_item_ret_uint(tree, hf_isobus_vt_vtstatus_objectidsoftkeymask, tvb, offset, 2, ENC_LITTLE_ENDIAN, &object_id_soft_key_mask); ti = proto_tree_add_item(tree, hf_isobus_vt_objectid, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); offset += 2; busycodes_item = proto_tree_add_item(tree, diff --git a/epan/dissectors/packet-isobus.c b/epan/dissectors/packet-isobus.c index b862142163..e57d76b62b 100644 --- a/epan/dissectors/packet-isobus.c +++ b/epan/dissectors/packet-isobus.c @@ -342,26 +342,26 @@ dissect_isobus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) /* add priority */ ti = proto_tree_add_uint(isobus_can_id_tree, hf_isobus_priority, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* add extended data page */ ti = proto_tree_add_uint(isobus_can_id_tree, hf_isobus_ext_data_page, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* add data page */ ti = proto_tree_add_uint(isobus_can_id_tree, hf_isobus_data_page, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* add pdu format */ switch(data_page) { case 0: ti = proto_tree_add_uint(isobus_can_id_tree, hf_isobus_pdu_format_dp0, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; case 1: ti = proto_tree_add_uint(isobus_can_id_tree, hf_isobus_pdu_format_dp1, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; } @@ -369,17 +369,17 @@ dissect_isobus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) if(pdu_format <= 239) { ti = proto_tree_add_uint(isobus_can_id_tree, hf_isobus_dst_addr, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else { ti = proto_tree_add_uint(isobus_can_id_tree, hf_isobus_group_extension, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* add source address */ ti = proto_tree_add_uint(isobus_can_id_tree, hf_isobus_src_addr, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* put source address in source field */ g_snprintf(str_src, 4, "%d", src_addr); diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c index 94f86977c4..6aa563e93c 100644 --- a/epan/dissectors/packet-iuup.c +++ b/epan/dissectors/packet-iuup.c @@ -741,14 +741,14 @@ static int dissect_iuup(tvbuff_t* tvb_in, packet_info* pinfo, proto_tree* tree, if (ta >= 1 && ta <= 80) { pi = proto_tree_add_uint(time_tree,hf_iuup_delay,tvb,4,1,ta * 500); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pi = proto_tree_add_float(time_tree,hf_iuup_delta,tvb,4,1,((gfloat)((gint)(ta) * 500))/(gfloat)1000000.0); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } else if (ta >= 129 && ta <= 208) { pi = proto_tree_add_uint(time_tree,hf_iuup_advance,tvb,4,1,(ta-128) * 500); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pi = proto_tree_add_float(time_tree,hf_iuup_delta,tvb,4,1,((gfloat)((gint)(-(((gint)ta)-128))) * 500)/(gfloat)1000000.0); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } else { expert_add_info(pinfo, pi, &ei_iuup_time_align); } diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c index 8534891351..b346967c8e 100644 --- a/epan/dissectors/packet-ixveriwave.c +++ b/epan/dissectors/packet-ixveriwave.c @@ -1045,7 +1045,7 @@ dissect_ixveriwave(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da ti = proto_tree_add_uint_format_value(common_tree, hf_ixveriwave_vw_ifg, tvb, 18, 0, p_ifg_info->ifg, "Cannot be determined"); } - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if(cmd_type ==3 || cmd_type ==4) @@ -1518,7 +1518,7 @@ ethernettap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_t p_ifg_info = (struct ifg_info *) p_get_proto_data(wmem_file_scope(), pinfo, proto_ixveriwave, 0); ti = proto_tree_add_uint(tap_tree, hf_ixveriwave_vw_ifg, tvb, offset, 0, p_ifg_info->ifg); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); length = tvb_get_letohs(tvb, offset); length_remaining = length; @@ -1933,7 +1933,7 @@ wlantap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ti = proto_tree_add_uint(tap_tree, hf_ixveriwave_vw_ifg, tvb, 18, 0, 0); else ti = proto_tree_add_uint(tap_tree, hf_ixveriwave_vw_ifg, tvb, 18, 0, p_ifg_info->ifg); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); offset = 0; /* header length */ diff --git a/epan/dissectors/packet-j1939.c b/epan/dissectors/packet-j1939.c index 3869ac352f..07625bb4d4 100644 --- a/epan/dissectors/packet-j1939.c +++ b/epan/dissectors/packet-j1939.c @@ -186,19 +186,19 @@ static int dissect_j1939(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo can_tree = proto_tree_add_subtree_format(j1939_tree, tvb, 0, 0, ett_j1939_can, NULL, "CAN Identifier: 0x%08x", can_id.id); can_id_item = proto_tree_add_uint(can_tree, hf_j1939_can_id, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(can_id_item); + proto_item_set_generated(can_id_item); ti = proto_tree_add_uint(can_tree, hf_j1939_priority, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(can_tree, hf_j1939_extended_data_page, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(can_tree, hf_j1939_data_page, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(can_tree, hf_j1939_pdu_format, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(can_tree, hf_j1939_pdu_specific, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(can_tree, hf_j1939_src_addr, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Set source address */ src_addr = (guint8*)wmem_alloc(pinfo->pool, 1); @@ -213,12 +213,12 @@ static int dissect_j1939(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo pgn &= 0x3FF00; ti = proto_tree_add_uint(can_tree, hf_j1939_dst_addr, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else { ti = proto_tree_add_uint(can_tree, hf_j1939_group_extension, tvb, 0, 0, can_id.id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Fill in "destination" address even if its "broadcast" */ @@ -242,7 +242,7 @@ static int dissect_j1939(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo msg_tree = proto_tree_add_subtree(j1939_tree, tvb, 0, tvb_reported_length(tvb), ett_j1939_message, NULL, "Message"); ti = proto_tree_add_uint(msg_tree, hf_j1939_pgn, tvb, 0, 0, pgn); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (!dissector_try_uint_new(subdissector_pgn_table, pgn, tvb, pinfo, msg_tree, TRUE, data)) { diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c index 8c2e9f4b4e..17b005e8d2 100644 --- a/epan/dissectors/packet-juniper.c +++ b/epan/dissectors/packet-juniper.c @@ -627,7 +627,7 @@ dissect_juniper_payload_proto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre tvbuff_t *next_tvb; ti = proto_tree_add_uint(juniper_subtree, hf_juniper_payload_type, tvb, offset, 0, proto); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (proto == 0xa248) { @@ -750,7 +750,7 @@ dissect_juniper_mlfr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* } ti = proto_tree_add_uint(juniper_subtree, hf_juniper_cookie_len, tvb, offset, 0, cookie_len); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); dissect_juniper_payload_proto(tvb, pinfo, tree, juniper_subtree, proto, offset); @@ -824,7 +824,7 @@ dissect_juniper_mlppp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* } ti = proto_tree_add_uint(juniper_subtree, hf_juniper_cookie_len, tvb, offset, 0, cookie_len); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); offset += cookie_len; dissect_juniper_payload_proto(tvb, pinfo, tree, juniper_subtree, proto, offset); diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index f935b76e3a..4b2c2131d6 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -841,7 +841,7 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree if (jxta_welcome_tree) { proto_item *jxta_welcome_initiator_item = proto_tree_add_boolean(jxta_welcome_tree, hf_jxta_welcome_initiator, tvb, 0, 0, initiator); - PROTO_ITEM_SET_GENERATED(jxta_welcome_initiator_item); + proto_item_set_generated(jxta_welcome_initiator_item); } if (NULL != *current_token) { @@ -1348,35 +1348,35 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree tree_offset += (int)sizeof(JXTA_MSG_SIG); tree_item = proto_tree_add_string(jxta_msg_tree, hf_jxta_message_src, tvb, 0, 0, wmem_strbuf_get_str(src_addr)); - PROTO_ITEM_SET_GENERATED(tree_item); + proto_item_set_generated(tree_item); tree_item = proto_tree_add_string(jxta_msg_tree, hf_jxta_message_address, tvb, 0, 0, wmem_strbuf_get_str(src_addr)); - PROTO_ITEM_SET_HIDDEN(tree_item); - PROTO_ITEM_SET_GENERATED(tree_item); + proto_item_set_hidden(tree_item); + proto_item_set_generated(tree_item); if(uri_address_type == pinfo->src.type) { tree_item = proto_tree_add_string(jxta_msg_tree, hf_uri_src, tvb, 0, 0, wmem_strbuf_get_str(src_addr)); - PROTO_ITEM_SET_HIDDEN(tree_item); - PROTO_ITEM_SET_GENERATED(tree_item); + proto_item_set_hidden(tree_item); + proto_item_set_generated(tree_item); tree_item = proto_tree_add_string(jxta_msg_tree, hf_uri_addr, tvb, 0, 0, wmem_strbuf_get_str(src_addr)); - PROTO_ITEM_SET_HIDDEN(tree_item); - PROTO_ITEM_SET_GENERATED(tree_item); + proto_item_set_hidden(tree_item); + proto_item_set_generated(tree_item); } tree_item = proto_tree_add_string(jxta_msg_tree, hf_jxta_message_dst, tvb, 0, 0, wmem_strbuf_get_str(dst_addr)); - PROTO_ITEM_SET_GENERATED(tree_item); + proto_item_set_generated(tree_item); tree_item = proto_tree_add_string(jxta_msg_tree, hf_jxta_message_address, tvb, 0, 0, wmem_strbuf_get_str(dst_addr)); - PROTO_ITEM_SET_HIDDEN(tree_item); - PROTO_ITEM_SET_GENERATED(tree_item); + proto_item_set_hidden(tree_item); + proto_item_set_generated(tree_item); if(uri_address_type == pinfo->dst.type) { tree_item = proto_tree_add_string(jxta_msg_tree, hf_uri_dst, tvb, 0, 0, wmem_strbuf_get_str(dst_addr)); - PROTO_ITEM_SET_HIDDEN(tree_item); - PROTO_ITEM_SET_GENERATED(tree_item); + proto_item_set_hidden(tree_item); + proto_item_set_generated(tree_item); tree_item = proto_tree_add_string(jxta_msg_tree, hf_uri_addr, tvb, 0, 0, wmem_strbuf_get_str(dst_addr)); - PROTO_ITEM_SET_HIDDEN(tree_item); - PROTO_ITEM_SET_GENERATED(tree_item); + proto_item_set_hidden(tree_item); + proto_item_set_generated(tree_item); } message_version = tvb_get_guint8(tvb, tree_offset); @@ -2072,7 +2072,7 @@ static int dissect_media( const gchar* fullmediatype, tvbuff_t * tvb, packet_inf if (dissected < (int) tvb_reported_length(tvb)) { proto_item *item = proto_tree_add_expert(tree, pinfo, &ei_media_too_short, tvb, 0, dissected); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } return dissected; } diff --git a/epan/dissectors/packet-kafka.c b/epan/dissectors/packet-kafka.c index d4afc54b88..2bac752ef2 100644 --- a/epan/dissectors/packet-kafka.c +++ b/epan/dissectors/packet-kafka.c @@ -576,7 +576,7 @@ dissect_kafka_string(proto_tree *tree, int hf_item, tvbuff_t *tvb, packet_info * else { /* Only showing length field if preference indicates */ if (!kafka_show_string_bytes_lengths) { - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); } if (len == -1) { @@ -615,7 +615,7 @@ dissect_kafka_bytes(proto_tree *tree, int hf_item, tvbuff_t *tvb, packet_info *p else { /* Only showing length field if preference indicates */ if (!kafka_show_string_bytes_lengths) { - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); } if (len == -1) { @@ -678,7 +678,7 @@ static void show_compression_reduction(tvbuff_t *tvb, proto_tree *tree, guint co if (uncompressed_size != 0) { ti = proto_tree_add_float(tree, hf_kafka_message_compression_reduction, tvb, 0, 0, (float)compressed_size / (float)uncompressed_size); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } @@ -3490,7 +3490,7 @@ dissect_kafka(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U if (matcher->response_found) { ti = proto_tree_add_uint(kafka_tree, hf_kafka_response_frame, tvb, 0, 0, matcher->response_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } ti = proto_tree_add_item(kafka_tree, hf_kafka_request_api_key, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -3613,18 +3613,18 @@ dissect_kafka(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U /* Show request frame */ ti = proto_tree_add_uint(kafka_tree, hf_kafka_request_frame, tvb, 0, 0, matcher->request_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Show api key (message type) */ ti = proto_tree_add_int(kafka_tree, hf_kafka_response_api_key, tvb, 0, 0, matcher->api_key); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); kafka_check_supported_api_key(pinfo, ti, matcher); /* Also show api version from request */ ti = proto_tree_add_int(kafka_tree, hf_kafka_response_api_version, tvb, 0, 0, matcher->api_version); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); kafka_check_supported_api_version(pinfo, ti, matcher); switch (matcher->api_key) { diff --git a/epan/dissectors/packet-kismet.c b/epan/dissectors/packet-kismet.c index 2ba2ae91b3..f7a96fd6f1 100644 --- a/epan/dissectors/packet-kismet.c +++ b/epan/dissectors/packet-kismet.c @@ -136,7 +136,7 @@ dissect_kismet(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * da tmp_item = proto_tree_add_boolean(kismet_tree, hf_kismet_response, tvb, 0, 0, TRUE); } - PROTO_ITEM_SET_GENERATED (tmp_item); + proto_item_set_generated (tmp_item); while (tvb_offset_exists(tvb, offset)) { /* diff --git a/epan/dissectors/packet-kt.c b/epan/dissectors/packet-kt.c index bd0abef72c..4dc9f5df7e 100644 --- a/epan/dissectors/packet-kt.c +++ b/epan/dissectors/packet-kt.c @@ -196,7 +196,7 @@ dissect_kt_replication(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint } else { /* This is an empty ack to the message with magic 0xB0. */ pi = proto_tree_add_uint(tree, hf_kt_type, tvb, offset, 1, KT_OPER_RESPONSE); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); col_append_sep_str(pinfo->cinfo, COL_INFO, " ", "[response]"); } @@ -222,7 +222,7 @@ dissect_kt_set_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint of if (tvb_reported_length_remaining(tvb, (new_offset + 4)) > 0) { /* There's more data after the 32 bits. This is a request */ pi = proto_tree_add_uint(tree, hf_kt_type, tvb, offset, 1, KT_OPER_REQUEST); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); proto_tree_add_uint(tree, hf_kt_flags, tvb, new_offset, 4, next32); new_offset += 4; @@ -254,14 +254,14 @@ dissect_kt_set_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint of proto_tree_add_item(rec_tree, hf_kt_key, tvb, new_offset, ksiz, ENC_NA); if (kt_present_key_val_as_ascii) { pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } new_offset += ksiz; proto_tree_add_item(rec_tree, hf_kt_val, tvb, new_offset, vsiz, ENC_NA); if (kt_present_key_val_as_ascii) { pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } new_offset += vsiz; @@ -271,7 +271,7 @@ dissect_kt_set_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint of } else { /* Nothing remaining after the 32 bits. This is a response. */ pi = proto_tree_add_uint(tree, hf_kt_type, tvb, offset, 1, KT_OPER_RESPONSE); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); col_append_sep_str(pinfo->cinfo, COL_INFO, " ", "[response]"); proto_tree_add_uint(tree, hf_kt_hits, tvb, new_offset, 4, next32); @@ -301,7 +301,7 @@ dissect_kt_play_script(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint if (tvb_reported_length_remaining(tvb, (new_offset + 4)) > 0) { /* There's more data after the 32 bits. This is a request */ pi = proto_tree_add_uint(tree, hf_kt_type, tvb, offset, 1, KT_OPER_REQUEST); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); proto_tree_add_uint(tree, hf_kt_flags, tvb, new_offset, 4, next32); new_offset += 4; @@ -334,14 +334,14 @@ dissect_kt_play_script(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint proto_tree_add_item(rec_tree, hf_kt_key, tvb, new_offset, ksiz, ENC_NA); if (kt_present_key_val_as_ascii) { pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } new_offset += ksiz; proto_tree_add_item(rec_tree, hf_kt_val, tvb, new_offset, vsiz, ENC_NA); if (kt_present_key_val_as_ascii) { pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } new_offset += vsiz; @@ -351,7 +351,7 @@ dissect_kt_play_script(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint } else { /* Nothing remaining after the 32 bits. This is a response with no records. */ pi = proto_tree_add_uint(tree, hf_kt_type, tvb, offset, 1, KT_OPER_RESPONSE); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); col_append_sep_str(pinfo->cinfo, COL_INFO, " ", "[response]"); proto_tree_add_uint(tree, hf_kt_rnum, tvb, new_offset, 4, next32); @@ -359,7 +359,7 @@ dissect_kt_play_script(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint } } else { /* response - one or more records */ pi = proto_tree_add_uint(tree, hf_kt_type, tvb, offset, 1, KT_OPER_RESPONSE); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); col_append_sep_str(pinfo->cinfo, COL_INFO, " ", "[response]"); rnum = tvb_get_ntohl(tvb, new_offset); @@ -383,14 +383,14 @@ dissect_kt_play_script(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint proto_tree_add_item(rec_tree, hf_kt_key, tvb, new_offset, ksiz, ENC_NA); if (kt_present_key_val_as_ascii) { pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } new_offset += ksiz; proto_tree_add_item(rec_tree, hf_kt_val, tvb, new_offset, vsiz, ENC_NA); if (kt_present_key_val_as_ascii) { pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } new_offset += vsiz; @@ -423,7 +423,7 @@ dissect_kt_get_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint of if (next32 == 0) { if (tvb_reported_length_remaining(tvb, (new_offset + 4)) > 0) { /* request */ pi = proto_tree_add_uint(tree, hf_kt_type, tvb, offset, 1, KT_OPER_REQUEST); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); proto_tree_add_uint(tree, hf_kt_flags, tvb, new_offset, 4, next32); new_offset += 4; @@ -448,7 +448,7 @@ dissect_kt_get_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint of proto_tree_add_item(rec_tree, hf_kt_key, tvb, new_offset, ksiz, ENC_NA); if (kt_present_key_val_as_ascii) { pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } new_offset += ksiz; @@ -457,7 +457,7 @@ dissect_kt_get_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint of } } else { /* response - no records */ pi = proto_tree_add_uint(tree, hf_kt_type, tvb, offset, 1, KT_OPER_RESPONSE); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); col_append_sep_str(pinfo->cinfo, COL_INFO, " ", "[response]"); proto_tree_add_uint(tree, hf_kt_hits, tvb, new_offset, 4, next32); @@ -465,7 +465,7 @@ dissect_kt_get_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint of } } else { /* response - one or more records */ pi = proto_tree_add_uint(tree, hf_kt_type, tvb, offset, 1, KT_OPER_RESPONSE); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); col_append_sep_str(pinfo->cinfo, COL_INFO, " ", "[response]"); rnum = tvb_get_ntohl(tvb, new_offset); @@ -498,14 +498,14 @@ dissect_kt_get_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint of proto_tree_add_item(rec_tree, hf_kt_key, tvb, new_offset, ksiz, ENC_NA); if (kt_present_key_val_as_ascii) { pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } new_offset += ksiz; proto_tree_add_item(rec_tree, hf_kt_val, tvb, new_offset, vsiz, ENC_NA); if (kt_present_key_val_as_ascii) { pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } new_offset += vsiz; @@ -535,7 +535,7 @@ dissect_kt_remove_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint if (tvb_reported_length_remaining(tvb, (new_offset + 4)) > 0) { /* request */ pi = proto_tree_add_uint(tree, hf_kt_type, tvb, offset, 1, KT_OPER_REQUEST); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); proto_tree_add_uint(tree, hf_kt_flags, tvb, new_offset, 4, next32); new_offset += 4; @@ -560,7 +560,7 @@ dissect_kt_remove_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint proto_tree_add_item(rec_tree, hf_kt_key, tvb, new_offset, ksiz, ENC_NA); if (kt_present_key_val_as_ascii) { pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } new_offset += ksiz; @@ -569,7 +569,7 @@ dissect_kt_remove_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint } } else { /* response */ pi = proto_tree_add_uint(tree, hf_kt_type, tvb, offset, 1, KT_OPER_RESPONSE); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); col_append_sep_str(pinfo->cinfo, COL_INFO, " ", "[response]"); proto_tree_add_uint(tree, hf_kt_hits, tvb, new_offset, 4, next32); diff --git a/epan/dissectors/packet-lacp.c b/epan/dissectors/packet-lacp.c index 44a3305e92..e08553a555 100644 --- a/epan/dissectors/packet-lacp.c +++ b/epan/dissectors/packet-lacp.c @@ -235,7 +235,7 @@ dissect_lacp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ ett_lacp_a_flags, actor_flags, ENC_NA, BMT_NO_INT|BMT_NO_TFS|BMT_NO_FALSE); flagstr = lacp_state_flags_to_str(tvb_get_guint8(tvb, offset)); ti = proto_tree_add_string(lacp_tree, hf_lacp_actor_state_str, tvb, offset, 1, flagstr); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); offset += 1; proto_tree_add_item(lacp_tree, hf_lacp_actor_reserved, tvb, offset, 3, ENC_NA); @@ -277,7 +277,7 @@ dissect_lacp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_tree_add_bitmask_with_flags(lacp_tree, tvb, offset, hf_lacp_partner_state, ett_lacp_p_flags, partner_flags, ENC_NA, BMT_NO_INT|BMT_NO_TFS|BMT_NO_FALSE); flagstr = lacp_state_flags_to_str(tvb_get_guint8(tvb, offset)); ti = proto_tree_add_string(lacp_tree, hf_lacp_partner_state_str, tvb, offset, 1, flagstr); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); offset += 1; proto_tree_add_item(lacp_tree, hf_lacp_partner_reserved, tvb, offset, 3, ENC_NA); diff --git a/epan/dissectors/packet-lanforge.c b/epan/dissectors/packet-lanforge.c index 5cc437362f..a380c79aaa 100644 --- a/epan/dissectors/packet-lanforge.c +++ b/epan/dissectors/packet-lanforge.c @@ -101,12 +101,12 @@ static gboolean dissect_lanforge(tvbuff_t *tvb, packet_info *pinfo, proto_tree * pld_len = tvb_get_ntohs(tvb, offset); tmp = proto_tree_add_item(lanforge_tree, hf_lanforge_pld_len_l, tvb, offset, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(tmp); + proto_item_set_generated(tmp); offset+=2; tmpi = tvb_get_guint8(tvb, offset); tmp = proto_tree_add_item(lanforge_tree, hf_lanforge_pld_len_h, tvb, offset, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(tmp); + proto_item_set_generated(tmp); offset+=1; pld_len |= (tmpi << 16); @@ -121,13 +121,13 @@ static gboolean dissect_lanforge(tvbuff_t *tvb, packet_info *pinfo, proto_tree * tss = tvb_get_ntohl(tvb, offset); tstamp.secs = tss; tmp = proto_tree_add_item(lanforge_tree, hf_lanforge_tx_time_s, tvb, offset, 4, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(tmp); + proto_item_set_generated(tmp); offset+=4; tss = tvb_get_ntohl(tvb, offset); tstamp.nsecs = tss; tmp = proto_tree_add_item(lanforge_tree, hf_lanforge_tx_time_ns, tvb, offset, 4, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(tmp); + proto_item_set_generated(tmp); offset+=4; proto_tree_add_time(lanforge_tree, hf_lanforge_timestamp, tvb, offset - 8, 8, &tstamp); diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c index b92a4e8869..a60a4f8e5c 100644 --- a/epan/dissectors/packet-lapd.c +++ b/epan/dissectors/packet-lapd.c @@ -509,7 +509,7 @@ dissect_lapd_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 f if (direction != P2P_DIR_UNKNOWN) { direction_ti = proto_tree_add_uint(lapd_tree, hf_lapd_direction, tvb, 0, 0, pinfo->p2p_dir); - PROTO_ITEM_SET_GENERATED(direction_ti); + proto_item_set_generated(direction_ti); } addr_ti = proto_tree_add_uint(lapd_tree, hf_lapd_address, tvb, diff --git a/epan/dissectors/packet-lbmc.c b/epan/dissectors/packet-lbmc.c index 208a117dca..e7e4652c74 100644 --- a/epan/dissectors/packet-lbmc.c +++ b/epan/dissectors/packet-lbmc.c @@ -10112,9 +10112,9 @@ static int dissect_nhdr_extopt(tvbuff_t * tvb, int offset, packet_info * pinfo, ritem = proto_tree_add_item(tree, hf_lbmc_extopt_reassembled_data, reassembly_tvb, 0, reassembly->len, ENC_NA); rtree = proto_item_add_subtree(ritem, ett_lbmc_extopt_reassembled_data); pi = proto_tree_add_uint(rtree, hf_lbmc_extopt_reassembled_data_subtype, reassembly_tvb, 0, 0, reassembly->subtype); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pi = proto_tree_add_uint(rtree, hf_lbmc_extopt_reassembled_data_len, reassembly_tvb, 0, 0, (guint32)reassembly->len); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); switch (reassembly->subtype) { case LBMC_EXT_NHDR_MSGSEL: @@ -10848,14 +10848,14 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr proto_item * pi = NULL; pi = proto_tree_add_string(subtree, hf_lbmc_tag, tvb, 0, 0, tag_name); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if (topic_name != NULL) { proto_item * pi = NULL; pi = proto_tree_add_string(subtree, hf_lbmc_topic, tvb, 0, 0, topic_name); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } proto_tree_add_item(subtree, hf_lbmc_version, lbmc_tvb, O_LBMC_HDR_T_VER_TYPE, L_LBMC_HDR_T_VER_TYPE, ENC_BIG_ENDIAN); type_item = proto_tree_add_item(subtree, hf_lbmc_type, lbmc_tvb, O_LBMC_HDR_T_VER_TYPE, L_LBMC_HDR_T_VER_TYPE, ENC_BIG_ENDIAN); @@ -11291,12 +11291,12 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr lbm_stream_istream_substream_update(inst_substream, msglen, pinfo->num); stream_item = proto_tree_add_item(subtree, hf_lbm_stream, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(stream_item); + proto_item_set_generated(stream_item); stream_tree = proto_item_add_subtree(stream_item, ett_lbm_stream); pi = proto_tree_add_uint64(stream_tree, hf_lbm_stream_stream_id, tvb, 0, 0, inst_stream->channel); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pi = proto_tree_add_uint(stream_tree, hf_lbm_stream_substream_id, tvb, 0, 0, inst_substream->substream_id); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); proto_tree_move_item(subtree, last_initial_item, stream_item); stream_tap_info = wmem_new0(wmem_packet_scope(), lbm_uim_stream_tap_info_t); @@ -11341,12 +11341,12 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr lbm_stream_dstream_substream_update(dom_substream, msglen, pinfo->num); stream_item = proto_tree_add_item(subtree, hf_lbm_stream, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(stream_item); + proto_item_set_generated(stream_item); stream_tree = proto_item_add_subtree(stream_item, ett_lbm_stream); pi = proto_tree_add_uint64(stream_tree, hf_lbm_stream_stream_id, tvb, 0, 0, dom_stream->channel); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pi = proto_tree_add_uint(stream_tree, hf_lbm_stream_substream_id, tvb, 0, 0, dom_substream->substream_id); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); proto_tree_move_item(subtree, last_initial_item, stream_item); stream_tap_info = wmem_new0(wmem_packet_scope(), lbm_uim_stream_tap_info_t); @@ -11555,7 +11555,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr cur->fragment_start, (cur->fragment_start + cur->fragment_len) - 1, cur->fragment_len); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); if (first_item) { proto_item_append_text(frag_item, " #%" G_GUINT32_FORMAT "(%" G_GUINT32_FORMAT ")", cur->frame, cur->fragment_len); @@ -11567,7 +11567,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr first_item = FALSE; cur = cur->next; } - PROTO_ITEM_SET_GENERATED(frag_item); + proto_item_set_generated(frag_item); } else { @@ -11580,7 +11580,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr else { pi = proto_tree_add_uint(subtree, hf_reassembly_frame, data_tvb, 0, tvb_reported_length_remaining(data_tvb, 0), msg->reassembled_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } } } diff --git a/epan/dissectors/packet-lbmpdm.c b/epan/dissectors/packet-lbmpdm.c index d052fa5865..03fa0618f0 100644 --- a/epan/dissectors/packet-lbmpdm.c +++ b/epan/dissectors/packet-lbmpdm.c @@ -673,7 +673,7 @@ static int dissect_field(tvbuff_t * tvb, int offset, proto_tree * tree, lbmpdm_d field_item = proto_tree_add_item(tree, hf_lbmpdm_field, tvb, offset, field->len, ENC_NA); field_tree = proto_item_add_subtree(field_item, ett_lbmpdm_field); ti = proto_tree_add_uint(field_tree, hf_lbmpdm_field_id, tvb, 0, 0, field->id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (string_field_names) { ti = proto_tree_add_string(field_tree, hf_lbmpdm_field_string_name, tvb, 0, 0, field->field_string_name); @@ -682,9 +682,9 @@ static int dissect_field(tvbuff_t * tvb, int offset, proto_tree * tree, lbmpdm_d { ti = proto_tree_add_uint(field_tree, hf_lbmpdm_field_int_name, tvb, 0, 0, field->field_int_name); } - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(field_tree, hf_lbmpdm_field_type, tvb, 0, 0, field->field_type); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (field->num_array_elem == 0) { element_count = 1; @@ -1210,7 +1210,7 @@ int lbmpdm_dissect_lbmpdm_payload(tvbuff_t * tvb, int offset, packet_info * pinf proto_tree_add_item(subtree, hf_lbmpdm_magic, tvb, offset + O_LBMPDM_MSG_HDR_T_MAGIC, L_LBMPDM_MSG_HDR_T_MAGIC, encoding); pi = proto_tree_add_string(subtree, hf_lbmpdm_encoding, tvb, offset + O_LBMPDM_MSG_HDR_T_MAGIC, L_LBMPDM_MSG_HDR_T_MAGIC, ((encoding == ENC_BIG_ENDIAN) ? "Big-Endian" : "Little-Endian")); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); proto_tree_add_item(subtree, hf_lbmpdm_ver, tvb, offset + O_LBMPDM_MSG_HDR_T_VER_TYPE, L_LBMPDM_MSG_HDR_T_VER_TYPE, encoding); proto_tree_add_item(subtree, hf_lbmpdm_type, tvb, offset + O_LBMPDM_MSG_HDR_T_VER_TYPE, L_LBMPDM_MSG_HDR_T_VER_TYPE, encoding); proto_tree_add_item(subtree, hf_lbmpdm_next_hdr, tvb, offset + O_LBMPDM_MSG_HDR_T_NEXT_HDR, L_LBMPDM_MSG_HDR_T_NEXT_HDR, encoding); diff --git a/epan/dissectors/packet-lbmpdmtcp.c b/epan/dissectors/packet-lbmpdmtcp.c index 2edc885da6..c986ea67ac 100644 --- a/epan/dissectors/packet-lbmpdmtcp.c +++ b/epan/dissectors/packet-lbmpdmtcp.c @@ -280,14 +280,14 @@ static int dissect_lbmpdm_tcp_pdu(tvbuff_t * tvb, packet_info * pinfo, proto_tre proto_item * item = NULL; item = proto_tree_add_string(lbmpdm_tcp_tree, hf_lbmpdm_tcp_tag, tvb, 0, 0, tag_name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (channel != LBM_CHANNEL_NO_CHANNEL) { proto_item * item = NULL; item = proto_tree_add_uint64(lbmpdm_tcp_tree, hf_lbmpdm_tcp_channel, tvb, 0, 0, channel); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } return (lbmpdm_dissect_lbmpdm_payload(tvb, 0, pinfo, tree, channel)); } diff --git a/epan/dissectors/packet-lbmr.c b/epan/dissectors/packet-lbmr.c index f71b4183e0..d64910c047 100644 --- a/epan/dissectors/packet-lbmr.c +++ b/epan/dissectors/packet-lbmr.c @@ -4089,7 +4089,7 @@ static int dissect_lbmr_tir_transport(tvbuff_t * tvb, int offset, lbm_uint8_t tr { lbm_topic_add(channel, topic_index, topic_name); channel_item = proto_tree_add_uint64(tree, hf_lbmr_tir_channel, tvb, 0, 0, channel); - PROTO_ITEM_SET_GENERATED(channel_item); + proto_item_set_generated(channel_item); } return (len); } @@ -5202,7 +5202,7 @@ static int dissect_lbmr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, proto_item * item = NULL; item = proto_tree_add_string(lbmr_tree, hf_lbmr_tag, tvb, 0, 0, tag_name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } lbmr_hdr_item = proto_tree_add_item(lbmr_tree, hf_lbmr_hdr, tvb, 0, -1, ENC_NA); lbmr_hdr_tree = proto_item_add_subtree(lbmr_hdr_item, ett_lbmr_hdr); @@ -5361,7 +5361,7 @@ static int dissect_lbmr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, { proto_item * item; item = proto_tree_add_string(lbmr_tree, hf_lbmr_tag, tvb, 0, 0, tag_name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } lbmr_hdr_item = proto_tree_add_item(lbmr_tree, hf_lbmr_hdr, tvb, 0, -1, ENC_NA); lbmr_hdr_tree = proto_item_add_subtree(lbmr_hdr_item, ett_lbmr_hdr); diff --git a/epan/dissectors/packet-lbtrm.c b/epan/dissectors/packet-lbtrm.c index 4a7b007ef0..d700be6876 100644 --- a/epan/dissectors/packet-lbtrm.c +++ b/epan/dissectors/packet-lbtrm.c @@ -1088,7 +1088,7 @@ static gboolean dissect_lbtrm_sqn_frame_list_callback(const void *key _U_, void { transport_item = proto_tree_add_uint(cb_data->tree, hf_lbtrm_analysis_sqn_frame, cb_data->tvb, 0, 0, sqn_frame->frame); } - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } return (FALSE); } @@ -1185,14 +1185,14 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, channel = transport->channel; item = proto_tree_add_uint64(lbtrm_tree, hf_lbtrm_channel, tvb, 0, 0, channel); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (tag_name != NULL) { proto_item * item = NULL; item = proto_tree_add_string(lbtrm_tree, hf_lbtrm_tag, tvb, 0, 0, tag_name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } tapinfo = wmem_new0(wmem_packet_scope(), lbm_lbtrm_tap_info_t); if (transport != NULL) @@ -1294,7 +1294,7 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, /* Setup the tree */ transport_item = proto_tree_add_item(lbtrm_tree, hf_lbtrm_analysis, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); transport_tree = proto_item_add_subtree(transport_item, ett_lbtrm_transport); frame = lbtrm_transport_frame_find(transport, pinfo->num); if (frame != NULL) @@ -1304,12 +1304,12 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if (frame->previous_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtrm_analysis_prev_frame, tvb, 0, 0, frame->previous_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } if (frame->next_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtrm_analysis_next_frame, tvb, 0, 0, frame->next_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } switch (packet_type) { @@ -1317,12 +1317,12 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if (frame->previous_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtrm_analysis_prev_data_frame, tvb, 0, 0, frame->previous_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } if (frame->next_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtrm_analysis_next_data_frame, tvb, 0, 0, frame->next_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } sqn = lbtrm_transport_sqn_find(transport, packet_type, sequence); if (sqn != NULL) @@ -1334,7 +1334,7 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, lbtrm_sqn_frame_list_callback_data_t cb_data; frame_tree_item = proto_tree_add_item(transport_tree, hf_lbtrm_analysis_sqn, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(frame_tree_item); + proto_item_set_generated(frame_tree_item); frame_tree = proto_item_add_subtree(frame_tree_item, ett_lbtrm_transport_sqn); cb_data.tree = frame_tree; cb_data.tvb = tvb; @@ -1345,25 +1345,25 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if (frame->retransmission) { transport_item = proto_tree_add_boolean(transport_tree, hf_lbtrm_analysis_data_retransmission, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); expert_add_info(pinfo, transport_item, &ei_lbtrm_analysis_data_rx); } if (frame->sqn_gap != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtrm_analysis_data_sqn_gap, tvb, 0, 0, frame->sqn_gap); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); expert_add_info_format(pinfo, transport_item, &ei_lbtrm_analysis_data_gap, "Data sequence gap (%" G_GUINT32_FORMAT ")", frame->sqn_gap); } if (frame->ooo_gap != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtrm_analysis_data_ooo_gap, tvb, 0, 0, frame->ooo_gap); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); expert_add_info_format(pinfo, transport_item, &ei_lbtrm_analysis_data_ooo, "Data sequence out of order gap (%" G_GUINT32_FORMAT ")", frame->ooo_gap); } if (frame->duplicate) { transport_item = proto_tree_add_boolean(transport_tree, hf_lbtrm_analysis_data_duplicate, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); expert_add_info(pinfo, transport_item, &ei_lbtrm_analysis_data_dup); } break; @@ -1371,12 +1371,12 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if (frame->previous_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtrm_analysis_prev_sm_frame, tvb, 0, 0, frame->previous_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } if (frame->next_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtrm_analysis_next_sm_frame, tvb, 0, 0, frame->next_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } sqn = lbtrm_transport_sqn_find(transport, packet_type, sequence); if (sqn != NULL) @@ -1388,7 +1388,7 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, lbtrm_sqn_frame_list_callback_data_t cb_data; frame_tree_item = proto_tree_add_item(transport_tree, hf_lbtrm_analysis_sqn, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(frame_tree_item); + proto_item_set_generated(frame_tree_item); frame_tree = proto_item_add_subtree(frame_tree_item, ett_lbtrm_transport_sqn); cb_data.tree = frame_tree; cb_data.tvb = tvb; @@ -1399,19 +1399,19 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if (frame->sqn_gap != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtrm_analysis_sm_sqn_gap, tvb, 0, 0, frame->sqn_gap); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); expert_add_info_format(pinfo, transport_item, &ei_lbtrm_analysis_sm_gap, "SM sequence gap (%" G_GUINT32_FORMAT ")", frame->sqn_gap); } if (frame->ooo_gap != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtrm_analysis_sm_ooo_gap, tvb, 0, 0, frame->ooo_gap); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); expert_add_info_format(pinfo, transport_item, &ei_lbtrm_analysis_sm_ooo, "SM sequence out of order gap (%" G_GUINT32_FORMAT ")", frame->ooo_gap); } if (frame->duplicate) { transport_item = proto_tree_add_boolean(transport_tree, hf_lbtrm_analysis_sm_duplicate, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); expert_add_info(pinfo, transport_item, &ei_lbtrm_analysis_sm_dup); } break; @@ -1419,24 +1419,24 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if (frame->previous_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtrm_analysis_prev_nak_frame, tvb, 0, 0, frame->previous_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } if (frame->next_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtrm_analysis_next_nak_frame, tvb, 0, 0, frame->next_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } break; case LBTRM_PACKET_TYPE_NCF: if (frame->previous_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtrm_analysis_prev_ncf_frame, tvb, 0, 0, frame->previous_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } if (frame->next_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtrm_analysis_next_ncf_frame, tvb, 0, 0, frame->next_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } break; default: diff --git a/epan/dissectors/packet-lbtru.c b/epan/dissectors/packet-lbtru.c index 60c6f85a63..5dc8b8d56e 100644 --- a/epan/dissectors/packet-lbtru.c +++ b/epan/dissectors/packet-lbtru.c @@ -1091,7 +1091,7 @@ static gboolean dissect_lbtru_sqn_frame_list_callback(const void *key _U_, void { transport_item = proto_tree_add_uint(cb_data->tree, hf_lbtru_analysis_sqn_frame, cb_data->tvb, 0, 0, sqn_frame->frame); } - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } return (FALSE); } @@ -1174,10 +1174,10 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, { proto_item * item = NULL; item = proto_tree_add_string(lbtru_tree, hf_lbtru_tag, tvb, 0, 0, tag_name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } channel_item = proto_tree_add_item(lbtru_tree, hf_lbtru_channel, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(channel_item); + proto_item_set_generated(channel_item); channel_tree = proto_item_add_subtree(channel_item, ett_lbtru_channel); tapinfo = wmem_new0(wmem_packet_scope(), lbm_lbtru_tap_info_t); @@ -1322,7 +1322,7 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if (lbtru_sequence_analysis) { transport_item = proto_tree_add_item(lbtru_tree, hf_lbtru_analysis, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); transport_tree = proto_item_add_subtree(transport_item, ett_lbtru_transport); } while (next_hdr != LBTRU_NHDR_DATA) @@ -1434,11 +1434,11 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, tapinfo->transport = lbtru_transport_source_string_transport(transport); channel = transport->channel; fld_item = proto_tree_add_uint64(channel_tree, hf_lbtru_channel_id, tvb, 0, 0, channel); - PROTO_ITEM_SET_GENERATED(fld_item); + proto_item_set_generated(fld_item); if (client != NULL) { fld_item = proto_tree_add_uint(channel_tree, hf_lbtru_channel_client, tvb, 0, 0, client->id); - PROTO_ITEM_SET_GENERATED(fld_item); + proto_item_set_generated(fld_item); } } proto_item_set_len(lbtru_item, total_dissected_len); @@ -1461,12 +1461,12 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if (frame->previous_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_prev_frame, tvb, 0, 0, frame->previous_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } if (frame->next_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_next_frame, tvb, 0, 0, frame->next_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } switch (packet_type) { @@ -1474,12 +1474,12 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if (frame->previous_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_prev_data_frame, tvb, 0, 0, frame->previous_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } if (frame->next_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_next_data_frame, tvb, 0, 0, frame->next_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } sqn = lbtru_client_transport_sqn_find(client, packet_type, packet_sqn); if (sqn != NULL) @@ -1491,7 +1491,7 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, lbtru_sqn_frame_list_callback_data_t cb_data; frame_tree_item = proto_tree_add_item(transport_tree, hf_lbtru_analysis_sqn, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(frame_tree_item); + proto_item_set_generated(frame_tree_item); frame_tree = proto_item_add_subtree(frame_tree_item, ett_lbtru_transport_sqn); cb_data.tree = frame_tree; cb_data.tvb = tvb; @@ -1502,26 +1502,26 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if (frame->retransmission) { transport_item = proto_tree_add_boolean(transport_tree, hf_lbtru_analysis_data_retransmission, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); expert_add_info(pinfo, transport_item, &ei_lbtru_analysis_data_rx); } if (frame->sqn_gap != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_data_sqn_gap, tvb, 0, 0, frame->sqn_gap); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); expert_add_info_format(pinfo, transport_item, &ei_lbtru_analysis_data_gap, "Data sequence gap (%" G_GUINT32_FORMAT ")", frame->sqn_gap); } if (frame->ooo_gap != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_data_ooo_gap, tvb, 0, 0, frame->ooo_gap); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); expert_add_info_format(pinfo, transport_item, &ei_lbtru_analysis_data_ooo, "Data sequence out of order gap (%" G_GUINT32_FORMAT ")", frame->ooo_gap); } if (frame->duplicate) { transport_item = proto_tree_add_boolean(transport_tree, hf_lbtru_analysis_data_duplicate, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); expert_add_info(pinfo, transport_item, &ei_lbtru_analysis_data_dup); } break; @@ -1529,12 +1529,12 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if (frame->previous_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_prev_sm_frame, tvb, 0, 0, frame->previous_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } if (frame->next_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_next_sm_frame, tvb, 0, 0, frame->next_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } sqn = lbtru_client_transport_sqn_find(client, packet_type, packet_sqn); if (sqn != NULL) @@ -1546,7 +1546,7 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, lbtru_sqn_frame_list_callback_data_t cb_data; frame_tree_item = proto_tree_add_item(transport_tree, hf_lbtru_analysis_sqn, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(frame_tree_item); + proto_item_set_generated(frame_tree_item); frame_tree = proto_item_add_subtree(frame_tree_item, ett_lbtru_transport_sqn); cb_data.tree = frame_tree; cb_data.tvb = tvb; @@ -1557,20 +1557,20 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if (frame->sqn_gap != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_sm_sqn_gap, tvb, 0, 0, frame->sqn_gap); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); expert_add_info_format(pinfo, transport_item, &ei_lbtru_analysis_sm_gap, "SM sequence gap (%" G_GUINT32_FORMAT ")", frame->sqn_gap); } if (frame->ooo_gap != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_sm_ooo_gap, tvb, 0, 0, frame->ooo_gap); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); expert_add_info_format(pinfo, transport_item, &ei_lbtru_analysis_sm_ooo, "SM sequence out of order gap (%" G_GUINT32_FORMAT ")", frame->ooo_gap); } if (frame->duplicate) { transport_item = proto_tree_add_boolean(transport_tree, hf_lbtru_analysis_sm_duplicate, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); expert_add_info(pinfo, transport_item, &ei_lbtru_analysis_sm_dup); } break; @@ -1578,60 +1578,60 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if (frame->previous_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_prev_nak_frame, tvb, 0, 0, frame->previous_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } if (frame->next_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_next_nak_frame, tvb, 0, 0, frame->next_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } break; case LBTRU_PACKET_TYPE_NCF: if (frame->previous_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_prev_ncf_frame, tvb, 0, 0, frame->previous_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } if (frame->next_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_next_ncf_frame, tvb, 0, 0, frame->next_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } break; case LBTRU_PACKET_TYPE_ACK: if (frame->previous_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_prev_ack_frame, tvb, 0, 0, frame->previous_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } if (frame->next_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_next_ack_frame, tvb, 0, 0, frame->next_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } break; case LBTRU_PACKET_TYPE_CREQ: if (frame->previous_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_prev_creq_frame, tvb, 0, 0, frame->previous_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } if (frame->next_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_next_creq_frame, tvb, 0, 0, frame->next_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } break; case LBTRU_PACKET_TYPE_RST: if (frame->previous_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_prev_rst_frame, tvb, 0, 0, frame->previous_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } if (frame->next_type_frame != 0) { transport_item = proto_tree_add_uint(transport_tree, hf_lbtru_analysis_next_rst_frame, tvb, 0, 0, frame->next_type_frame); - PROTO_ITEM_SET_GENERATED(transport_item); + proto_item_set_generated(transport_item); } break; default: diff --git a/epan/dissectors/packet-lbttcp.c b/epan/dissectors/packet-lbttcp.c index e27acea005..239e1bf06f 100644 --- a/epan/dissectors/packet-lbttcp.c +++ b/epan/dissectors/packet-lbttcp.c @@ -497,7 +497,7 @@ static int dissect_lbttcp_pdu(tvbuff_t * tvb, packet_info * pinfo, proto_tree * proto_item * item = NULL; item = proto_tree_add_string(lbttcp_tree, hf_lbttcp_tag, tvb, 0, 0, tag_name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (lbttcp_packet_is_transport_source(pinfo, tag)) { @@ -598,12 +598,12 @@ static int dissect_lbttcp_pdu(tvbuff_t * tvb, packet_info * pinfo, proto_tree * proto_tree * channel_tree = NULL; channel_item = proto_tree_add_item(lbttcp_tree, hf_lbttcp_channel, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(channel_item); + proto_item_set_generated(channel_item); channel_tree = proto_item_add_subtree(channel_item, ett_lbttcp_channel); channel_item = proto_tree_add_uint64(channel_tree, hf_lbttcp_channel_id, tvb, 0, 0, channel); - PROTO_ITEM_SET_GENERATED(channel_item); + proto_item_set_generated(channel_item); channel_item = proto_tree_add_uint(channel_tree, hf_lbttcp_channel_client, tvb, 0, 0, client_id); - PROTO_ITEM_SET_GENERATED(channel_item); + proto_item_set_generated(channel_item); } len_dissected = lbmc_dissect_lbmc_packet(tvb, 0, pinfo, tree, tag_name, channel); return (len_dissected); diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 5ae1b937a4..abb49273b2 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -1102,14 +1102,14 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu if(lcrp->is_request){ it=proto_tree_add_uint(tree, hf_ldap_response_in, tvb, 0, 0, lcrp->rep_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { nstime_t ns; it=proto_tree_add_uint(tree, hf_ldap_response_to, tvb, 0, 0, lcrp->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &lcrp->req_time); it=proto_tree_add_time(tree, hf_ldap_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } @@ -1613,7 +1613,7 @@ dissect_ldap_LDAPURL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U NULL); #line 54 "./asn1/ldap/ldap.cnf" - PROTO_ITEM_SET_URL(actx->created_item); + proto_item_set_url(actx->created_item); return offset; diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c index 68e6e54390..b850e7cb47 100644 --- a/epan/dissectors/packet-ldss.c +++ b/epan/dissectors/packet-ldss.c @@ -319,7 +319,7 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, 0, 2, ENC_BIG_ENDIAN); ti = proto_tree_add_uint(ldss_tree, hf_ldss_message_detail, tvb, 0, 0, messageDetail); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_item(ldss_tree, hf_ldss_digest_type, tvb, 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ldss_tree, hf_ldss_compression, @@ -520,7 +520,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void transfer_info->req->size = g_ascii_strtoull(line+6, NULL, 10); ti = proto_tree_add_uint64(line_tree, hf_ldss_size, tvb, offset+6, linelen-6, transfer_info->req->size); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else if (strncmp(line, "Start: ", 7)==0) { /* Sample offset line: @@ -528,7 +528,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void transfer_info->req->offset = g_ascii_strtoull(line+7, NULL, 10); ti = proto_tree_add_uint64(line_tree, hf_ldss_offset, tvb, offset+7, linelen-7, transfer_info->req->offset); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else if (strncmp(line, "Compression: ", 13)==0) { /* Sample compression line: @@ -536,7 +536,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void transfer_info->req->compression = (gint8)strtol(line+13, NULL, 10); /* XXX - bad cast */ ti = proto_tree_add_uint(line_tree, hf_ldss_compression, tvb, offset+13, linelen-13, transfer_info->req->compression); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else { proto_tree_add_expert(line_tree, pinfo, &ei_ldss_unrecognized_line, tvb, offset, linelen); @@ -566,11 +566,11 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void tii = proto_tree_add_uint(line_tree, hf_ldss_digest_type, tvb, offset, digest_type_len, transfer_info->file->digest_type); - PROTO_ITEM_SET_GENERATED(tii); + proto_item_set_generated(tii); tii = proto_tree_add_bytes(line_tree, hf_ldss_digest, tvb, offset+digest_type_len, MIN(linelen-digest_type_len, DIGEST_LEN), transfer_info->file->digest); - PROTO_ITEM_SET_GENERATED(tii); + proto_item_set_generated(tii); } offset = next_offset; @@ -580,7 +580,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void if (transfer_info->resp_num != 0) { ti = proto_tree_add_uint(ldss_tree, hf_ldss_response_in, tvb, 0, 0, transfer_info->resp_num); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } transfer_info->req->num = pinfo->num; @@ -663,7 +663,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void #endif ti = proto_tree_add_uint(ldss_tree, hf_ldss_digest_type, tvb, 0, 0, transfer_info->file->digest_type); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (transfer_info->file->digest != NULL) { /* This is ugly. You can't add bytes of nonzero length and have * filtering work correctly unless you give a valid location in @@ -673,23 +673,23 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void ti = proto_tree_add_bytes(ldss_tree, hf_ldss_digest, tvb, 0, DIGEST_LEN, transfer_info->file->digest); } - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint64(ldss_tree, hf_ldss_size, tvb, 0, 0, size); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint64(ldss_tree, hf_ldss_offset, tvb, 0, 0, offset); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(ldss_tree, hf_ldss_compression, tvb, 0, 0, compression); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Link to the request for a pull. */ if (transfer_info->broadcast->message_id == MESSAGE_ID_WILLSEND && transfer_info->req != NULL && transfer_info->req->num != 0) { ti = proto_tree_add_uint(ldss_tree, hf_ldss_response_to, tvb, 0, 0, transfer_info->req->num); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } @@ -702,21 +702,21 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void &transfer_info->req->ts); ti = proto_tree_add_time(ldss_tree, hf_ldss_transfer_response_time, tvb, 0, 0, &pull_response_time); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Link the transfer back to the initiating broadcast. Response time is * calculated as the time from broadcast to completed transfer. */ ti = proto_tree_add_uint(ldss_tree, hf_ldss_initiated_by, tvb, 0, 0, transfer_info->broadcast->num); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (transfer_info->resp_num != 0) { nstime_delta(&broadcast_response_time, &transfer_info->resp_ts, &transfer_info->broadcast->ts); ti = proto_tree_add_time(ldss_tree, hf_ldss_transfer_completed_in, tvb, 0, 0, &broadcast_response_time); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* This conv got its addr2/port2 set by the TCP dissector because a TCP diff --git a/epan/dissectors/packet-lg8979.c b/epan/dissectors/packet-lg8979.c index 144ef49750..434bccd9c2 100644 --- a/epan/dissectors/packet-lg8979.c +++ b/epan/dissectors/packet-lg8979.c @@ -1201,7 +1201,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ if (exp_code == 14) { proto_item *lg8979_dfc_item; lg8979_dfc_item = proto_tree_add_item(lg8979_tree, hf_lg8979_disallowed_func, tvb, offset+1, 1, ENC_NA); - PROTO_ITEM_SET_GENERATED(lg8979_dfc_item); + proto_item_set_generated(lg8979_dfc_item); } offset += 2; diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index 576af25a54..1bc5352f45 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -737,7 +737,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) hidden_item = proto_tree_add_boolean(lmp_header_tree, hf_lmp_filter[lmp_msg_to_filter_num(message_type)], tvb, offset+3, 1, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } else { expert_add_info_format(pinfo, msg_item, &ei_lmp_invalid_msg_type, "Invalid message type: %u", message_type); @@ -776,7 +776,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) negotiable = (type >> 7); type &= 0x7f; hidden_item = proto_tree_add_uint(lmp_tree, hf_lmp_filter[LMPF_OBJECT], tvb, offset, 1, lmp_class); - PROTO_ITEM_SET_GENERATED(hidden_item); + proto_item_set_generated(hidden_item); filter_num = lmp_class_to_filter_num(lmp_class); if (filter_num != -1 && lmp_valid_class(lmp_class)) { ti = proto_tree_add_item(lmp_tree, diff --git a/epan/dissectors/packet-logcat.c b/epan/dissectors/packet-logcat.c index 652cacefb4..82937170ce 100644 --- a/epan/dissectors/packet-logcat.c +++ b/epan/dissectors/packet-logcat.c @@ -105,7 +105,7 @@ dissect_logcat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ logger_version = detect_version(tvb, offset); subitem = proto_tree_add_uint(maintree, hf_logcat_version, tvb, offset, 0, logger_version); - PROTO_ITEM_SET_GENERATED(subitem); + proto_item_set_generated(subitem); proto_tree_add_item(maintree, hf_logcat_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); length = tvb_get_letohs(tvb, offset); diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c index 95a1774876..62fa86a03e 100644 --- a/epan/dissectors/packet-logotypecertextn.c +++ b/epan/dissectors/packet-logotypecertextn.c @@ -171,7 +171,7 @@ dissect_logotypecertextn_T_logotypeURI_item(gboolean implicit_tag _U_, tvbuff_t NULL); #line 16 "./asn1/logotypecertextn/logotypecertextn.cnf" - PROTO_ITEM_SET_URL(actx->created_item); + proto_item_set_url(actx->created_item); return offset; @@ -371,7 +371,7 @@ dissect_logotypecertextn_T_refStructURI_item(gboolean implicit_tag _U_, tvbuff_t NULL); #line 19 "./asn1/logotypecertextn/logotypecertextn.cnf" - PROTO_ITEM_SET_URL(actx->created_item); + proto_item_set_url(actx->created_item); return offset; diff --git a/epan/dissectors/packet-lpd.c b/epan/dissectors/packet-lpd.c index 8ac05f3cb4..ad51b519cf 100644 --- a/epan/dissectors/packet-lpd.c +++ b/epan/dissectors/packet-lpd.c @@ -97,7 +97,7 @@ dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) hidden_item = proto_tree_add_boolean(lpd_tree, hf_lpd_request, tvb, 0, 0, TRUE); } - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); if (lpr_packet_type == request) { printer_len = find_printer_string(tvb, 1); diff --git a/epan/dissectors/packet-lpp.c b/epan/dissectors/packet-lpp.c index 5f6a3eaa8c..839f7b9e48 100644 --- a/epan/dissectors/packet-lpp.c +++ b/epan/dissectors/packet-lpp.c @@ -10598,7 +10598,7 @@ dissect_lpp_T_cnavMo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr #line 918 "./asn1/lpp/lpp.cnf" - PROTO_ITEM_SET_HIDDEN(actx->created_item); + proto_item_set_hidden(actx->created_item); actx->created_item = proto_tree_add_int64_format_value(tree, hf_index, tvb, curr_offset>>3, (offset+7-curr_offset)>>3, cnavMo, "%g semi-circles (%"G_GINT64_MODIFIER"d)", (double)cnavMo*pow(2, -32), cnavMo); @@ -10621,7 +10621,7 @@ dissect_lpp_T_cnavE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro #line 929 "./asn1/lpp/lpp.cnf" - PROTO_ITEM_SET_HIDDEN(actx->created_item); + proto_item_set_hidden(actx->created_item); actx->created_item = proto_tree_add_uint64_format_value(tree, hf_index, tvb, curr_offset>>3, (offset+7-curr_offset)>>3, cnavE, "%g (%"G_GINT64_MODIFIER"u)", (double)cnavE*pow(2, -34), cnavE); @@ -10644,7 +10644,7 @@ dissect_lpp_T_cnavOmega(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, #line 940 "./asn1/lpp/lpp.cnf" - PROTO_ITEM_SET_HIDDEN(actx->created_item); + proto_item_set_hidden(actx->created_item); actx->created_item = proto_tree_add_int64_format_value(tree, hf_index, tvb, curr_offset>>3, (offset+7-curr_offset)>>3, cnavOmega, "%g semi-circles (%"G_GINT64_MODIFIER"d)", (double)cnavOmega*pow(2, -32), cnavOmega); @@ -10667,7 +10667,7 @@ dissect_lpp_T_cnavOMEGA0(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ #line 951 "./asn1/lpp/lpp.cnf" - PROTO_ITEM_SET_HIDDEN(actx->created_item); + proto_item_set_hidden(actx->created_item); actx->created_item = proto_tree_add_int64_format_value(tree, hf_index, tvb, curr_offset>>3, (offset+7-curr_offset)>>3, cnavOMEGA0, "%g semi-circles (%"G_GINT64_MODIFIER"d)", (double)cnavOMEGA0*pow(2, -32), cnavOMEGA0); @@ -10690,7 +10690,7 @@ dissect_lpp_T_cnavIo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr #line 965 "./asn1/lpp/lpp.cnf" - PROTO_ITEM_SET_HIDDEN(actx->created_item); + proto_item_set_hidden(actx->created_item); actx->created_item = proto_tree_add_int64_format_value(tree, hf_index, tvb, curr_offset>>3, (offset+7-curr_offset)>>3, cnavIo, "%g semi-circles (%"G_GINT64_MODIFIER"d)", (double)cnavIo*pow(2, -32), cnavIo); diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index 7b5566a61c..082868262b 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -14036,7 +14036,7 @@ static const per_sequence_t HandoverCommand_sequence[] = { static int dissect_lte_rrc_HandoverCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_lte_rrc_HandoverCommand, HandoverCommand_sequence); @@ -25464,9 +25464,9 @@ dissect_lte_rrc_T_sr_ConfigIndex(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * /* Show parts as generated fields */ subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_sr_ConfigIndex); ti = proto_tree_add_uint(subtree, hf_lte_rrc_sr_config_periodicity, tvb, index_offset>>3, 1, periodicity); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(subtree, hf_lte_rrc_sr_config_subframe_offset, tvb, index_offset>>3, 1, subframe_offset); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); return offset; @@ -45128,9 +45128,9 @@ dissect_lte_rrc_T_sr_ConfigIndex_r13(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx /* Show parts as generated fields */ subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_sr_ConfigIndex); ti = proto_tree_add_uint(subtree, hf_lte_rrc_sr_config_periodicity, tvb, index_offset>>3, 1, periodicity); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(subtree, hf_lte_rrc_sr_config_subframe_offset, tvb, index_offset>>3, 1, subframe_offset); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); return offset; @@ -54241,7 +54241,7 @@ static const per_sequence_t HandoverPreparationInformation_sequence[] = { static int dissect_lte_rrc_HandoverPreparationInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_lte_rrc_HandoverPreparationInformation, HandoverPreparationInformation_sequence); @@ -55092,7 +55092,7 @@ static const per_sequence_t UEPagingCoverageInformation_sequence[] = { static int dissect_lte_rrc_UEPagingCoverageInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_lte_rrc_UEPagingCoverageInformation, UEPagingCoverageInformation_sequence); @@ -55215,7 +55215,7 @@ static const per_sequence_t UERadioAccessCapabilityInformation_sequence[] = { static int dissect_lte_rrc_UERadioAccessCapabilityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_lte_rrc_UERadioAccessCapabilityInformation, UERadioAccessCapabilityInformation_sequence); @@ -55377,7 +55377,7 @@ static const per_sequence_t UERadioPagingInformation_sequence[] = { static int dissect_lte_rrc_UERadioPagingInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_lte_rrc_UERadioPagingInformation, UERadioPagingInformation_sequence); @@ -67163,7 +67163,7 @@ static const per_sequence_t RRCConnectionReconfiguration_sequence[] = { static int dissect_lte_rrc_RRCConnectionReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RRCConnectionReconfiguration"); @@ -72986,7 +72986,7 @@ static const per_sequence_t RRCConnectionReconfigurationComplete_sequence[] = { static int dissect_lte_rrc_RRCConnectionReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RRCConnectionReconfigurationComplete"); @@ -74444,7 +74444,7 @@ static const per_sequence_t UECapabilityInformation_sequence[] = { static int dissect_lte_rrc_UECapabilityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UECapabilityInformation"); @@ -82576,7 +82576,7 @@ dissect_lte_rrc_InterFreqBandInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t /* Add a generated item showing serving & target band for this entry */ it = proto_tree_add_uint(tree, hf_lte_rrc_bandEUTRA, tvb, 0, 0, serving_band); proto_item_append_text(it, " -> band %u", target_band); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } @@ -109207,7 +109207,7 @@ dissect_lte_rrc_UE_Capability_NB_Ext_r14_IEs(tvbuff_t *tvb _U_, int offset _U_, int dissect_lte_rrc_HandoverCommand_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109217,7 +109217,7 @@ int dissect_lte_rrc_HandoverCommand_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U } int dissect_lte_rrc_HandoverPreparationInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109227,7 +109227,7 @@ int dissect_lte_rrc_HandoverPreparationInformation_PDU(tvbuff_t *tvb _U_, packet } int dissect_lte_rrc_SCG_Config_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109237,7 +109237,7 @@ int dissect_lte_rrc_SCG_Config_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } int dissect_lte_rrc_SCG_ConfigInfo_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109247,7 +109247,7 @@ int dissect_lte_rrc_SCG_ConfigInfo_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } int dissect_lte_rrc_UEPagingCoverageInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109257,7 +109257,7 @@ int dissect_lte_rrc_UEPagingCoverageInformation_PDU(tvbuff_t *tvb _U_, packet_in } static int dissect_UERadioAccessCapabilityInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109267,7 +109267,7 @@ static int dissect_UERadioAccessCapabilityInformation_PDU(tvbuff_t *tvb _U_, pac } static int dissect_UERadioPagingInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109277,7 +109277,7 @@ static int dissect_UERadioPagingInformation_PDU(tvbuff_t *tvb _U_, packet_info * } static int dissect_BCCH_BCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109287,7 +109287,7 @@ static int dissect_BCCH_BCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U } static int dissect_BCCH_BCH_Message_MBMS_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109297,7 +109297,7 @@ static int dissect_BCCH_BCH_Message_MBMS_PDU(tvbuff_t *tvb _U_, packet_info *pin } static int dissect_BCCH_DL_SCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109307,7 +109307,7 @@ static int dissect_BCCH_DL_SCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } static int dissect_BCCH_DL_SCH_Message_BR_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109317,7 +109317,7 @@ static int dissect_BCCH_DL_SCH_Message_BR_PDU(tvbuff_t *tvb _U_, packet_info *pi } static int dissect_BCCH_DL_SCH_Message_MBMS_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109327,7 +109327,7 @@ static int dissect_BCCH_DL_SCH_Message_MBMS_PDU(tvbuff_t *tvb _U_, packet_info * } static int dissect_MCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109337,7 +109337,7 @@ static int dissect_MCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } static int dissect_PCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109347,7 +109347,7 @@ static int dissect_PCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } static int dissect_DL_CCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109357,7 +109357,7 @@ static int dissect_DL_CCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } static int dissect_DL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109367,7 +109367,7 @@ static int dissect_DL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } static int dissect_UL_CCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109377,7 +109377,7 @@ static int dissect_UL_CCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } static int dissect_UL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109387,7 +109387,7 @@ static int dissect_UL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } static int dissect_SC_MCCH_Message_r13_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109397,7 +109397,7 @@ static int dissect_SC_MCCH_Message_r13_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } static int dissect_RRCConnectionReconfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109407,7 +109407,7 @@ static int dissect_RRCConnectionReconfiguration_PDU(tvbuff_t *tvb _U_, packet_in } int dissect_lte_rrc_RRCConnectionReconfigurationComplete_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109417,7 +109417,7 @@ int dissect_lte_rrc_RRCConnectionReconfigurationComplete_PDU(tvbuff_t *tvb _U_, } static int dissect_UECapabilityInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109427,7 +109427,7 @@ static int dissect_UECapabilityInformation_PDU(tvbuff_t *tvb _U_, packet_info *p } int dissect_lte_rrc_RLF_Report_r9_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109437,7 +109437,7 @@ int dissect_lte_rrc_RLF_Report_r9_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } int dissect_lte_rrc_RLF_Report_v9e0_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109447,7 +109447,7 @@ int dissect_lte_rrc_RLF_Report_v9e0_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U } int dissect_lte_rrc_UE_EUTRA_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109457,7 +109457,7 @@ int dissect_lte_rrc_UE_EUTRA_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinf } int dissect_lte_rrc_VisitedCellInfoList_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109467,7 +109467,7 @@ int dissect_lte_rrc_VisitedCellInfoList_r12_PDU(tvbuff_t *tvb _U_, packet_info * } int dissect_lte_rrc_VisitedCellInfo_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109477,7 +109477,7 @@ int dissect_lte_rrc_VisitedCellInfo_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinf } static int dissect_SBCCH_SL_BCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109487,7 +109487,7 @@ static int dissect_SBCCH_SL_BCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinf } static int dissect_SBCCH_SL_BCH_Message_V2X_r14_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109497,7 +109497,7 @@ static int dissect_SBCCH_SL_BCH_Message_V2X_r14_PDU(tvbuff_t *tvb _U_, packet_in } int dissect_lte_rrc_HandoverPreparationInformation_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109507,7 +109507,7 @@ int dissect_lte_rrc_HandoverPreparationInformation_NB_PDU(tvbuff_t *tvb _U_, pac } int dissect_lte_rrc_UEPagingCoverageInformation_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109517,7 +109517,7 @@ int dissect_lte_rrc_UEPagingCoverageInformation_NB_PDU(tvbuff_t *tvb _U_, packet } static int dissect_UERadioAccessCapabilityInformation_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109527,7 +109527,7 @@ static int dissect_UERadioAccessCapabilityInformation_NB_PDU(tvbuff_t *tvb _U_, } static int dissect_UERadioPagingInformation_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109537,7 +109537,7 @@ static int dissect_UERadioPagingInformation_NB_PDU(tvbuff_t *tvb _U_, packet_inf } static int dissect_BCCH_BCH_Message_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109547,7 +109547,7 @@ static int dissect_BCCH_BCH_Message_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } static int dissect_BCCH_BCH_Message_TDD_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109557,7 +109557,7 @@ static int dissect_BCCH_BCH_Message_TDD_NB_PDU(tvbuff_t *tvb _U_, packet_info *p } static int dissect_BCCH_DL_SCH_Message_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109567,7 +109567,7 @@ static int dissect_BCCH_DL_SCH_Message_NB_PDU(tvbuff_t *tvb _U_, packet_info *pi } static int dissect_PCCH_Message_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109577,7 +109577,7 @@ static int dissect_PCCH_Message_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } static int dissect_DL_CCCH_Message_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109587,7 +109587,7 @@ static int dissect_DL_CCCH_Message_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } static int dissect_DL_DCCH_Message_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109597,7 +109597,7 @@ static int dissect_DL_DCCH_Message_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } static int dissect_UL_CCCH_Message_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109607,7 +109607,7 @@ static int dissect_UL_CCCH_Message_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } static int dissect_SC_MCCH_Message_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109617,7 +109617,7 @@ static int dissect_SC_MCCH_Message_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } static int dissect_UL_DCCH_Message_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109627,7 +109627,7 @@ static int dissect_UL_DCCH_Message_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } static int dissect_HandoverPreparationInformation_v9j0_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109637,7 +109637,7 @@ static int dissect_HandoverPreparationInformation_v9j0_IEs_PDU(tvbuff_t *tvb _U_ } static int dissect_MBMSInterestIndication_r11_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109647,7 +109647,7 @@ static int dissect_MBMSInterestIndication_r11_PDU(tvbuff_t *tvb _U_, packet_info } static int dissect_UE_RadioPagingInfo_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109657,7 +109657,7 @@ static int dissect_UE_RadioPagingInfo_r12_PDU(tvbuff_t *tvb _U_, packet_info *pi } static int dissect_SystemInformationBlockType1_v890_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109667,7 +109667,7 @@ static int dissect_SystemInformationBlockType1_v890_IEs_PDU(tvbuff_t *tvb _U_, p } static int dissect_InDeviceCoexIndication_r11_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109677,7 +109677,7 @@ static int dissect_InDeviceCoexIndication_r11_PDU(tvbuff_t *tvb _U_, packet_info } static int dissect_UEAssistanceInformation_r11_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109687,7 +109687,7 @@ static int dissect_UEAssistanceInformation_r11_PDU(tvbuff_t *tvb _U_, packet_inf } static int dissect_SidelinkUEInformation_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109697,7 +109697,7 @@ static int dissect_SidelinkUEInformation_r12_PDU(tvbuff_t *tvb _U_, packet_info } static int dissect_WLANConnectionStatusReport_r13_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109707,7 +109707,7 @@ static int dissect_WLANConnectionStatusReport_r13_PDU(tvbuff_t *tvb _U_, packet_ } static int dissect_SystemInformationBlockType1_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109717,7 +109717,7 @@ static int dissect_SystemInformationBlockType1_PDU(tvbuff_t *tvb _U_, packet_inf } static int dissect_RRCConnectionReconfiguration_v8m0_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109727,7 +109727,7 @@ static int dissect_RRCConnectionReconfiguration_v8m0_IEs_PDU(tvbuff_t *tvb _U_, } static int dissect_SystemInformationBlockType2_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109737,7 +109737,7 @@ static int dissect_SystemInformationBlockType2_PDU(tvbuff_t *tvb _U_, packet_inf } static int dissect_RRCConnectionRelease_v9e0_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109747,7 +109747,7 @@ static int dissect_RRCConnectionRelease_v9e0_IEs_PDU(tvbuff_t *tvb _U_, packet_i } static int dissect_SCGFailureInformation_v12d0_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109757,7 +109757,7 @@ static int dissect_SCGFailureInformation_v12d0_IEs_PDU(tvbuff_t *tvb _U_, packet } static int dissect_SystemInformationBlockType1_v8h0_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109767,7 +109767,7 @@ static int dissect_SystemInformationBlockType1_v8h0_IEs_PDU(tvbuff_t *tvb _U_, p } static int dissect_UEInformationResponse_v9e0_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109777,7 +109777,7 @@ static int dissect_UEInformationResponse_v9e0_IEs_PDU(tvbuff_t *tvb _U_, packet_ } static int dissect_SystemInformationBlockType2_v8h0_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109787,7 +109787,7 @@ static int dissect_SystemInformationBlockType2_v8h0_IEs_PDU(tvbuff_t *tvb _U_, p } static int dissect_SystemInformationBlockType2_v10m0_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109797,7 +109797,7 @@ static int dissect_SystemInformationBlockType2_v10m0_IEs_PDU(tvbuff_t *tvb _U_, } static int dissect_SystemInformationBlockType3_v10j0_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109807,7 +109807,7 @@ static int dissect_SystemInformationBlockType3_v10j0_IEs_PDU(tvbuff_t *tvb _U_, } static int dissect_SystemInformationBlockType5_v8h0_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109817,7 +109817,7 @@ static int dissect_SystemInformationBlockType5_v8h0_IEs_PDU(tvbuff_t *tvb _U_, p } static int dissect_SystemInformationBlockType6_v8h0_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109827,7 +109827,7 @@ static int dissect_SystemInformationBlockType6_v8h0_IEs_PDU(tvbuff_t *tvb _U_, p } static int dissect_UE_EUTRA_Capability_v10j0_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109837,7 +109837,7 @@ static int dissect_UE_EUTRA_Capability_v10j0_IEs_PDU(tvbuff_t *tvb _U_, packet_i } static int dissect_UE_EUTRA_Capability_v9a0_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109847,7 +109847,7 @@ static int dissect_UE_EUTRA_Capability_v9a0_IEs_PDU(tvbuff_t *tvb _U_, packet_in } static int dissect_UE_Capability_NB_Ext_r14_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109857,7 +109857,7 @@ static int dissect_UE_Capability_NB_Ext_r14_IEs_PDU(tvbuff_t *tvb _U_, packet_in } static int dissect_UE_Capability_NB_r13_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109867,7 +109867,7 @@ static int dissect_UE_Capability_NB_r13_PDU(tvbuff_t *tvb _U_, packet_info *pinf } static int dissect_UECapabilityInformation_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -109877,7 +109877,7 @@ static int dissect_UECapabilityInformation_NB_PDU(tvbuff_t *tvb _U_, packet_info } static int dissect_UE_RadioPagingInfo_NB_r13_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); diff --git a/epan/dissectors/packet-lwm2mtlv.c b/epan/dissectors/packet-lwm2mtlv.c index 80d0c73bbb..6a00a52ada 100644 --- a/epan/dissectors/packet-lwm2mtlv.c +++ b/epan/dissectors/packet-lwm2mtlv.c @@ -718,7 +718,7 @@ addValueTree(tvbuff_t *tvb, proto_tree *tlv_tree, lwm2mElement_t *element, const if (resource && (element->type == RESOURCE || element->type == RESOURCE_ARRAY)) { proto_item *ti = proto_tree_add_string(tlv_tree, hf_lwm2mtlv_resource_name, tvb, 0, 0, resource->name); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if ( element->type == RESOURCE || element->type == RESOURCE_INSTANCE ) { @@ -884,7 +884,7 @@ dissect_lwm2mtlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void * if (object_name && object_name[0]) { proto_item *ti = proto_tree_add_string(lwm2mtlv_tree, hf_lwm2mtlv_object_name, tvb, 0, 0, object_name); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_item_append_text(lwm2mtlv_item, ", %s", object_name); } } diff --git a/epan/dissectors/packet-m2ua.c b/epan/dissectors/packet-m2ua.c index 66f3056983..205fad1987 100644 --- a/epan/dissectors/packet-m2ua.c +++ b/epan/dissectors/packet-m2ua.c @@ -887,7 +887,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, { proto_item *hidden_item; hidden_item = proto_tree_add_uint(parameter_tree, hf_parameter_tag, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, tag); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* add tag and length to the m2ua tree */ proto_tree_add_uint_format_value(parameter_tree, hf_parameter_tag, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c index d76ed27c8a..2ae4223ba2 100644 --- a/epan/dissectors/packet-m3ua.c +++ b/epan/dissectors/packet-m3ua.c @@ -1180,7 +1180,7 @@ dissect_protocol_data_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, pro */ register_frame_end_routine(pinfo, m3ua_reset_mtp3_standard); } - PROTO_ITEM_SET_GENERATED(gen_item); + proto_item_set_generated(gen_item); } mtp3_tap->addr_dpc.type = (Standard_Type)mtp3_standard; @@ -1228,20 +1228,20 @@ dissect_protocol_data_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, pro proto_item_set_len(parameter_item, PARAMETER_HEADER_LENGTH + DATA_HDR_LENGTH); parameter_tree = proto_tree_add_subtree(parameter_tree,parameter_tvb,0,0,ett_mtp3_equiv,&item,"MTP3 equivalents"); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_item(parameter_tree, hf_protocol_data_mtp3_opc, parameter_tvb, DATA_OPC_OFFSET, DATA_OPC_LENGTH, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_item(parameter_tree, hf_protocol_data_mtp3_dpc, parameter_tvb, DATA_DPC_OFFSET, DATA_OPC_LENGTH, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_item(parameter_tree, hf_protocol_data_mtp3_pc, parameter_tvb, DATA_OPC_OFFSET, DATA_OPC_LENGTH, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_item(parameter_tree, hf_protocol_data_mtp3_pc, parameter_tvb, DATA_DPC_OFFSET, DATA_OPC_LENGTH, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_item(parameter_tree, hf_protocol_data_mtp3_ni, parameter_tvb, DATA_NI_OFFSET, DATA_NI_LENGTH, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_item(parameter_tree, hf_protocol_data_mtp3_sls, parameter_tvb, DATA_SLS_OFFSET, DATA_SLS_LENGTH, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); }/* parameter_tree */ diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index d4d1ffa8f1..5f6fde3140 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -2191,46 +2191,46 @@ static void show_drx_info(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, drx_config_ti = proto_tree_add_string_format(tree, hf_mac_lte_drx_config, tvb, 0, 0, "", "DRX Config"); drx_config_tree = proto_item_add_subtree(drx_config_ti, ett_mac_lte_drx_config); - PROTO_ITEM_SET_GENERATED(drx_config_ti); + proto_item_set_generated(drx_config_ti); /* Link back to configuration (RRC) frame */ ti = proto_tree_add_uint(drx_config_tree, hf_mac_lte_drx_config_frame_num, tvb, 0, 0, frame_state->config.frameNum); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Link back to any previous config frame (only from current config frame) */ if ((frame_state->config.frameNum == pinfo->num) && (frame_state->config.previousFrameNum != 0)) { ti = proto_tree_add_uint(drx_config_tree, hf_mac_lte_drx_config_previous_frame_num, tvb, 0, 0, frame_state->config.previousFrameNum); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Config fields */ ti = proto_tree_add_uint(drx_config_tree, hf_mac_lte_drx_config_long_cycle, tvb, 0, 0, frame_state->config.longCycle); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(drx_config_tree, hf_mac_lte_drx_config_cycle_offset, tvb, 0, 0, frame_state->config.cycleOffset); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(drx_config_tree, hf_mac_lte_drx_config_onduration_timer, tvb, 0, 0, frame_state->config.onDurationTimer); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(drx_config_tree, hf_mac_lte_drx_config_inactivity_timer, tvb, 0, 0, frame_state->config.inactivityTimer); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(drx_config_tree, hf_mac_lte_drx_config_retransmission_timer, tvb, 0, 0, frame_state->config.retransmissionTimer); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (frame_state->config.shortCycleConfigured) { ti = proto_tree_add_uint(drx_config_tree, hf_mac_lte_drx_config_short_cycle, tvb, 0, 0, frame_state->config.shortCycle); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(drx_config_tree, hf_mac_lte_drx_config_short_cycle_timer, tvb, 0, 0, frame_state->config.shortCycleTimer); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } proto_item_append_text(drx_config_ti, " (Long-cycle=%u cycle-offset=%u onDuration=%u)", @@ -2256,7 +2256,7 @@ static void show_drx_info(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } drx_state_tree = proto_item_add_subtree(drx_state_ti, ett_mac_lte_drx_state); - PROTO_ITEM_SET_GENERATED(drx_state_ti); + proto_item_set_generated(drx_state_ti); /* Show cycle information */ @@ -2266,7 +2266,7 @@ static void show_drx_info(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, frame_state->config.longCycle; ti = proto_tree_add_uint(drx_state_tree, hf_mac_lte_drx_state_long_cycle_offset, tvb, 0, 0, offset_into_long_cycle); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else { /* Show where we are inside short cycle */ @@ -2275,14 +2275,14 @@ static void show_drx_info(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, ti = proto_tree_add_uint(drx_state_tree, hf_mac_lte_drx_state_short_cycle_offset, tvb, 0, 0, offset_into_short_cycle); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Is short-cycle-timer running? */ if (!mac_lte_drx_has_timer_expired(frame_state, drx_short_cycle_timer, 0, before_event, &time_until_expires)) { if (time_until_expires) { ti = proto_tree_add_uint(drx_state_tree, hf_mac_lte_drx_state_short_cycle_remaining, tvb, 0, 0, (guint16)time_until_expires); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } } @@ -2297,7 +2297,7 @@ static void show_drx_info(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, if (time_until_expires) { ti = proto_tree_add_uint(drx_state_tree, hf_mac_lte_drx_state_onduration_remaining, tvb, 0, 0, (guint16)time_until_expires); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } @@ -2306,7 +2306,7 @@ static void show_drx_info(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, if (time_until_expires) { ti = proto_tree_add_uint(drx_state_tree, hf_mac_lte_drx_state_inactivity_remaining, tvb, 0, 0, (guint16)time_until_expires); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } @@ -2316,7 +2316,7 @@ static void show_drx_info(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, if (time_until_expires) { ti = proto_tree_add_uint(drx_state_tree, hf_mac_lte_drx_state_retransmission_remaining, tvb, 0, 0, (guint16)time_until_expires); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_item_append_text(ti, " (harqid=%u)", n); } } @@ -2328,7 +2328,7 @@ static void show_drx_info(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, if (time_until_expires) { ti = proto_tree_add_uint(drx_state_tree, hf_mac_lte_drx_state_rtt_remaining, tvb, 0, 0, (guint16)time_until_expires); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_item_append_text(ti, " (harqid=%u)", n); } } @@ -2796,38 +2796,38 @@ static void show_extra_phy_parameters(packet_info *pinfo, tvbuff_t *tvb, proto_t phy_ti = proto_tree_add_string_format(tree, hf_mac_lte_context_phy_ul, tvb, 0, 0, "", "UL PHY Context"); phy_tree = proto_item_add_subtree(phy_ti, ett_mac_lte_phy_context); - PROTO_ITEM_SET_GENERATED(phy_ti); + proto_item_set_generated(phy_ti); /* Add items */ ti = proto_tree_add_uint(phy_tree, hf_mac_lte_context_phy_ul_modulation_type, tvb, 0, 0, p_mac_lte_info->detailed_phy_info.ul_info.modulation_type); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(phy_tree, hf_mac_lte_context_phy_ul_tbs_index, tvb, 0, 0, p_mac_lte_info->detailed_phy_info.ul_info.tbs_index); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(phy_tree, hf_mac_lte_context_phy_ul_resource_block_length, tvb, 0, 0, p_mac_lte_info->detailed_phy_info.ul_info.resource_block_length); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(phy_tree, hf_mac_lte_context_phy_ul_resource_block_start, tvb, 0, 0, p_mac_lte_info->detailed_phy_info.ul_info.resource_block_start); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(phy_tree, hf_mac_lte_context_phy_ul_harq_id, tvb, 0, 0, p_mac_lte_info->detailed_phy_info.ul_info.harq_id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(phy_tree, hf_mac_lte_context_phy_ul_ndi, tvb, 0, 0, p_mac_lte_info->detailed_phy_info.ul_info.ndi); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_item_append_text(phy_ti, " ("); @@ -2858,58 +2858,58 @@ static void show_extra_phy_parameters(packet_info *pinfo, tvbuff_t *tvb, proto_t phy_ti = proto_tree_add_string_format(tree, hf_mac_lte_context_phy_dl, tvb, 0, 0, "", "DL PHY Context"); phy_tree = proto_item_add_subtree(phy_ti, ett_mac_lte_phy_context); - PROTO_ITEM_SET_GENERATED(phy_ti); + proto_item_set_generated(phy_ti); /* Add items */ ti = proto_tree_add_uint(phy_tree, hf_mac_lte_context_phy_dl_dci_format, tvb, 0, 0, p_mac_lte_info->detailed_phy_info.dl_info.dci_format); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(phy_tree, hf_mac_lte_context_phy_dl_resource_allocation_type, tvb, 0, 0, p_mac_lte_info->detailed_phy_info.dl_info.resource_allocation_type); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(phy_tree, hf_mac_lte_context_phy_dl_aggregation_level, tvb, 0, 0, p_mac_lte_info->detailed_phy_info.dl_info.aggregation_level); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(phy_tree, hf_mac_lte_context_phy_dl_mcs_index, tvb, 0, 0, p_mac_lte_info->detailed_phy_info.dl_info.mcs_index); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(phy_tree, hf_mac_lte_context_phy_dl_redundancy_version_index, tvb, 0, 0, p_mac_lte_info->detailed_phy_info.dl_info.redundancy_version_index); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_boolean(phy_tree, hf_mac_lte_context_phy_dl_retx, tvb, 0, 0, p_mac_lte_info->dl_retx); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(phy_tree, hf_mac_lte_context_phy_dl_resource_block_length, tvb, 0, 0, p_mac_lte_info->detailed_phy_info.dl_info.resource_block_length); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(phy_tree, hf_mac_lte_context_phy_dl_harq_id, tvb, 0, 0, p_mac_lte_info->detailed_phy_info.dl_info.harq_id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(phy_tree, hf_mac_lte_context_phy_dl_ndi, tvb, 0, 0, p_mac_lte_info->detailed_phy_info.dl_info.ndi); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(phy_tree, hf_mac_lte_context_phy_dl_tb, tvb, 0, 0, p_mac_lte_info->detailed_phy_info.dl_info.transport_block); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_item_append_text(phy_ti, " ("); @@ -3200,7 +3200,7 @@ static void dissect_rar(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro /* Create hidden 'virtual root' so can filter on mac-lte.rar */ ti = proto_tree_add_item(tree, hf_mac_lte_rar, tvb, offset, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); /* Create headers tree */ rar_headers_ti = proto_tree_add_item(tree, @@ -3296,7 +3296,7 @@ static void dissect_rar(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro /* Append summary to headers root */ proto_item_append_text(rar_headers_ti, " (%u RARs", number_of_rars); ti = proto_tree_add_uint(rar_headers_tree, hf_mac_lte_rar_no_of_rapids, tvb, 0, 0, number_of_rars); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (backoff_indicator_seen) { proto_item_append_text(rar_headers_ti, ", BI=%sms)", val_to_str_const(backoff_indicator, (p_mac_lte_info->nbMode == no_nb_mode) ? @@ -3327,7 +3327,7 @@ static void dissect_rar(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro padding_length_ti = proto_tree_add_int(tree, hf_mac_lte_padding_length, tvb, offset, 0, p_mac_lte_info->length - offset); - PROTO_ITEM_SET_GENERATED(padding_length_ti); + proto_item_set_generated(padding_length_ti); /* Update padding bytes in stats */ tap_info->padding_bytes += (p_mac_lte_info->length - offset); @@ -3351,7 +3351,7 @@ static void dissect_bch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Show which transport layer it came in on (inferred from RNTI type) */ ti = proto_tree_add_uint(tree, hf_mac_lte_context_bch_transport_channel, tvb, offset, 0, p_mac_lte_info->rntiType); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /****************************************/ /* Whole frame is BCH data */ @@ -3389,7 +3389,7 @@ static void dissect_bch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } /* Hide raw view of bytes */ - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); call_with_catch_all(protocol_handle, rrc_tvb, pinfo, tree); } @@ -3428,7 +3428,7 @@ static void dissect_pch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvbuff_t *rrc_tvb = tvb_new_subset_remaining(tvb, offset); /* Hide raw view of bytes */ - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); /* Call it (catch exceptions so that stats will be updated) */ if (p_mac_lte_info->nbMode == no_nb_mode) { @@ -3659,22 +3659,22 @@ static void TrackReportedDLHARQResend(packet_info *pinfo, tvbuff_t *tvb, int len proto_item *gap_ti; proto_item *original_ti = proto_tree_add_uint(tree, hf_mac_lte_dl_harq_resend_original_frame, tvb, 0, 0, result->previousFrameNum); - PROTO_ITEM_SET_GENERATED(original_ti); + proto_item_set_generated(original_ti); gap_ti = proto_tree_add_uint(tree, hf_mac_lte_dl_harq_resend_time_since_previous_frame, tvb, 0, 0, result->timeSincePreviousFrame); - PROTO_ITEM_SET_GENERATED(gap_ti); + proto_item_set_generated(gap_ti); } if (result->nextSet) { proto_item *gap_ti; proto_item *next_ti = proto_tree_add_uint(tree, hf_mac_lte_dl_harq_resend_next_frame, tvb, 0, 0, result->nextFrameNum); - PROTO_ITEM_SET_GENERATED(next_ti); + proto_item_set_generated(next_ti); gap_ti = proto_tree_add_uint(tree, hf_mac_lte_dl_harq_resend_time_until_next_frame, tvb, 0, 0, result->timeToNextFrame); - PROTO_ITEM_SET_GENERATED(gap_ti); + proto_item_set_generated(gap_ti); } } @@ -3810,11 +3810,11 @@ static void TrackReportedULHARQResend(packet_info *pinfo, tvbuff_t *tvb, int off original_ti = proto_tree_add_uint(tree, hf_mac_lte_ul_harq_resend_original_frame, tvb, 0, 0, result->previousFrameNum); - PROTO_ITEM_SET_GENERATED(original_ti); + proto_item_set_generated(original_ti); gap_ti = proto_tree_add_uint(tree, hf_mac_lte_ul_harq_resend_time_since_previous_frame, tvb, 0, 0, result->timeSincePreviousFrame); - PROTO_ITEM_SET_GENERATED(gap_ti); + proto_item_set_generated(gap_ti); } } else { @@ -3832,11 +3832,11 @@ static void TrackReportedULHARQResend(packet_info *pinfo, tvbuff_t *tvb, int off expert_add_info_format(pinfo, next_ti, &ei_mac_lte_ul_harq_resend_next_frame, "UL MAC PDU (UE %u) needed to be retransmitted", p_mac_lte_info->ueid); - PROTO_ITEM_SET_GENERATED(next_ti); + proto_item_set_generated(next_ti); gap_ti = proto_tree_add_uint(tree, hf_mac_lte_ul_harq_resend_time_until_next_frame, tvb, 0, 0, result->timeToNextFrame); - PROTO_ITEM_SET_GENERATED(gap_ti); + proto_item_set_generated(gap_ti); } } @@ -4029,38 +4029,38 @@ static void TrackSRInfo(SREvent event, packet_info *pinfo, proto_tree *tree, case GrantAnsweringSR: ti = proto_tree_add_uint(tree, hf_mac_lte_grant_answering_sr, tvb, 0, 0, result->frameNum); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(tree, hf_mac_lte_sr_time_since_request, tvb, 0, 0, result->timeDifference); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; case FailureAnsweringSR: ti = proto_tree_add_uint(tree, hf_mac_lte_failure_answering_sr, tvb, 0, 0, result->frameNum); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(tree, hf_mac_lte_sr_time_since_request, tvb, 0, 0, result->timeDifference); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; case SRLeadingToGrant: ti = proto_tree_add_uint(tree, hf_mac_lte_sr_leading_to_grant, tvb, 0, 0, result->frameNum); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(tree, hf_mac_lte_sr_time_until_answer, tvb, 0, 0, result->timeDifference); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; case SRLeadingToFailure: ti = proto_tree_add_uint(tree, hf_mac_lte_sr_leading_to_failure, tvb, 0, 0, result->frameNum); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(tree, hf_mac_lte_sr_time_until_answer, tvb, 0, 0, result->timeDifference); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; case InvalidSREvent: @@ -4165,7 +4165,7 @@ static void show_ues_tti(packet_info *pinfo, mac_lte_info *p_mac_lte_info, tvbuf hf_mac_lte_ues_ul_per_tti : hf_mac_lte_ues_dl_per_tti, tvb, 0, 0, result->ues_in_tti); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } @@ -4991,14 +4991,14 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* Point back to msg3 frame */ ti = proto_tree_add_uint(cr_tree, hf_mac_lte_control_ue_contention_resolution_msg3, tvb, 0, 0, crResult->msg3FrameNum); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(cr_tree, hf_mac_lte_control_ue_contention_resolution_time_since_msg3, tvb, 0, 0, crResult->msSinceMsg3); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_boolean(cr_tree, hf_mac_lte_control_ue_contention_resolution_msg3_matched, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_item_append_text(cr_ti, " (matches Msg3 from frame %u, %ums ago)", crResult->msg3FrameNum, crResult->msSinceMsg3); @@ -5012,17 +5012,17 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree case Msg3NoMatch: ti = proto_tree_add_uint(cr_tree, hf_mac_lte_control_ue_contention_resolution_msg3, tvb, 0, 0, crResult->msg3FrameNum); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(cr_tree, hf_mac_lte_control_ue_contention_resolution_time_since_msg3, tvb, 0, 0, crResult->msSinceMsg3); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_boolean(cr_tree, hf_mac_lte_control_ue_contention_resolution_msg3_matched, tvb, 0, 0, FALSE); expert_add_info_format(pinfo, ti, &ei_mac_lte_control_ue_contention_resolution_msg3_matched, "CR body in Msg4 doesn't match Msg3 CCCH in frame %u", crResult->msg3FrameNum); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_item_append_text(cr_ti, " (doesn't match Msg3 from frame %u, %u ago)", crResult->msg3FrameNum, crResult->msSinceMsg3); break; @@ -5643,7 +5643,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree if (global_mac_lte_show_BSR_median) { /* Add value that can be graphed */ proto_item *bsr_median_ti = proto_tree_add_uint(bsr_tree, hf_mac_lte_bsr_size_median, tvb, offset, 1, p_buffer_size_median[buffer_size]); - PROTO_ITEM_SET_GENERATED(bsr_median_ti); + proto_item_set_generated(bsr_median_ti); } offset++; @@ -5706,7 +5706,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree if (global_mac_lte_show_BSR_median) { /* Add value that can be graphed */ bsr_median_ti = proto_tree_add_uint(bsr_tree, hf_mac_lte_bsr_size_median, tvb, offset, 1, p_buffer_size_median[buffer_size[0]]); - PROTO_ITEM_SET_GENERATED(bsr_median_ti); + proto_item_set_generated(bsr_median_ti); } if (buffer_size[0] >= global_mac_lte_bsr_warn_threshold) { @@ -5725,7 +5725,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree if (global_mac_lte_show_BSR_median) { /* Add value that can be graphed */ bsr_median_ti = proto_tree_add_uint(bsr_tree, hf_mac_lte_bsr_size_median, tvb, offset, 1, p_buffer_size_median[buffer_size[1]]); - PROTO_ITEM_SET_GENERATED(bsr_median_ti); + proto_item_set_generated(bsr_median_ti); } offset++; @@ -5746,7 +5746,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree if (global_mac_lte_show_BSR_median) { /* Add value that can be graphed */ bsr_median_ti = proto_tree_add_uint(bsr_tree, hf_mac_lte_bsr_size_median, tvb, offset, 1, p_buffer_size_median[buffer_size[2]]); - PROTO_ITEM_SET_GENERATED(bsr_median_ti); + proto_item_set_generated(bsr_median_ti); } offset++; @@ -5766,7 +5766,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree if (global_mac_lte_show_BSR_median) { /* Add value that can be graphed */ bsr_median_ti = proto_tree_add_uint(bsr_tree, hf_mac_lte_bsr_size_median, tvb, offset, 1, p_buffer_size_median[buffer_size[3]]); - PROTO_ITEM_SET_GENERATED(bsr_median_ti); + proto_item_set_generated(bsr_median_ti); } offset++; @@ -5802,7 +5802,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree truncated_ti = proto_tree_add_uint(tree, hf_mac_lte_sch_header_only, tvb, 0, 0, is_truncated); if (is_truncated) { - PROTO_ITEM_SET_GENERATED(truncated_ti); + proto_item_set_generated(truncated_ti); expert_add_info(pinfo, truncated_ti, &ei_mac_lte_sch_header_only_truncated); /* Update sdu and byte count in stats */ for (; n < number_of_headers; n++) { @@ -5825,7 +5825,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree return; } else { - PROTO_ITEM_SET_HIDDEN(truncated_ti); + proto_item_set_hidden(truncated_ti); } @@ -5931,7 +5931,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree } /* Hide raw view of bytes */ - PROTO_ITEM_SET_HIDDEN(sdu_ti); + proto_item_set_hidden(sdu_ti); rlc_called_for_sdu = TRUE; call_with_catch_all(protocol_handle, rrc_tvb, pinfo, tree); @@ -5951,7 +5951,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree FALSE, p_mac_lte_info->nbMode); /* Hide raw view of bytes */ - PROTO_ITEM_SET_HIDDEN(sdu_ti); + proto_item_set_hidden(sdu_ti); rlc_called_for_sdu = TRUE; } } @@ -6018,7 +6018,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree if (rlc_channel_type != rlcRaw) { /* Hide raw view of bytes */ - PROTO_ITEM_SET_HIDDEN(sdu_ti); + proto_item_set_hidden(sdu_ti); rlc_called_for_sdu = TRUE; } @@ -6029,7 +6029,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree tvbuff_t *rrc_tvb = tvb_new_subset_length(tvb, offset, data_length); /* Hide raw view of bytes */ - PROTO_ITEM_SET_HIDDEN(sdu_ti); + proto_item_set_hidden(sdu_ti); rlc_called_for_sdu = TRUE; call_with_catch_all(lte_rrc_sc_mcch_handle, rrc_tvb, pinfo, tree); @@ -6066,7 +6066,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree if (cr_frame != 0) { proto_item *cr_ti = proto_tree_add_uint(tree, hf_mac_lte_control_msg3_to_cr, tvb, 0, 0, cr_frame); - PROTO_ITEM_SET_GENERATED(cr_ti); + proto_item_set_generated(cr_ti); } } } @@ -6080,7 +6080,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree padding_length_ti = proto_tree_add_int(tree, hf_mac_lte_padding_length, tvb, offset, 0, p_mac_lte_info->length - offset); - PROTO_ITEM_SET_GENERATED(padding_length_ti); + proto_item_set_generated(padding_length_ti); /* Update padding bytes in stats */ tap_info->padding_bytes += (p_mac_lte_info->length - offset); @@ -6152,7 +6152,7 @@ static void dissect_mch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro /* Add hidden item to filter on */ hidden_root_ti = proto_tree_add_string_format(tree, hf_mac_lte_mch, tvb, offset, 0, "", "Hidden header"); - PROTO_ITEM_SET_HIDDEN(hidden_root_ti); + proto_item_set_hidden(hidden_root_ti); /* Add PDU block header subtree */ pdu_header_ti = proto_tree_add_string_format(tree, hf_mac_lte_mch_header, @@ -6452,12 +6452,12 @@ static void dissect_mch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro truncated_ti = proto_tree_add_uint(tree, hf_mac_lte_mch_header_only, tvb, 0, 0, is_truncated); if (is_truncated) { - PROTO_ITEM_SET_GENERATED(truncated_ti); + proto_item_set_generated(truncated_ti); expert_add_info(pinfo, truncated_ti, &ei_mac_lte_mch_header_only_truncated); return; } else { - PROTO_ITEM_SET_HIDDEN(truncated_ti); + proto_item_set_hidden(truncated_ti); } @@ -6516,7 +6516,7 @@ static void dissect_mch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro padding_length_ti = proto_tree_add_int(tree, hf_mac_lte_padding_length, tvb, offset, 0, p_mac_lte_info->length - offset); - PROTO_ITEM_SET_GENERATED(padding_length_ti); + proto_item_set_generated(padding_length_ti); /* Make sure the PDU isn't bigger than reported! */ if (offset > p_mac_lte_info->length) { @@ -6566,7 +6566,7 @@ static void dissect_sl_bch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvbuff_t *rrc_tvb = tvb_new_subset_remaining(tvb, offset); /* Hide raw view of bytes */ - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); call_with_catch_all(lte_rrc_sbcch_sl_bch_handle, rrc_tvb, pinfo, tree); } @@ -6822,11 +6822,11 @@ static void dissect_slsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, truncated_ti = proto_tree_add_uint(tree, hf_mac_lte_slsch_header_only, tvb, 0, 0, is_truncated); if (is_truncated) { - PROTO_ITEM_SET_GENERATED(truncated_ti); + proto_item_set_generated(truncated_ti); expert_add_info(pinfo, truncated_ti, &ei_mac_lte_slsch_header_only_truncated); return; } else { - PROTO_ITEM_SET_HIDDEN(truncated_ti); + proto_item_set_hidden(truncated_ti); } @@ -6872,7 +6872,7 @@ static void dissect_slsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, padding_length_ti = proto_tree_add_int(tree, hf_mac_lte_padding_length, tvb, offset, 0, p_mac_lte_info->length - offset); - PROTO_ITEM_SET_GENERATED(padding_length_ti); + proto_item_set_generated(padding_length_ti); /* Make sure the PDU isn't bigger than reported! */ if (offset > p_mac_lte_info->length) { @@ -6950,26 +6950,26 @@ int dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d context_ti = proto_tree_add_string_format(mac_lte_tree, hf_mac_lte_context, tvb, offset, 0, "", "Context"); context_tree = proto_item_add_subtree(context_ti, ett_mac_lte_context); - PROTO_ITEM_SET_GENERATED(context_ti); + proto_item_set_generated(context_ti); ti = proto_tree_add_uint(context_tree, hf_mac_lte_context_radio_type, tvb, 0, 0, p_mac_lte_info->radioType); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(context_tree, hf_mac_lte_context_direction, tvb, 0, 0, p_mac_lte_info->direction); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (p_mac_lte_info->ueid != 0) { ti = proto_tree_add_uint(context_tree, hf_mac_lte_context_ueid, tvb, 0, 0, p_mac_lte_info->ueid); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if(p_mac_lte_info->sfnSfInfoPresent) { ti = proto_tree_add_uint(context_tree, hf_mac_lte_context_sysframe_number, tvb, 0, 0, p_mac_lte_info->sysframeNumber); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (p_mac_lte_info->sysframeNumber > 1023) { expert_add_info_format(pinfo, ti, &ei_mac_lte_context_sysframe_number, "Sysframe number (%u) out of range - valid range is 0-1023", @@ -6978,7 +6978,7 @@ int dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d ti = proto_tree_add_uint(context_tree, hf_mac_lte_context_subframe_number, tvb, 0, 0, p_mac_lte_info->subframeNumber); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (p_mac_lte_info->subframeNumber > 9) { /* N.B. if we set it to valid value, it won't trigger when we rescan (at least with DCT2000 files where the context struct isn't re-read). */ @@ -6990,7 +6990,7 @@ int dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d if (p_mac_lte_info->subframeNumberOfGrantPresent) { ti = proto_tree_add_uint(context_tree, hf_mac_lte_context_grant_subframe_number, tvb, 0, 0, p_mac_lte_info->subframeNumberOfGrant); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } @@ -7006,15 +7006,15 @@ int dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d preamble_ti = proto_tree_add_item(mac_lte_tree, hf_mac_lte_oob_send_preamble, tvb, 0, 0, ENC_ASCII|ENC_NA); preamble_tree = proto_item_add_subtree(preamble_ti, ett_mac_lte_oob); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(preamble_tree, hf_mac_lte_context_rapid, tvb, 0, 0, p_mac_lte_info->rapid); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(preamble_tree, hf_mac_lte_context_rach_attempt_number, tvb, 0, 0, p_mac_lte_info->rach_attempt_number); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); rapid_description = get_mac_lte_rapid_description(p_mac_lte_info->rapid); @@ -7037,7 +7037,7 @@ int dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d /* Count of SRs */ ti = proto_tree_add_uint(mac_lte_tree, hf_mac_lte_number_of_srs, tvb, 0, 0, p_mac_lte_info->number_of_srs); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); for (n=0; n < p_mac_lte_info->number_of_srs; n++) { @@ -7049,17 +7049,17 @@ int dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d tvb, 0, 0, "Scheduling Request sent for UE %u (RNTI %u)", p_mac_lte_info->oob_ueid[n], p_mac_lte_info->oob_rnti[n]); sr_tree = proto_item_add_subtree(sr_ti, ett_mac_lte_oob); - PROTO_ITEM_SET_GENERATED(sr_ti); + proto_item_set_generated(sr_ti); /* RNTI */ ti = proto_tree_add_uint(sr_tree, hf_mac_lte_context_rnti, tvb, 0, 0, p_mac_lte_info->oob_rnti[n]); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* UEID */ ti = proto_tree_add_uint(sr_tree, hf_mac_lte_context_ueid, tvb, 0, 0, p_mac_lte_info->oob_ueid[n]); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Add summary to root. */ proto_item_append_text(sr_ti, " (UE=%u C-RNTI=%u)", @@ -7103,12 +7103,12 @@ int dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d case ltemac_sr_failure: ti = proto_tree_add_uint(context_tree, hf_mac_lte_context_rnti, tvb, 0, 0, p_mac_lte_info->rnti); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_expert_format(mac_lte_tree, pinfo, &ei_mac_lte_oob_sr_failure, tvb, 0, 0, "Scheduling Request failed for UE %u (RNTI %u)", p_mac_lte_info->ueid, p_mac_lte_info->rnti); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Info column */ write_pdu_label_and_info(pdu_ti, NULL, pinfo, @@ -7132,14 +7132,14 @@ int dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d if (p_mac_lte_info->rntiType != NO_RNTI) { ti = proto_tree_add_uint(context_tree, hf_mac_lte_context_rnti, tvb, 0, 0, p_mac_lte_info->rnti); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_item_append_text(context_ti, " (RNTI=%u)", p_mac_lte_info->rnti); } ti = proto_tree_add_uint(context_tree, hf_mac_lte_context_rnti_type, tvb, 0, 0, p_mac_lte_info->rntiType); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Check that RNTI value is consistent with given RNTI type */ switch (p_mac_lte_info->rntiType) { @@ -7195,20 +7195,20 @@ int dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d ti = proto_tree_add_uint(context_tree, hf_mac_lte_context_predefined_frame, tvb, 0, 0, p_mac_lte_info->isPredefinedData); if (p_mac_lte_info->isPredefinedData) { - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else { - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); } ti = proto_tree_add_uint(context_tree, hf_mac_lte_context_length, tvb, 0, 0, p_mac_lte_info->length); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Infer uplink grant size */ if (p_mac_lte_info->direction == DIRECTION_UPLINK) { ti = proto_tree_add_uint(context_tree, hf_mac_lte_context_ul_grant_size, tvb, 0, 0, p_mac_lte_info->length); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Retx count goes in top-level tree to make it more visible */ @@ -7216,7 +7216,7 @@ int dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d proto_item *retx_reason_ti; retx_ti = proto_tree_add_uint(mac_lte_tree, hf_mac_lte_context_retx_count, tvb, 0, 0, p_mac_lte_info->reTxCount); - PROTO_ITEM_SET_GENERATED(retx_ti); + proto_item_set_generated(retx_ti); if (p_mac_lte_info->reTxCount >= global_mac_lte_retx_counter_trigger) { if (p_mac_lte_info->direction == DIRECTION_UPLINK) { @@ -7233,14 +7233,14 @@ int dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d retx_reason_ti = proto_tree_add_uint(mac_lte_tree, hf_mac_lte_context_retx_reason, tvb, 0, 0, p_mac_lte_info->isPHICHNACK); - PROTO_ITEM_SET_GENERATED(retx_reason_ti); + proto_item_set_generated(retx_reason_ti); } if (p_mac_lte_info->crcStatusValid) { /* Set status */ ti = proto_tree_add_uint(context_tree, hf_mac_lte_context_crc_status, tvb, 0, 0, p_mac_lte_info->crcStatus); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Report non-success */ if (p_mac_lte_info->crcStatus != crc_success) { @@ -7266,7 +7266,7 @@ int dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d /* Carrier Id */ ti = proto_tree_add_uint(context_tree, hf_mac_lte_context_carrier_id, tvb, 0, 0, p_mac_lte_info->carrierId); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* May also have extra Physical layer attributes set for this frame */ show_extra_phy_parameters(pinfo, tvb, mac_lte_tree, p_mac_lte_info); @@ -7295,14 +7295,14 @@ int dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d tvb, offset, 0, "", "Hidden header"); - PROTO_ITEM_SET_HIDDEN(hidden_root_ti); + proto_item_set_hidden(hidden_root_ti); } else if (p_mac_lte_info->rntiType == SL_RNTI) { hidden_root_ti = proto_tree_add_string_format(tree, hf_mac_lte_slsch, tvb, offset, 0, "", "Hidden header"); - PROTO_ITEM_SET_HIDDEN(hidden_root_ti); + proto_item_set_hidden(hidden_root_ti); } /* Also set total number of bytes (won't be used for UL/DL-SCH) */ diff --git a/epan/dissectors/packet-mac-nr.c b/epan/dissectors/packet-mac-nr.c index bfc9704f4c..23b566d0c2 100644 --- a/epan/dissectors/packet-mac-nr.c +++ b/epan/dissectors/packet-mac-nr.c @@ -1138,7 +1138,7 @@ static void dissect_bcch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Show which transport layer it came in on (inferred from RNTI type) */ ti = proto_tree_add_uint(tree, hf_mac_nr_context_bcch_transport_channel, tvb, offset, 0, p_mac_nr_info->rntiType); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /****************************************/ /* Whole frame is BCCH data */ @@ -1159,7 +1159,7 @@ static void dissect_bcch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } /* Hide raw view of bytes */ - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); call_with_catch_all(protocol_handle, rrc_tvb, pinfo, tree); } @@ -1188,7 +1188,7 @@ static void dissect_pcch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvbuff_t *rrc_tvb = tvb_new_subset_remaining(tvb, offset); /* Hide raw view of bytes */ - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); call_with_catch_all(nr_rrc_pcch_handle, rrc_tvb, pinfo, tree); @@ -1205,7 +1205,7 @@ static void dissect_rar(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, /* Create hidden 'virtual root' so can filter on mac-nr.rar */ proto_item *ti = proto_tree_add_item(tree, hf_mac_nr_rar, tvb, offset, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); gboolean E, T; @@ -1652,7 +1652,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree protocol_handle = nr_rrc_dl_ccch_handle; } /* Hide raw view of bytes */ - PROTO_ITEM_SET_HIDDEN(sch_pdu_ti); + proto_item_set_hidden(sch_pdu_ti); call_with_catch_all(protocol_handle, rrc_tvb, pinfo, tree); dissected_by_upper_layer = TRUE; } @@ -2433,48 +2433,48 @@ static int dissect_mac_nr(tvbuff_t *tvb, packet_info *pinfo, context_ti = proto_tree_add_string_format(mac_nr_tree, hf_mac_nr_context, tvb, offset, 0, "", "Context"); context_tree = proto_item_add_subtree(context_ti, ett_mac_nr_context); - PROTO_ITEM_SET_GENERATED(context_ti); + proto_item_set_generated(context_ti); /* Radio type */ ti = proto_tree_add_uint(context_tree, hf_mac_nr_context_radio_type, tvb, 0, 0, p_mac_nr_info->radioType); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Direction */ ti = proto_tree_add_uint(context_tree, hf_mac_nr_context_direction, tvb, 0, 0, p_mac_nr_info->direction); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* RNTI type and value */ if (p_mac_nr_info->rntiType != NO_RNTI) { ti = proto_tree_add_uint(context_tree, hf_mac_nr_context_rnti, tvb, 0, 0, p_mac_nr_info->rnti); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_item_append_text(context_ti, " (RNTI=%u)", p_mac_nr_info->rnti); } ti = proto_tree_add_uint(context_tree, hf_mac_nr_context_rnti_type, tvb, 0, 0, p_mac_nr_info->rntiType); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* UEId */ if (p_mac_nr_info->ueid != 0) { ti = proto_tree_add_uint(context_tree, hf_mac_nr_context_ueid, tvb, 0, 0, p_mac_nr_info->ueid); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (p_mac_nr_info->rntiType == C_RNTI || p_mac_nr_info->rntiType == CS_RNTI) { /* Harqid */ ti = proto_tree_add_uint(context_tree, hf_mac_nr_context_harqid, tvb, 0, 0, p_mac_nr_info->harqid); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (p_mac_nr_info->direction == DIRECTION_UPLINK) { /* Type 2 other */ ti = proto_tree_add_boolean(context_tree, hf_mac_nr_context_phr_type2_othercell, tvb, 0, 0, p_mac_nr_info->phr_type2_othercell); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c index ed6da4e156..585ad4ca0d 100644 --- a/epan/dissectors/packet-mbim.c +++ b/epan/dissectors/packet-mbim.c @@ -5015,7 +5015,7 @@ dissect_mbim_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * ti = proto_tree_add_item(tree, proto_mbim, tvb, offset, -1, ENC_NA); mbim_tree = proto_item_add_subtree(ti, ett_mbim); ti = proto_tree_add_item(mbim_tree, hf_mbim_control, tvb, offset, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); header_tree = proto_tree_add_subtree(mbim_tree, tvb, offset, 12, ett_mbim_msg_header, NULL, "Message Header"); proto_tree_add_item_ret_uint(header_tree, hf_mbim_header_message_type, tvb, offset, 4, ENC_LITTLE_ENDIAN, &msg_type); @@ -5094,7 +5094,7 @@ dissect_mbim_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * proto_item *resp_it; resp_it = proto_tree_add_uint(header_tree, hf_mbim_response_in, tvb, 0, 0, mbim_info->resp_frame); - PROTO_ITEM_SET_GENERATED(resp_it); + proto_item_set_generated(resp_it); } } @@ -5896,7 +5896,7 @@ dissect_mbim_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * proto_item *req_it; req_it = proto_tree_add_uint(header_tree, hf_mbim_request_in, tvb, 0, 0, mbim_info->req_frame); - PROTO_ITEM_SET_GENERATED(req_it); + proto_item_set_generated(req_it); } } /* FALLTHROUGH */ @@ -5952,7 +5952,7 @@ dissect_mbim_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * proto_item *req_it; req_it = proto_tree_add_uint(header_tree, hf_mbim_request_in, tvb, 0, 0, mbim_info->req_frame); - PROTO_ITEM_SET_GENERATED(req_it); + proto_item_set_generated(req_it); } } } @@ -6767,7 +6767,7 @@ dissect_mbim_descriptor(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } ti = proto_tree_add_item(tree, hf_mbim_descriptor, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); if (subtype == 0x1b) { proto_tree_add_item(tree, hf_mbim_descriptor_version, tvb, 3, 2, ENC_LITTLE_ENDIAN); @@ -6820,7 +6820,7 @@ dissect_mbim_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat ti = proto_tree_add_item(tree, proto_mbim, tvb, 0, -1, ENC_NA); mbim_tree = proto_item_add_subtree(ti, ett_mbim); ti =proto_tree_add_item(mbim_tree, hf_mbim_bulk, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); subtree = proto_tree_add_subtree(mbim_tree, tvb, 0, 0, ett_mbim_msg_header, NULL, "NCM Transfer Header"); proto_tree_add_item(subtree, hf_mbim_bulk_nth_signature, tvb, 0, 4, ENC_ASCII|ENC_NA); @@ -6992,7 +6992,7 @@ dissect_mbim_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat } } ti = proto_tree_add_uint(subtree, hf_mbim_bulk_ndp_nb_datagrams, tvb, 0, 0, nb); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (++ndp > MBIM_MAX_ITEMS) { expert_add_info_format(pinfo, NULL, &ei_mbim_too_many_items, "More than %u NCM Datagram Pointers, dissection seems suspicious", @@ -7001,7 +7001,7 @@ dissect_mbim_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat } } ti = proto_tree_add_uint(mbim_tree, hf_mbim_bulk_total_nb_datagrams, tvb, 0, 0, total); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); return tvb_captured_length(tvb); } @@ -7069,7 +7069,7 @@ dissect_mbim_bulk_ndp_ctrl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ti = proto_tree_add_protocol_format(tree, proto_mbim, tvb, 0, -1, "MBIM NDP Control"); ndp_ctrl_tree = proto_item_add_subtree(ti, ett_mbim_bulk_ndp_ctrl); ti = proto_tree_add_item(ndp_ctrl_tree, hf_mbim_bulk_ndp_ctrl, tvb, offset, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); proto_tree_add_item_ret_uint(ndp_ctrl_tree, hf_mbim_bulk_ndp_ctrl_message_type, tvb, offset, 2, ENC_LITTLE_ENDIAN, &msg_type); offset += 2; diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c index 761491fa5c..72c1ee429e 100644 --- a/epan/dissectors/packet-mbtcp.c +++ b/epan/dissectors/packet-mbtcp.c @@ -900,7 +900,7 @@ dissect_modbus_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 bit_tree = proto_tree_add_subtree_format(tree, next_tvb, data_offset, 1, ett_bit, NULL, "Bit %u : %u", reg_num, data_bool); bitnum_ti = proto_tree_add_uint(bit_tree, hf_modbus_bitnum, next_tvb, data_offset, 1, reg_num); - PROTO_ITEM_SET_GENERATED(bitnum_ti); + proto_item_set_generated(bitnum_ti); proto_tree_add_boolean(bit_tree, hf_modbus_bitval, next_tvb, data_offset, 1, data_bool); reg_num++; @@ -1214,11 +1214,11 @@ dissect_modbus_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *modbus_tr if (pkt_info->request_found == TRUE) { request_frame_item = proto_tree_add_uint(modbus_tree, hf_modbus_request_frame, tvb, 0, 0, pkt_info->req_frame_num); - PROTO_ITEM_SET_GENERATED(request_frame_item); + proto_item_set_generated(request_frame_item); nstime_delta(&response_time, &pinfo->abs_ts, &pkt_info->req_time); response_time_item = proto_tree_add_time(modbus_tree, hf_modbus_response_time, tvb, 0, 0, &response_time); - PROTO_ITEM_SET_GENERATED(response_time_item); + proto_item_set_generated(response_time_item); } switch (function_code) { diff --git a/epan/dissectors/packet-mcpe.c b/epan/dissectors/packet-mcpe.c index ed0111f271..b4703c7630 100644 --- a/epan/dissectors/packet-mcpe.c +++ b/epan/dissectors/packet-mcpe.c @@ -241,7 +241,7 @@ mcpe_dissect_login(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void offset, item_size, ENC_NA); login_tree = proto_item_add_subtree(ti, ett_mcpe_login); proto_item_append_text(ti, " (%u octets)", decomp_length); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); mcpe_dissect_string(login_tree, hf_mcpe_chain_JSON , login_tvb, &offset, ENC_LITTLE_ENDIAN | ENC_UTF_8); mcpe_dissect_string(login_tree, hf_mcpe_client_data_JWT, login_tvb, &offset, ENC_LITTLE_ENDIAN | ENC_UTF_8); @@ -306,7 +306,7 @@ mcpe_dissect_batch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da offset, item_size, ENC_NA); batch_tree = proto_item_add_subtree(ti, ett_mcpe_batch); proto_item_append_text(ti, " (%u octets)", decomp_length); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); col_append_str(pinfo->cinfo, COL_INFO, " ["); diff --git a/epan/dissectors/packet-mdshdr.c b/epan/dissectors/packet-mdshdr.c index 1af2c66576..0003dcd124 100644 --- a/epan/dissectors/packet-mdshdr.c +++ b/epan/dissectors/packet-mdshdr.c @@ -184,7 +184,7 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ hidden_item = proto_tree_add_item(mdshdr_tree_hdr, hf_mdshdr_sof, tvb, MDSHDR_SOF_OFFSET, MDSHDR_SIZE_BYTE, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(mdshdr_tree_hdr, hf_mdshdr_pkt_len, tvb, MDSHDR_PKTLEN_OFFSET, MDSHDR_SIZE_INT16, ENC_BIG_ENDIAN); proto_tree_add_item(mdshdr_tree_hdr, hf_mdshdr_dstidx, tvb, MDSHDR_DIDX_OFFSET, @@ -196,7 +196,7 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ hidden_item = proto_tree_add_item(mdshdr_tree_hdr, hf_mdshdr_span, tvb, MDSHDR_VSAN_OFFSET, MDSHDR_SIZE_INT16, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Add Mdshdr Trailer part */ if (tvb_reported_length(tvb) >= MDSHDR_HEADER_SIZE + pktlen diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index 12fe66e97b..06153da4ba 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -546,7 +546,7 @@ megaco_tree_add_string(proto_tree *tree, int hfindex, tvbuff_t *tvb, pi = proto_tree_add_string(tree, hfindex, tvb, start, length, value); if (!global_megaco_dissect_tree) { - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); } return(pi); @@ -563,7 +563,7 @@ my_proto_tree_add_uint(proto_tree *tree, int hfindex, tvbuff_t *tvb, proto_item_set_len(pi, length); if (!global_megaco_dissect_tree) { - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); } return(pi); @@ -1108,7 +1108,7 @@ nextcontext: megaco_tree_command_line = proto_item_add_subtree(sub_ti, ett_megaco_command_line); */ if (!global_megaco_dissect_tree) { - PROTO_ITEM_SET_HIDDEN(sub_ti); + proto_item_set_hidden(sub_ti); } tvb_next_offset = tvb_command_start_offset + tokenlen; diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c index df1ebc86fa..1f66d6b6e4 100644 --- a/epan/dissectors/packet-memcache.c +++ b/epan/dissectors/packet-memcache.c @@ -560,7 +560,7 @@ dissect_memcache (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat body_len = tvb_get_ntohl (tvb, offset); value_len = body_len - extras_len - key_len; ti = proto_tree_add_uint (memcache_tree, hf_value_length, tvb, offset, 0, value_len); - PROTO_ITEM_SET_GENERATED (ti); + proto_item_set_generated (ti); proto_tree_add_item (memcache_tree, hf_total_body_length, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; diff --git a/epan/dissectors/packet-messageanalyzer.c b/epan/dissectors/packet-messageanalyzer.c index 7e9ece3a58..3b8a46da61 100644 --- a/epan/dissectors/packet-messageanalyzer.c +++ b/epan/dissectors/packet-messageanalyzer.c @@ -208,15 +208,15 @@ add_ipv4_src_address(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int of proto_tree_add_ipv4(tree, hf_ip_src, tvb, offset, 4, addr); item = proto_tree_add_ipv4(tree, hf_ip_addr, tvb, offset, 4, addr); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_string(tree, hf_ip_src_host, tvb, offset, 4, src_host); - PROTO_ITEM_SET_GENERATED(item); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_generated(item); + proto_item_set_hidden(item); item = proto_tree_add_string(tree, hf_ip_host, tvb, offset, 4, src_host); - PROTO_ITEM_SET_GENERATED(item); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_generated(item); + proto_item_set_hidden(item); } } @@ -238,15 +238,15 @@ add_ipv4_dst_address(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int of proto_tree_add_ipv4(tree, hf_ip_dst, tvb, offset, 4, addr); item = proto_tree_add_ipv4(tree, hf_ip_addr, tvb, offset, 4, addr); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_string(tree, hf_ip_dst_host, tvb, offset, 4, dst_host); - PROTO_ITEM_SET_GENERATED(item); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_generated(item); + proto_item_set_hidden(item); item = proto_tree_add_string(tree, hf_ip_host, tvb, offset, 4, dst_host); - PROTO_ITEM_SET_GENERATED(item); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_generated(item); + proto_item_set_hidden(item); } } @@ -265,15 +265,15 @@ add_ipv6_src_address(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int of proto_tree_add_item(tree, hf_ipv6_src, tvb, offset, IPv6_ADDR_SIZE, ENC_NA); item = proto_tree_add_item(tree, hf_ipv6_addr, tvb, offset, IPv6_ADDR_SIZE, ENC_NA); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_string(tree, hf_ipv6_src_host, tvb, offset, IPv6_ADDR_SIZE, src_host); - PROTO_ITEM_SET_GENERATED(item); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_generated(item); + proto_item_set_hidden(item); item = proto_tree_add_string(tree, hf_ipv6_host, tvb, offset, IPv6_ADDR_SIZE, src_host); - PROTO_ITEM_SET_GENERATED(item); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_generated(item); + proto_item_set_hidden(item); } } @@ -292,15 +292,15 @@ add_ipv6_dst_address(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int of proto_tree_add_item(tree, hf_ipv6_dst, tvb, offset, IPv6_ADDR_SIZE, ENC_NA); item = proto_tree_add_item(tree, hf_ipv6_addr, tvb, offset, IPv6_ADDR_SIZE, ENC_NA); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_string(tree, hf_ipv6_dst_host, tvb, offset, IPv6_ADDR_SIZE, dst_host); - PROTO_ITEM_SET_GENERATED(item); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_generated(item); + proto_item_set_hidden(item); item = proto_tree_add_string(tree, hf_ipv6_host, tvb, offset, IPv6_ADDR_SIZE, dst_host); - PROTO_ITEM_SET_GENERATED(item); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_generated(item); + proto_item_set_hidden(item); } } @@ -578,7 +578,7 @@ dissect_etw_wfp_capture(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi etw_tree = proto_item_add_subtree(ti, ett_etw_wfp_capture); generated = proto_tree_add_uint(etw_tree, hf_etw_wfp_capture_event_id, tvb, 0, 0, provider_id_data->event_id); - PROTO_ITEM_SET_GENERATED(generated); + proto_item_set_generated(generated); col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(provider_id_data->event_id, etw_wfp_capture_event_vals, "Unknown")); switch (provider_id_data->event_id) @@ -887,10 +887,10 @@ dissect_etw_ndis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data etw_tree = proto_item_add_subtree(ti, ett_etw_ndis); generated = proto_tree_add_uint(etw_tree, hf_etw_ndis_event_id, tvb, 0, 0, provider_id_data->event_id); - PROTO_ITEM_SET_GENERATED(generated); + proto_item_set_generated(generated); col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(provider_id_data->event_id, etw_ndis_event_vals, "Unknown")); generated = proto_tree_add_bitmask_value(etw_tree, tvb, 0, hf_etw_ndis_keyword, ett_etw_ndis_keyword, keyword_fields, provider_id_data->keyword); - PROTO_ITEM_SET_GENERATED(generated); + proto_item_set_generated(generated); diff --git a/epan/dissectors/packet-metamako.c b/epan/dissectors/packet-metamako.c index 60c94a0ad3..8029dfd5c4 100644 --- a/epan/dissectors/packet-metamako.c +++ b/epan/dissectors/packet-metamako.c @@ -325,7 +325,7 @@ dissect_metamako(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data /* [Timestamp difference from pcap time] */ nstime_delta(&timediff, &metamako_time, &pinfo->abs_ts); item = proto_tree_add_time(timestamp_tree, hf_metamako_tdiff, tvb, offset, 8, &timediff); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); offset += 8; diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c index 77ecd0188a..96b62606e9 100644 --- a/epan/dissectors/packet-mgcp.c +++ b/epan/dissectors/packet-mgcp.c @@ -508,7 +508,7 @@ static int dissect_mgcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi tii = proto_tree_add_uint(mgcp_tree, hf_mgcp_messagecount, tvb, 0 , 0 , num_messages); - PROTO_ITEM_SET_HIDDEN(tii); + proto_item_set_hidden(tii); /* * Add our column information after dissecting SDP @@ -1281,7 +1281,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree { case MGCP_RESPONSE: hidden_item = proto_tree_add_boolean(tree, hf_mgcp_rsp, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Check for MGCP response. A response must match a call that we've seen, and the response must be sent to the same port and address that the call came from, and must @@ -1335,10 +1335,10 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree tvb, 0, 0, mgcp_call->req_num, "This is a response to a request in frame %u", mgcp_call->req_num); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); nstime_delta(&delta, &pinfo->abs_ts, &mgcp_call->req_time); item = proto_tree_add_time(tree, hf_mgcp_time, tvb, 0, 0, &delta); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (mgcp_call->rsp_num == 0) @@ -1365,13 +1365,13 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree mi->transid); item = proto_tree_add_uint(tree, hf_mgcp_dup, tvb, 0, 0, mi->transid); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_uint(tree, hf_mgcp_rsp_dup, tvb, 0, 0, mi->transid); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(tree, hf_mgcp_rsp_dup_frame, tvb, 0, 0, mgcp_call->rsp_num); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } /* Now store the response code (after comparison above) */ @@ -1381,7 +1381,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree break; case MGCP_REQUEST: hidden_item = proto_tree_add_boolean(tree, hf_mgcp_req, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Keep track of the address and port whence the call came, * and the port to which the call is being sent, so that * we can match up calls with replies. @@ -1455,11 +1455,11 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree { proto_item* item; item = proto_tree_add_uint(tree, hf_mgcp_dup, tvb, 0, 0, mi->transid); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); item = proto_tree_add_uint(tree, hf_mgcp_req_dup, tvb, 0, 0, mi->transid); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(tree, hf_mgcp_req_dup_frame, tvb, 0, 0, mi->req_num); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } } @@ -1489,7 +1489,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree tvb, 0, 0, mgcp_call->rsp_num, "The response to this request is in frame %u", mgcp_call->rsp_num); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } break; default: diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index fc50aa5c28..a1b479998f 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -2960,7 +2960,7 @@ dissect_pmip6_opt_mhipv6ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(opt_tree, hf_mip6_opt_mhipv6ap_ipv6_address, tvb, offset, 16, ENC_NA); ti = proto_tree_add_string(opt_tree, hf_mip6_opt_mhipv6ap_ipv6_address_prefix, tvb, offset -1, 16+1, tvb_ip6_to_str(tvb, offset)); proto_item_append_text(ti, "/%u", prefix_l); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); return tvb_captured_length(tvb); } diff --git a/epan/dissectors/packet-mle.c b/epan/dissectors/packet-mle.c index 7dbc72240a..79503609d3 100644 --- a/epan/dissectors/packet-mle.c +++ b/epan/dissectors/packet-mle.c @@ -617,7 +617,7 @@ dissect_mle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) /* MIC */ if (rx_mic_len) { mic_item = proto_tree_add_bytes(header_tree, hf_mle_mic, tvb, 0, rx_mic_len, rx_mic); - PROTO_ITEM_SET_GENERATED(mic_item); + proto_item_set_generated(mic_item); } } else { status = DECRYPT_NOT_ENCRYPTED; diff --git a/epan/dissectors/packet-moldudp.c b/epan/dissectors/packet-moldudp.c index 25436e4bbf..a04783689a 100644 --- a/epan/dissectors/packet-moldudp.c +++ b/epan/dissectors/packet-moldudp.c @@ -90,7 +90,7 @@ dissect_moldudp_msgblk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ti = proto_tree_add_uint(blk_tree, hf_moldudp_msgseq, tvb, offset, 0, sequence); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_item(blk_tree, hf_moldudp_msglen, tvb, offset, MOLDUDP_MSGLEN_LEN, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-moldudp64.c b/epan/dissectors/packet-moldudp64.c index e0449e2f51..23f07376c0 100644 --- a/epan/dissectors/packet-moldudp64.c +++ b/epan/dissectors/packet-moldudp64.c @@ -90,7 +90,7 @@ dissect_moldudp64_msgblk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ti = proto_tree_add_uint64(blk_tree, hf_moldudp64_msgseq, tvb, offset, 0, sequence); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_item(blk_tree, hf_moldudp64_msglen, tvb, offset, MOLDUDP64_MSGLEN_LEN, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index c5bd38d158..72e3c8df4e 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -953,11 +953,11 @@ detect_cc_drops(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, flags_item = proto_tree_add_uint(tree, hf_mp2t_analysis_skips, tvb, 0, 0, skips); - PROTO_ITEM_SET_GENERATED(flags_item); + proto_item_set_generated(flags_item); flags_item = proto_tree_add_uint(tree, hf_mp2t_analysis_drops, tvb, 0, 0, 1); - PROTO_ITEM_SET_GENERATED(flags_item); + proto_item_set_generated(flags_item); } return skips; } @@ -1186,7 +1186,7 @@ dissect_tsp(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* Create a subtree for analysis stuff */ mp2t_analysis_tree = proto_tree_add_subtree_format(mp2t_tree, tvb, offset, 0, ett_mp2t_analysis, &item, "MPEG2 PCR Analysis"); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); skips = detect_cc_drops(tvb, mp2t_analysis_tree, pinfo, pid, cc, mp2t_data); diff --git a/epan/dissectors/packet-mpeg-dsmcc.c b/epan/dissectors/packet-mpeg-dsmcc.c index 73481aaf2e..c0a1fcb6ec 100644 --- a/epan/dissectors/packet-mpeg-dsmcc.c +++ b/epan/dissectors/packet-mpeg-dsmcc.c @@ -783,7 +783,7 @@ dissect_dsmcc_ts(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree_in, void *d crc_len, 4, crc, "CRC: 0x%08x [Failed Verification (Calculated: 0x%08x)]", crc, calculated_crc ); - PROTO_ITEM_SET_GENERATED(msg_error); + proto_item_set_generated(msg_error); expert_add_info( pinfo, msg_error, &ei_dsmcc_crc_invalid); } } else { diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index 8b4a212539..054194542c 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -1688,7 +1688,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre hidden_item = proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_responder_indent_len, tvb, offset + 6, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_responder_indent_ipv4, tvb, offset + 8, 4, ENC_BIG_ENDIAN); break; @@ -1704,7 +1704,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre tvb, offset + 4, 2, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_responder_indent_len, tvb, offset + 6, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_responder_indent_ipv4, tvb, offset + 8, 16, ENC_BIG_ENDIAN); break; diff --git a/epan/dissectors/packet-mqtt.c b/epan/dissectors/packet-mqtt.c index ad27d939da..7ca7deb673 100644 --- a/epan/dissectors/packet-mqtt.c +++ b/epan/dissectors/packet-mqtt.c @@ -712,7 +712,7 @@ static void mqtt_user_decode_message(proto_tree *tree, proto_tree *mqtt_tree, pa { proto_item *ti = proto_tree_add_string(mqtt_tree, hf_mqtt_pubmsg_decoded, msg_tvb, 0, -1, message_decode_entry->payload_proto_name); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); call_dissector(message_decode_entry->payload_proto, msg_tvb, pinfo, tree); } diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index 9287e4341d..d86e9bc6a2 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -379,7 +379,7 @@ static gint dissect_msmms_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* Add hidden filter for "msmms.command" */ ti = proto_tree_add_item(tree, hf_msmms_command, tvb, 0, 0, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); /* Create MSMMS control protocol tree */ ti = proto_tree_add_item(tree, proto_msmms, tvb, offset, -1, ENC_NA); @@ -639,7 +639,7 @@ static gint dissect_msmms_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr /* Add hidden filter for "msmms.data" */ ti = proto_tree_add_item(tree, hf_msmms_data, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); /* Create MSMMS data protocol tree */ ti = proto_tree_add_item(tree, proto_msmms, tvb, offset, -1, ENC_NA); diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index c6c25e131b..52ae2fe661 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -248,17 +248,17 @@ show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Stream setup by %s (frame %u)", p_conv_data->setup_method, p_conv_data->setup_frame_number); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); msrp_setup_tree = proto_item_add_subtree(ti, ett_msrp_setup); if (msrp_setup_tree) { /* Add details into subtree */ proto_item* item = proto_tree_add_uint(msrp_setup_tree, hf_msrp_setup_frame, tvb, 0, 0, p_conv_data->setup_frame_number); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_string(msrp_setup_tree, hf_msrp_setup_method, tvb, 0, 0, p_conv_data->setup_method); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } } diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c index 8f69a98d6d..00672bd588 100644 --- a/epan/dissectors/packet-mtp3.c +++ b/epan/dissectors/packet-mtp3.c @@ -462,11 +462,11 @@ dissect_mtp3_3byte_pc(tvbuff_t *tvb, guint offset, proto_tree *tree, gint ett_pc g_snprintf(pc_string, sizeof(pc_string), "%u", pc); proto_item_append_text(pc_item, " (%s)", pc_string); hidden_item = proto_tree_add_string(tree, hf_pc_string, tvb, offset, ANSI_PC_LENGTH, pc_string); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); g_snprintf(pc_string, sizeof(pc_string), "0x%x", pc); proto_item_append_text(pc_item, " (%s)", pc_string); hidden_item = proto_tree_add_string(tree, hf_pc_string, tvb, offset, ANSI_PC_LENGTH, pc_string); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); pc_tree = proto_item_add_subtree(pc_item, ett_pc); @@ -477,11 +477,11 @@ dissect_mtp3_3byte_pc(tvbuff_t *tvb, guint offset, proto_tree *tree, gint ett_pc /* add full integer values of DPC as hidden for filtering purposes */ if (hf_dpc) { hidden_item = proto_tree_add_uint(pc_tree, hf_dpc, tvb, offset, ANSI_PC_LENGTH, pc); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } if (hf_pc) { hidden_item = proto_tree_add_uint(pc_tree, hf_pc, tvb, offset, ANSI_PC_LENGTH, pc); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } } @@ -545,9 +545,9 @@ dissect_mtp3_routing_label(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mtp3_t dpc = label & ITU_DPC_MASK; hidden_item = proto_tree_add_uint(label_tree, hf_mtp3_itu_pc, tvb, ROUTING_LABEL_OFFSET, ITU_ROUTING_LABEL_LENGTH, opc); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_uint(label_tree, hf_mtp3_itu_pc, tvb, ROUTING_LABEL_OFFSET, ITU_ROUTING_LABEL_LENGTH, dpc); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); label_dpc_item = proto_tree_add_uint(label_tree, hf_mtp3_itu_dpc, tvb, ROUTING_LABEL_OFFSET, ITU_ROUTING_LABEL_LENGTH, label); if (mtp3_pc_structured()) @@ -624,9 +624,9 @@ dissect_mtp3_routing_label(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mtp3_t } hidden_item = proto_tree_add_item(label_tree, hf_mtp3_japan_pc, tvb, ROUTING_LABEL_OFFSET, JAPAN_PC_LENGTH, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item(label_tree, hf_mtp3_japan_pc, tvb, JAPAN_OPC_OFFSET, JAPAN_PC_LENGTH, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); if (mtp3_use_japan_5_bit_sls) { proto_tree_add_item(label_tree, hf_mtp3_japan_5_bit_sls, tvb, JAPAN_SLS_OFFSET, JAPAN_SLS_SPARE_LENGTH, ENC_LITTLE_ENDIAN); @@ -755,7 +755,7 @@ dissect_mtp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ */ register_frame_end_routine(pinfo, reset_mtp3_standard); } - PROTO_ITEM_SET_GENERATED(gen_item); + proto_item_set_generated(gen_item); } /* Make entries in Protocol column on summary display */ diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c index 08680d751e..aece651e01 100644 --- a/epan/dissectors/packet-multipart.c +++ b/epan/dissectors/packet-multipart.c @@ -839,7 +839,7 @@ static int dissect_multipart(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* Show multi-part type as a generated field */ type_ti = proto_tree_add_string(subtree, hf_multipart_type, tvb, 0, 0, pinfo->match_string); - PROTO_ITEM_SET_GENERATED(type_ti); + proto_item_set_generated(type_ti); /* * Make no entries in Protocol column and Info column on summary display, diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index b82d8a47bb..d656d30884 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -2320,17 +2320,17 @@ dissect_mysql_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat generation= conn_data->generation; if (tree) { pi = proto_tree_add_debug_text(mysql_tree, "conversation: %p", conversation); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pi = proto_tree_add_debug_text(mysql_tree, "generation: %" G_GINT64_MODIFIER "d", generation); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pi = proto_tree_add_debug_text(mysql_tree, "conn state: %s (%u)", val_to_str(conn_state_in, state_vals, "Unknown (%u)"), conn_state_in); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pi = proto_tree_add_debug_text(mysql_tree, "frame state: %s (%u)", val_to_str(frame_state, state_vals, "Unknown (%u)"), frame_state); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } #endif @@ -2366,7 +2366,7 @@ dissect_mysql_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat pi = proto_tree_add_debug_text(mysql_tree, "next proto state: %s (%u)", val_to_str(conn_state_out, state_vals, "Unknown (%u)"), conn_state_out); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); #endif /* remaining payload indicates an error */ diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index 6d2cb4e0ca..6318d8564c 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -1953,7 +1953,7 @@ de_emm_trac_area_id_lst(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, curr_offset+=2; for (i = 1; i < n_elem; i++) { it = proto_tree_add_uint(tree, hf_nas_eps_emm_tai_tac, tvb, curr_offset, 0, tac+i); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } break; case 2: diff --git a/epan/dissectors/packet-nasdaq-itch.c b/epan/dissectors/packet-nasdaq-itch.c index 814ef486f6..e92b308a54 100644 --- a/epan/dissectors/packet-nasdaq-itch.c +++ b/epan/dissectors/packet-nasdaq-itch.c @@ -289,7 +289,7 @@ dissect_nasdaq_itch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d nasdaq_itch_tree = proto_item_add_subtree(ti, ett_nasdaq_itch); item = proto_tree_add_uint(nasdaq_itch_tree, hf_nasdaq_itch_version, tvb, 0, 0, version); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (version == 2) { diff --git a/epan/dissectors/packet-nat-pmp.c b/epan/dissectors/packet-nat-pmp.c index ac813e9273..54ca1174ec 100644 --- a/epan/dissectors/packet-nat-pmp.c +++ b/epan/dissectors/packet-nat-pmp.c @@ -321,7 +321,7 @@ dissect_portcontrol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui if(!is_response) { ti = proto_tree_add_boolean(pcp_tree, hf_request, tvb, offset-1, 1, is_response == FALSE); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); proto_tree_add_item(pcp_tree, hf_reserved2, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; @@ -335,7 +335,7 @@ dissect_portcontrol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui else { ti = proto_tree_add_boolean(pcp_tree, hf_response, tvb, offset-1, 1, is_response == TRUE); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); proto_tree_add_item(pcp_tree, hf_reserved1, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c index 7354c58689..3607769c8e 100644 --- a/epan/dissectors/packet-nbd.c +++ b/epan/dissectors/packet-nbd.c @@ -281,7 +281,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, proto_item *it; it=proto_tree_add_uint(tree, hf_nbd_response_in, tvb, 0, 0, nbd_trans->rep_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else if(magic==NBD_RESPONSE_MAGIC){ /* This is a reply */ @@ -290,11 +290,11 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, nstime_t ns; it=proto_tree_add_uint(tree, hf_nbd_response_to, tvb, 0, 0, nbd_trans->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &nbd_trans->req_time); it=proto_tree_add_time(tree, hf_nbd_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } @@ -332,7 +332,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, break; case NBD_RESPONSE_MAGIC: item=proto_tree_add_uint(tree, hf_nbd_type, tvb, 0, 0, nbd_trans->type); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); error=tvb_get_ntohl(tvb, offset); proto_tree_add_item(tree, hf_nbd_error, tvb, offset, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc index fd6bc81ed0..589b059aba 100644 --- a/epan/dissectors/packet-ncp2222.inc +++ b/epan/dissectors/packet-ncp2222.inc @@ -7187,7 +7187,7 @@ dissect_ncp_request(tvbuff_t *tvb, packet_info *pinfo, * information to display anyway. Put it in the tree for filtering and tap use*/ if (ncp_rec) { ti = proto_tree_add_uint_format_value(ncp_tree, hf_ncp_group, tvb, 0, 0, ncp_rec->group, "%s", ncp_groups[ncp_rec->group]); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } exception_code = 0; @@ -9297,7 +9297,7 @@ dissect_ping_req(tvbuff_t *tvb, packet_info *pinfo, } pi = proto_tree_add_uint(ncp_tree, hf_ncp_nds_verb, tvb, 0, 0, 240); - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); proto_tree_add_bitmask(ncp_tree, tvb, 12, hf_pingflags1, ett_ncp, ncp_pingflags1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask(ncp_tree, tvb, 14, hf_pingflags2, ett_ncp, ncp_pingflags2, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 5f67c4c1c3..85545653db 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -3207,7 +3207,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* } else { vers_item=proto_tree_add_uint_format(ndmp_tree, hf_ndmp_version, new_tvb, offset, 0, ndmp_default_protocol_version, "Unknown NDMP version, using default:%d", ndmp_default_protocol_version); } - PROTO_ITEM_SET_GENERATED(vers_item); + proto_item_set_generated(vers_item); /* request response matching */ ndmp_conv_data->task=NULL; @@ -3227,7 +3227,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* proto_item *it; it=proto_tree_add_uint(ndmp_tree, hf_ndmp_response_frame, new_tvb, 0, 0, ndmp_conv_data->task->response_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } break; case NDMP_MESSAGE_REPLY: @@ -3245,11 +3245,11 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* it=proto_tree_add_uint(ndmp_tree, hf_ndmp_request_frame, new_tvb, 0, 0, ndmp_conv_data->task->request_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&delta_ts, &pinfo->abs_ts, &ndmp_conv_data->task->ndmp_time); it=proto_tree_add_time(ndmp_tree, hf_ndmp_time, new_tvb, 0, 0, &delta_ts); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } break; } diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 250bc3a573..36debc173a 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -3474,7 +3474,7 @@ static void show_sequence_analysis_info(guint32 domain_id, guint32 seqnum, /* Expected sequence number, i.e. what we stored in state when checking previous frame */ ti = proto_tree_add_uint(tree, hf_cflow_sequence_analysis_expected_sn, tvb, 0, 0, state->current_sequence_number); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); expert_add_info_format(pinfo, flow_sequence_ti, &ei_unexpected_sequence_number, "Unexpected flow sequence for domain ID %u (expected %u, got %u)", domain_id, state->current_sequence_number, seqnum); @@ -3485,7 +3485,7 @@ static void show_sequence_analysis_info(guint32 domain_id, guint32 seqnum, /* Previous frame for this observation domain ID */ ti = proto_tree_add_uint(tree, hf_cflow_sequence_analysis_previous_frame, tvb, 0, 0, state->current_frame_number); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } @@ -3884,7 +3884,7 @@ flow_process_timeperiod(proto_tree *pdutree, tvbuff_t *tvb, int offset) timeitem = proto_tree_add_time(pdutree, hf_cflow_timedelta, tvb, offset_s, 8, &ts_delta); - PROTO_ITEM_SET_GENERATED(timeitem); + proto_item_set_generated(timeitem); timetree = proto_item_add_subtree(timeitem, ett_flowtime); proto_tree_add_time(timetree, hf_cflow_timestart, tvb, offset_s, 4, @@ -4194,7 +4194,7 @@ dissect_v9_v10_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, int if (tmplt_p->template_frame_number > pinfo->num) { proto_item_append_text(ti, " (received after this frame)"); } - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Note: If the flow contains variable length fields then */ /* tmplt_p->length will be less then actual length of the flow. */ @@ -4460,49 +4460,49 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case VENDOR_CACE: if (!cace_pie_seen) { proto_item *pie_cace_ti = proto_tree_add_item(pdutree, hf_pie_cace, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(pie_cace_ti); + proto_item_set_hidden(pie_cace_ti); cace_pie_seen = TRUE; } break; case VENDOR_PLIXER: if (!plixer_pie_seen) { proto_item *pie_plixer_ti = proto_tree_add_item(pdutree, hf_pie_plixer, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(pie_plixer_ti); + proto_item_set_hidden(pie_plixer_ti); plixer_pie_seen = TRUE; } break; case VENDOR_NTOP: if (!ntop_pie_seen) { proto_item *pie_ntop_ti = proto_tree_add_item(pdutree, hf_pie_ntop, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(pie_ntop_ti); + proto_item_set_hidden(pie_ntop_ti); ntop_pie_seen = TRUE; } break; case VENDOR_IXIA: if (!ixia_pie_seen) { proto_item *pie_ixia_ti = proto_tree_add_item(pdutree, hf_pie_ixia, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(pie_ixia_ti); + proto_item_set_hidden(pie_ixia_ti); ixia_pie_seen = TRUE; } break; case VENDOR_NETSCALER: if (!netscaler_pie_seen) { proto_item *pie_netscaler_ti = proto_tree_add_item(pdutree, hf_pie_netscaler, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(pie_netscaler_ti); + proto_item_set_hidden(pie_netscaler_ti); netscaler_pie_seen = TRUE; } break; case VENDOR_BARRACUDA: if (!barracuda_pie_seen) { proto_item *pie_barracuda_ti = proto_tree_add_item(pdutree, hf_pie_barracuda, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(pie_barracuda_ti); + proto_item_set_hidden(pie_barracuda_ti); barracuda_pie_seen = TRUE; } break; case VENDOR_GIGAMON: if (!gigamon_pie_seen) { proto_item *pie_gigamon_ti = proto_tree_add_item(pdutree, hf_pie_gigamon, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(pie_gigamon_ti); + proto_item_set_hidden(pie_gigamon_ti); gigamon_pie_seen = TRUE; } break; @@ -4742,7 +4742,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, timeitem = proto_tree_add_time(pdutree, hf_cflow_timedelta, tvb, offset_s[rev][duration_type], 0, &ts_delta); - PROTO_ITEM_SET_GENERATED(timeitem); + proto_item_set_generated(timeitem); timetree = proto_item_add_subtree(timeitem, ett_flowtime); /* Show the type/units used to calculate the duration */ diff --git a/epan/dissectors/packet-netmon.c b/epan/dissectors/packet-netmon.c index 44267b0213..51205c8dd2 100644 --- a/epan/dissectors/packet-netmon.c +++ b/epan/dissectors/packet-netmon.c @@ -409,7 +409,7 @@ dissect_netmon_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* if (pinfo->pseudo_header->netmon.title != NULL) { ti = proto_tree_add_string(header_tree, hf_netmon_header_title_comment, tvb, 0, 0, pinfo->pseudo_header->netmon.title); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (pinfo->pseudo_header->netmon.description != NULL) { @@ -421,7 +421,7 @@ dissect_netmon_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* comment = wmem_strndup(wmem_packet_scope(), pinfo->pseudo_header->netmon.description, pinfo->pseudo_header->netmon.descLength); ti = proto_tree_add_string(header_tree, hf_netmon_header_description_comment, tvb, 0, 0, comment); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Save the pseudo header data to a temp variable before it's copied to diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 12cf52efb6..0efb1c950f 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -1314,23 +1314,23 @@ nfs_name_snoop_fh(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int fh_of if (hidden) { fh_item = proto_tree_add_string(tree, hf_nfs_name, NULL, 0, 0, nns->name); - PROTO_ITEM_SET_HIDDEN(fh_item); + proto_item_set_hidden(fh_item); } else { fh_item = proto_tree_add_string(tree, hf_nfs_name, tvb, fh_offset, 0, nns->name); } - PROTO_ITEM_SET_GENERATED(fh_item); + proto_item_set_generated(fh_item); if (nns->full_name) { if (hidden) { fh_item = proto_tree_add_string(tree, hf_nfs_full_name, NULL, 0, 0, nns->full_name); - PROTO_ITEM_SET_HIDDEN(fh_item); + proto_item_set_hidden(fh_item); } else { fh_item = proto_tree_add_string_format_value(tree, hf_nfs_full_name, tvb, fh_offset, 0, nns->full_name, "%s", nns->full_name); } - PROTO_ITEM_SET_GENERATED(fh_item); + proto_item_set_generated(fh_item); } } } @@ -2257,12 +2257,12 @@ dissect_fhandle_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree * if (hidden) { fh_item = proto_tree_add_uint(tree, hf_nfs_fh_hash, NULL, 0, 0, fhhash); - PROTO_ITEM_SET_HIDDEN(fh_item); + proto_item_set_hidden(fh_item); } else { fh_item = proto_tree_add_uint(tree, hf_nfs_fh_hash, tvb, offset, fhlen, fhhash); } - PROTO_ITEM_SET_GENERATED(fh_item); + proto_item_set_generated(fh_item); if (hash) { *hash = fhhash; } @@ -2393,7 +2393,7 @@ dissect_nfs2_status(tvbuff_t *tvb, int offset, proto_tree *tree, guint32 *status proto_tree_add_item_ret_uint(tree, hf_nfs2_status, tvb, offset+0, 4, ENC_BIG_ENDIAN, &stat); stat_item = proto_tree_add_uint(tree, hf_nfs_status, tvb, offset+0, 4, stat); - PROTO_ITEM_SET_HIDDEN(stat_item); + proto_item_set_hidden(stat_item); offset += 4; @@ -3581,7 +3581,7 @@ dissect_nfs3_status(tvbuff_t *tvb, int offset, proto_tree *tree, guint32 *status proto_item *stat_item; proto_tree_add_uint(tree, hf_nfs3_status, tvb, offset+0, 4, nfsstat3); stat_item = proto_tree_add_uint(tree, hf_nfs_status, tvb, offset+0, 4, nfsstat3); - PROTO_ITEM_SET_HIDDEN(stat_item); + proto_item_set_hidden(stat_item); } offset += 4; @@ -4743,7 +4743,7 @@ dissect_access_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree * ditem = proto_tree_add_boolean(access_tree, hf_nfs_access_denied, tvb, offset, 4, (mask_denied > 0 ? TRUE : FALSE )); - PROTO_ITEM_SET_GENERATED(ditem); + proto_item_set_generated(ditem); return offset+4; } @@ -6168,7 +6168,7 @@ dissect_nfs4_status(tvbuff_t *tvb, int offset, proto_tree *tree, guint32 *status proto_tree_add_item_ret_uint(tree, hf_nfs4_status, tvb, offset+0, 4, ENC_BIG_ENDIAN, &stat); stat_item = proto_tree_add_uint(tree, hf_nfs_status, tvb, offset+0, 4, stat); - PROTO_ITEM_SET_HIDDEN(stat_item); + proto_item_set_hidden(stat_item); if (status) *status = stat; @@ -6882,8 +6882,8 @@ dissect_nfs4_fattrs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t count += (bitmap & 1); bitmap = bitmaps[i]; hitem = proto_tree_add_uint_format(bitmap_tree, hf_nfs4_attr_count, tvb, attr_mask_offset, 4, count, "%u attribute%s", count, plurality(count, "", "s")); - PROTO_ITEM_SET_HIDDEN(hitem); - PROTO_ITEM_SET_GENERATED(hitem); + proto_item_set_hidden(hitem); + proto_item_set_generated(hitem); } } else { attr_mask_offset += 4; @@ -7492,13 +7492,13 @@ dissect_nfs4_clientaddr(tvbuff_t *tvb, int offset, proto_tree *tree) set_address(&addr, AT_IPv4, 4, &ipv4); ti = proto_tree_add_ipv4_format(tree, hf_nfs4_universal_address_ipv4, tvb, addr_offset, offset-addr_offset, ipv4, "IPv4 address %s, protocol=%s, port=%u", address_to_str(wmem_packet_scope(), &addr), protocol, port); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else if (universal_ip_address && sscanf(universal_ip_address, "%u.%u", &b1, &b2) == 2) { /* Some clients (linux) sometimes send only the port. */ port = (b1<<8) | b2; ti = proto_tree_add_ipv4_format(tree, hf_nfs4_universal_address_ipv4, tvb, addr_offset, offset-addr_offset, 0, "ip address NOT SPECIFIED, protocol=%s, port=%u", protocol, port); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else if (universal_ip_address && sscanf(universal_ip_address, "%2x:%2x:%2x:%2x:%2x:%2x:%2x:%2x.%u.%u", &b1, &b2, &b3, &b4, &b5, &b6, &b7, &b8, &b9, &b10) == 10) { @@ -7509,10 +7509,10 @@ dissect_nfs4_clientaddr(tvbuff_t *tvb, int offset, proto_tree *tree) set_address(&addr, AT_IPv6, 16, &ipv6); ti = proto_tree_add_ipv6_format(tree, hf_nfs4_universal_address_ipv6, tvb, addr_offset, offset-addr_offset, &ipv6, "IPv6 address %s, protocol=%s, port=%u", address_to_str(wmem_packet_scope(), &addr), protocol, port); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else { ti = proto_tree_add_ipv4_format(tree, hf_nfs4_universal_address_ipv4, tvb, addr_offset, offset-addr_offset, 0, "Invalid address"); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } return offset; @@ -7897,7 +7897,7 @@ dissect_nfs4_stateid(tvbuff_t *tvb, int offset, proto_tree *tree, guint16 *hash) stateid_hash = crc16_ccitt_tvb_offset(tvb, offset, 16); hitem = proto_tree_add_uint(stateid_tree, hf_nfs4_stateid_hash, tvb, offset, 16, stateid_hash); - PROTO_ITEM_SET_GENERATED(hitem); + proto_item_set_generated(hitem); offset = dissect_rpc_uint32(tvb, sitem, hf_nfs4_seqid_stateid, offset); @@ -7905,7 +7905,7 @@ dissect_nfs4_stateid(tvbuff_t *tvb, int offset, proto_tree *tree, guint16 *hash) other_hash = crc16_ccitt_tvb_offset(tvb, offset, 12); oth_item = proto_tree_add_uint(stateid_tree, hf_nfs4_stateid_other_hash, tvb, offset, 12, other_hash); - PROTO_ITEM_SET_GENERATED(oth_item); + proto_item_set_generated(oth_item); offset+=12; if (hash) @@ -8465,8 +8465,8 @@ dissect_nfs4_io_hints(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree count += (bitmap & 1); bitmap = bitmaps[i]; hitem = proto_tree_add_uint_format(bitmap_tree, hf_nfs4_io_hint_count, tvb, hints_mask_offset, 4, count, "%u hint%s", count, plurality(count, "", "s")); - PROTO_ITEM_SET_HIDDEN(hitem); - PROTO_ITEM_SET_GENERATED(hitem); + proto_item_set_hidden(hitem); + proto_item_set_generated(hitem); } } else { hints_mask_offset += 4; @@ -8520,7 +8520,7 @@ dissect_nfs4_app_data_block(tvbuff_t *tvb, int offset, proto_tree *tree, guint32 pattern_hash = crc32_ccitt_tvb_offset(tvb, offset, pattern_len); fitem = proto_tree_add_uint(tree, hf_nfs4_pattern_hash, tvb, offset, pattern_len, pattern_hash); - PROTO_ITEM_SET_GENERATED(fitem); + proto_item_set_generated(fitem); proto_item_set_len(fitem, pattern_len); offset += pattern_len; @@ -10366,7 +10366,7 @@ dissect_nfs4_request_op(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre main_opname = val_to_str_ext_const(main_opcode, &names_nfs4_operation_ext, "Unknown"); main_op_item = proto_tree_add_uint_format_value(tree, hf_nfs4_main_opcode, tvb, 0, 0, main_opcode, "%s (%u)", main_opname, main_opcode); - PROTO_ITEM_SET_GENERATED(main_op_item); + proto_item_set_generated(main_op_item); } if (first_operation == 0) @@ -10897,7 +10897,7 @@ dissect_nfs4_response_op(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr main_opname = val_to_str_ext_const(main_opcode, &names_nfs4_operation_ext, "Unknown"); main_op_item = proto_tree_add_uint_format_value(tree, hf_nfs4_main_opcode, tvb, 0, 0, main_opcode, "%s (%u)", main_opname, main_opcode); - PROTO_ITEM_SET_GENERATED(main_op_item); + proto_item_set_generated(main_op_item); } if (first_operation == 0) diff --git a/epan/dissectors/packet-nntp.c b/epan/dissectors/packet-nntp.c index b391bb0747..fe7c60be9e 100644 --- a/epan/dissectors/packet-nntp.c +++ b/epan/dissectors/packet-nntp.c @@ -65,7 +65,7 @@ dissect_nntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ ti = proto_tree_add_boolean(nntp_tree, hf_nntp_response, tvb, 0, 0, TRUE); } - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); /* * Show the request or response as text, a line at a time. diff --git a/epan/dissectors/packet-nordic_ble.c b/epan/dissectors/packet-nordic_ble.c index 5070017fd1..a5c21dcee3 100644 --- a/epan/dissectors/packet-nordic_ble.c +++ b/epan/dissectors/packet-nordic_ble.c @@ -356,7 +356,7 @@ dissect_ble_delta_time(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tre /* Calculated start-to-start is not valid for the first packet because we don't have the previous packet */ delta_time_ss = prev_packet_time + delta_time; pi = proto_tree_add_uint(tree, hf_nordic_ble_delta_time_ss, tvb, offset, 4, delta_time_ss); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } offset += 4; @@ -398,7 +398,7 @@ dissect_packet_header(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree if (nordic_ble_context->protover == 0) { proto_item *item = proto_tree_add_uint(header_tree, hf_nordic_ble_protover, tvb, 0, 0, 0); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); proto_tree_add_item(header_tree, hf_nordic_ble_packet_id, tvb, offset, 1, ENC_NA); offset += 1; diff --git a/epan/dissectors/packet-nr-rrc.c b/epan/dissectors/packet-nr-rrc.c index 4081aca9b4..e5dfc4863b 100644 --- a/epan/dissectors/packet-nr-rrc.c +++ b/epan/dissectors/packet-nr-rrc.c @@ -4653,7 +4653,7 @@ static const per_sequence_t HandoverCommand_sequence[] = { static int dissect_nr_rrc_HandoverCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_nr_rrc_HandoverCommand, HandoverCommand_sequence); @@ -5590,7 +5590,7 @@ static const per_sequence_t ConfigRestrictInfoSCG_sequence[] = { static int dissect_nr_rrc_ConfigRestrictInfoSCG(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_nr_rrc_ConfigRestrictInfoSCG, ConfigRestrictInfoSCG_sequence); @@ -5864,7 +5864,7 @@ static const per_sequence_t HandoverPreparationInformation_sequence[] = { static int dissect_nr_rrc_HandoverPreparationInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_nr_rrc_HandoverPreparationInformation, HandoverPreparationInformation_sequence); @@ -5901,7 +5901,7 @@ static const per_sequence_t BandCombinationInfoSN_sequence[] = { static int dissect_nr_rrc_BandCombinationInfoSN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_nr_rrc_BandCombinationInfoSN, BandCombinationInfoSN_sequence); @@ -7652,7 +7652,7 @@ static const per_sequence_t MeasurementTimingConfiguration_sequence[] = { static int dissect_nr_rrc_MeasurementTimingConfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_nr_rrc_MeasurementTimingConfiguration, MeasurementTimingConfiguration_sequence); @@ -7779,7 +7779,7 @@ static const per_sequence_t UERadioPagingInformation_sequence[] = { static int dissect_nr_rrc_UERadioPagingInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_nr_rrc_UERadioPagingInformation, UERadioPagingInformation_sequence); @@ -7902,7 +7902,7 @@ static const per_sequence_t UERadioAccessCapabilityInformation_sequence[] = { static int dissect_nr_rrc_UERadioAccessCapabilityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_nr_rrc_UERadioAccessCapabilityInformation, UERadioAccessCapabilityInformation_sequence); @@ -8009,7 +8009,7 @@ static const per_sequence_t MIB_sequence[] = { static int dissect_nr_rrc_MIB(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MIB"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -8608,7 +8608,7 @@ static const per_sequence_t SIB2_sequence[] = { static int dissect_nr_rrc_SIB2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB2"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -8739,7 +8739,7 @@ static const per_sequence_t SIB3_sequence[] = { static int dissect_nr_rrc_SIB3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB3"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -8870,7 +8870,7 @@ static const per_sequence_t SIB4_sequence[] = { static int dissect_nr_rrc_SIB4(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB4"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -9231,7 +9231,7 @@ static const per_sequence_t SIB5_sequence[] = { static int dissect_nr_rrc_SIB5(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB5"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -9311,7 +9311,7 @@ static const per_sequence_t SIB6_sequence[] = { static int dissect_nr_rrc_SIB6(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB6"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -9468,7 +9468,7 @@ static const per_sequence_t SIB7_sequence[] = { static int dissect_nr_rrc_SIB7(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB7"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -9626,7 +9626,7 @@ static const per_sequence_t SIB8_sequence[] = { static int dissect_nr_rrc_SIB8(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB8"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -9722,7 +9722,7 @@ static const per_sequence_t SIB9_sequence[] = { static int dissect_nr_rrc_SIB9(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB9"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -13312,7 +13312,7 @@ static const per_sequence_t SIB1_sequence[] = { static int dissect_nr_rrc_SIB1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SIB1"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -14365,7 +14365,7 @@ static const per_sequence_t RadioBearerConfig_sequence[] = { static int dissect_nr_rrc_RadioBearerConfig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_nr_rrc_RadioBearerConfig, RadioBearerConfig_sequence); @@ -16378,7 +16378,7 @@ static const per_sequence_t MeasGapConfig_sequence[] = { static int dissect_nr_rrc_MeasGapConfig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_nr_rrc_MeasGapConfig, MeasGapConfig_sequence); @@ -16516,7 +16516,7 @@ static const per_sequence_t MeasConfig_sequence[] = { static int dissect_nr_rrc_MeasConfig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_nr_rrc_MeasConfig, MeasConfig_sequence); @@ -16908,7 +16908,7 @@ static const per_sequence_t RRCReconfiguration_sequence[] = { static int dissect_nr_rrc_RRCReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RRC Reconfiguration"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -19344,7 +19344,7 @@ static const per_sequence_t UplinkTxDirectCurrentList_sequence_of[1] = { static int dissect_nr_rrc_UplinkTxDirectCurrentList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, ett_nr_rrc_UplinkTxDirectCurrentList, UplinkTxDirectCurrentList_sequence_of, 1, maxNrofServingCells, FALSE); @@ -19440,7 +19440,7 @@ static const per_sequence_t RRCReconfigurationComplete_sequence[] = { static int dissect_nr_rrc_RRCReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RRC Reconfiguration Complete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -32357,7 +32357,7 @@ static const per_sequence_t CellGroupConfig_sequence[] = { static int dissect_nr_rrc_CellGroupConfig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_nr_rrc_CellGroupConfig, CellGroupConfig_sequence); @@ -35835,7 +35835,7 @@ static const per_sequence_t FreqBandList_sequence_of[1] = { static int dissect_nr_rrc_FreqBandList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, ett_nr_rrc_FreqBandList, FreqBandList_sequence_of, 1, maxBandsMRDC, FALSE); @@ -41093,7 +41093,7 @@ dissect_nr_rrc_UE_NR_Capability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a int dissect_nr_rrc_HandoverCommand_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41103,7 +41103,7 @@ int dissect_nr_rrc_HandoverCommand_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } int dissect_nr_rrc_HandoverPreparationInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41113,7 +41113,7 @@ int dissect_nr_rrc_HandoverPreparationInformation_PDU(tvbuff_t *tvb _U_, packet_ } int dissect_nr_rrc_CG_Config_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41123,7 +41123,7 @@ int dissect_nr_rrc_CG_Config_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot } int dissect_nr_rrc_BandCombinationInfoSN_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41133,7 +41133,7 @@ int dissect_nr_rrc_BandCombinationInfoSN_PDU(tvbuff_t *tvb _U_, packet_info *pin } int dissect_nr_rrc_CG_ConfigInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41143,7 +41143,7 @@ int dissect_nr_rrc_CG_ConfigInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } int dissect_nr_rrc_ConfigRestrictInfoSCG_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41153,7 +41153,7 @@ int dissect_nr_rrc_ConfigRestrictInfoSCG_PDU(tvbuff_t *tvb _U_, packet_info *pin } int dissect_nr_rrc_MeasurementTimingConfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41163,7 +41163,7 @@ int dissect_nr_rrc_MeasurementTimingConfiguration_PDU(tvbuff_t *tvb _U_, packet_ } static int dissect_UERadioPagingInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41173,7 +41173,7 @@ static int dissect_UERadioPagingInformation_PDU(tvbuff_t *tvb _U_, packet_info * } static int dissect_UERadioAccessCapabilityInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41183,7 +41183,7 @@ static int dissect_UERadioAccessCapabilityInformation_PDU(tvbuff_t *tvb _U_, pac } static int dissect_BCCH_BCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41193,7 +41193,7 @@ static int dissect_BCCH_BCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U } static int dissect_BCCH_DL_SCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41203,7 +41203,7 @@ static int dissect_BCCH_DL_SCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } static int dissect_DL_CCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41213,7 +41213,7 @@ static int dissect_DL_CCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } static int dissect_DL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41223,7 +41223,7 @@ static int dissect_DL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } static int dissect_PCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41233,7 +41233,7 @@ static int dissect_PCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } static int dissect_UL_CCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41243,7 +41243,7 @@ static int dissect_UL_CCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } static int dissect_UL_CCCH1_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41253,7 +41253,7 @@ static int dissect_UL_CCCH1_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U } int dissect_nr_rrc_UL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41263,7 +41263,7 @@ int dissect_nr_rrc_UL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } int dissect_nr_rrc_MIB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41273,7 +41273,7 @@ int dissect_nr_rrc_MIB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree } int dissect_nr_rrc_RRCReconfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41283,7 +41283,7 @@ int dissect_nr_rrc_RRCReconfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } int dissect_nr_rrc_RRCReconfigurationComplete_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41293,7 +41293,7 @@ int dissect_nr_rrc_RRCReconfigurationComplete_PDU(tvbuff_t *tvb _U_, packet_info } int dissect_nr_rrc_SIB1_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41303,7 +41303,7 @@ int dissect_nr_rrc_SIB1_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre } int dissect_nr_rrc_SIB2_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41313,7 +41313,7 @@ int dissect_nr_rrc_SIB2_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre } int dissect_nr_rrc_SIB3_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41323,7 +41323,7 @@ int dissect_nr_rrc_SIB3_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre } int dissect_nr_rrc_SIB4_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41333,7 +41333,7 @@ int dissect_nr_rrc_SIB4_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre } int dissect_nr_rrc_SIB5_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41343,7 +41343,7 @@ int dissect_nr_rrc_SIB5_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre } int dissect_nr_rrc_SIB6_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41353,7 +41353,7 @@ int dissect_nr_rrc_SIB6_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre } int dissect_nr_rrc_SIB7_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41363,7 +41363,7 @@ int dissect_nr_rrc_SIB7_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre } int dissect_nr_rrc_SIB8_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41373,7 +41373,7 @@ int dissect_nr_rrc_SIB8_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre } int dissect_nr_rrc_SIB9_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41383,7 +41383,7 @@ int dissect_nr_rrc_SIB9_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre } int dissect_nr_rrc_CellGroupConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41393,7 +41393,7 @@ int dissect_nr_rrc_CellGroupConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } int dissect_nr_rrc_MeasConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41403,7 +41403,7 @@ int dissect_nr_rrc_MeasConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro } int dissect_nr_rrc_MeasGapConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41413,7 +41413,7 @@ int dissect_nr_rrc_MeasGapConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } int dissect_nr_rrc_MeasResultSCG_Failure_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41423,7 +41423,7 @@ int dissect_nr_rrc_MeasResultSCG_Failure_PDU(tvbuff_t *tvb _U_, packet_info *pin } int dissect_nr_rrc_P_Max_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41433,7 +41433,7 @@ int dissect_nr_rrc_P_Max_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tr } int dissect_nr_rrc_RadioBearerConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41443,7 +41443,7 @@ int dissect_nr_rrc_RadioBearerConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ } int dissect_nr_rrc_UplinkTxDirectCurrentList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41453,7 +41453,7 @@ int dissect_nr_rrc_UplinkTxDirectCurrentList_PDU(tvbuff_t *tvb _U_, packet_info } int dissect_nr_rrc_FreqBandList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41463,7 +41463,7 @@ int dissect_nr_rrc_FreqBandList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } int dissect_nr_rrc_UE_CapabilityRAT_ContainerList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41473,7 +41473,7 @@ int dissect_nr_rrc_UE_CapabilityRAT_ContainerList_PDU(tvbuff_t *tvb _U_, packet_ } static int dissect_UE_CapabilityRequestFilterNR_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41483,7 +41483,7 @@ static int dissect_UE_CapabilityRequestFilterNR_PDU(tvbuff_t *tvb _U_, packet_in } int dissect_nr_rrc_UE_MRDC_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41493,7 +41493,7 @@ int dissect_nr_rrc_UE_MRDC_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } int dissect_nr_rrc_UE_NR_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41503,7 +41503,7 @@ int dissect_nr_rrc_UE_NR_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U } static int dissect_MeasResultList2NR_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -41513,7 +41513,7 @@ static int dissect_MeasResultList2NR_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ } static int dissect_SystemInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); diff --git a/epan/dissectors/packet-nstrace.c b/epan/dissectors/packet-nstrace.c index 6cf0faecf8..363d891191 100644 --- a/epan/dissectors/packet-nstrace.c +++ b/epan/dissectors/packet-nstrace.c @@ -551,11 +551,11 @@ dissect_nstrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data case NSPR_HEADER_VERSION201: proto_tree_add_item(ns_tree, hf_ns_pcbdevno, tvb, pnstr->pcb_offset, 4, ENC_LITTLE_ENDIAN); ti = proto_tree_add_item(ns_tree, hf_ns_devno, tvb, pnstr->pcb_offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); proto_tree_add_item(ns_tree, hf_ns_l_pcbdevno, tvb, pnstr->l_pcb_offset, 4, ENC_LITTLE_ENDIAN); ti = proto_tree_add_item(ns_tree, hf_ns_devno, tvb, pnstr->l_pcb_offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); break; @@ -582,11 +582,11 @@ dissect_nstrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data /* NSPR_HEADER_VERSION201 stuff */ proto_tree_add_item(ns_tree, hf_ns_pcbdevno, tvb, pnstr->pcb_offset, 4, ENC_LITTLE_ENDIAN); ti = proto_tree_add_item(ns_tree, hf_ns_devno, tvb, pnstr->pcb_offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); proto_tree_add_item(ns_tree, hf_ns_l_pcbdevno, tvb, pnstr->l_pcb_offset, 4, ENC_LITTLE_ENDIAN); ti = proto_tree_add_item(ns_tree, hf_ns_devno, tvb, pnstr->l_pcb_offset, 4, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); add35records(tvb, pinfo, tree, ns_tree); if (error_code) 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); } } } diff --git a/epan/dissectors/packet-nvme.c b/epan/dissectors/packet-nvme.c index 878c5685b5..a760368970 100644 --- a/epan/dissectors/packet-nvme.c +++ b/epan/dissectors/packet-nvme.c @@ -244,7 +244,7 @@ nvme_publish_qid(proto_tree *tree, int field_index, guint16 qid) qid ? "%d (IOQ)" : "%d (AQ)", qid); - PROTO_ITEM_SET_GENERATED(cmd_ref_item); + proto_item_set_generated(cmd_ref_item); } static void nvme_build_pending_cmd_key(wmem_tree_key_t *cmd_key, guint32 *key) @@ -394,7 +394,7 @@ nvme_publish_cmd_latency(proto_tree *tree, struct nvme_cmd_ctx *cmd_ctx, cmd_ref_item = proto_tree_add_double_format_value(tree, field_index, NULL, 0, 0, cmd_latency, "%.3f ms", cmd_latency); - PROTO_ITEM_SET_GENERATED(cmd_ref_item); + proto_item_set_generated(cmd_ref_item); } void nvme_update_cmd_end_info(packet_info *pinfo, struct nvme_cmd_ctx *cmd_ctx) @@ -410,7 +410,7 @@ nvme_publish_cqe_to_cmd_link(proto_tree *cqe_tree, tvbuff_t *nvme_tvb, proto_item *cqe_ref_item; cqe_ref_item = proto_tree_add_uint(cqe_tree, hf_index, nvme_tvb, 0, 0, cmd_ctx->cmd_pkt_num); - PROTO_ITEM_SET_GENERATED(cqe_ref_item); + proto_item_set_generated(cqe_ref_item); } void @@ -422,7 +422,7 @@ nvme_publish_cmd_to_cqe_link(proto_tree *cmd_tree, tvbuff_t *cmd_tvb, if (cmd_ctx->cqe_pkt_num) { cmd_ref_item = proto_tree_add_uint(cmd_tree, hf_index, cmd_tvb, 0, 0, cmd_ctx->cqe_pkt_num); - PROTO_ITEM_SET_GENERATED(cmd_ref_item); + proto_item_set_generated(cmd_ref_item); } } diff --git a/epan/dissectors/packet-obex.c b/epan/dissectors/packet-obex.c index bf816f9a8d..c7adb9e990 100644 --- a/epan/dissectors/packet-obex.c +++ b/epan/dissectors/packet-obex.c @@ -2316,11 +2316,11 @@ dissect_obex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } sub_item = proto_tree_add_uint(main_tree, hf_profile, tvb, 0, 0, profile); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); if (path) { sub_item = proto_tree_add_string(main_tree, hf_current_path, tvb, 0, 0, path); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } current_handle = dissector_get_uint_handle(obex_profile_table, profile); @@ -2492,7 +2492,7 @@ dissect_obex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) obex_last_opcode_data->channel == obex_proto_data.channel) { if (obex_last_opcode_data->request_in_frame > 0 && obex_last_opcode_data->request_in_frame != pinfo->num) { sub_item = proto_tree_add_uint(main_tree, hf_request_in_frame, next_tvb, 0, 0, obex_last_opcode_data->request_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (!pinfo->fd->visited && obex_last_opcode_data->response_in_frame == 0 && obex_last_opcode_data->request_in_frame < pinfo->num) { @@ -2501,7 +2501,7 @@ dissect_obex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (obex_last_opcode_data->response_in_frame > 0 && obex_last_opcode_data->response_in_frame != pinfo->num) { sub_item = proto_tree_add_uint(main_tree, hf_response_in_frame, next_tvb, 0, 0, obex_last_opcode_data->response_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } diff --git a/epan/dissectors/packet-oer.c b/epan/dissectors/packet-oer.c index bb5d093492..f398021ebf 100644 --- a/epan/dissectors/packet-oer.c +++ b/epan/dissectors/packet-oer.c @@ -136,7 +136,7 @@ dissect_oer_length_determinant(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, *length = oct; if (hf_index != -1) { item = proto_tree_add_item(tree, hf_index, tvb, offset, 1, ENC_BIG_ENDIAN); - if (!display_internal_oer_fields) PROTO_ITEM_SET_HIDDEN(item); + if (!display_internal_oer_fields) proto_item_set_hidden(item); } offset++; @@ -442,7 +442,7 @@ dissect_oer_sequence(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree */ actx->created_item = proto_tree_add_bits_item(tree, hf_oer_extension_present_bit, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset++; - if (!display_internal_oer_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_oer_fields) proto_item_set_hidden(actx->created_item); } /* The presence bitmap is encoded as a bit string with a fixed size constraint (see 16.2.3), * and has one bit for each field of the sequence type that has the keyword OPTIONAL or DEFAULT, @@ -466,7 +466,7 @@ dissect_oer_sequence(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree proto_item_append_text(actx->created_item, " (%s %s present)", index_get_optional_name(sequence, i), optional_field_flag ? "is" : "is NOT"); } - if (!display_internal_oer_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_oer_fields) proto_item_set_hidden(actx->created_item); if (optional_field_flag) { optional_mask[i >> 5] |= 0x80000000 >> (i & 0x1f); } @@ -614,7 +614,7 @@ dissect_oer_choice(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree * /* 8.7.2.1 Bits 8 and 7 of the first octet shall denote the tag class */ item = proto_tree_add_bits_ret_val(tree, hf_oer_class, tvb, bit_offset, 2, &oer_class, ENC_BIG_ENDIAN); - if (!display_internal_oer_fields) PROTO_ITEM_SET_HIDDEN(item); + if (!display_internal_oer_fields) proto_item_set_hidden(item); bit_offset += 2; tag = tvb_get_bits8(tvb, bit_offset, 6); @@ -631,12 +631,12 @@ dissect_oer_choice(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree * /* Bits 7 to 1 of the first subsequent octet shall not be all set to 0.*/ tag = oct; item = proto_tree_add_uint(tree, hf_oer_tag, tvb, offset, 1, tag); - if (!display_internal_oer_fields) PROTO_ITEM_SET_HIDDEN(item); + if (!display_internal_oer_fields) proto_item_set_hidden(item); } } else { /* Tag value in first octet */ item = proto_tree_add_bits_item(tree, hf_oer_tag, tvb, bit_offset, 6, ENC_BIG_ENDIAN); - if (!display_internal_oer_fields) PROTO_ITEM_SET_HIDDEN(item); + if (!display_internal_oer_fields) proto_item_set_hidden(item); } /* 20.2 If the choice type contains an extension marker in the "AlternativeTypeLists" and the chosen alternative diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index e5e668c553..4a95a944fa 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -357,7 +357,7 @@ opensafety_packet_node(tvbuff_t * message_tvb, packet_info *pinfo, proto_tree *t psf_item = proto_tree_add_uint(tree, hf_field, message_tvb, posInFrame, 2, saddr); psf_tree = proto_item_add_subtree(psf_item, ett_opensafety_node); psf_item = proto_tree_add_uint(psf_tree, hf_oss_msg_node, message_tvb, posInFrame, 2, saddr); - PROTO_ITEM_SET_GENERATED(psf_item); + proto_item_set_generated(psf_item); if ( sdn > 0 ) { @@ -368,7 +368,7 @@ opensafety_packet_node(tvbuff_t * message_tvb, packet_info *pinfo, proto_tree *t posSdnInFrame, 2, sdn * -1); expert_add_info(pinfo, psf_item, &ei_scmudid_unknown ); } - PROTO_ITEM_SET_GENERATED(psf_item); + proto_item_set_generated(psf_item); } static void @@ -444,7 +444,7 @@ opensafety_packet_payloadtree(tvbuff_t *message_tvb, proto_tree *opensafety_tree proto_item *item = NULL; item = proto_tree_add_item(opensafety_tree, hf_oss_msg_category, message_tvb, OSS_FRAME_POS_ID + packet->frame.subframe1, 1, ENC_NA ); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if ( packet->msg_type == OPENSAFETY_SNMT_MESSAGE_TYPE) packet->payload.snmt = wmem_new0(wmem_packet_scope(), opensafety_packet_snmt); @@ -849,7 +849,7 @@ dissect_opensafety_spdo_message(tvbuff_t *message_tvb, packet_info *pinfo, proto item = proto_tree_add_uint_format_value(spdo_tree, hf_oss_spdo_ct, message_tvb, 0, 0, ct, "0x%04X [%d] (%s)", ct, ct, (packet->scm_udid_valid ? "Complete" : "Low byte only")); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); packet->payload.spdo->counter.b16 = ct; packet->payload.spdo->timerequest = taddr; @@ -864,7 +864,7 @@ dissect_opensafety_spdo_message(tvbuff_t *message_tvb, packet_info *pinfo, proto { item = proto_tree_add_uint_format_value(spdo_tree, hf_oss_spdo_ct, message_tvb, 0, 0, ct, "0x%04X [%d] (%s)", ct, ct, (packet->scm_udid_valid ? "Complete" : "Low byte only")); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); packet->payload.spdo->counter.b16 = ct; } else @@ -883,13 +883,13 @@ dissect_opensafety_spdo_message(tvbuff_t *message_tvb, packet_info *pinfo, proto ct40bit += tvb_get_guint8(message_tvb, packet->frame.subframe1 + 3); item = proto_tree_add_uint64(spdo_tree, hf_oss_spdo_ct_40bit, message_tvb, 0, 0, ct40bit); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); packet->payload.spdo->counter.b40 = ct40bit; if ( global_opensafety_debug_verbose ) expert_add_info ( pinfo, item, &ei_40bit_default_domain ); } - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if ( b_ID == OPENSAFETY_MSG_SPDO_DATA_WITH_TIME_RESPONSE ) { @@ -977,13 +977,13 @@ static void dissect_opensafety_ssdo_payload ( packet_info *pinfo, tvbuff_t *new_ val_to_str_ext_const( ((guint32) (0x1018 << 16) ), &opensafety_sod_idx_names_ext, "Unknown") ); sod_tree = proto_item_add_subtree(item, ett_opensafety_ssdo_sodentry); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint_format_value(sod_tree, hf_oss_ssdo_sod_subindex, new_tvb, 0, 0, 0x06, "0x%02X (%s)", 0x06, val_to_str_ext_const(((guint32) (0x1018 << 16) + 0x06), &opensafety_sod_idx_names_ext, "Unknown") ); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); proto_tree_add_item( sod_tree, hf_oss_sod_par_timestamp, new_tvb, 0, 4, ENC_LITTLE_ENDIAN ); @@ -1021,7 +1021,7 @@ static void dissect_opensafety_ssdo_payload ( packet_info *pinfo, tvbuff_t *new_ val_to_str_ext_const( ((guint32) (dispSSDOIndex << 16) ), &opensafety_sod_idx_names_ext, "Unknown") ); if ( ssdoIndex != dispSSDOIndex ) - PROTO_ITEM_SET_GENERATED ( item ); + proto_item_set_generated ( item ); if ( ssdoIndex < 0x1000 || ssdoIndex > 0xE7FF ) expert_add_info ( pinfo, item, &ei_payload_unknown_format ); @@ -1296,7 +1296,7 @@ dissect_opensafety_ssdo_message(tvbuff_t *message_tvb, packet_info *pinfo, proto if ( frag_msg != NULL ) { item = proto_tree_add_bytes_format_value(ssdo_tree, hf_oss_ssdo_payload, message_tvb, 0, 0, NULL, "Reassembled" ); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); ssdo_payload = proto_item_add_subtree(item, ett_opensafety_ssdo_payload); process_reassembled_data(message_tvb, 0, pinfo, "Reassembled Message", frag_msg, &oss_frag_items, NULL, ssdo_payload ); @@ -1334,7 +1334,7 @@ dissect_opensafety_ssdo_message(tvbuff_t *message_tvb, packet_info *pinfo, proto { item = proto_tree_add_bytes_format_value(ssdo_tree, hf_oss_ssdo_payload, message_tvb, 0, 0, NULL, "Reassembled" ); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); ssdo_payload = proto_item_add_subtree(item, ett_opensafety_ssdo_payload); new_tvb = process_reassembled_data(message_tvb, 0, pinfo, "Reassembled Message", frag_msg, @@ -1343,7 +1343,7 @@ dissect_opensafety_ssdo_message(tvbuff_t *message_tvb, packet_info *pinfo, proto { item = proto_tree_add_uint_format_value(ssdo_payload, hf_oss_ssdo_payload_size, message_tvb, 0, 0, payloadSize, "%d octets (over all fragments)", frag_msg->len); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); col_append_str(pinfo->cinfo, COL_INFO, " (Message Reassembled)" ); dissect_opensafety_ssdo_payload ( pinfo, new_tvb, ssdo_payload, db0 ); @@ -1353,7 +1353,7 @@ dissect_opensafety_ssdo_message(tvbuff_t *message_tvb, packet_info *pinfo, proto { item = proto_tree_add_uint_format_value(ssdo_tree, hf_oss_ssdo_payload_size, message_tvb, 0, 0, payloadSize, "%d octets", payloadSize); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if ( ssdoIndex == OPENSAFETY_SOD_DVI && ssdoSubIndex == 0x06 ) { @@ -1675,7 +1675,7 @@ dissect_opensafety_checksum(tvbuff_t *message_tvb, packet_info *pinfo, proto_tre item = proto_tree_add_boolean(checksum_tree, hf_oss_crc_valid, message_tvb, packet->frame.subframe1, dataLength + 4, (frame1_crc == calc1_crc)); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if ( crcType == OPENSAFETY_CHECKSUM_INVALID || frame1_crc != calc1_crc ) expert_add_info(pinfo, item, &ei_crc_frame_1_invalid ); @@ -1766,13 +1766,13 @@ dissect_opensafety_checksum(tvbuff_t *message_tvb, packet_info *pinfo, proto_tre item = proto_tree_add_boolean(checksum_tree, hf_oss_crc2_valid, message_tvb, packet->frame.subframe2, frame2Length, (frame2_crc == calc2_crc)); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if ( frame2_crc != calc2_crc ) { item = proto_tree_add_uint_format(checksum_tree, hf_oss_crc, message_tvb, packet->frame.subframe2, frame2Length, calc2_crc, "Calculated CRC: 0x%04X", calc2_crc); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); expert_add_info(pinfo, item, &ei_crc_frame_2_invalid ); } else @@ -1864,7 +1864,7 @@ dissect_opensafety_message(opensafety_packet_info *packet, } item = proto_tree_add_uint(opensafety_tree, hf_oss_byte_offset, packet->frame.frame_tvb, 0, 1, packet->frame.byte_offset); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if ( packet->msg_type == OPENSAFETY_SNMT_MESSAGE_TYPE ) { @@ -1885,13 +1885,13 @@ dissect_opensafety_message(opensafety_packet_info *packet, } else item = proto_tree_add_string(opensafety_tree, hf_oss_scm_udid, message_tvb, 0, 0, global_scm_udid); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } item = proto_tree_add_boolean(opensafety_tree, hf_oss_scm_udid_valid, message_tvb, 0, 0, packet->scm_udid_valid); if ( udidLen != 6 ) expert_add_info(pinfo, item, &ei_scmudid_invalid_preference ); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if ( packet->msg_type == OPENSAFETY_SSDO_MESSAGE_TYPE || packet->msg_type == OPENSAFETY_SLIM_SSDO_MESSAGE_TYPE ) { diff --git a/epan/dissectors/packet-openwire.c b/epan/dissectors/packet-openwire.c index d3a55046c0..cb99d9e45d 100644 --- a/epan/dissectors/packet-openwire.c +++ b/epan/dissectors/packet-openwire.c @@ -679,7 +679,7 @@ dissect_openwire_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int o if (!openwire_verbose_type) { /* Hide it but allow it in search filters */ - PROTO_ITEM_SET_HIDDEN(cached_item); + proto_item_set_hidden(cached_item); } if (inlined == FALSE) { diff --git a/epan/dissectors/packet-oscore.c b/epan/dissectors/packet-oscore.c index 1945d9d60c..1bdb776b07 100644 --- a/epan/dissectors/packet-oscore.c +++ b/epan/dissectors/packet-oscore.c @@ -641,7 +641,7 @@ oscore_decrypt_and_verify(tvbuff_t *tvb_ciphertext, /* Display the tag. */ if (tag_len) { item = proto_tree_add_bytes(tree, hf_oscore_tag, tvb_ciphertext, ciphertext_captured_len, tag_len, rx_tag); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } return STATUS_SUCCESS_DECRYPTED_TAG_CHECKED; diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c index 05a50afb81..b225f85f87 100644 --- a/epan/dissectors/packet-ositp.c +++ b/epan/dissectors/packet-ositp.c @@ -631,12 +631,12 @@ static gboolean ositp_decode_var_part(tvbuff_t *tvb, int offset, int vp_length, print_tsap(tvb, offset, length)); hidden_item = proto_tree_add_item(tree, hf_cotp_vp_src_tsap_bytes, tvb, offset, length, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } else { hidden_item = proto_tree_add_string(tree, hf_cotp_vp_src_tsap, tvb, offset, length, print_tsap(tvb, offset, length)); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(tree, hf_cotp_vp_src_tsap_bytes, tvb, offset, length, ENC_NA); } @@ -654,12 +654,12 @@ static gboolean ositp_decode_var_part(tvbuff_t *tvb, int offset, int vp_length, print_tsap(tvb, offset, length)); hidden_item = proto_tree_add_item(tree, hf_cotp_vp_dst_tsap_bytes, tvb, offset, length, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } else { hidden_item = proto_tree_add_string(tree, hf_cotp_vp_dst_tsap, tvb, offset, length, print_tsap(tvb, offset, length)); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(tree, hf_cotp_vp_dst_tsap_bytes, tvb, offset, length, ENC_NA); } @@ -1071,7 +1071,7 @@ static int ositp_decode_DT(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, } else if (tree) { ti = proto_tree_add_uint (cotp_tree, hf_cotp_destref, tvb, offset, 0, dst_ref); - PROTO_ITEM_SET_GENERATED (ti); + proto_item_set_generated (ti); } if (is_extended) { diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index b7d0cfcb64..3e790a4be2 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -1268,7 +1268,7 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ hidden_item = proto_tree_add_item(ospf_header_tree, *hf_ospf_msg_type_array[ospf_msg_type_to_filter(packet_type)], tvb, 1, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } proto_tree_add_item(ospf_header_tree, hf_ospf_header_packet_length, tvb, 2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ospf_header_tree, hf_ospf_header_src_router, tvb, 4, 4, ENC_BIG_ENDIAN); @@ -2036,7 +2036,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree ett_ospf_lsa_mpls, NULL, "MPLS Traffic Engineering LSA"); hidden_item = proto_tree_add_item(tree, hf_ospf_ls_mpls, tvb, offset, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); while (length != 0) { tlv_type = tvb_get_ntohs(tvb, offset); @@ -3192,7 +3192,7 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *t hidden_item = proto_tree_add_item(ospf_lsa_tree, *hf_ospf_ls_type_array[ospf_ls_type_to_filter(ls_type)], tvb, offset + 3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } if (options & OSPF_V2_OPTIONS_MT) { @@ -3450,7 +3450,7 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *t hidden_item = proto_tree_add_item(ospf_lsa_tree, *hf_ospf_v3_ls_type_array[ospf_v3_ls_type_to_filter(ls_type)], tvb, offset + 2, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } proto_tree_add_item(ospf_lsa_tree, hf_ospf_link_state_id, tvb, offset + 4, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index 1d4c2d46bc..9557eb7941 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -530,7 +530,7 @@ static void add_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_m if (pdu_type == Address_PDU) { analysis_tree = proto_tree_add_subtree(p_mul_tree, tvb, 0, 0, ett_ack_analysis, &sa, "ACK analysis"); - PROTO_ITEM_SET_GENERATED (sa); + proto_item_set_generated (sa); /* Fetch package data */ if ((pkg_data = lookup_seq_val (message_id, 0, src)) == NULL) { @@ -543,12 +543,12 @@ static void add_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_m if (pkg_data->addr_id) { en = proto_tree_add_uint (analysis_tree, hf_analysis_acks_acked_addr_pdu_num, tvb, 0, 0, pkg_data->addr_id); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); nstime_delta (&ns, &pinfo->abs_ts, &pkg_data->addr_time); en = proto_tree_add_time (analysis_tree, hf_analysis_total_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); } else { proto_tree_add_expert(analysis_tree, pinfo, &ei_address_pdu_missing, tvb, offset, 0); } @@ -563,7 +563,7 @@ static void add_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_m if (ack_data && ack_data->ack_id) { en = proto_tree_add_uint (analysis_tree, hf_analysis_ack_num, tvb, 0, 0, ack_data->ack_id); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); item_added = TRUE; } else if (!pkg_data->msg_resend_count) { en = proto_tree_add_item (analysis_tree, @@ -573,18 +573,18 @@ static void add_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_m /* We do not know this on first visit and we do not want to add a entry in the "Expert Severity Info" for this note */ expert_add_info(pinfo, en, &ei_analysis_ack_missing); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); } item_added = TRUE; } } if (!item_added) { - PROTO_ITEM_SET_HIDDEN (sa); + proto_item_set_hidden (sa); } } else if (pdu_type == Ack_PDU) { analysis_tree = proto_tree_add_subtree(p_mul_tree, tvb, 0, 0, ett_seq_ack_analysis, &sa, "SEQ/ACK analysis"); - PROTO_ITEM_SET_GENERATED (sa); + proto_item_set_generated (sa); /* Fetch package data */ memcpy((guint8 *)&dstIp, dst->data, 4); @@ -600,13 +600,13 @@ static void add_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_m if (pkg_data->msg_type != Ack_PDU) { en = proto_tree_add_uint (analysis_tree, hf_analysis_acks_addr_pdu_num, tvb, 0, 0, pkg_data->pdu_id); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); if (no_missing == 0) { nstime_delta (&ns, &pinfo->abs_ts, &pkg_data->first_msg_time); en = proto_tree_add_time (analysis_tree, hf_analysis_trans_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); } } else { proto_tree_add_expert(analysis_tree, pinfo, &ei_address_pdu_missing, tvb, offset, 0); @@ -616,25 +616,25 @@ static void add_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_m /* Add reference to previous PDU */ en = proto_tree_add_uint (analysis_tree, hf_analysis_last_pdu_num, tvb, 0, 0, pkg_data->prev_pdu_id); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); nstime_delta (&ns, &pinfo->abs_ts, &pkg_data->prev_pdu_time); en = proto_tree_add_time (analysis_tree, hf_analysis_ack_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); } if (ack_data && ack_data->ack_resend_count) { /* Add resend statistics */ en = proto_tree_add_uint (analysis_tree, hf_analysis_ack_dup_no, tvb, 0, 0, ack_data->ack_resend_count); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); expert_add_info_format(pinfo, en, &ei_analysis_ack_dup_no, "Dup ACK #%d", ack_data->ack_resend_count); en = proto_tree_add_uint (analysis_tree, hf_analysis_ack_resend_from, tvb, 0, 0, ack_data->ack_id); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); col_append_fstr (pinfo->cinfo, COL_INFO, "[Dup ACK %d#%d] ", ack_data->ack_id, ack_data->ack_resend_count); @@ -663,25 +663,25 @@ static p_mul_seq_val *add_seq_analysis (tvbuff_t *tvb, packet_info *pinfo, } analysis_tree = proto_tree_add_subtree(p_mul_tree, tvb, 0, 0, ett_seq_analysis, &sa, "SEQ analysis"); - PROTO_ITEM_SET_GENERATED (sa); + proto_item_set_generated (sa); if (pdu_type == Data_PDU || pdu_type == Discard_Message_PDU) { /* Add reference to Address_PDU */ if (pkg_data->addr_id) { en = proto_tree_add_uint (analysis_tree, hf_analysis_addr_pdu_num, tvb, 0, 0, pkg_data->addr_id); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); nstime_delta (&ns, &pinfo->abs_ts, &pkg_data->addr_time); en = proto_tree_add_time (analysis_tree, hf_analysis_addr_pdu_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); if (pkg_data->prev_pdu_id == pkg_data->addr_id) { /* Previous pdu time is the same as time since address pdu */ en = proto_tree_add_time (analysis_tree, hf_analysis_prev_pdu_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); } item_added = TRUE; } else if (!pkg_data->msg_resend_count) { @@ -695,12 +695,12 @@ static p_mul_seq_val *add_seq_analysis (tvbuff_t *tvb, packet_info *pinfo, if (pkg_data->prev_pdu_id) { en = proto_tree_add_uint (analysis_tree, hf_analysis_prev_pdu_num, tvb, 0, 0, pkg_data->prev_pdu_id); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); nstime_delta (&ns, &pinfo->abs_ts, &pkg_data->prev_pdu_time); en = proto_tree_add_time (analysis_tree, hf_analysis_prev_pdu_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); item_added = TRUE; } else if (!pkg_data->msg_resend_count) { proto_tree_add_expert(analysis_tree, pinfo, &ei_analysis_prev_pdu_missing, tvb, offset, 0); @@ -714,28 +714,28 @@ static p_mul_seq_val *add_seq_analysis (tvbuff_t *tvb, packet_info *pinfo, if (pkg_data->msg_resend_count) { en = proto_tree_add_uint (analysis_tree, hf_analysis_retrans_no, tvb, 0, 0, pkg_data->msg_resend_count); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); en = proto_tree_add_uint (analysis_tree, hf_analysis_msg_resend_from, tvb, 0, 0, pkg_data->pdu_id); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); expert_add_info_format(pinfo, en, &ei_analysis_retrans_no, "Retransmission #%d", pkg_data->msg_resend_count); nstime_delta (&ns, &pinfo->abs_ts, &pkg_data->prev_msg_time); en = proto_tree_add_time (analysis_tree, hf_analysis_retrans_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); nstime_delta (&ns, &pinfo->abs_ts, &pkg_data->first_msg_time); eh = proto_tree_add_time (analysis_tree, hf_analysis_total_retrans_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED (eh); + proto_item_set_generated (eh); if (pkg_data->first_msg_time.secs == pkg_data->prev_msg_time.secs && pkg_data->first_msg_time.nsecs == pkg_data->prev_msg_time.nsecs) { /* Time values does not differ, hide the total time */ - PROTO_ITEM_SET_HIDDEN (eh); + proto_item_set_hidden (eh); } item_added = TRUE; @@ -745,7 +745,7 @@ static p_mul_seq_val *add_seq_analysis (tvbuff_t *tvb, packet_info *pinfo, } if (!item_added) { - PROTO_ITEM_SET_HIDDEN (sa); + proto_item_set_hidden (sa); } return pkg_data; @@ -916,19 +916,19 @@ static int dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v proto_item_append_text (en, " (correct)"); en = proto_tree_add_boolean (checksum_tree, hf_checksum_good, tvb, offset, 2, TRUE); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); en = proto_tree_add_boolean (checksum_tree, hf_checksum_bad, tvb, offset, 2, FALSE); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); } else { proto_item_append_text (en, " (incorrect, should be 0x%04x)", checksum_calc); expert_add_info(pinfo, en, &ei_checksum_bad); en = proto_tree_add_boolean (checksum_tree, hf_checksum_good, tvb, offset, 2, FALSE); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); en = proto_tree_add_boolean (checksum_tree, hf_checksum_bad, tvb, offset, 2, TRUE); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); } offset += 2; @@ -1130,7 +1130,7 @@ static int dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v en = proto_tree_add_uint_format_value(missing_tree, hf_miss_seq_no, tvb, offset, 6, sno, "%d", sno); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); } tot_no_missing += (end_seq_no - ack_seq_no + 1); } @@ -1180,7 +1180,7 @@ static int dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v proto_item_append_text (ti, ", Missing seq numbers: %u", tot_no_missing); en = proto_tree_add_uint (p_mul_tree, hf_tot_miss_seq_no, tvb, 0, 0, tot_no_missing); - PROTO_ITEM_SET_GENERATED (en); + proto_item_set_generated (en); expert_add_info_format(pinfo, en, &ei_tot_miss_seq_no, "Missing seq numbers: %d", tot_no_missing); } break; diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c index 9bd01b144f..dff6a42f43 100644 --- a/epan/dissectors/packet-pana.c +++ b/epan/dissectors/packet-pana.c @@ -532,7 +532,7 @@ dissect_pana_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *it; it=proto_tree_add_uint(pana_tree, hf_pana_response_in, tvb, 0, 0, pana_trans->rep_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else { /* This is a reply */ @@ -541,11 +541,11 @@ dissect_pana_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) nstime_t ns; it=proto_tree_add_uint(pana_tree, hf_pana_response_to, tvb, 0, 0, pana_trans->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &pana_trans->req_time); it=proto_tree_add_time(pana_tree, hf_pana_response_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } diff --git a/epan/dissectors/packet-parlay.c b/epan/dissectors/packet-parlay.c index 98d89a13dd..32b4f0fcec 100644 --- a/epan/dissectors/packet-parlay.c +++ b/epan/dissectors/packet-parlay.c @@ -54724,7 +54724,7 @@ process_RequestOperation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, M } /* fill-up the field */ pi=proto_tree_add_string(ptree, hf_operationrequest, tvb, 0, 0, operation); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); return pi; } diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index ce19a0099c..a8b7b8635f 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -658,7 +658,7 @@ static void addChannelSequenceInfo(pdcp_sequence_report_in_frame *p, "", "Sequence Analysis"); seqnum_tree = proto_item_add_subtree(seqnum_ti, ett_pdcp_lte_sequence_analysis); - PROTO_ITEM_SET_GENERATED(seqnum_ti); + proto_item_set_generated(seqnum_ti); /* Previous channel frame */ @@ -670,7 +670,7 @@ static void addChannelSequenceInfo(pdcp_sequence_report_in_frame *p, /* Expected sequence number */ ti_expected_sn = proto_tree_add_uint(seqnum_tree, hf_pdcp_lte_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_lte_info->seqnum_length) { @@ -687,10 +687,10 @@ static void addChannelSequenceInfo(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_lte_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 channel (if known) */ @@ -710,13 +710,13 @@ static void addChannelSequenceInfo(pdcp_sequence_report_in_frame *p, /* BEARER */ ti = proto_tree_add_uint(security_tree, hf_pdcp_lte_security_bearer, tvb, 0, 0, p_pdcp_lte_info->channelId-1); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); pdu_security->bearer = p_pdcp_lte_info->channelId-1; /* DIRECTION */ ti = proto_tree_add_uint(security_tree, hf_pdcp_lte_security_direction, tvb, 0, 0, p_pdcp_lte_info->direction); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* COUNT (HFN * snLength^2 + SN) */ switch (p_pdcp_lte_info->seqnum_length) { @@ -742,7 +742,7 @@ static void addChannelSequenceInfo(pdcp_sequence_report_in_frame *p, count = (p->hfn * hfn_multiplier) + sequenceNumber; ti = proto_tree_add_uint(security_tree, hf_pdcp_lte_security_count, tvb, 0, 0, count); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); pdu_security->count = count; /* KEY. Look this UE up among UEs that have keys configured */ @@ -775,12 +775,12 @@ static void addChannelSequenceInfo(pdcp_sequence_report_in_frame *p, if (cipher_key != NULL) { ti = proto_tree_add_string(security_tree, hf_pdcp_lte_security_cipher_key, tvb, 0, 0, cipher_key); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (integrity_key != NULL) { ti = proto_tree_add_string(security_tree, hf_pdcp_lte_security_integrity_key, tvb, 0, 0, integrity_key); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } pdu_security->direction = p_pdcp_lte_info->direction; @@ -791,10 +791,10 @@ static void addChannelSequenceInfo(pdcp_sequence_report_in_frame *p, case SN_Missing: ti = proto_tree_add_boolean(seqnum_tree, hf_pdcp_lte_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_lte_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_lte_sequence_analysis_sn_missing, "PDCP SNs (%u to %u) missing for %s on UE %u (%s-%u)", @@ -822,10 +822,10 @@ static void addChannelSequenceInfo(pdcp_sequence_report_in_frame *p, case SN_Repeated: ti = proto_tree_add_boolean(seqnum_tree, hf_pdcp_lte_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_lte_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_lte_sequence_analysis_sn_repeated, "PDCP SN (%u) repeated for %s for UE %u (%s-%u)", p->firstSN, @@ -1118,29 +1118,29 @@ static void show_pdcp_config(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree /* Direction */ ti = proto_tree_add_uint(configuration_tree, hf_pdcp_lte_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_lte_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_lte_ueid, tvb, 0, 0, p_pdcp_info->ueid); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Channel type */ ti = proto_tree_add_uint(configuration_tree, hf_pdcp_lte_channel_type, tvb, 0, 0, p_pdcp_info->channelType); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (p_pdcp_info->channelId != 0) { /* Channel type */ ti = proto_tree_add_uint(configuration_tree, hf_pdcp_lte_channel_id, tvb, 0, 0, p_pdcp_info->channelId); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } @@ -1150,21 +1150,21 @@ static void show_pdcp_config(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree /* No Header PDU */ ti = proto_tree_add_uint(configuration_tree, hf_pdcp_lte_no_header_pdu, tvb, 0, 0, p_pdcp_info->no_header_pdu); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (!p_pdcp_info->no_header_pdu) { /* Seqnum length */ ti = proto_tree_add_uint(configuration_tree, hf_pdcp_lte_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_lte_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) { @@ -1172,32 +1172,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_lte_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_uint(configuration_tree, hf_pdcp_lte_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_uint(configuration_tree, hf_pdcp_lte_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_lte_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_uint(configuration_tree, hf_pdcp_lte_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_uint(configuration_tree, hf_pdcp_lte_large_cid_present, tvb, 0, 0, p_pdcp_info->rohc.large_cid_present); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Append summary to configuration root */ @@ -1212,7 +1212,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: ", @@ -1868,24 +1868,24 @@ static int dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb, 0, 0, "", "UE Security"); security_tree = proto_item_add_subtree(security_ti, ett_pdcp_security); - PROTO_ITEM_SET_GENERATED(security_ti); + proto_item_set_generated(security_ti); /* Setup frame */ if (pinfo->num > pdu_security->configuration_frame) { ti = proto_tree_add_uint(security_tree, hf_pdcp_lte_security_setup_frame, tvb, 0, 0, pdu_security->configuration_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Ciphering */ ti = proto_tree_add_uint(security_tree, hf_pdcp_lte_security_ciphering_algorithm, tvb, 0, 0, pdu_security->ciphering); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Integrity */ ti = proto_tree_add_uint(security_tree, hf_pdcp_lte_security_integrity_algorithm, tvb, 0, 0, pdu_security->integrity); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_item_append_text(security_ti, " (ciphering=%s, integrity=%s)", val_to_str_const(pdu_security->ciphering, ciphering_algorithm_vals, "Unknown"), 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: ", diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index 7ffb82d13b..5ac0ce4339 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -369,7 +369,7 @@ dissect_per_length_determinant(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx _ if (display_internal_per_fields) proto_item_append_text(pi," %s", str); else - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); } return offset; @@ -381,7 +381,7 @@ dissect_per_length_determinant(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx _ if (display_internal_per_fields) proto_item_append_text(pi," %s", str); else - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); } return offset; @@ -393,7 +393,7 @@ dissect_per_length_determinant(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx _ if (display_internal_per_fields) proto_item_append_text(pi," %s", str); else - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); } return offset; @@ -409,7 +409,7 @@ dissect_per_length_determinant(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx _ *length=byte; if(hf_index!=-1){ pi = proto_tree_add_uint(tree, hf_index, tvb, (offset>>3)-1, 1, *length); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(pi); + if (!display_internal_per_fields) proto_item_set_hidden(pi); } return offset; } @@ -421,7 +421,7 @@ dissect_per_length_determinant(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx _ offset+=8; if(hf_index!=-1){ pi = proto_tree_add_uint(tree, hf_index, tvb, (offset>>3)-2, 2, *length); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(pi); + if (!display_internal_per_fields) proto_item_set_hidden(pi); } return offset; } @@ -437,7 +437,7 @@ dissect_per_length_determinant(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx _ *is_fragmented = TRUE; if(hf_index!=-1){ pi = proto_tree_add_uint(tree, hf_index, tvb, (offset>>3)-1, 1, *length); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(pi); + if (!display_internal_per_fields) proto_item_set_hidden(pi); } return offset; } @@ -460,7 +460,7 @@ DEBUG_ENTRY("dissect_per_normally_small_nonnegative_whole_number"); } offset=dissect_per_boolean(tvb, offset, actx, tree, hf_per_small_number_bit, &small_number); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_per_fields) proto_item_set_hidden(actx->created_item); if(!small_number){ int i; /* 10.6.1 */ @@ -474,7 +474,7 @@ DEBUG_ENTRY("dissect_per_normally_small_nonnegative_whole_number"); } if(hf_index!=-1){ pi = proto_tree_add_uint(tree, hf_index, tvb, (offset-6)>>3, (offset%8<6)?2:1, *length); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(pi); + if (!display_internal_per_fields) proto_item_set_hidden(pi); } return offset; } @@ -509,7 +509,7 @@ DEBUG_ENTRY("dissect_per_normally_small_nonnegative_whole_number"); } if(hf_index!=-1){ pi = proto_tree_add_uint(tree, hf_index, tvb, (offset-(8*length_determinant))>>3, length_determinant, *length); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(pi); + if (!display_internal_per_fields) proto_item_set_hidden(pi); } return offset; @@ -677,7 +677,7 @@ DEBUG_ENTRY("dissect_per_restricted_character_string"); if (has_extension) { gboolean extension_present; offset = dissect_per_boolean(tvb, offset, actx, tree, hf_per_extension_present_bit, &extension_present); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_per_fields) proto_item_set_hidden(actx->created_item); if(extension_present){ min_len = NO_BOUND; max_len = NO_BOUND; @@ -702,7 +702,7 @@ DEBUG_ENTRY("dissect_per_restricted_character_string"); offset=dissect_per_constrained_integer(tvb, offset, actx, tree, hf_per_octet_string_length, min_len, max_len, &length, FALSE); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_per_fields) proto_item_set_hidden(actx->created_item); } if(!length){ @@ -845,7 +845,7 @@ dissect_per_BMPString(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tre offset=dissect_per_constrained_integer(tvb, offset, actx, tree, hf_per_octet_string_length, min_len, max_len, &length, FALSE); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_per_fields) proto_item_set_hidden(actx->created_item); } @@ -898,7 +898,7 @@ DEBUG_ENTRY("dissect_per_constrained_sequence_of"); if(has_extension){ gboolean extension_present; offset=dissect_per_boolean(tvb, offset, actx, parent_tree, hf_per_extension_present_bit, &extension_present); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_per_fields) proto_item_set_hidden(actx->created_item); if(extension_present){ /* 10.9 shall be invoked to add the length determinant as a semi-constrained whole number to the field-list, * followed by the component values @@ -925,7 +925,7 @@ DEBUG_ENTRY("dissect_per_constrained_sequence_of"); offset=dissect_per_constrained_integer(tvb, offset, actx, parent_tree, hf_per_sequence_of_length, min_len, max_len, &length, FALSE); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_per_fields) proto_item_set_hidden(actx->created_item); call_sohelper: hfi = proto_registrar_get_nth(hf_index); @@ -1252,7 +1252,7 @@ DEBUG_ENTRY("dissect_per_constrained_integer"); if(has_extension){ gboolean extension_present; offset=dissect_per_boolean(tvb, offset, actx, tree, hf_per_extension_present_bit, &extension_present); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_per_fields) proto_item_set_hidden(actx->created_item); if(extension_present){ offset = dissect_per_integer(tvb, offset, actx, tree, hf_index, (gint32*)value); return offset; @@ -1417,7 +1417,7 @@ DEBUG_ENTRY("dissect_per_constrained_integer_64b"); if(has_extension){ gboolean extension_present; offset=dissect_per_boolean(tvb, offset, actx, tree, hf_per_extension_present_bit, &extension_present); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_per_fields) proto_item_set_hidden(actx->created_item); if(extension_present){ offset = dissect_per_integer64b(tvb, offset, actx, tree, hf_index, (gint64*)value); return offset; @@ -1618,13 +1618,13 @@ dissect_per_enumerated(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tr if (has_extension) { /* Extension bit */ offset = dissect_per_boolean(tvb, offset, actx, tree, hf_per_extension_present_bit, &extension_present); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_per_fields) proto_item_set_hidden(actx->created_item); } if (!extension_present) { /* 13.2 */ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_per_enum_index, 0, root_num - 1, &enum_index, FALSE); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_per_fields) proto_item_set_hidden(actx->created_item); } else { /* 13.3 ".. and the value shall be added to the field-list as a * normally small non-negative whole number whose value is the @@ -1695,7 +1695,7 @@ DEBUG_ENTRY("dissect_per_choice"); } else { /*extension_present = TRUE; ?? */ offset = dissect_per_boolean(tvb, offset, actx, tree, hf_per_extension_bit, &extension_flag); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_per_fields) proto_item_set_hidden(actx->created_item); } /* count the number of entries in the extension root and extension addition */ @@ -1720,7 +1720,7 @@ DEBUG_ENTRY("dissect_per_choice"); offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_per_choice_index, 0, extension_root_entries - 1, &choice_index, FALSE); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_per_fields) proto_item_set_hidden(actx->created_item); } idx = -1; cidx = choice_index; @@ -1855,7 +1855,7 @@ DEBUG_ENTRY("dissect_per_sequence"); } else { /*extension_present=1; ?? */ offset=dissect_per_boolean(tvb, offset, actx, tree, hf_per_extension_bit, &extension_flag); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_per_fields) proto_item_set_hidden(actx->created_item); } /* 18.2 */ num_opts=0; @@ -1875,7 +1875,7 @@ DEBUG_ENTRY("dissect_per_sequence"); proto_item_append_text(actx->created_item, " (%s %s present)", index_get_optional_name(sequence, i), optional_field_flag?"is":"is NOT"); } - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_per_fields) proto_item_set_hidden(actx->created_item); if(optional_field_flag){ optional_mask[i>>5]|=0x80000000>>(i&0x1f); } @@ -1942,7 +1942,7 @@ DEBUG_ENTRY("dissect_per_sequence"); proto_item_append_text(actx->created_item, " (%s %s present)", index_get_extension_name(sequence, i), extension_bit?"is":"is NOT"); } - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_per_fields) proto_item_set_hidden(actx->created_item); extension_mask=(extension_mask<<1)|extension_bit; } @@ -2040,7 +2040,7 @@ DEBUG_ENTRY("dissect_per_sequence_eag"); proto_item_append_text(actx->created_item, " (%s %s present)", index_get_optional_name(sequence, i), optional_field_flag?"is":"is NOT"); } - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_per_fields) proto_item_set_hidden(actx->created_item); if(optional_field_flag){ optional_mask[i>>5]|=0x80000000>>(i&0x1f); } @@ -2161,7 +2161,7 @@ DEBUG_ENTRY("dissect_per_bit_string"); if (has_extension) { gboolean extension_present; offset = dissect_per_boolean(tvb, offset, actx, tree, hf_per_extension_present_bit, &extension_present); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_per_fields) proto_item_set_hidden(actx->created_item); if(extension_present){ next_fragment1: offset=dissect_per_length_determinant(tvb, offset, actx, tree, hf_per_bit_string_length, &length, &is_fragmented); @@ -2239,7 +2239,7 @@ DEBUG_ENTRY("dissect_per_bit_string"); offset=dissect_per_constrained_integer(tvb, offset, actx, tree, hf_per_bit_string_length, min_len, max_len, &length, FALSE); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_per_fields) proto_item_set_hidden(actx->created_item); } else { next_fragment2: offset=dissect_per_length_determinant(tvb, offset, actx, tree, hf_per_bit_string_length, &length, &is_fragmented); @@ -2328,7 +2328,7 @@ DEBUG_ENTRY("dissect_per_octet_string"); if (has_extension) { /* 16.3 an extension marker is present */ gboolean extension_present; offset = dissect_per_boolean(tvb, offset, actx, tree, hf_per_extension_present_bit, &extension_present); - if (!display_internal_per_fields) PROTO_ITEM_SET_HIDDEN(actx->created_item); + if (!display_internal_per_fields) proto_item_set_hidden(actx->created_item); if (extension_present) max_len = NO_BOUND; /* skip to 16.8 */ } @@ -2371,7 +2371,7 @@ DEBUG_ENTRY("dissect_per_octet_string"); hf_per_octet_string_length, min_len, max_len, &length, FALSE); if (!display_internal_per_fields) - PROTO_ITEM_SET_HIDDEN(actx->created_item); + proto_item_set_hidden(actx->created_item); } else { next_fragment: offset = dissect_per_length_determinant(tvb, offset, actx, tree, diff --git a/epan/dissectors/packet-pfcp.c b/epan/dissectors/packet-pfcp.c index efc2c548f2..3c900f40a6 100644 --- a/epan/dissectors/packet-pfcp.c +++ b/epan/dissectors/packet-pfcp.c @@ -1166,7 +1166,7 @@ pfcp_track_session(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, pfcp_ session = (guint32*)g_hash_table_lookup(pfcp_session_table, &pinfo->num); if (session) { it = proto_tree_add_uint(tree, hf_pfcp_session, tvb, 0, 0, *session); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } @@ -5351,15 +5351,15 @@ pfcp_match_response(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gint if (pcrp->is_request) { it = proto_tree_add_uint(tree, hf_pfcp_response_in, tvb, 0, 0, pcrp->rep_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { nstime_t ns; it = proto_tree_add_uint(tree, hf_pfcp_response_to, tvb, 0, 0, pcrp->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &pcrp->req_time); it = proto_tree_add_time(tree, hf_pfcp_response_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); if (g_pfcp_session && !PINFO_FD_VISITED(pinfo)) { /* PFCP session */ /* If it's not already in the list */ diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c index 231221bfb9..3da505db16 100644 --- a/epan/dissectors/packet-pgm.c +++ b/epan/dissectors/packet-pgm.c @@ -867,9 +867,9 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) cursor = ptvcursor_new(pgm_tree, tvb, 0); hidden_item = proto_tree_add_item(pgm_tree, hf_pgm_port, tvb, 0, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item(pgm_tree, hf_pgm_port, tvb, 2, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); ptvcursor_add(cursor, hf_pgm_main_sport, 2, ENC_BIG_ENDIAN); ptvcursor_add(cursor, hf_pgm_main_dport, 2, ENC_BIG_ENDIAN); ptvcursor_add(cursor, hf_pgm_main_type, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c index 404a504a41..ba66683e8e 100644 --- a/epan/dissectors/packet-pgsql.c +++ b/epan/dissectors/packet-pgsql.c @@ -732,7 +732,7 @@ dissect_pgsql_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat proto_tree_add_string(ptree, hf_type, tvb, 0, n, typestr); proto_tree_add_item(ptree, hf_length, tvb, n, 4, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_boolean(ptree, hf_frontend, tvb, 0, 0, fe); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); n += 4; if (fe) diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c index 4002eead9f..48e63f30ae 100644 --- a/epan/dissectors/packet-pktc.c +++ b/epan/dissectors/packet-pktc.c @@ -263,7 +263,7 @@ dissect_pktc_list_of_ciphersuites(packet_info *pinfo _U_, proto_tree *parent_tre proto_item_append_text(tree, " (%d):", len); } hidden_item = proto_tree_add_uint(tree, hf_pktc_list_of_ciphersuites_len, tvb, offset, 1, len); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset+=1; switch(doi){ diff --git a/epan/dissectors/packet-pktgen.c b/epan/dissectors/packet-pktgen.c index bf3463ed90..4710a4f6d3 100644 --- a/epan/dissectors/packet-pktgen.c +++ b/epan/dissectors/packet-pktgen.c @@ -85,12 +85,12 @@ static gboolean dissect_pktgen(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr tstamp.secs = tvb_get_ntohl(tvb, offset); tmp = proto_tree_add_item(pktgen_tree, hf_pktgen_tvsec, tvb, offset, 4, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(tmp); + proto_item_set_generated(tmp); offset += 4; tstamp.nsecs = tvb_get_ntohl(tvb, offset) /* microsecond on the wire so... */ * 1000; tmp = proto_tree_add_item(pktgen_tree, hf_pktgen_tvusec, tvb, offset, 4, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(tmp); + proto_item_set_generated(tmp); offset += 4; proto_tree_add_time(pktgen_tree, hf_pktgen_timestamp, tvb, offset - 8, 8, &tstamp); diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c index 259d5621bd..732a189c51 100644 --- a/epan/dissectors/packet-ppi.c +++ b/epan/dissectors/packet-ppi.c @@ -1029,7 +1029,7 @@ dissect_ppi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) /* List our fragments */ seg_tree = proto_tree_add_subtree_format(ppi_tree, tvb, offset, -1, ett_ampdu_segments, &ti, "A-MPDU (%u bytes w/hdrs):", ampdu_len); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); while (ft_fdh) { if (ft_fdh->tvb_data && ft_fdh->len) { diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index b48c1ab440..7f9c889ac0 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -4759,7 +4759,7 @@ dissect_ppp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (pinfo->p2p_dir == P2P_DIR_RECV || pinfo->p2p_dir == P2P_DIR_SENT) { proto_item *direction_ti = proto_tree_add_uint(tree, hf_ppp_direction, tvb, 0, 0, pinfo->p2p_dir); - PROTO_ITEM_SET_GENERATED(direction_ti); + proto_item_set_generated(direction_ti); } ppp_prot = tvb_get_guint8(tvb, 0); @@ -5230,7 +5230,7 @@ dissect_pppmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ /* if protocol is not present in the sub-frame */ if (!(flags & PPPMUX_PFF_BIT_SET)) { /* mark this item as generated */ - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } offset += hdr_length; diff --git a/epan/dissectors/packet-proxy.c b/epan/dissectors/packet-proxy.c index 633e5df870..c8babcafdd 100644 --- a/epan/dissectors/packet-proxy.c +++ b/epan/dissectors/packet-proxy.c @@ -191,7 +191,7 @@ dissect_proxy_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(proxy_tree, hf_proxy2_ver, tvb, offset, 1, ENC_NA); proto_tree_add_item(proxy_tree, hf_proxy2_cmd, tvb, offset, 1, ENC_NA); ti_ver = proto_tree_add_uint(proxy_tree, hf_proxy_version, tvb, offset, 1, 2); - PROTO_ITEM_SET_GENERATED(ti_ver); + proto_item_set_generated(ti_ver); offset += 1; ti = proto_tree_add_item_ret_uint(proxy_tree, hf_proxy2_addr_family_protocol, tvb, offset, 1, ENC_NA, &fam_pro); diff --git a/epan/dissectors/packet-prp.c b/epan/dissectors/packet-prp.c index 4af24333d5..00825fe14b 100644 --- a/epan/dissectors/packet-prp.c +++ b/epan/dissectors/packet-prp.c @@ -153,7 +153,7 @@ dissect_prp_redundancy_control_trailer(tvbuff_t *tvb, packet_info *pinfo _U_, pr ti = proto_tree_add_string(prp_tree, hf_prp_redundancy_control_trailer_version, tvb, trailer_start, trailer_length, "PRP-1"); } - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_item(prp_tree, hf_prp_redundancy_control_trailer_sequence_nr, tvb, trailer_start, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-pw-atm.c b/epan/dissectors/packet-pw-atm.c index eb6af4d1a4..79787bdb56 100644 --- a/epan/dissectors/packet-pw-atm.c +++ b/epan/dissectors/packet-pw-atm.c @@ -679,11 +679,11 @@ dissect_11_or_aal5_pdu(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, v ,hf_pw_type_11_vcc ,hf_pw_type_aal5_pdu) ,tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(item2); + proto_item_set_generated(item2); if (MODE_11(pd.mode)) { item2 = proto_tree_add_int(tree2, hf_11_ncells, tvb, 0, 0, cells); - PROTO_ITEM_SET_GENERATED(item2); + proto_item_set_generated(item2); } } } @@ -890,7 +890,7 @@ dissect_aal5_sdu(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* d tree2 = proto_item_add_subtree(item, ett_encaps); { item = proto_tree_add_boolean(tree2, hf_pw_type_aal5_sdu, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } if (pd.props & PWC_PAY_SIZE_BAD) @@ -1057,9 +1057,9 @@ dissect_n1_cw(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data { proto_item* item2; item2 = proto_tree_add_boolean(tree2, hf_pw_type_n1_cw, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(item2); + proto_item_set_generated(item2); item2 = proto_tree_add_int(tree2, hf_n1_cw_ncells, tvb, 0, 0, cells); - PROTO_ITEM_SET_GENERATED(item2); + proto_item_set_generated(item2); } } if (pd.props & PWC_PAY_SIZE_BAD) @@ -1134,9 +1134,9 @@ dissect_n1_nocw(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* da { proto_item* item2; item2 = proto_tree_add_boolean(tree2, hf_pw_type_n1_nocw, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(item2); + proto_item_set_generated(item2); item2 = proto_tree_add_int(tree2, hf_n1_nocw_ncells, tvb, 0, 0, cells); - PROTO_ITEM_SET_GENERATED(item2); + proto_item_set_generated(item2); } } if (pd.props & PWC_PAY_SIZE_BAD) @@ -1238,7 +1238,7 @@ dissect_control_word(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, voi } else { - PROTO_ITEM_SET_HIDDEN(item); /* show only in error cases */ + proto_item_set_hidden(item); /* show only in error cases */ } /* flags */ @@ -1295,7 +1295,7 @@ dissect_control_word(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, voi } else { - PROTO_ITEM_SET_HIDDEN(item); /*...and show only in error cases */ + proto_item_set_hidden(item); /*...and show only in error cases */ } } @@ -1584,7 +1584,7 @@ dissect_cell_header(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void } else { - PROTO_ITEM_SET_HIDDEN(item2); /*...and show only in error cases */ + proto_item_set_hidden(item2); /*...and show only in error cases */ } if (MODE_11(pd->mode)) @@ -1673,7 +1673,7 @@ dissect_cell(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * data tvb_d = tvb_new_subset_length_caplen(tvb, 0, dissect_size, -1); call_data_dissector(tvb_d, pinfo, tree2); item = proto_tree_add_int(tree2, hf_cell_payload_len, tvb, 0, 0, dissect_size); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); } return dissect_size; diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c index a7d4038636..dce4e17b77 100644 --- a/epan/dissectors/packet-pw-cesopsn.c +++ b/epan/dissectors/packet-pw-cesopsn.c @@ -338,7 +338,7 @@ void dissect_pw_cesopsn( tvbuff_t * tvb_original call_data_dissector(tvb, pinfo, tree2); item2 = proto_tree_add_int(tree2, hf_payload_l, tvb, 0, 0 ,(int)payload_size); /* allow filtering */ - PROTO_ITEM_SET_HIDDEN(item2); + proto_item_set_hidden(item2); } } diff --git a/epan/dissectors/packet-pw-common.c b/epan/dissectors/packet-pw-common.c index eeed9cf706..f2379a2a6a 100644 --- a/epan/dissectors/packet-pw-common.c +++ b/epan/dissectors/packet-pw-common.c @@ -88,7 +88,7 @@ int dissect_pw_padding(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, v call_data_dissector(tvb, pinfo, tree_p); item = proto_tree_add_int(tree_p, hf_padding_len, tvb, 0, 0, size); - PROTO_ITEM_SET_HIDDEN(item); /*allow filtering*/ + proto_item_set_hidden(item); /*allow filtering*/ return tvb_captured_length(tvb); } diff --git a/epan/dissectors/packet-pw-eth.c b/epan/dissectors/packet-pw-eth.c index fc59c922e6..ff78974bfd 100644 --- a/epan/dissectors/packet-pw-eth.c +++ b/epan/dissectors/packet-pw-eth.c @@ -58,7 +58,7 @@ dissect_pw_eth_cw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat ti = proto_tree_add_boolean(tree, hf_pw_eth_cw, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); ti = proto_tree_add_item(tree, proto_pw_eth_cw, tvb, 0, 4, ENC_NA); pw_eth_tree = proto_item_add_subtree(ti, ett_pw_eth); @@ -86,7 +86,7 @@ dissect_pw_eth_nocw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d if (tree) { proto_item *ti; ti = proto_tree_add_boolean(tree, hf_pw_eth, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); } next_tvb = tvb_new_subset_remaining(tvb, 0); diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c index ddba278c66..eab957a0bb 100644 --- a/epan/dissectors/packet-pw-satop.c +++ b/epan/dissectors/packet-pw-satop.c @@ -351,7 +351,7 @@ void dissect_pw_satop(tvbuff_t * tvb_original call_data_dissector(tvb, pinfo, tree3); item2 = proto_tree_add_int(tree3, hf_payload_l, tvb, 0, 0 ,(int)payload_size); /* allow filtering */ - PROTO_ITEM_SET_HIDDEN(item2); + proto_item_set_hidden(item2); } } } diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c index be38882c9a..8c88f54997 100644 --- a/epan/dissectors/packet-q932.c +++ b/epan/dissectors/packet-q932.c @@ -820,7 +820,7 @@ dissect_q932_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data offset = 0; ti = proto_tree_add_item(tree, proto_q932, tvb, offset, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); ie_type = tvb_get_guint8(tvb, offset); ie_len = tvb_get_guint8(tvb, offset + 1); diff --git a/epan/dissectors/packet-qnet6.c b/epan/dissectors/packet-qnet6.c index c357767780..56f58e1ea8 100644 --- a/epan/dissectors/packet-qnet6.c +++ b/epan/dissectors/packet-qnet6.c @@ -1583,7 +1583,7 @@ dissect_qnet6_lr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gint * len, ENC_ASCII|ENC_NA); ti = proto_tree_add_string(sstree, hf_index, tvb, addr_data_offset, len, name[i]); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else { @@ -1591,7 +1591,7 @@ dissect_qnet6_lr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gint * { name[i] = tvb_ether_to_str(tvb, addr_data_offset + 2); ti = proto_tree_add_item(sstree, hf_index, tvb, addr_data_offset + 2, 6, ENC_NA); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else { @@ -3275,7 +3275,7 @@ qos_tcs_init_addtree(tvbuff_t * tvb, proto_tree * tree, gint * poffset, guint en if (i <= rlen) { ti = proto_tree_add_item(tree, hf_generated, tvb, name_start + off, i - off, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c index 86040f43f7..4556498863 100644 --- a/epan/dissectors/packet-qsig.c +++ b/epan/dissectors/packet-qsig.c @@ -12571,7 +12571,7 @@ dissect_qsig_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int codeset offset = 0; ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); ie_type = tvb_get_guint8(tvb, offset); ie_len = tvb_get_guint8(tvb, offset + 1); @@ -12581,7 +12581,7 @@ dissect_qsig_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int codeset proto_tree_add_item(ie_tree, *hf_qsig_ie_type_arr[codeset], tvb, offset, 1, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_item(ie_tree, hf_qsig_ie_type, tvb, offset, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(ie_tree, hf_qsig_ie_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN); offset += 2; if (tvb_reported_length_remaining(tvb, offset) <= 0) diff --git a/epan/dissectors/packet-quic.c b/epan/dissectors/packet-quic.c index a748ff19f3..576b02f6ef 100644 --- a/epan/dissectors/packet-quic.c +++ b/epan/dissectors/packet-quic.c @@ -899,7 +899,7 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree * sake let's combine multiple zeroes into a single field. */ pad_len = 1 + tvb_skip_guint8(tvb, offset, tvb_reported_length_remaining(tvb, offset), '\0') - offset; ti = proto_tree_add_uint(ft_tree, hf_quic_padding_length, tvb, offset, 0, pad_len); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_item_append_text(ti_ft, " Length: %u", pad_len); offset += pad_len - 1; } @@ -1758,7 +1758,7 @@ quic_add_connection_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, qu } pi = proto_tree_add_uint(ctree, hf_quic_connection_number, tvb, 0, 0, conn->number); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); #if 0 proto_tree_add_debug_text(ctree, "Client CID: %s", cid_to_string(&conn->client_cids.data)); proto_tree_add_debug_text(ctree, "Server CID: %s", cid_to_string(&conn->server_cids.data)); diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index c0faf1af17..f6a2ddc5f3 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -1305,7 +1305,7 @@ radius_tlv(radius_attr_info_t *a, proto_tree *tree, packet_info *pinfo _U_, tvbu tlv_len_item = proto_tree_add_uint(tlv_tree, dictionary_entry->hf_len, tvb, 0, 0, tlv_length); - PROTO_ITEM_SET_GENERATED(tlv_len_item); + proto_item_set_generated(tlv_len_item); } add_tlv_to_tree(tlv_tree, tlv_item, pinfo, tvb, dictionary_entry, @@ -1643,7 +1643,7 @@ dissect_attribute_value_pairs(proto_tree *tree, packet_info *pinfo, tvbuff_t *tv avp_len_item = proto_tree_add_uint(avp_tree, dictionary_entry->hf_len, tvb, 0, 0, avp_length); - PROTO_ITEM_SET_GENERATED(avp_len_item); + proto_item_set_generated(avp_len_item); } if (vendor->has_flags) { @@ -1725,7 +1725,7 @@ dissect_attribute_value_pairs(proto_tree *tree, packet_info *pinfo, tvbuff_t *tv avp_len_item = proto_tree_add_uint(avp_tree, dictionary_entry->hf_len, tvb, 0, 0, avp_length); - PROTO_ITEM_SET_GENERATED(avp_len_item); + proto_item_set_generated(avp_len_item); } if (avp_is_extended) { @@ -2031,7 +2031,7 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ break; hidden_item = proto_tree_add_boolean(radius_tree, hf_radius_req, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Keep track of the address and port whence the call came * so that we can match up requests with replies. @@ -2091,9 +2091,9 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ if (tree) { proto_item *item; hidden_item = proto_tree_add_uint(radius_tree, hf_radius_dup, tvb, 0, 0, rh.rh_ident); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); item = proto_tree_add_uint(radius_tree, hf_radius_req_dup, tvb, 0, 0, radius_call->req_num); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } } @@ -2125,7 +2125,7 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ hf_radius_rsp_frame, tvb, 0, 0, radius_call->rsp_num, "The response to this request is in frame %u", radius_call->rsp_num); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } break; case RADIUS_PKT_TYPE_ACCESS_ACCEPT: @@ -2151,7 +2151,7 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ break; hidden_item = proto_tree_add_boolean(radius_tree, hf_radius_rsp, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* Check for RADIUS response. A response must match a call that * we've seen, and the response must be sent to the same @@ -2209,10 +2209,10 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ radius_call->req_num, "This is a response to a request in frame %u", radius_call->req_num); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); nstime_delta(&delta, &pinfo->abs_ts, &radius_call->req_time); item = proto_tree_add_time(radius_tree, hf_radius_time, tvb, 0, 0, &delta); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); /* Response Authenticator Validation */ if (validate_authenticator && *shared_secret != '\0') { proto_item *authenticator_tree; @@ -2222,9 +2222,9 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ proto_item_append_text(authenticator_item, " [%s]", valid? "correct" : "incorrect"); authenticator_tree = proto_item_add_subtree(authenticator_item, ett_radius_authenticator); item = proto_tree_add_boolean(authenticator_tree, hf_radius_authenticator_valid, tvb, 4, AUTHENTICATOR_LENGTH, valid ? TRUE : FALSE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_boolean(authenticator_tree, hf_radius_authenticator_invalid, tvb, 4, AUTHENTICATOR_LENGTH, valid ? FALSE : TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (!valid) { col_append_fstr(pinfo->cinfo, COL_INFO, " [incorrect authenticator]"); @@ -2249,10 +2249,10 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ proto_item *item; hidden_item = proto_tree_add_uint(radius_tree, hf_radius_dup, tvb, 0, 0, rh.rh_ident); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); item = proto_tree_add_uint(radius_tree, hf_radius_rsp_dup, tvb, 0, 0, radius_call->rsp_num); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } } diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index 47bf86138f..bf6f0ae437 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -5489,7 +5489,7 @@ dissect_ranap_IMSI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot if(!imsi_tvb) return offset; /* Hide the octet string default printout */ - PROTO_ITEM_SET_HIDDEN(actx->created_item); + proto_item_set_hidden(actx->created_item); digit_str = dissect_e212_imsi(imsi_tvb, actx->pinfo, tree, 0, tvb_reported_length(imsi_tvb), FALSE); sccp_info = (sccp_msg_info_t *)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_ranap, actx->pinfo->curr_layer_num); diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c index 781a5fce95..195105a652 100644 --- a/epan/dissectors/packet-rdt.c +++ b/epan/dissectors/packet-rdt.c @@ -1251,20 +1251,20 @@ static void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) p_conv_data->method, p_conv_data->frame_number, p_conv_data->feature_level); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); rdt_setup_tree = proto_item_add_subtree(ti, ett_rdt_setup); if (rdt_setup_tree) { /* Add details into subtree */ proto_item* item = proto_tree_add_uint(rdt_setup_tree, hf_rdt_setup_frame, tvb, 0, 0, p_conv_data->frame_number); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_string(rdt_setup_tree, hf_rdt_setup_method, tvb, 0, 0, p_conv_data->method); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_int(rdt_setup_tree, hf_rdt_feature_level, tvb, 0, 0, p_conv_data->feature_level); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } } diff --git a/epan/dissectors/packet-reload-framing.c b/epan/dissectors/packet-reload-framing.c index ded05f814a..22e3ea26d6 100644 --- a/epan/dissectors/packet-reload-framing.c +++ b/epan/dissectors/packet-reload-framing.c @@ -282,12 +282,12 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr if (reload_frame->data_frame != pinfo->num) { proto_item *it; it = proto_tree_add_uint(reload_framing_tree, hf_reload_framing_duplicate, tvb, 0, 0, reload_frame->data_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } if (reload_frame->ack_frame) { proto_item *it; it = proto_tree_add_uint(reload_framing_tree, hf_reload_framing_response_in, tvb, 0, 0, reload_frame->ack_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else { @@ -295,7 +295,7 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr if (reload_frame->ack_frame != pinfo->num) { proto_item *it; it = proto_tree_add_uint(reload_framing_tree, hf_reload_framing_duplicate, tvb, 0, 0, reload_frame->ack_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } if (reload_frame->data_frame) { @@ -303,11 +303,11 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr nstime_t ns; it = proto_tree_add_uint(reload_framing_tree, hf_reload_framing_response_to, tvb, 0, 0, reload_frame->data_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &reload_frame->req_time); it = proto_tree_add_time(reload_framing_tree, hf_reload_framing_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } @@ -417,7 +417,7 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr } } proto_item_append_text(ti_parsed_received, "]"); - PROTO_ITEM_SET_GENERATED(ti_parsed_received); + proto_item_set_generated(ti_parsed_received); } } } diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c index ae40268612..3e9065cb17 100644 --- a/epan/dissectors/packet-reload.c +++ b/epan/dissectors/packet-reload.c @@ -4157,12 +4157,12 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void if (reload_trans->req_frame != pinfo->num) { proto_item *it; it = proto_tree_add_uint(reload_tree, hf_reload_duplicate, tvb, 0, 0, reload_trans->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } if (reload_trans->rep_frame) { proto_item *it; it = proto_tree_add_uint(reload_tree, hf_reload_response_in, tvb, 0, 0, reload_trans->rep_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else { @@ -4170,7 +4170,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void if (reload_trans->rep_frame != pinfo->num) { proto_item *it; it = proto_tree_add_uint(reload_tree, hf_reload_duplicate, tvb, 0, 0, reload_trans->rep_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } if (reload_trans->req_frame) { @@ -4178,11 +4178,11 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void nstime_t ns; it = proto_tree_add_uint(reload_tree, hf_reload_response_to, tvb, 0, 0, reload_trans->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &reload_trans->req_time); it = proto_tree_add_time(reload_tree, hf_reload_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } diff --git a/epan/dissectors/packet-rfid-pn532.c b/epan/dissectors/packet-rfid-pn532.c index 2bb7f57f86..bec6ce7a05 100644 --- a/epan/dissectors/packet-rfid-pn532.c +++ b/epan/dissectors/packet-rfid-pn532.c @@ -716,7 +716,7 @@ dissect_pn532(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (command_data) { sub_item = proto_tree_add_uint(pn532_tree, hf_pn532_response_for, tvb, offset, tvb_captured_length_remaining(tvb, offset), command_data->command_frame_number); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } @@ -1260,7 +1260,7 @@ dissect_pn532(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) baudrate = -1; /* Force unknown baudrate... */ sub_item = proto_tree_add_uint(pn532_tree, hf_pn532_BrTy, tvb, offset, tvb_captured_length_remaining(tvb, offset), baudrate); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); for (item_value = 1; item_value <= value; item_value += 1) { sub_item = proto_tree_add_item(pn532_tree, hf_pn532_target, tvb, offset, tvb_captured_length_remaining(tvb, offset), ENC_NA); diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c index 91c5fb7707..87c29331ca 100644 --- a/epan/dissectors/packet-rlc-lte.c +++ b/epan/dissectors/packet-rlc-lte.c @@ -558,7 +558,7 @@ static void reassembly_show_source(rlc_channel_reassembly_info *reassembly_info, hf_rlc_lte_reassembly_source, tvb, 0, 0, ENC_ASCII|ENC_NA); source_tree = proto_item_add_subtree(source_ti, ett_rlc_lte_reassembly_source); - PROTO_ITEM_SET_GENERATED(source_ti); + proto_item_set_generated(source_ti); for (n=0; n < reassembly_info->number_of_segments; n++) { total_length += reassembly_info->segments[n].length; @@ -570,13 +570,13 @@ static void reassembly_show_source(rlc_channel_reassembly_info *reassembly_info, ti = proto_tree_add_uint(source_tree, hf_rlc_lte_reassembly_source_number_of_segments, tvb, 0, 0, reassembly_info->number_of_segments); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Total length */ ti = proto_tree_add_uint(source_tree, hf_rlc_lte_reassembly_source_total_length, tvb, 0, 0, total_length); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Now add info about each segment in turn */ for (n=0; n < reassembly_info->number_of_segments; n++) { @@ -596,18 +596,18 @@ static void reassembly_show_source(rlc_channel_reassembly_info *reassembly_info, segment_tree = proto_item_add_subtree(segment_ti, ett_rlc_lte_reassembly_source_segment); proto_item_append_text(segment_ti, " (SN=%u frame=%u length=%u)", segment->SN, segment->frameNum, segment->length); - PROTO_ITEM_SET_GENERATED(segment_ti); + proto_item_set_generated(segment_ti); /* Add details to segment tree */ ti = proto_tree_add_uint(segment_tree, hf_rlc_lte_reassembly_source_segment_sn, tvb, 0, 0, segment->SN); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(segment_tree, hf_rlc_lte_reassembly_source_segment_framenum, tvb, 0, 0, segment->frameNum); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(segment_tree, hf_rlc_lte_reassembly_source_segment_length, tvb, 0, 0, segment->length); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } @@ -902,7 +902,7 @@ static void show_PDU_in_tree(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb } ENDTRY - PROTO_ITEM_SET_HIDDEN(data_ti); + proto_item_set_hidden(data_ti); } else if (global_rlc_lte_call_rrc_for_mcch && (rlc_info->channelType == CHANNEL_TYPE_MCCH)) { /* Send whole PDU to RRC */ @@ -925,7 +925,7 @@ static void show_PDU_in_tree(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb } ENDTRY - PROTO_ITEM_SET_HIDDEN(data_ti); + proto_item_set_hidden(data_ti); } else if (global_rlc_lte_call_ip_for_mtch && (rlc_info->channelType == CHANNEL_TYPE_MTCH)) { /* Send whole PDU to IP */ @@ -948,7 +948,7 @@ static void show_PDU_in_tree(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb } ENDTRY - PROTO_ITEM_SET_HIDDEN(data_ti); + proto_item_set_hidden(data_ti); } } } @@ -1062,7 +1062,7 @@ static void checkFIconsistency(sequence_analysis_report *p, else { ti = proto_tree_add_boolean(seqnum_tree, hf_rlc_lte_sequence_analysis_framing_info_correct, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); } } else { @@ -1079,10 +1079,10 @@ static void checkFIconsistency(sequence_analysis_report *p, else { ti = proto_tree_add_boolean(seqnum_tree, hf_rlc_lte_sequence_analysis_framing_info_correct, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); } } - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Add to the tree values associated with sequence analysis for this frame */ @@ -1105,12 +1105,12 @@ static void addChannelSequenceInfo(sequence_analysis_report *p, "", "Sequence Analysis"); seqnum_tree = proto_item_add_subtree(seqnum_ti, ett_rlc_lte_sequence_analysis); - PROTO_ITEM_SET_GENERATED(seqnum_ti); + proto_item_set_generated(seqnum_ti); if (p->previousFrameNum != 0) { ti = proto_tree_add_uint(seqnum_tree, hf_rlc_lte_sequence_analysis_previous_frame, tvb, 0, 0, p->previousFrameNum); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } switch (p_rlc_lte_info->rlcMode) { @@ -1128,7 +1128,7 @@ static void addChannelSequenceInfo(sequence_analysis_report *p, ti = proto_tree_add_boolean(seqnum_tree, hf_rlc_lte_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 channel (if known) */ @@ -1148,10 +1148,10 @@ static void addChannelSequenceInfo(sequence_analysis_report *p, ti = proto_tree_add_boolean(seqnum_tree, hf_rlc_lte_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_rlc_lte_sequence_analysis_mac_retx, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); expert_add_info_format(pinfo, ti, &ei_rlc_lte_sequence_analysis_mac_retx, "AM Frame retransmitted for %s on UE %u - due to MAC retx! (%s-%u)", val_to_str_const(p_rlc_lte_info->direction, direction_vals, "Unknown"), @@ -1168,10 +1168,10 @@ static void addChannelSequenceInfo(sequence_analysis_report *p, ti = proto_tree_add_boolean(seqnum_tree, hf_rlc_lte_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_rlc_lte_sequence_analysis_retx, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); expert_add_info_format(pinfo, ti, &ei_rlc_lte_sequence_analysis_retx, "AM Frame retransmitted for %s on UE %u - most likely in response to NACK (%s-%u)", val_to_str_const(p_rlc_lte_info->direction, direction_vals, "Unknown"), @@ -1188,10 +1188,10 @@ static void addChannelSequenceInfo(sequence_analysis_report *p, ti = proto_tree_add_boolean(seqnum_tree, hf_rlc_lte_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_rlc_lte_sequence_analysis_repeated, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); expert_add_info_format(pinfo, ti, &ei_rlc_lte_sequence_analysis_repeated, "AM SN Repeated for %s for UE %u - probably because didn't receive Status PDU? (%s-%u)", val_to_str_const(p_rlc_lte_info->direction, direction_vals, "Unknown"), @@ -1208,10 +1208,10 @@ static void addChannelSequenceInfo(sequence_analysis_report *p, ti = proto_tree_add_boolean(seqnum_tree, hf_rlc_lte_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_rlc_lte_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_rlc_lte_am_sn_missing, "AM SNs (%u to %u) missing for %s on UE %u (%s-%u)", @@ -1251,15 +1251,15 @@ static void addChannelSequenceInfo(sequence_analysis_report *p, ti = proto_tree_add_boolean(seqnum_tree, hf_rlc_lte_sequence_analysis_ok, tvb, 0, 0, FALSE); /* Out of range */ - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_boolean(seqnum_tree, hf_rlc_lte_sequence_analysis_ack_out_of_range, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Link back to last seen SN in other direction */ ti = proto_tree_add_uint(seqnum_tree, hf_rlc_lte_sequence_analysis_ack_out_of_range_opposite_frame, tvb, 0, 0, p->previousFrameNum); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Expert error */ expert_add_info_format(pinfo, ti, &ei_rlc_lte_sequence_analysis_ack_out_of_range_opposite_frame, @@ -1287,9 +1287,9 @@ static void addChannelSequenceInfo(sequence_analysis_report *p, /* Expected sequence number */ ti = proto_tree_add_uint(seqnum_tree, hf_rlc_lte_sequence_analysis_expected_sn, tvb, 0, 0, p->sequenceExpected); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (p->sequenceExpectedCorrect) { - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); } if (!p->sequenceExpectedCorrect) { @@ -1306,10 +1306,10 @@ static void addChannelSequenceInfo(sequence_analysis_report *p, case SN_Missing: ti = proto_tree_add_boolean(seqnum_tree, hf_rlc_lte_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_rlc_lte_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_rlc_lte_um_sn_missing, "UM SNs (%u to %u) missing for %s on UE %u (%s-%u)", @@ -1339,10 +1339,10 @@ static void addChannelSequenceInfo(sequence_analysis_report *p, case SN_Repeated: ti = proto_tree_add_boolean(seqnum_tree, hf_rlc_lte_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_rlc_lte_sequence_analysis_repeated, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); expert_add_info_format(pinfo, ti, &ei_rlc_lte_um_sn_repeated, "UM SN (%u) repeated for %s for UE %u (%s-%u)", p->firstSN, @@ -1357,10 +1357,10 @@ static void addChannelSequenceInfo(sequence_analysis_report *p, case SN_MAC_Retx: ti = proto_tree_add_boolean(seqnum_tree, hf_rlc_lte_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_rlc_lte_sequence_analysis_mac_retx, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); expert_add_info_format(pinfo, ti, &ei_rlc_lte_sequence_analysis_mac_retx, "UM Frame retransmitted for %s on UE %u - due to MAC retx! (%s-%u)", val_to_str_const(p_rlc_lte_info->direction, direction_vals, "Unknown"), @@ -1389,7 +1389,7 @@ static void addChannelSequenceInfo(sequence_analysis_report *p, /* Set OK here! */ ti = proto_tree_add_boolean(seqnum_tree, hf_rlc_lte_sequence_analysis_ok, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_item_append_text(seqnum_ti, " - OK"); } @@ -1397,7 +1397,7 @@ static void addChannelSequenceInfo(sequence_analysis_report *p, if (p->nextFrameNum != 0) { ti = proto_tree_add_uint(seqnum_tree, hf_rlc_lte_sequence_analysis_next_frame, tvb, 0, 0, p->nextFrameNum); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } } @@ -1793,19 +1793,19 @@ static void addChannelRepeatedNACKInfo(channel_repeated_nack_report *p, "", "Sequence Analysis"); seqnum_tree = proto_item_add_subtree(seqnum_ti, ett_rlc_lte_sequence_analysis); - PROTO_ITEM_SET_GENERATED(seqnum_ti); + proto_item_set_generated(seqnum_ti); /* OK = FALSE */ ti = proto_tree_add_boolean(seqnum_tree, hf_rlc_lte_sequence_analysis_ok, tvb, 0, 0, FALSE); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Add each repeated NACK as item & expert info */ for (n=0; n < p->noOfNACKsRepeated; n++) { ti = proto_tree_add_uint(seqnum_tree, hf_rlc_lte_sequence_analysis_repeated_nack, tvb, 0, 0, p->repeatedNACKs[n]); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); expert_add_info_format(pinfo, ti, &ei_rlc_lte_sequence_analysis_repeated_nack, "Same SN (%u) NACKd for %s on UE %u in successive Status PDUs", @@ -1817,7 +1817,7 @@ static void addChannelRepeatedNACKInfo(channel_repeated_nack_report *p, /* Link back to previous status report */ ti = proto_tree_add_uint(seqnum_tree, hf_rlc_lte_sequence_analysis_repeated_nack_original_frame, tvb, 0, 0, p->previousFrameNum); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Append count to sequence analysis root */ proto_item_append_text(seqnum_ti, " - %u SNs repeated from previous Status PDU", @@ -2021,7 +2021,7 @@ static void dissect_rlc_lte_tm(tvbuff_t *tvb, packet_info *pinfo, /* Create hidden TM root */ tm_ti = proto_tree_add_string_format(tree, hf_rlc_lte_tm, tvb, offset, 0, "", "TM"); - PROTO_ITEM_SET_HIDDEN(tm_ti); + proto_item_set_hidden(tm_ti); /* Remaining bytes are all data */ raw_tm_ti = proto_tree_add_item(tree, hf_rlc_lte_tm_data, tvb, offset, -1, ENC_NA); @@ -2070,7 +2070,7 @@ static void dissect_rlc_lte_tm(tvbuff_t *tvb, packet_info *pinfo, } /* Hide raw view of bytes */ - PROTO_ITEM_SET_HIDDEN(raw_tm_ti); + proto_item_set_hidden(raw_tm_ti); /* Call it (catch exceptions) */ TRY { @@ -2110,7 +2110,7 @@ static void dissect_rlc_lte_um(tvbuff_t *tvb, packet_info *pinfo, /* Hidden UM root */ um_ti = proto_tree_add_string_format(tree, hf_rlc_lte_um, tvb, offset, 0, "", "UM"); - PROTO_ITEM_SET_HIDDEN(um_ti); + proto_item_set_hidden(um_ti); /* Add UM header subtree */ um_header_ti = proto_tree_add_string_format(tree, hf_rlc_lte_um_header, @@ -2205,7 +2205,7 @@ static void dissect_rlc_lte_um(tvbuff_t *tvb, packet_info *pinfo, is_truncated); if (is_truncated) { int n; - PROTO_ITEM_SET_GENERATED(truncated_ti); + proto_item_set_generated(truncated_ti); expert_add_info(pinfo, truncated_ti, &ei_rlc_lte_header_only); /* Show in the info column how long the data would be */ @@ -2221,7 +2221,7 @@ static void dissect_rlc_lte_um(tvbuff_t *tvb, packet_info *pinfo, last_includes_end); } else { - PROTO_ITEM_SET_HIDDEN(truncated_ti); + proto_item_set_hidden(truncated_ti); } } @@ -2453,7 +2453,7 @@ static void dissect_rlc_lte_am_status_pdu(tvbuff_t *tvb, if (nack_count > 0) { proto_item *count_ti = proto_tree_add_uint(tree, hf_rlc_lte_am_nacks, tvb, 0, 1, nack_count); - PROTO_ITEM_SET_GENERATED(count_ti); + proto_item_set_generated(count_ti); proto_item_append_text(status_ti, " (%u NACKs)", nack_count); tap_info->noOfNACKs = nack_count; } @@ -2516,7 +2516,7 @@ static void dissect_rlc_lte_am(tvbuff_t *tvb, packet_info *pinfo, /* Hidden AM root */ am_ti = proto_tree_add_string_format(tree, hf_rlc_lte_am, tvb, offset, 0, "", "AM"); - PROTO_ITEM_SET_HIDDEN(am_ti); + proto_item_set_hidden(am_ti); /* Add AM header subtree */ am_header_ti = proto_tree_add_string_format(tree, hf_rlc_lte_am_header, @@ -2662,7 +2662,7 @@ static void dissect_rlc_lte_am(tvbuff_t *tvb, packet_info *pinfo, is_truncated); if (is_truncated) { int n; - PROTO_ITEM_SET_GENERATED(truncated_ti); + proto_item_set_generated(truncated_ti); expert_add_info(pinfo, truncated_ti, &ei_rlc_lte_header_only); /* Show in the info column how long the data would be */ for (n=0; n < s_number_of_extensions; n++) { @@ -2677,7 +2677,7 @@ static void dissect_rlc_lte_am(tvbuff_t *tvb, packet_info *pinfo, last_includes_end); } else { - PROTO_ITEM_SET_HIDDEN(truncated_ti); + proto_item_set_hidden(truncated_ti); } } @@ -2949,55 +2949,55 @@ static void dissect_rlc_lte_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree context_ti = proto_tree_add_string_format(rlc_lte_tree, hf_rlc_lte_context, tvb, offset, 0, "", "Context"); context_tree = proto_item_add_subtree(context_ti, ett_rlc_lte_context); - PROTO_ITEM_SET_GENERATED(context_ti); + proto_item_set_generated(context_ti); ti = proto_tree_add_uint(context_tree, hf_rlc_lte_context_direction, tvb, 0, 0, p_rlc_lte_info->direction); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); mode_ti = proto_tree_add_uint(context_tree, hf_rlc_lte_context_mode, tvb, 0, 0, p_rlc_lte_info->rlcMode); - PROTO_ITEM_SET_GENERATED(mode_ti); + proto_item_set_generated(mode_ti); if (p_rlc_lte_info->ueid != 0) { ti = proto_tree_add_uint(context_tree, hf_rlc_lte_context_ueid, tvb, 0, 0, p_rlc_lte_info->ueid); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if ((p_rlc_lte_info->priority >= 1) && (p_rlc_lte_info->priority <=16)) { ti = proto_tree_add_uint(context_tree, hf_rlc_lte_context_priority, tvb, 0, 0, p_rlc_lte_info->priority); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } ti = proto_tree_add_uint(context_tree, hf_rlc_lte_context_channel_type, tvb, 0, 0, p_rlc_lte_info->channelType); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if ((p_rlc_lte_info->channelType == CHANNEL_TYPE_SRB) || (p_rlc_lte_info->channelType == CHANNEL_TYPE_DRB) || (p_rlc_lte_info->channelType == CHANNEL_TYPE_MTCH)) { ti = proto_tree_add_uint(context_tree, hf_rlc_lte_context_channel_id, tvb, 0, 0, p_rlc_lte_info->channelId); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } ti = proto_tree_add_uint(context_tree, hf_rlc_lte_context_pdu_length, tvb, 0, 0, p_rlc_lte_info->pduLength); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (p_rlc_lte_info->rlcMode == RLC_UM_MODE) { ti = proto_tree_add_uint(context_tree, hf_rlc_lte_context_um_sn_length, tvb, 0, 0, p_rlc_lte_info->sequenceNumberLength); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (p_rlc_lte_info->rlcMode == RLC_AM_MODE) { ti = proto_tree_add_uint(context_tree, hf_rlc_lte_context_am_sn_length, tvb, 0, 0, p_rlc_lte_info->sequenceNumberLength ? p_rlc_lte_info->sequenceNumberLength : 10); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Append highlights to top-level item */ diff --git a/epan/dissectors/packet-rlc-nr.c b/epan/dissectors/packet-rlc-nr.c index b442b2baa3..a09b879b9f 100644 --- a/epan/dissectors/packet-rlc-nr.c +++ b/epan/dissectors/packet-rlc-nr.c @@ -390,7 +390,7 @@ static void dissect_rlc_nr_tm(tvbuff_t *tvb, packet_info *pinfo, /* Create hidden TM root */ tm_ti = proto_tree_add_string_format(tree, hf_rlc_nr_tm, tvb, offset, 0, "", "TM"); - PROTO_ITEM_SET_HIDDEN(tm_ti); + proto_item_set_hidden(tm_ti); /* Remaining bytes are all data */ raw_tm_ti = proto_tree_add_item(tree, hf_rlc_nr_tm_data, tvb, offset, -1, ENC_NA); @@ -418,7 +418,7 @@ static void dissect_rlc_nr_tm(tvbuff_t *tvb, packet_info *pinfo, } /* Hide raw view of bytes */ - PROTO_ITEM_SET_HIDDEN(raw_tm_ti); + proto_item_set_hidden(raw_tm_ti); /* Call it (catch exceptions) */ TRY { @@ -453,7 +453,7 @@ static void dissect_rlc_nr_um(tvbuff_t *tvb, packet_info *pinfo, /* Hidden UM root */ um_ti = proto_tree_add_string_format(tree, hf_rlc_nr_um, tvb, offset, 0, "", "UM"); - PROTO_ITEM_SET_HIDDEN(um_ti); + proto_item_set_hidden(um_ti); /* Add UM header subtree */ um_header_ti = proto_tree_add_string_format(tree, hf_rlc_nr_um_header, @@ -510,12 +510,12 @@ static void dissect_rlc_nr_um(tvbuff_t *tvb, packet_info *pinfo, truncated_ti = proto_tree_add_boolean(tree, hf_rlc_nr_header_only, tvb, 0, 0, is_truncated); if (is_truncated) { - PROTO_ITEM_SET_GENERATED(truncated_ti); + proto_item_set_generated(truncated_ti); expert_add_info(pinfo, truncated_ti, &ei_rlc_nr_header_only); show_PDU_in_info(pinfo, top_ti, p_rlc_nr_info->pduLength - offset, seg_info); return; } else { - PROTO_ITEM_SET_HIDDEN(truncated_ti); + proto_item_set_hidden(truncated_ti); } } @@ -703,7 +703,7 @@ static void dissect_rlc_nr_am_status_pdu(tvbuff_t *tvb, if (nack_count > 0) { proto_item *count_ti = proto_tree_add_uint(tree, hf_rlc_nr_am_nacks, tvb, 0, 1, nack_count); - PROTO_ITEM_SET_GENERATED(count_ti); + proto_item_set_generated(count_ti); proto_item_append_text(status_ti, " (%u NACKs)", nack_count); } @@ -743,7 +743,7 @@ static void dissect_rlc_nr_am(tvbuff_t *tvb, packet_info *pinfo, /* Hidden AM root */ am_ti = proto_tree_add_string_format(tree, hf_rlc_nr_am, tvb, offset, 0, "", "AM"); - PROTO_ITEM_SET_HIDDEN(am_ti); + proto_item_set_hidden(am_ti); /* Add AM header subtree */ am_header_ti = proto_tree_add_string_format(tree, hf_rlc_nr_am_header, @@ -827,12 +827,12 @@ static void dissect_rlc_nr_am(tvbuff_t *tvb, packet_info *pinfo, truncated_ti = proto_tree_add_boolean(tree, hf_rlc_nr_header_only, tvb, 0, 0, is_truncated); if (is_truncated) { - PROTO_ITEM_SET_GENERATED(truncated_ti); + proto_item_set_generated(truncated_ti); expert_add_info(pinfo, truncated_ti, &ei_rlc_nr_header_only); show_PDU_in_info(pinfo, top_ti, p_rlc_nr_info->pduLength - offset, seg_info); return; } else { - PROTO_ITEM_SET_HIDDEN(truncated_ti); + proto_item_set_hidden(truncated_ti); } } @@ -993,41 +993,41 @@ static void dissect_rlc_nr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree context_ti = proto_tree_add_string_format(rlc_nr_tree, hf_rlc_nr_context, tvb, offset, 0, "", "Context"); context_tree = proto_item_add_subtree(context_ti, ett_rlc_nr_context); - PROTO_ITEM_SET_GENERATED(context_ti); + proto_item_set_generated(context_ti); ti = proto_tree_add_uint(context_tree, hf_rlc_nr_context_direction, tvb, 0, 0, p_rlc_nr_info->direction); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); mode_ti = proto_tree_add_uint(context_tree, hf_rlc_nr_context_mode, tvb, 0, 0, p_rlc_nr_info->rlcMode); - PROTO_ITEM_SET_GENERATED(mode_ti); + proto_item_set_generated(mode_ti); if (p_rlc_nr_info->ueid != 0) { ti = proto_tree_add_uint(context_tree, hf_rlc_nr_context_ueid, tvb, 0, 0, p_rlc_nr_info->ueid); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } ti = proto_tree_add_uint(context_tree, hf_rlc_nr_context_bearer_type, tvb, 0, 0, p_rlc_nr_info->bearerType); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if ((p_rlc_nr_info->bearerType == BEARER_TYPE_SRB) || (p_rlc_nr_info->bearerType == BEARER_TYPE_DRB)) { ti = proto_tree_add_uint(context_tree, hf_rlc_nr_context_bearer_id, tvb, 0, 0, p_rlc_nr_info->bearerId); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } ti = proto_tree_add_uint(context_tree, hf_rlc_nr_context_pdu_length, tvb, 0, 0, p_rlc_nr_info->pduLength); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (p_rlc_nr_info->rlcMode != RLC_TM_MODE) { ti = proto_tree_add_uint(context_tree, hf_rlc_nr_context_sn_length, tvb, 0, 0, p_rlc_nr_info->sequenceNumberLength); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Append highlights to top-level item */ diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c index 9c0ecc53da..1ab772f3d6 100644 --- a/epan/dissectors/packet-rohc.c +++ b/epan/dissectors/packet-rohc.c @@ -1246,7 +1246,7 @@ dissect_rohc_feedback_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, proto_tree_add_item(rohc_feedback_tree, hf_rohc_opt_sn, tvb, offset, 1, ENC_BIG_ENDIAN); sn = (sn << 8) | tvb_get_guint8(tvb, offset); ti = proto_tree_add_uint(rohc_feedback_tree, hf_rohc_ext_sn, tvb, 0, 0, sn); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; case 5: /* Clock */ @@ -2108,7 +2108,7 @@ dissect_rohc_ir_packet(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, if((p_rohc_info->large_cid_present == FALSE) && (is_add_cid == FALSE)){ item = proto_tree_add_uint(tree, hf_rohc_small_cid, tvb, 0, 0, cid); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } ir_item = proto_tree_add_item(tree, hf_rohc_ir_packet, tvb, offset, 1, ENC_BIG_ENDIAN); ir_tree = proto_item_add_subtree(ir_item, ett_rohc_ir); @@ -2236,7 +2236,7 @@ dissect_rohc_ir_dyn_packet(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, if((p_rohc_info->large_cid_present == FALSE) && (is_add_cid == FALSE)){ item = proto_tree_add_uint(tree, hf_rohc_small_cid, tvb, 0, 0, cid); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } ir_item = proto_tree_add_item(tree, hf_rohc_ir_dyn_packet, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -2377,34 +2377,34 @@ dissect_rohc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) /* Put configuration data into the tree */ conf_tree = proto_tree_add_subtree_format(rohc_tree, tvb, offset, 0, ett_rohc_conf, &item, "Global Configuration: (%s)", p_rohc_info->large_cid_present ? "Large CID" : "Small CID"); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); rohc_cid_context = (rohc_cid_context_t*)p_get_proto_data(wmem_file_scope(), pinfo, proto_rohc, 0); if(rohc_cid_context){ /* Do we have info from an IR frame? */ if(rohc_cid_context->ir_frame_number>0){ conf_item = proto_tree_add_item(conf_tree, hf_rohc_configured_by_ir_packet, tvb, offset, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(conf_item); + proto_item_set_generated(conf_item); conf_item = proto_tree_add_uint(conf_tree, hf_rohc_ir_pkt_frame, tvb, 0, 0, rohc_cid_context->ir_frame_number); - PROTO_ITEM_SET_GENERATED(conf_item); + proto_item_set_generated(conf_item); if(rohc_cid_context->prev_ir_frame_number>0){ conf_item = proto_tree_add_uint(conf_tree, hf_rohc_ir_previous_frame, tvb, 0, 0, rohc_cid_context->prev_ir_frame_number); - PROTO_ITEM_SET_GENERATED(conf_item); + proto_item_set_generated(conf_item); } conf_item = proto_tree_add_uint(conf_tree, hf_rohc_ir_profile, tvb, offset, 0, rohc_cid_context->profile); - PROTO_ITEM_SET_GENERATED(conf_item); + proto_item_set_generated(conf_item); conf_item = proto_tree_add_uint(conf_tree, hf_rohc_ir_ip_version, tvb, offset, 0, rohc_cid_context->rohc_ip_version); - PROTO_ITEM_SET_GENERATED(conf_item); + proto_item_set_generated(conf_item); if(rohc_cid_context->mode == 0){ conf_item = proto_tree_add_uint_format_value(conf_tree, hf_rohc_ir_mode, tvb, offset, 0, 0, "not known"); - PROTO_ITEM_SET_GENERATED(conf_item); + proto_item_set_generated(conf_item); }else{ conf_item = proto_tree_add_uint(conf_tree, hf_rohc_ir_mode, tvb, offset, 0, rohc_cid_context->mode); - PROTO_ITEM_SET_GENERATED(conf_item); + proto_item_set_generated(conf_item); } }else{ conf_item = proto_tree_add_item(conf_tree, hf_rohc_no_configuration_info, tvb, offset, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(conf_item); + proto_item_set_generated(conf_item); } } @@ -2481,7 +2481,7 @@ start_over: feedback_data_len--; }else{ item = proto_tree_add_uint(sub_tree, hf_rohc_small_cid, tvb, 0, 0, cid); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } }else{ /* Read Large CID here */ @@ -2508,7 +2508,7 @@ start_over: col_append_str(pinfo->cinfo, COL_INFO, "Segment"); if((p_rohc_info->large_cid_present == FALSE) && (is_add_cid == FALSE)){ item = proto_tree_add_uint(rohc_tree, hf_rohc_small_cid, tvb, 0, 0, cid); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } proto_tree_add_expert(rohc_tree, pinfo, &ei_rohc_desegmentation_not_implemented, tvb, offset, -1); return tvb_captured_length(tvb); diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index b0335be2e6..95d49baeb3 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -399,14 +399,14 @@ ros_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui if(rcrp->is_request){ item=proto_tree_add_uint(tree, hf_ros_response_in, tvb, 0, 0, rcrp->rep_frame); - PROTO_ITEM_SET_GENERATED (item); + proto_item_set_generated (item); } else { nstime_t ns; item=proto_tree_add_uint(tree, hf_ros_response_to, tvb, 0, 0, rcrp->req_frame); - PROTO_ITEM_SET_GENERATED (item); + proto_item_set_generated (item); nstime_delta(&ns, &pinfo->abs_ts, &rcrp->req_time); item=proto_tree_add_time(tree, hf_ros_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED (item); + proto_item_set_generated (item); } } diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index ce1e684d9e..f936059408 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -1088,13 +1088,13 @@ dissect_rpc_authgss_context(proto_tree *tree, tvbuff_t *tvb, int offset, if (context_info->create_frame) { proto_item *it; it = proto_tree_add_uint(context_tree, hf_rpc_authgss_ctx_create_frame, tvb, 0, 0, context_info->create_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } if (context_info->destroy_frame) { proto_item *it; it = proto_tree_add_uint(context_tree, hf_rpc_authgss_ctx_destroy_frame, tvb, 0, 0, context_info->destroy_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } proto_item_set_len(context_item, offset - old_offset); @@ -1937,15 +1937,15 @@ dissect_rpc_indir_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tmp_item=proto_tree_add_uint_format(tree, prog_id, tvb, 0, 0, rpc_call->prog, "Program: %s (%u)", rpc_prog_name(rpc_call->prog), rpc_call->prog); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); tmp_item=proto_tree_add_uint(tree, vers_id, tvb, 0, 0, rpc_call->vers); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); tmp_item=proto_tree_add_uint_format(tree, proc_id, tvb, 0, 0, rpc_call->proc, "Procedure: %s (%u)", procname, rpc_call->proc); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); } if (dissect_function == NULL) { @@ -2511,7 +2511,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb, 0, 0, rpc_call->rep_num, "The reply to this request is in frame %u", rpc_call->rep_num); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); } offset += 16; @@ -2600,14 +2600,14 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tmp_item=proto_tree_add_uint_format_value(rpc_tree, hf_rpc_program, tvb, 0, 0, prog, "%s (%u)", progname, prog); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); tmp_item=proto_tree_add_uint(rpc_tree, hf_rpc_programversion, tvb, 0, 0, vers); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); tmp_item=proto_tree_add_uint_format_value(rpc_tree, hf_rpc_procedure, tvb, 0, 0, proc, "%s (%u)", procname, proc); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); } reply_state = tvb_get_ntohl(tvb,offset); @@ -2623,12 +2623,12 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb, 0, 0, rpc_call->req_num, "This is a reply to a request in frame %u", rpc_call->req_num); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); nstime_delta(&ns, &pinfo->abs_ts, &rpc_call->req_time); tmp_item=proto_tree_add_time(rpc_tree, hf_rpc_time, tvb, offset, 0, &ns); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); col_append_fstr(pinfo->cinfo, COL_INFO," (Call In %d)", rpc_call->req_num); } @@ -2651,11 +2651,11 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, "[RPC duplicate of #%d]", rpc_call->rep_num); tmp_item=proto_tree_add_item(rpc_tree, hf_rpc_dup, tvb, 0,0, ENC_NA); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); tmp_item=proto_tree_add_uint(rpc_tree, hf_rpc_reply_dup, tvb, 0,0, rpc_call->rep_num); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); } } @@ -2822,7 +2822,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tmp_item=proto_tree_add_uint(ptree, hf_rpc_programversion, tvb, 0, 0, vers); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); if (rpc_prog && rpc_prog->procedure_hfs && (rpc_prog->procedure_hfs->len > vers) ) procedure_hf = g_array_index(rpc_prog->procedure_hfs, int, vers); else { @@ -2834,12 +2834,12 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (procedure_hf != 0 && procedure_hf != -1) { tmp_item=proto_tree_add_uint(ptree, procedure_hf, tvb, 0, 0, proc); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); } else { tmp_item=proto_tree_add_uint_format_value(ptree, hf_rpc_procedure, tvb, 0, 0, proc, "%s (%u)", procname, proc); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); } } diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 00bf767a88..e8209ba87f 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -18877,9 +18877,9 @@ dissect_rrc_U_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot sub_tree = proto_item_get_subtree(actx->created_item); item_len = proto_item_get_len(actx->created_item); ti = proto_tree_add_uint(sub_tree, generated_field_hf, tvb, original_offset/8, item_len, u_rnti_value); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(sub_tree, hf_urnti, tvb, original_offset/8, item_len, u_rnti_value); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); private_data_set_s_rnc_id(actx, 0); private_data_set_s_rnti(actx, 0); @@ -22736,9 +22736,9 @@ dissect_rrc_CellIdentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ if(cell_id_tvb != NULL) { cell_identity_tree = proto_item_add_subtree(actx->created_item, ett_rrc_cellIdentity); temp_ti = proto_tree_add_bits_item(cell_identity_tree, hf_rrc_cellIdentity_rnc_id,cell_id_tvb, 0, 12, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(temp_ti); + proto_item_set_generated(temp_ti); temp_ti = proto_tree_add_bits_item(cell_identity_tree, hf_rrc_cellIdentity_c_id, cell_id_tvb, 12, 16, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(temp_ti); + proto_item_set_generated(temp_ti); } @@ -130639,7 +130639,7 @@ static const per_choice_t HandoverToUTRANCommand_choice[] = { static int dissect_rrc_HandoverToUTRANCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); #line 1441 "./asn1/rrc/rrc.cnf" offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverToUTRANCommand, HandoverToUTRANCommand_choice, @@ -134131,7 +134131,7 @@ static const per_sequence_t InterRATHandoverInfo_sequence[] = { int dissect_rrc_InterRATHandoverInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_InterRATHandoverInfo, InterRATHandoverInfo_sequence); @@ -152464,7 +152464,7 @@ static const per_sequence_t MasterInformationBlock_sequence[] = { static int dissect_rrc_MasterInformationBlock(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MasterInformationBlock, MasterInformationBlock_sequence); @@ -152761,7 +152761,7 @@ static const per_sequence_t SysInfoType1_sequence[] = { static int dissect_rrc_SysInfoType1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType1, SysInfoType1_sequence); @@ -152791,7 +152791,7 @@ static const per_sequence_t SysInfoType2_sequence[] = { static int dissect_rrc_SysInfoType2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType2, SysInfoType2_sequence); @@ -153242,7 +153242,7 @@ static const per_sequence_t SysInfoType3_sequence[] = { static int dissect_rrc_SysInfoType3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType3, SysInfoType3_sequence); @@ -153390,7 +153390,7 @@ static const per_sequence_t SysInfoType4_sequence[] = { static int dissect_rrc_SysInfoType4(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType4, SysInfoType4_sequence); @@ -154197,7 +154197,7 @@ static const per_sequence_t SysInfoType5_sequence[] = { static int dissect_rrc_SysInfoType5(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType5, SysInfoType5_sequence); @@ -154209,7 +154209,7 @@ dissect_rrc_SysInfoType5(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int dissect_rrc_SysInfoType5bis(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_rrc_SysInfoType5(tvb, offset, actx, tree, hf_index); return offset; @@ -154596,7 +154596,7 @@ static const per_sequence_t SysInfoType6_sequence[] = { static int dissect_rrc_SysInfoType6(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType6, SysInfoType6_sequence); @@ -154665,7 +154665,7 @@ static const per_sequence_t SysInfoType7_sequence[] = { static int dissect_rrc_SysInfoType7(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType7, SysInfoType7_sequence); @@ -154697,7 +154697,7 @@ static const per_sequence_t SysInfoType8_sequence[] = { static int dissect_rrc_SysInfoType8(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType8, SysInfoType8_sequence); @@ -154727,7 +154727,7 @@ static const per_sequence_t SysInfoType9_sequence[] = { static int dissect_rrc_SysInfoType9(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType9, SysInfoType9_sequence); @@ -154757,7 +154757,7 @@ static const per_sequence_t SysInfoType10_sequence[] = { static int dissect_rrc_SysInfoType10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType10, SysInfoType10_sequence); @@ -155129,7 +155129,7 @@ static const per_sequence_t SysInfoType11_sequence[] = { static int dissect_rrc_SysInfoType11(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType11, SysInfoType11_sequence); @@ -155278,7 +155278,7 @@ static const per_sequence_t SysInfoType11bis_sequence[] = { static int dissect_rrc_SysInfoType11bis(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType11bis, SysInfoType11bis_sequence); @@ -155309,7 +155309,7 @@ static const per_sequence_t SysInfoType11ter_sequence[] = { static int dissect_rrc_SysInfoType11ter(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType11ter, SysInfoType11ter_sequence); @@ -155549,7 +155549,7 @@ static const per_sequence_t SysInfoType12_sequence[] = { static int dissect_rrc_SysInfoType12(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType12, SysInfoType12_sequence); @@ -155668,7 +155668,7 @@ static const per_sequence_t SysInfoType13_sequence[] = { static int dissect_rrc_SysInfoType13(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType13, SysInfoType13_sequence); @@ -155847,7 +155847,7 @@ static const per_sequence_t SysInfoType14_sequence[] = { static int dissect_rrc_SysInfoType14(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType14, SysInfoType14_sequence); @@ -155967,7 +155967,7 @@ static const per_sequence_t SysInfoType15_sequence[] = { static int dissect_rrc_SysInfoType15(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType15, SysInfoType15_sequence); @@ -156058,7 +156058,7 @@ static const per_sequence_t SysInfoType15bis_sequence[] = { static int dissect_rrc_SysInfoType15bis(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType15bis, SysInfoType15bis_sequence); @@ -156914,7 +156914,7 @@ static const per_sequence_t SysInfoType16_sequence[] = { static int dissect_rrc_SysInfoType16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType16, SysInfoType16_sequence); @@ -157077,7 +157077,7 @@ static const per_sequence_t SysInfoType17_sequence[] = { static int dissect_rrc_SysInfoType17(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType17, SysInfoType17_sequence); @@ -157198,7 +157198,7 @@ static const per_sequence_t SysInfoType18_sequence[] = { static int dissect_rrc_SysInfoType18(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType18, SysInfoType18_sequence); @@ -157459,7 +157459,7 @@ static const per_sequence_t SysInfoType19_sequence[] = { static int dissect_rrc_SysInfoType19(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType19, SysInfoType19_sequence); @@ -157489,7 +157489,7 @@ static const per_sequence_t SysInfoType20_sequence[] = { static int dissect_rrc_SysInfoType20(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType20, SysInfoType20_sequence); @@ -157519,7 +157519,7 @@ static const per_sequence_t SysInfoType21_sequence[] = { static int dissect_rrc_SysInfoType21(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType21, SysInfoType21_sequence); @@ -157600,7 +157600,7 @@ static const per_sequence_t SysInfoType22_sequence[] = { static int dissect_rrc_SysInfoType22(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType22, SysInfoType22_sequence); @@ -157666,7 +157666,7 @@ static const per_sequence_t SysInfoType23_sequence[] = { static int dissect_rrc_SysInfoType23(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType23, SysInfoType23_sequence); @@ -157707,7 +157707,7 @@ static const per_sequence_t SysInfoType24_sequence[] = { static int dissect_rrc_SysInfoType24(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType24, SysInfoType24_sequence); @@ -157737,7 +157737,7 @@ static const per_sequence_t SysInfoType25_sequence[] = { static int dissect_rrc_SysInfoType25(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoType25, SysInfoType25_sequence); @@ -157856,7 +157856,7 @@ static const per_sequence_t SysInfoTypeSB1_sequence[] = { static int dissect_rrc_SysInfoTypeSB1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoTypeSB1, SysInfoTypeSB1_sequence); @@ -157975,7 +157975,7 @@ static const per_sequence_t SysInfoTypeSB2_sequence[] = { static int dissect_rrc_SysInfoTypeSB2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoTypeSB2, SysInfoTypeSB2_sequence); @@ -158006,7 +158006,7 @@ static const per_sequence_t SysInfoTypeSB3_sequence[] = { static int dissect_rrc_SysInfoTypeSB3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SysInfoTypeSB3, SysInfoTypeSB3_sequence); @@ -164005,7 +164005,7 @@ dissect_rrc_SRNC_RelocationInfo_r7_add_ext_IEs(tvbuff_t *tvb _U_, int offset _U_ static int dissect_DL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164015,7 +164015,7 @@ static int dissect_DL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } static int dissect_UL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164025,7 +164025,7 @@ static int dissect_UL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } static int dissect_DL_CCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164035,7 +164035,7 @@ static int dissect_DL_CCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } static int dissect_UL_CCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164045,7 +164045,7 @@ static int dissect_UL_CCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } static int dissect_PCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164055,7 +164055,7 @@ static int dissect_PCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } static int dissect_DL_SHCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164065,7 +164065,7 @@ static int dissect_DL_SHCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U } static int dissect_UL_SHCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164075,7 +164075,7 @@ static int dissect_UL_SHCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U } static int dissect_BCCH_FACH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164085,7 +164085,7 @@ static int dissect_BCCH_FACH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ } static int dissect_BCCH_BCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164095,7 +164095,7 @@ static int dissect_BCCH_BCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U } static int dissect_BCCH_BCH2_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164105,7 +164105,7 @@ static int dissect_BCCH_BCH2_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ } static int dissect_MCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164115,7 +164115,7 @@ static int dissect_MCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } static int dissect_MSCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164125,7 +164125,7 @@ static int dissect_MSCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } int dissect_rrc_HandoverToUTRANCommand_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164135,7 +164135,7 @@ int dissect_rrc_HandoverToUTRANCommand_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } int dissect_rrc_InterRATHandoverInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164145,7 +164145,7 @@ int dissect_rrc_InterRATHandoverInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ } static int dissect_SystemInformation_BCH_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164155,7 +164155,7 @@ static int dissect_SystemInformation_BCH_PDU(tvbuff_t *tvb _U_, packet_info *pin } static int dissect_SystemInformation2_BCH_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164165,7 +164165,7 @@ static int dissect_SystemInformation2_BCH_PDU(tvbuff_t *tvb _U_, packet_info *pi } static int dissect_System_Information_Container_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164175,7 +164175,7 @@ static int dissect_System_Information_Container_PDU(tvbuff_t *tvb _U_, packet_in } static int dissect_UE_RadioAccessCapabilityInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164185,7 +164185,7 @@ static int dissect_UE_RadioAccessCapabilityInfo_PDU(tvbuff_t *tvb _U_, packet_in } int dissect_rrc_MasterInformationBlock_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164195,7 +164195,7 @@ int dissect_rrc_MasterInformationBlock_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } int dissect_rrc_SysInfoType1_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164205,7 +164205,7 @@ int dissect_rrc_SysInfoType1_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot } int dissect_rrc_SysInfoType2_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164215,7 +164215,7 @@ int dissect_rrc_SysInfoType2_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot } int dissect_rrc_SysInfoType3_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164225,7 +164225,7 @@ int dissect_rrc_SysInfoType3_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot } int dissect_rrc_SysInfoType4_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164235,7 +164235,7 @@ int dissect_rrc_SysInfoType4_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot } int dissect_rrc_SysInfoType5_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164245,7 +164245,7 @@ int dissect_rrc_SysInfoType5_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot } static int dissect_SysInfoType5bis_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164255,7 +164255,7 @@ static int dissect_SysInfoType5bis_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } int dissect_rrc_SysInfoType6_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164265,7 +164265,7 @@ int dissect_rrc_SysInfoType6_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot } int dissect_rrc_SysInfoType7_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164275,7 +164275,7 @@ int dissect_rrc_SysInfoType7_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot } static int dissect_SysInfoType8_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164285,7 +164285,7 @@ static int dissect_SysInfoType8_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } static int dissect_SysInfoType9_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164295,7 +164295,7 @@ static int dissect_SysInfoType9_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } static int dissect_SysInfoType10_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164305,7 +164305,7 @@ static int dissect_SysInfoType10_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } int dissect_rrc_SysInfoType11_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164315,7 +164315,7 @@ int dissect_rrc_SysInfoType11_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro } static int dissect_SysInfoType11bis_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164325,7 +164325,7 @@ static int dissect_SysInfoType11bis_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U } static int dissect_SysInfoType11ter_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164335,7 +164335,7 @@ static int dissect_SysInfoType11ter_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U } int dissect_rrc_SysInfoType12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164345,7 +164345,7 @@ int dissect_rrc_SysInfoType12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro } int dissect_rrc_SysInfoType13_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164355,7 +164355,7 @@ int dissect_rrc_SysInfoType13_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro } int dissect_rrc_SysInfoType13_1_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164365,7 +164365,7 @@ int dissect_rrc_SysInfoType13_1_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } int dissect_rrc_SysInfoType13_2_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164375,7 +164375,7 @@ int dissect_rrc_SysInfoType13_2_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } int dissect_rrc_SysInfoType13_3_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164385,7 +164385,7 @@ int dissect_rrc_SysInfoType13_3_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } int dissect_rrc_SysInfoType13_4_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164395,7 +164395,7 @@ int dissect_rrc_SysInfoType13_4_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } int dissect_rrc_SysInfoType14_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164405,7 +164405,7 @@ int dissect_rrc_SysInfoType14_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro } int dissect_rrc_SysInfoType15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164415,7 +164415,7 @@ int dissect_rrc_SysInfoType15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro } static int dissect_SysInfoType15bis_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164425,7 +164425,7 @@ static int dissect_SysInfoType15bis_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U } int dissect_rrc_SysInfoType15_1_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164435,7 +164435,7 @@ int dissect_rrc_SysInfoType15_1_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } static int dissect_SysInfoType15_1bis_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164445,7 +164445,7 @@ static int dissect_SysInfoType15_1bis_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } static int dissect_SysInfoType15_1ter_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164455,7 +164455,7 @@ static int dissect_SysInfoType15_1ter_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } int dissect_rrc_SysInfoType15_2_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164465,7 +164465,7 @@ int dissect_rrc_SysInfoType15_2_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } static int dissect_SysInfoType15_2bis_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164475,7 +164475,7 @@ static int dissect_SysInfoType15_2bis_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } static int dissect_SysInfoType15_2ter_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164485,7 +164485,7 @@ static int dissect_SysInfoType15_2ter_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } int dissect_rrc_SysInfoType15_3_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164495,7 +164495,7 @@ int dissect_rrc_SysInfoType15_3_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } static int dissect_SysInfoType15_3bis_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164505,7 +164505,7 @@ static int dissect_SysInfoType15_3bis_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } int dissect_rrc_SysInfoType15_4_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164515,7 +164515,7 @@ int dissect_rrc_SysInfoType15_4_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } static int dissect_SysInfoType15_5_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164525,7 +164525,7 @@ static int dissect_SysInfoType15_5_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } static int dissect_SysInfoType15_6_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164535,7 +164535,7 @@ static int dissect_SysInfoType15_6_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } static int dissect_SysInfoType15_7_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164545,7 +164545,7 @@ static int dissect_SysInfoType15_7_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } static int dissect_SysInfoType15_8_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164555,7 +164555,7 @@ static int dissect_SysInfoType15_8_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } int dissect_rrc_SysInfoType16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164565,7 +164565,7 @@ int dissect_rrc_SysInfoType16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro } int dissect_rrc_SysInfoType17_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164575,7 +164575,7 @@ int dissect_rrc_SysInfoType17_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro } int dissect_rrc_SysInfoType18_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164585,7 +164585,7 @@ int dissect_rrc_SysInfoType18_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro } int dissect_rrc_SysInfoType19_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164595,7 +164595,7 @@ int dissect_rrc_SysInfoType19_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro } static int dissect_SysInfoType20_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164605,7 +164605,7 @@ static int dissect_SysInfoType20_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } static int dissect_SysInfoType21_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164615,7 +164615,7 @@ static int dissect_SysInfoType21_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } static int dissect_SysInfoType22_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164625,7 +164625,7 @@ static int dissect_SysInfoType22_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } static int dissect_SysInfoType23_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164635,7 +164635,7 @@ static int dissect_SysInfoType23_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } static int dissect_SysInfoType24_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164645,7 +164645,7 @@ static int dissect_SysInfoType24_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } static int dissect_SysInfoType25_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164655,7 +164655,7 @@ static int dissect_SysInfoType25_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } static int dissect_SysInfoTypeSB1_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164665,7 +164665,7 @@ static int dissect_SysInfoTypeSB1_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } static int dissect_SysInfoTypeSB2_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164675,7 +164675,7 @@ static int dissect_SysInfoTypeSB2_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } static int dissect_SysInfoTypeSB3_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164685,7 +164685,7 @@ static int dissect_SysInfoTypeSB3_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } int dissect_rrc_ToTargetRNC_Container_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164695,7 +164695,7 @@ int dissect_rrc_ToTargetRNC_Container_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } int dissect_rrc_TargetRNC_ToSourceRNC_Container_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164705,7 +164705,7 @@ int dissect_rrc_TargetRNC_ToSourceRNC_Container_PDU(tvbuff_t *tvb _U_, packet_in } static int dissect_CellUpdate_r3_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164715,7 +164715,7 @@ static int dissect_CellUpdate_r3_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info } static int dissect_CellUpdateConfirm_r7_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164725,7 +164725,7 @@ static int dissect_CellUpdateConfirm_r7_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packe } static int dissect_InitialDirectTransfer_r3_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164735,7 +164735,7 @@ static int dissect_InitialDirectTransfer_r3_add_ext_IEs_PDU(tvbuff_t *tvb _U_, p } static int dissect_InterRATHandoverInfo_r3_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164745,7 +164745,7 @@ static int dissect_InterRATHandoverInfo_r3_add_ext_IEs_PDU(tvbuff_t *tvb _U_, pa } static int dissect_RadioBearerSetup_r7_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164755,7 +164755,7 @@ static int dissect_RadioBearerSetup_r7_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet } static int dissect_RRCConnectionSetupComplete_r3_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164765,7 +164765,7 @@ static int dissect_RRCConnectionSetupComplete_r3_add_ext_IEs_PDU(tvbuff_t *tvb _ } static int dissect_UE_CapabilityContainer_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164775,7 +164775,7 @@ static int dissect_UE_CapabilityContainer_IEs_PDU(tvbuff_t *tvb _U_, packet_info } static int dissect_UECapabilityInformation_r3_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164785,7 +164785,7 @@ static int dissect_UECapabilityInformation_r3_add_ext_IEs_PDU(tvbuff_t *tvb _U_, } static int dissect_URAUpdate_r3_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164795,7 +164795,7 @@ static int dissect_URAUpdate_r3_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info * } static int dissect_SRNC_RelocationInfo_v3h0ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164805,7 +164805,7 @@ static int dissect_SRNC_RelocationInfo_v3h0ext_IEs_PDU(tvbuff_t *tvb _U_, packet } static int dissect_SRNC_RelocationInfo_r6_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164815,7 +164815,7 @@ static int dissect_SRNC_RelocationInfo_r6_add_ext_IEs_PDU(tvbuff_t *tvb _U_, pac } static int dissect_SRNC_RelocationInfo_r7_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); @@ -164825,7 +164825,7 @@ static int dissect_SRNC_RelocationInfo_r7_add_ext_IEs_PDU(tvbuff_t *tvb _U_, pac } static int dissect_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(prot_ti); + proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 754936d044..f957523c18 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -2671,7 +2671,7 @@ dissect_rsvp_session(proto_item *ti, proto_tree *rsvp_object_tree, proto_item_set_text(ti, "%s", summary_session(tvb, offset)); hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); switch(type) { case RSVP_SESSION_TYPE_IPV4: @@ -2736,7 +2736,7 @@ dissect_rsvp_session(proto_item *ti, proto_tree *rsvp_object_tree, hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID], tvb, offset2+8, 4, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* * Save this information to build the conversation request key @@ -2770,7 +2770,7 @@ dissect_rsvp_session(proto_item *ti, proto_tree *rsvp_object_tree, hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID_IPV6], tvb, offset2+20, 16, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* * Save this information to build the conversation request key @@ -2815,7 +2815,7 @@ dissect_rsvp_session(proto_item *ti, proto_tree *rsvp_object_tree, hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID], tvb, offset2+8, 4, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* * Save this information to build the conversation request key @@ -2842,7 +2842,7 @@ dissect_rsvp_session(proto_item *ti, proto_tree *rsvp_object_tree, hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID], tvb, offset2+8, 4, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* * Save this information to build the conversation request key @@ -2868,7 +2868,7 @@ dissect_rsvp_session(proto_item *ti, proto_tree *rsvp_object_tree, hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID_IPV6], tvb, offset2+8, 16, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* * Save this information to build the conversation request key @@ -2895,7 +2895,7 @@ dissect_rsvp_session(proto_item *ti, proto_tree *rsvp_object_tree, hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID], tvb, offset2+8, 4, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* * Save this information to build the conversation request key @@ -3178,7 +3178,7 @@ dissect_rsvp_hop(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_object_tre proto_tree *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); switch(type) { case 1: @@ -3241,7 +3241,7 @@ dissect_rsvp_time_values(proto_item *ti, proto_tree *rsvp_object_tree, proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); switch(type) { case 1: @@ -3361,7 +3361,7 @@ dissect_rsvp_error(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_object_t proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); switch(type) { case 1: { @@ -3464,7 +3464,7 @@ dissect_rsvp_scope(proto_item *ti _U_, proto_tree *rsvp_object_tree, proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); mylen = obj_length - 4; switch(type) { @@ -3508,7 +3508,7 @@ dissect_rsvp_style(proto_item *ti, proto_tree *rsvp_object_tree, proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); switch(type) { case 1: { @@ -3544,7 +3544,7 @@ dissect_rsvp_confirm(proto_item *ti, proto_tree *rsvp_object_tree, proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); switch(type) { case 1: { @@ -3582,7 +3582,7 @@ dissect_rsvp_template_filter(proto_item *ti, proto_tree *rsvp_object_tree, proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_item_set_text(ti, "%s", summary_template(tvb, offset)); switch(type) { @@ -3882,7 +3882,7 @@ dissect_rsvp_tspec(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_object_t proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); mylen = obj_length - 4; @@ -4101,7 +4101,7 @@ dissect_rsvp_flowspec(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_objec guint16 m; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); mylen = obj_length - 4; @@ -4334,7 +4334,7 @@ dissect_rsvp_adspec(proto_item *ti _U_, packet_info* pinfo, proto_tree *rsvp_obj proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_adspec, tvb, offset+3, 1, ENC_BIG_ENDIAN); mylen = obj_length - 4; @@ -4415,7 +4415,7 @@ dissect_rsvp_integrity(proto_item *ti _U_, proto_tree *rsvp_object_tree, proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_integrity, tvb, offset+3, 1, ENC_BIG_ENDIAN); @@ -4441,7 +4441,7 @@ dissect_rsvp_policy(proto_item *ti _U_, proto_tree *rsvp_object_tree, proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_policy, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_object_tree, hf_rsvp_policy_data, tvb, offset2, obj_length - 4, ENC_NA); @@ -4460,7 +4460,7 @@ dissect_rsvp_label_request(proto_item *ti, proto_tree *rsvp_object_tree, proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_label_request, tvb, offset+3, 1, ENC_BIG_ENDIAN); @@ -4758,7 +4758,7 @@ dissect_rsvp_label(proto_tree *ti, proto_tree *rsvp_object_tree, guint32 unassigned_upstream_label; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); name = (rsvp_class==RSVP_CLASS_SUGGESTED_LABEL ? "SUGGESTED LABEL": (rsvp_class==RSVP_CLASS_UPSTREAM_LABEL ? "UPSTREAM LABEL": @@ -4840,7 +4840,7 @@ dissect_rsvp_label_set(proto_item *ti, proto_tree *rsvp_object_tree, proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_label_set, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_object_tree, hf_rsvp_label_set_action, tvb, offset+4, 1, ENC_BIG_ENDIAN); @@ -4884,7 +4884,7 @@ dissect_rsvp_session_attribute(proto_item *ti, proto_tree *rsvp_object_tree, proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); switch(type) { case 1: @@ -5357,7 +5357,7 @@ dissect_rsvp_explicit_route(proto_item *ti, packet_info* pinfo, proto_tree *rsvp proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); switch(type) { case 1: @@ -5387,7 +5387,7 @@ dissect_rsvp_record_route(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_o proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_item_set_text(ti, "RECORD ROUTE: "); switch(type) { @@ -5416,7 +5416,7 @@ dissect_rsvp_exclude_route(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_ proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_item_set_text(ti, "EXCLUDE ROUTE: "); switch (ctype) { @@ -5446,7 +5446,7 @@ dissect_rsvp_message_id(proto_tree *ti, proto_tree *rsvp_object_tree, proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); switch(type) { case 1: @@ -5515,7 +5515,7 @@ dissect_rsvp_message_id_list(proto_tree *ti, proto_tree *rsvp_object_tree, proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); switch(type) { case 1: @@ -5547,7 +5547,7 @@ dissect_rsvp_hello(proto_tree *ti, proto_tree *rsvp_object_tree, proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); switch(type) { case 1: @@ -5580,7 +5580,7 @@ dissect_rsvp_dclass(proto_tree *ti, proto_tree *rsvp_object_tree, proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_item_set_text(ti, "DCLASS: "); switch(type) { @@ -5629,7 +5629,7 @@ dissect_rsvp_admin_status(proto_tree *ti, proto_tree *rsvp_object_tree, proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_item_set_text(ti, "ADMIN STATUS: "); switch(type) { @@ -5694,7 +5694,7 @@ dissect_rsvp_lsp_attributes(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); if (rsvp_class == RSVP_CLASS_LSP_REQUIRED_ATTRIBUTES) proto_item_set_text(ti, "LSP REQUIRED ATTRIBUTES: "); @@ -5780,7 +5780,7 @@ dissect_rsvp_association(proto_tree *ti, proto_tree *rsvp_object_tree, proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_item_set_text(ti, "ASSOCIATION "); association_type = tvb_get_ntohs (tvb, offset + 4); @@ -5927,7 +5927,7 @@ dissect_rsvp_lsp_tunnel_if_id(proto_tree *ti, packet_info* pinfo, proto_tree *rs proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_item_set_text(ti, "LSP INTERFACE-ID: "); switch(type) { @@ -6001,7 +6001,7 @@ dissect_rsvp_notify_request(proto_item *ti, proto_tree *rsvp_object_tree, proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); switch(type) { case 1: { @@ -6046,7 +6046,7 @@ dissect_rsvp_gen_uni(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_item_set_text(ti, "GENERALIZED UNI: "); @@ -6316,7 +6316,7 @@ dissect_rsvp_call_id(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object proto_tree *ti2 = NULL, *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_item_set_text(ti, "CALL-ID: "); @@ -6496,7 +6496,7 @@ dissect_rsvp_3gpp_object(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_ob proto_tree *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset+=3; proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_3gpp_object, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -6853,7 +6853,7 @@ dissect_rsvp_restart_cap(proto_tree *ti, proto_tree *rsvp_object_tree, proto_tree *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_item_set_text(ti, "RESTART CAPABILITY: "); switch(type) { @@ -6886,7 +6886,7 @@ dissect_rsvp_link_cap(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_objec proto_tree *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_item_set_text(ti, "LINK CAPABILITY: "); switch(type) { @@ -6919,7 +6919,7 @@ dissect_rsvp_protection_info(proto_tree *ti, proto_tree *rsvp_object_tree, proto_tree *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_item_set_text(ti, "PROTECTION_INFO: "); switch(type) { @@ -7073,7 +7073,7 @@ dissect_rsvp_fast_reroute(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_o proto_tree *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_item_set_text(ti, "FAST_REROUTE: "); switch(type) { @@ -7129,7 +7129,7 @@ dissect_rsvp_s2l_sub_lsp(proto_tree *ti, packet_info* pinfo _U_, proto_tree *rsv proto_tree *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_item_set_text(ti, "S2L SUB LSP: "); switch(type) { @@ -7168,7 +7168,7 @@ dissect_rsvp_detour(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object_ proto_tree *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_item_set_text(ti, "DETOUR: "); switch(type) { @@ -7228,7 +7228,7 @@ dissect_rsvp_diffserv(proto_tree *ti, proto_tree *rsvp_object_tree, proto_tree *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_item_set_text(ti, "DIFFSERV: "); offset += 3; @@ -7277,10 +7277,10 @@ dissect_rsvp_diffserv_aware_te(proto_tree *ti, proto_tree *rsvp_object_tree, hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_filter[RSVPF_DSTE], tvb, offset, 8, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); switch(type) { case 1: @@ -7325,10 +7325,10 @@ dissect_rsvp_vendor_private_use(proto_tree *ti _U_, hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_filter[RSVPF_PRIVATE_OBJ], tvb, offset, obj_length, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_vendor, tvb, offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_object_tree, @@ -7393,10 +7393,10 @@ dissect_rsvp_juniper(proto_tree *ti _U_, hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_filter[RSVPF_JUNIPER], tvb, offset, obj_length, ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_juniper, tvb, offset + 3, 1, ENC_BIG_ENDIAN); offset += 4; @@ -7475,7 +7475,7 @@ dissect_rsvp_unknown(proto_tree *ti _U_, proto_tree *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_unknown, tvb, offset + 3, 1, ENC_BIG_ENDIAN); if (obj_length > 4) { @@ -7553,7 +7553,7 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case RSVPF_NOTIFY: hidden_item = proto_tree_add_boolean(rsvp_header_tree, hf_rsvp_filter[RSVPF_MSG + message_type], tvb, offset+1, 1, 1); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); break; } diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 905e6db54e..4672163ae3 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -1727,7 +1727,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree guint8 t2timer_code, participants_code; proto_item *item; item = proto_tree_add_uint( tree, hf_rtcp_app_poc1_subtype, tvb, offset - 8, 1, rtcp_subtype ); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); col_add_fstr(pinfo->cinfo, COL_INFO,"(%s) %s",ascii_name, val_to_str(rtcp_subtype,rtcp_app_poc1_floor_cnt_type_vals,"unknown (%u)") ); offset += 4; @@ -2947,7 +2947,7 @@ dissect_rtcp_xr(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree, offset+=4; proto_tree_add_item(content_tree, hf_rtcp_xr_idms_ntp_rcv_ts, tvb, offset, 8, ENC_BIG_ENDIAN); item = proto_tree_add_item(content_tree, hf_rtcp_ntp, tvb, offset, 8, ENC_TIME_NTP|ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); proto_tree_add_item(content_tree, hf_rtcp_xr_idms_rtp_ts, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; @@ -3021,7 +3021,7 @@ dissect_rtcp_rsi( tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree proto_tree_add_item(tree, hf_rtcp_ntp_lsw, tvb, offset+4, 4, ENC_BIG_ENDIAN); item = proto_tree_add_item(tree, hf_rtcp_ntp, tvb, offset, 8, ENC_TIME_NTP|ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); offset += 8; /* Sub report blocks */ @@ -3282,7 +3282,7 @@ dissect_rtcp_sr( packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tree *tree proto_tree_add_item(tree, hf_rtcp_ntp_lsw, tvb, offset+4, 4, ENC_BIG_ENDIAN); item = proto_tree_add_item(tree, hf_rtcp_ntp, tvb, offset, 8, ENC_TIME_NTP|ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); offset += 8; /* RTP timestamp, 32 bits */ @@ -3364,17 +3364,17 @@ void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Stream setup by %s (frame %u)", p_conv_data->setup_method, p_conv_data->setup_frame_number); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); rtcp_setup_tree = proto_item_add_subtree(ti, ett_rtcp_setup); if (rtcp_setup_tree) { /* Add details into subtree */ proto_item *item = proto_tree_add_uint(rtcp_setup_tree, hf_rtcp_setup_frame, tvb, 0, 0, p_conv_data->setup_frame_number); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_string(rtcp_setup_tree, hf_rtcp_setup_method, tvb, 0, 0, p_conv_data->setup_method); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } } @@ -3584,13 +3584,13 @@ static void add_roundtrip_delay_info(tvbuff_t *tvb, packet_info *pinfo, proto_tr proto_item *item = proto_tree_add_uint(tree, hf_rtcp_last_sr_timestamp_frame, tvb, 0, 0, frame); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); /* Time elapsed since 'Last SR' time in capture */ item = proto_tree_add_uint(tree, hf_rtcp_time_since_last_sr, tvb, 0, 0, gap_between_reports); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); /* Don't report on calculated delays below the threshold. Will report delays less than -threshold, to highlight @@ -3602,7 +3602,7 @@ static void add_roundtrip_delay_info(tvbuff_t *tvb, packet_info *pinfo, proto_tr /* Calculated delay in ms */ item = proto_tree_add_int(tree, hf_rtcp_roundtrip_delay, tvb, 0, 0, delay); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); /* Add to expert info */ if (delay >= 0) @@ -3923,7 +3923,7 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U 0, 0, TRUE, "OK - %u bytes", offset); /* Hidden might be less annoying here...? */ - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else { @@ -3931,7 +3931,7 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U 0, 0, FALSE, "Wrong (expected %u bytes, found %d)", total_packet_length, offset); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); expert_add_info_format(pinfo, ti, &ei_rtcp_length_check, "Incorrect RTCP packet length information (expected %u bytes, found %d)", total_packet_length, offset); } diff --git a/epan/dissectors/packet-rtitcp.c b/epan/dissectors/packet-rtitcp.c index 6010af7411..8b412fc8cc 100644 --- a/epan/dissectors/packet-rtitcp.c +++ b/epan/dissectors/packet-rtitcp.c @@ -566,7 +566,7 @@ static guint16 dissect_control_message(proto_tree *rtitcp_tree, tvbuff_t *tvb, p proto_item *it; it = proto_tree_add_uint(rtitcp_message, hf_rtitcp_response_in, tvb, 0, 0, rtitcp_trans->rep_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else { /* This is a reply */ @@ -575,11 +575,11 @@ static guint16 dissect_control_message(proto_tree *rtitcp_tree, tvbuff_t *tvb, p nstime_t ns; it = proto_tree_add_uint(rtitcp_message, hf_rtitcp_response_to, tvb, 0, 0, rtitcp_trans->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &rtitcp_trans->req_time); it = proto_tree_add_time(rtitcp_message, hf_rtitcp_response_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } diff --git a/epan/dissectors/packet-rtls.c b/epan/dissectors/packet-rtls.c index 44cff0ba0b..d61e094e1b 100644 --- a/epan/dissectors/packet-rtls.c +++ b/epan/dissectors/packet-rtls.c @@ -243,7 +243,7 @@ hf_rtls_nack_flags, ett_rtls_nack_flags, rtls_nack_flags, ENC_BIG_ENDIAN, BMT_NO offset += 6; proto_tree_add_item(rtls_tree, hf_rtls_tr_rssi, tvb, offset, 1, ENC_BIG_ENDIAN); ti_rssi = proto_tree_add_item(rtls_tree, hf_rtls_tr_rssi_calculated, tvb, offset, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(ti_rssi); + proto_item_set_generated(ti_rssi); offset += 1; proto_tree_add_item(rtls_tree, hf_rtls_tr_noise_floor, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -277,7 +277,7 @@ hf_rtls_nack_flags, ett_rtls_nack_flags, rtls_nack_flags, ENC_BIG_ENDIAN, BMT_NO offset += 1; proto_tree_add_item(rtls_tree, hf_rtls_sr_rssi, tvb, offset, 1, ENC_BIG_ENDIAN); ti_rssi = proto_tree_add_item(rtls_tree, hf_rtls_sr_rssi_calculated, tvb, offset, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(ti_rssi); + proto_item_set_generated(ti_rssi); offset += 1; proto_tree_add_item(rtls_tree, hf_rtls_sr_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -303,7 +303,7 @@ hf_rtls_nack_flags, ett_rtls_nack_flags, rtls_nack_flags, ENC_BIG_ENDIAN, BMT_NO offset += 1; proto_tree_add_item(rtls_tree, hf_rtls_ser_rssi, tvb, offset, 1, ENC_BIG_ENDIAN); ti_rssi = proto_tree_add_item(rtls_tree, hf_rtls_ser_rssi_calculated, tvb, offset, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(ti_rssi); + proto_item_set_generated(ti_rssi); offset += 1; proto_tree_add_item(rtls_tree, hf_rtls_ser_duration, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -327,7 +327,7 @@ hf_rtls_nack_flags, ett_rtls_nack_flags, rtls_nack_flags, ENC_BIG_ENDIAN, BMT_NO offset += 1; proto_tree_add_item(rtls_tree, hf_rtls_aer_rssi, tvb, offset, 1, ENC_BIG_ENDIAN); ti_rssi = proto_tree_add_item(rtls_tree, hf_rtls_aer_rssi_calculated, tvb, offset, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(ti_rssi); + proto_item_set_generated(ti_rssi); offset += 1; proto_tree_add_item(rtls_tree, hf_rtls_aer_duration, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; diff --git a/epan/dissectors/packet-rtp-ed137.c b/epan/dissectors/packet-rtp-ed137.c index ab25b44721..24263cdc5a 100644 --- a/epan/dissectors/packet-rtp-ed137.c +++ b/epan/dissectors/packet-rtp-ed137.c @@ -755,7 +755,7 @@ dissect_rtp_hdr_ext_ed137b_feature_rrc_single(tvbuff_t *tvb, packet_info *pinfo /* Generated item points really to previous byte */ item = proto_tree_add_item( tree, hf_rtp_hdr_ed137b_ft_rrc_single, tvb, -1, 1, ENC_NA); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); proto_tree_add_item( tree, hf_rtp_hdr_ed137b_ft_rrc_single_ms_tx_f1, tvb, 0, 1, ENC_BIG_ENDIAN); proto_tree_add_item( tree, hf_rtp_hdr_ed137b_ft_rrc_single_ms_rx_f1, tvb, 0, 1, ENC_BIG_ENDIAN); @@ -779,7 +779,7 @@ dissect_rtp_hdr_ext_ed137b_feature_climax_ddc_rmm(tvbuff_t *tvb, packet_info *pi /* Generated item points really to previous byte */ item = proto_tree_add_item( tree, hf_rtp_hdr_ed137b_ft_climax_ddc_rmm, tvb, -1, 1, ENC_NA); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); ext_value = tvb_get_ntoh24( tvb, 0 ); climax_ddc_rmm_tqv = RTP_ED137B_feature_climax_ddc_rmm_tqv(ext_value); @@ -802,7 +802,7 @@ dissect_rtp_hdr_ext_ed137b_feature_climax_ddc_mam(tvbuff_t *tvb, packet_info *pi /* Generated item points really to previous byte */ item = proto_tree_add_item( tree, hf_rtp_hdr_ed137b_ft_climax_ddc_mam, tvb, -1, 1, ENC_NA); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); ext_value = tvb_get_ntoh24( tvb, 0 + 0 ); climax_ddc_mam_tqg = RTP_ED137B_feature_climax_ddc_mam_tqg(ext_value); @@ -835,7 +835,7 @@ dissect_rtp_hdr_ext_ed137c_feature_climax_ddc_mam(tvbuff_t *tvb, packet_info *pi /* Generated item points really to previous byte */ item = proto_tree_add_item( tree, hf_rtp_hdr_ed137c_ft_climax_ddc_mam, tvb, -1, 1, ENC_NA); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); ext_value = tvb_get_ntoh24( tvb, 0 + 0 ); climax_ddc_mam_tqg = RTP_ED137C_feature_climax_ddc_mam_tqg(ext_value); diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 603ad31c3e..c60335f4fd 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -1549,7 +1549,7 @@ dissect_rtp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rtp_tree_item = proto_tree_add_uint( tree, hf_rtp_reassembled_in, newtvb, deseg_offset, tvb_reported_length_remaining(newtvb, deseg_offset), fd_head->reassembled_in); - PROTO_ITEM_SET_GENERATED(rtp_tree_item); + proto_item_set_generated(rtp_tree_item); #ifdef DEBUG_FRAGMENTS g_debug("\tReassembled in %d", fd_head->reassembled_in); #endif @@ -2079,7 +2079,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ proto_tree_add_uint( rtp_tree, hf_rtp_seq_nr, tvb, offset, 2, seq_num ); if(p_conv_data != NULL) { item = proto_tree_add_uint( rtp_tree, hf_rtp_ext_seq_nr, tvb, offset, 2, p_conv_data->extended_seqno ); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } offset += 2; @@ -2566,17 +2566,17 @@ show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "", "Stream setup by %s (frame %u)", p_conv_data->method, p_conv_data->frame_number); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); rtp_setup_tree = proto_item_add_subtree(ti, ett_rtp_setup); if (rtp_setup_tree) { /* Add details into subtree */ proto_item* item = proto_tree_add_uint(rtp_setup_tree, hf_rtp_setup_frame, tvb, 0, 0, p_conv_data->frame_number); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_string(rtp_setup_tree, hf_rtp_setup_method, tvb, 0, 0, p_conv_data->method); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (p_conv_data->rtp_sdp_setup_info_list){ guint i; @@ -2586,15 +2586,15 @@ show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (stored_setup_info->hf_id) { if (stored_setup_info->hf_type == SDP_TRACE_ID_HF_TYPE_STR) { item = proto_tree_add_string(rtp_setup_tree, stored_setup_info->hf_id, tvb, 0, 0, stored_setup_info->trace_id.str); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (stored_setup_info->add_hidden == TRUE) { - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); } } else if (stored_setup_info->hf_type == SDP_TRACE_ID_HF_TYPE_GUINT32) { item = proto_tree_add_uint(rtp_setup_tree, stored_setup_info->hf_id, tvb, 0, 0, stored_setup_info->trace_id.num); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (stored_setup_info->add_hidden == TRUE) { - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); } } } diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c index 425ff811a5..7b0825c6fd 100644 --- a/epan/dissectors/packet-rtpproxy.c +++ b/epan/dissectors/packet-rtpproxy.c @@ -296,13 +296,13 @@ rtpproxy_add_tag(proto_tree *rtpproxy_tree, tvbuff_t *tvb, guint begin, guint re another_tree = proto_item_add_subtree(ti, ett_rtpproxy_tag); ti = proto_tree_add_item(another_tree, hf_rtpproxy_mediaid, tvb, new_offset+1, 0, ENC_ASCII | ENC_NA); proto_item_append_text(ti, "<skipped>"); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else{ ti = proto_tree_add_item(rtpproxy_tree, hf_rtpproxy_tag, tvb, begin, new_offset - begin, ENC_ASCII | ENC_NA); if ((guint)new_offset == begin){ proto_item_append_text(ti, "<skipped>"); /* A very first Offer/Update command */ - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } another_tree = proto_item_add_subtree(ti, ett_rtpproxy_tag); proto_tree_add_item(another_tree, hf_rtpproxy_mediaid, tvb, new_offset+1, end - (new_offset+1), ENC_ASCII | ENC_NA); @@ -446,13 +446,13 @@ rtpproxy_add_tid(gboolean is_request, tvbuff_t *tvb, packet_info *pinfo, proto_t nstime_t ns; pi = proto_tree_add_uint(rtpproxy_tree, is_request ? hf_rtpproxy_response_in : hf_rtpproxy_request_in, tvb, 0, 0, is_request ? rtpproxy_info->resp_frame : rtpproxy_info->req_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* If not a request (so it's a reply) then calculate response time */ if (!is_request){ nstime_delta(&ns, &pinfo->abs_ts, &rtpproxy_info->req_time); pi = proto_tree_add_time(rtpproxy_tree, hf_rtpproxy_response_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); if (nstime_cmp(&rtpproxy_timeout_ns, &ns) < 0) expert_add_info_format(pinfo, rtpproxy_tree, &ei_rtpproxy_timeout, "Response timeout %.3f seconds", nstime_to_sec(&ns)); } @@ -502,7 +502,7 @@ rtpproxy_add_notify_addr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *rtpproxy ti = proto_tree_add_ipv4(rtpproxy_tree, hf_rtpproxy_notify_ipv4, tvb, begin, 0, *(const guint32*)(pinfo->src.data)); else ti = proto_tree_add_ipv6(rtpproxy_tree, hf_rtpproxy_notify_ipv6, tvb, begin, 0, (const ws_in6_addr *)(pinfo->src.data)); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_uint(rtpproxy_tree, hf_rtpproxy_notify_port, tvb, begin, end - begin, (guint16) g_ascii_strtoull((gchar*)tvb_get_string_enc(wmem_packet_scope(), tvb, begin, end - begin, ENC_ASCII), NULL, 10)); } @@ -788,7 +788,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data if(rtpproxy_info && rtpproxy_info->callid){ ti = proto_tree_add_string(rtpproxy_tree, hf_rtpproxy_callid, tvb, offset, 0, rtpproxy_info->callid); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (tmp == 'e'){ diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 0b50c79b2c..eae83c70b2 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -2185,7 +2185,7 @@ static void rtps_util_add_guid_prefix_v2(proto_tree *tree, tvbuff_t *tvb, gint o /* Optional filter that can be guidPrefix.src or guidPrefix.dst */ if (hf_prefix_extra != 0) { ti = proto_tree_add_item(tree, hf_prefix_extra, tvb, offset, 12, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); } /* Host Id */ @@ -3359,7 +3359,7 @@ static gint rtps_util_add_type_id(proto_tree *tree, int hf_type; short_number = tvb_get_guint16(tvb, offset, encoding); ti = proto_tree_add_item(tree, hf_rtps_type_object_type_id_disc, tvb, offset, 2, encoding); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); /* Here we choose the proper hf item to use */ if (hf_base != -1) { @@ -3896,19 +3896,19 @@ static int rtps_util_add_bitmap(proto_tree *tree, if (first_seq_number == 0 && show_analysis) { ti = proto_tree_add_uint_format(bitmap_tree, hf_rtps_acknack_analysis, tvb, 0, 0, 1, "Acknack Analysis: Preemptive ACKNACK"); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (first_seq_number > 0 && num_bits == 0 && show_analysis) { ti = proto_tree_add_uint_format(bitmap_tree, hf_rtps_acknack_analysis, tvb, 0, 0, 2, "Acknack Analysis: Expecting sample %" G_GINT64_MODIFIER "u", first_seq_number); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (num_bits > 0 && show_analysis) { ti = proto_tree_add_uint_format(bitmap_tree, hf_rtps_acknack_analysis, tvb, 0, 0, 3, "Acknack Analysis: Lost samples"); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Reads the bits (and format the print buffer) */ @@ -4151,19 +4151,19 @@ static void rtps_util_topic_info_add_tree(proto_tree *tree, tvbuff_t *tvb, ett_rtps_topic_info, NULL, "[Topic Information (from Discovery)]"); ti = proto_tree_add_string(topic_info_tree, hf_rtps_param_topic_name, tvb, offset, 0, type_mapping_object->topic_name); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_string(topic_info_tree, hf_rtps_param_type_name, tvb, offset, 0, type_mapping_object->type_name); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); dw_qos_tree = proto_tree_add_subtree_format(topic_info_tree, tvb, 0, 0, ett_rtps_topic_info_dw_qos, NULL, "DataWriter QoS: %s, %s, %s", val_to_str(type_mapping_object->dw_qos.reliability_kind, reliability_qos_vals, "%02x"), val_to_str(type_mapping_object->dw_qos.durability_kind, durability_qos_vals, "%02x"), val_to_str(type_mapping_object->dw_qos.ownership_kind, ownership_qos_vals, "%02x")); - PROTO_ITEM_SET_GENERATED(dw_qos_tree); + proto_item_set_generated(dw_qos_tree); ti = proto_tree_add_uint(topic_info_tree, hf_rtps_dcps_publication_data_frame_number, tvb, 0, 0, type_mapping_object->dcps_publication_frame_number); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } } @@ -10048,14 +10048,14 @@ static gboolean dissect_rtps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree } ti = proto_tree_add_uint(mapping_tree, hf_rtps_domain_id, tvb, 0, 0, domain_id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if ((nature == PORT_METATRAFFIC_UNICAST) || (nature == PORT_USERTRAFFIC_UNICAST) || (version < 0x0200)) { ti = proto_tree_add_uint(mapping_tree, hf_rtps_participant_idx, tvb, 0, 0, participant_idx); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } ti = proto_tree_add_uint(mapping_tree, hf_rtps_nature_type, tvb, 0, 0, nature); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* offset behind RTPS's Header (need to be set in case tree=NULL)*/ diff --git a/epan/dissectors/packet-s7comm.c b/epan/dissectors/packet-s7comm.c index 2908e37717..ee6c59a5c3 100644 --- a/epan/dissectors/packet-s7comm.c +++ b/epan/dissectors/packet-s7comm.c @@ -5241,7 +5241,7 @@ dissect_s7comm(tvbuff_t *tvb, /* when there is an error, use the errorcode from parameterpart*/ if (errorcode > 0) { s7comm_item = proto_tree_add_item(s7comm_header_tree, hf_s7comm_param_errcod, tvb, offset-2, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED (s7comm_item); + proto_item_set_generated (s7comm_item); } } diff --git a/epan/dissectors/packet-sbc.c b/epan/dissectors/packet-sbc.c index 6d67d0b098..612ed5285f 100644 --- a/epan/dissectors/packet-sbc.c +++ b/epan/dissectors/packet-sbc.c @@ -217,19 +217,19 @@ dissect_sbc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) /* TODO: expert_info for invalid CRC */ pitem = proto_tree_add_uint(rtree, hf_sbc_expected_data_speed, tvb, offset, 0, expected_speed_data / 1024); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); frame_duration = (((double) frame_length / (double) expected_speed_data) * 1000.0); cumulative_frame_duration += frame_duration; pitem = proto_tree_add_double(rtree, hf_sbc_frame_duration, tvb, offset, 0, frame_duration); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); counter += 1; } pitem = proto_tree_add_double(sbc_tree, hf_sbc_cumulative_frame_duration, tvb, offset, 0, cumulative_frame_duration); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); if (info && info->configuration && info->configuration_length > 0) { /* TODO: display current codec configuration */ @@ -240,14 +240,14 @@ dissect_sbc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) nstime_delta(&delta, &pinfo->abs_ts, &info->previous_media_packet_info->abs_ts); pitem = proto_tree_add_double(sbc_tree, hf_sbc_delta_time, tvb, offset, 0, nstime_to_msec(&delta)); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); pitem = proto_tree_add_double(sbc_tree, hf_sbc_avrcp_song_position, tvb, offset, 0, info->previous_media_packet_info->avrcp_song_position); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); nstime_delta(&delta, &pinfo->abs_ts, &info->previous_media_packet_info->first_abs_ts); pitem = proto_tree_add_double(sbc_tree, hf_sbc_delta_time_from_the_beginning, tvb, offset, 0, nstime_to_msec(&delta)); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); if (!pinfo->fd->visited) { info->current_media_packet_info->cumulative_frame_duration += cumulative_frame_duration; @@ -255,10 +255,10 @@ dissect_sbc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } pitem = proto_tree_add_double(sbc_tree, hf_sbc_cumulative_duration, tvb, offset, 0, info->previous_media_packet_info->cumulative_frame_duration); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); pitem = proto_tree_add_double(sbc_tree, hf_sbc_diff, tvb, offset, 0, info->previous_media_packet_info->cumulative_frame_duration - nstime_to_msec(&delta)); - PROTO_ITEM_SET_GENERATED(pitem); + proto_item_set_generated(pitem); } /* TODO: more precise dissection: blocks, channels, subbands, padding */ diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index 2c8c66d67b..7dab381c3f 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -1711,7 +1711,7 @@ dissect_sccp_dlr_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guin sccp_info->dlr = tvb_get_letoh24(tvb, 0); proto_tree_add_uint(tree, hf_sccp_dlr, tvb, 0, length, sccp_info->dlr); lr_item = proto_tree_add_uint(tree, hf_sccp_lr, tvb, 0, length, sccp_info->dlr); - PROTO_ITEM_SET_GENERATED(lr_item); + proto_item_set_generated(lr_item); if (show_key_params) col_append_fstr(pinfo->cinfo, COL_INFO, "DLR=%d ", sccp_info->dlr); @@ -1731,7 +1731,7 @@ dissect_sccp_slr_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guin sccp_info->slr = tvb_get_letoh24(tvb, 0); proto_tree_add_uint(tree, hf_sccp_slr, tvb, 0, length, sccp_info->slr); lr_item = proto_tree_add_uint(tree, hf_sccp_lr, tvb, 0, length, sccp_info->slr); - PROTO_ITEM_SET_GENERATED(lr_item); + proto_item_set_generated(lr_item); if (show_key_params) col_append_fstr(pinfo->cinfo, COL_INFO, "SLR=%d ", sccp_info->slr); @@ -2081,7 +2081,7 @@ dissect_sccp_called_calling_param(tvbuff_t *tvb, proto_tree *tree, packet_info * tvb, offset, ADDRESS_SSN_LENGTH, ssn); hidden_item = proto_tree_add_uint(call_tree, hf_sccp_ssn, tvb, offset, ADDRESS_SSN_LENGTH, ssn); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset += ADDRESS_SSN_LENGTH; @@ -2096,7 +2096,7 @@ dissect_sccp_called_calling_param(tvbuff_t *tvb, proto_tree *tree, packet_info * if (ssn_dissector_short_name) { item = proto_tree_add_string_format(call_tree, hf_sccp_linked_dissector, tvb, offset - 1, ADDRESS_SSN_LENGTH, ssn_dissector_short_name, "Linked to %s", ssn_dissector_short_name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (g_ascii_strncasecmp("TCAP", ssn_dissector_short_name, 4)== 0) { tcap_ssn_dissector = get_itu_tcap_subdissector(ssn); @@ -2166,7 +2166,7 @@ dissect_sccp_called_calling_param(tvbuff_t *tvb, proto_tree *tree, packet_info * tvb, offset, ADDRESS_SSN_LENGTH, ssn); hidden_item = proto_tree_add_uint(call_tree, hf_sccp_ssn, tvb, offset, ADDRESS_SSN_LENGTH, ssn); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); offset += ADDRESS_SSN_LENGTH; } @@ -2771,7 +2771,7 @@ dissect_sccp_variable_parameter(tvbuff_t *tvb, packet_info *pinfo, parameter_length); if (!sccp_show_length) { /* The user doesn't want to see it... */ - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); } offset += length_length; @@ -2823,11 +2823,11 @@ static void build_assoc_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccp { if (trace_sccp && sccp_info->assoc && (sccp_info->assoc != &no_assoc)) { proto_item *pi = proto_tree_add_uint(sccp_tree, hf_sccp_assoc_id, tvb, 0, 0, sccp_info->assoc->id); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); proto_tree *pt = proto_item_add_subtree(pi, ett_sccp_assoc); if(sccp_info->assoc->imsi){ proto_item *pi2 = proto_tree_add_string(sccp_tree, hf_assoc_imsi, tvb, 0, 0, sccp_info->assoc->imsi); - PROTO_ITEM_SET_GENERATED(pi2); + proto_item_set_generated(pi2); } if (sccp_info->assoc->msgs) { sccp_msg_info_t *m; @@ -2846,7 +2846,7 @@ static void build_assoc_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccp tap_queue_packet(sccp_tap, pinfo, m); proto_item_append_text(pi," (current)"); } - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } } } diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c index 8d7ca651b4..a42dc29faa 100644 --- a/epan/dissectors/packet-scsi-mmc.c +++ b/epan/dissectors/packet-scsi-mmc.c @@ -745,7 +745,7 @@ dissect_mmc4_readdiscstructure (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre proto_item *ti; ti = proto_tree_add_uint (tree, hf_scsi_mmc_read_dvd_format, tvb, 0, 0, cdata->itlq->flags); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 4; diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c index 6e0009e606..d86551d576 100644 --- a/epan/dissectors/packet-scsi-osd.c +++ b/epan/dissectors/packet-scsi-osd.c @@ -1293,12 +1293,12 @@ dissect_osd_partition_id(packet_info *pinfo, tvbuff_t *tvb, int offset, if (part_info->created_in) { proto_item *tmp_item; tmp_item = proto_tree_add_uint(partition_tree, hf_scsi_osd_partition_created_in, tvb, 0, 0, part_info->created_in); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); } if (part_info->removed_in) { proto_item *tmp_item; tmp_item = proto_tree_add_uint(partition_tree, hf_scsi_osd_partition_removed_in, tvb, 0, 0, part_info->removed_in); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); } } @@ -3387,7 +3387,7 @@ dissect_osd_opcode(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (svcaction) { proto_item *it; it = proto_tree_add_uint_format_value(tree, hf_scsi_osd_svcaction, tvb, 0, 0, svcaction, "0x%04x", svcaction); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } dissector = find_svcaction_dissector(svcaction); if (dissector) { diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 910d80fd9b..fb0b897c07 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -2869,7 +2869,7 @@ dissect_scsi_evpd(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, i++; ti = proto_tree_add_uint(des_tree, hf_scsi_inq_evpd_identifier_number, tvb, offset, 0, i); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); codeset = tvb_get_guint8(tvb, offset) & 0x0F; ti = proto_tree_add_item(des_tree, hf_scsi_inq_evpd_devid_code_set, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -4057,7 +4057,7 @@ dissect_scsi_spc_modepage(tvbuff_t *tvb, packet_info *pinfo _U_, proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, hf_scsi_modesns_errrep, tvb, offset+3, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } else { proto_tree_add_item(tree, hf_scsi_modesns_errrep, tvb, offset+3, 1, ENC_BIG_ENDIAN); @@ -5387,7 +5387,7 @@ dissect_spc_mgmt_protocol_in(tvbuff_t *tvb_a, packet_info *pinfo _U_, csdata = get_cmdset_data(cdata->itlq, cdata->itl); it = proto_tree_add_uint(tree, hf_scsi_mpi_service_action, tvb_a, 0, 0, cdata->itlq->flags & 0x7f); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); TRY_SCSI_CDB_ALLOC_LEN(cdata->itlq->alloc_len); /* (defines/initializes try_tvb & try_offset) */ @@ -5519,9 +5519,9 @@ dissect_scsi_fix_snsinfo(tvbuff_t *tvb, proto_tree *sns_tree, guint offset) { proto_tree_add_item(sns_tree, hf_scsi_sns_command_specific_information, tvb, offset+8, 4, ENC_NA); proto_tree_add_item(sns_tree, hf_scsi_ascascq, tvb, offset+12, 2, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_item(sns_tree, hf_scsi_asc, tvb, offset+12, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item(sns_tree, hf_scsi_ascq, tvb, offset+13, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(sns_tree, hf_scsi_fru, tvb, offset+14, 1, ENC_BIG_ENDIAN); dissect_scsi_sns_specific_info(tvb,sns_tree,offset+15,flags&0x0F); } @@ -5781,30 +5781,30 @@ dissect_scsi_rsp(tvbuff_t *tvb, packet_info *pinfo, } ti = proto_tree_add_uint(scsi_tree, hf_scsi_lun, tvb, 0, 0, itlq->lun); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (itl) { ti = proto_tree_add_uint_format(scsi_tree, hf_scsi_inq_devtype, tvb, 0, 0, itl->cmdset&SCSI_CMDSET_MASK, "Command Set:%s (0x%02x) %s", val_to_str(itl->cmdset&SCSI_CMDSET_MASK, scsi_devtype_val, "Unknown (%d)"), itl->cmdset&SCSI_CMDSET_MASK,itl->cmdset&SCSI_CMDSET_DEFAULT?"(Using default commandset)":""); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (itlq->scsi_opcode != 0xffff) { ti = proto_tree_add_uint(scsi_tree, csdata->hf_opcode, tvb, 0, 0, itlq->scsi_opcode); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } if (itlq->first_exchange_frame) { nstime_t delta_time; ti = proto_tree_add_uint(scsi_tree, hf_scsi_request_frame, tvb, 0, 0, itlq->first_exchange_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); nstime_delta(&delta_time, &pinfo->abs_ts, &itlq->fc_time); ti = proto_tree_add_time(scsi_tree, hf_scsi_time, tvb, 0, 0, &delta_time); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } ti = proto_tree_add_uint(scsi_tree, hf_scsi_status, tvb, 0, 0, scsi_status); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); col_add_fstr(pinfo->cinfo, COL_INFO, "SCSI: Response LUN: 0x%02x (%s) (%s)", itlq->lun, val_to_str_ext(itlq->scsi_opcode, csdata->cdb_vals_ext, "CDB:0x%02x"), val_to_str(scsi_status, scsi_status_val, "Unknown (0x%08x)")); @@ -5839,7 +5839,7 @@ dissect_scsi_snsinfo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ti = proto_tree_add_uint(sns_tree, hf_scsi_lun, tvb, 0, 0, itlq->lun); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); col_append_fstr(pinfo->cinfo, COL_INFO, " LUN:0x%02x ", itlq->lun); col_set_fence(pinfo->cinfo, COL_INFO); @@ -6183,16 +6183,16 @@ dissect_scsi_cdb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } ti = proto_tree_add_uint(scsi_tree, hf_scsi_lun, tvb, 0, 0, itlq->lun); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (itl) { ti = proto_tree_add_uint_format(scsi_tree, hf_scsi_inq_devtype, tvb, 0, 0, itl->cmdset&SCSI_CMDSET_MASK, "Command Set:%s (0x%02x) %s", val_to_str(itl->cmdset&SCSI_CMDSET_MASK, scsi_devtype_val, "Unknown (%d)"), itl->cmdset&SCSI_CMDSET_MASK,itl->cmdset&SCSI_CMDSET_DEFAULT?"(Using default commandset)":""); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (itlq->last_exchange_frame) { ti = proto_tree_add_uint(scsi_tree, hf_scsi_response_frame, tvb, 0, 0, itlq->last_exchange_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } @@ -6281,7 +6281,7 @@ dissect_scsi_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, col_set_fence(pinfo->cinfo, COL_INFO); ti = proto_tree_add_uint(scsi_tree, hf_scsi_lun, tvb, 0, 0, itlq->lun); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (itl) { ti = proto_tree_add_uint_format(scsi_tree, hf_scsi_inq_devtype, tvb, 0, 0, itl->cmdset&SCSI_CMDSET_MASK, @@ -6289,22 +6289,22 @@ dissect_scsi_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, val_to_str(itl->cmdset&SCSI_CMDSET_MASK, scsi_devtype_val, "Unknown (%d)"), itl->cmdset&SCSI_CMDSET_MASK, itl->cmdset&SCSI_CMDSET_DEFAULT ? "(Using default commandset)" : ""); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (itlq && (itlq->scsi_opcode != 0xffff)) { ti = proto_tree_add_uint(scsi_tree, csdata->hf_opcode, tvb, 0, 0, itlq->scsi_opcode); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } if (itlq->first_exchange_frame) { ti = proto_tree_add_uint(scsi_tree, hf_scsi_request_frame, tvb, 0, 0, itlq->first_exchange_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (itlq->last_exchange_frame) { ti = proto_tree_add_uint(scsi_tree, hf_scsi_response_frame, tvb, 0, 0, itlq->last_exchange_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 3269ab0b48..11d2e77ebc 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -1119,12 +1119,12 @@ tsn_tree(sctp_tsn_t *t, proto_item *tsn_item, packet_info *pinfo, pi = proto_tree_add_uint(tsn_tree_pt, hf_sctp_retransmission, tvb, 0, 0, t->first_transmit.framenum); pt = proto_item_add_subtree(pi, ett_sctp_tsn_retransmission); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); expert_add_info(pinfo, pi, &ei_sctp_tsn_retransmitted); nstime_delta( &rto, &pinfo->abs_ts, &(t->first_transmit.ts) ); pi = proto_tree_add_time(pt, hf_sctp_rto, tvb, 0, 0, &rto); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* Detect reneged acks */ /* XXX what if the frames aren't sorted by time? */ @@ -1133,7 +1133,7 @@ tsn_tree(sctp_tsn_t *t, proto_item *tsn_item, packet_info *pinfo, pi = proto_tree_add_uint_format(pt, hf_sctp_retransmitted_after_ack, tvb, 0, 0, t->ack.framenum, "This TSN was acked (in frame %u) prior to this retransmission (reneged ack?)", t->ack.framenum); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); expert_add_info(pinfo, pi, &ei_sctp_retransmitted_after_ack); } } else if (t->retransmit) { @@ -1153,7 +1153,7 @@ tsn_tree(sctp_tsn_t *t, proto_item *tsn_item, packet_info *pinfo, t->retransmit_count, plurality(t->retransmit_count, "", "s"), ds); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); if (t->retransmit_count > 2) expert_add_info(pinfo, pi, &ei_sctp_tsn_retransmitted_more_than_twice); @@ -1170,7 +1170,7 @@ tsn_tree(sctp_tsn_t *t, proto_item *tsn_item, packet_info *pinfo, "This TSN was retransmitted in frame %u (%s seconds after this frame)", (*r)->framenum, rel_time_to_secs_str(wmem_packet_scope(), &rto)); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); r = &(*r)->next; } } @@ -1179,12 +1179,12 @@ tsn_tree(sctp_tsn_t *t, proto_item *tsn_item, packet_info *pinfo, nstime_t rtt; pi = proto_tree_add_uint(tsn_tree_pt, hf_sctp_acked, tvb, 0 , 0, t->ack.framenum); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pt = proto_item_add_subtree(pi, ett_sctp_ack); nstime_delta( &rtt, &(t->ack.ts), &(t->first_transmit.ts) ); pi = proto_tree_add_time(pt, hf_sctp_data_rtt, tvb, 0, 0, &rtt); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } } @@ -1283,15 +1283,15 @@ ack_tree(sctp_tsn_t *t, proto_tree *acks_tree, nstime_delta( &rtt, &(t->ack.ts), &(t->first_transmit.ts) ); pi = proto_tree_add_uint(acks_tree, hf_sctp_ack_tsn, tvb, 0 , 0, t->tsn); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pt = proto_item_add_subtree(pi, ett_sctp_acked); pi = proto_tree_add_uint(pt, hf_sctp_ack_frame, tvb, 0 , 0, t->first_transmit.framenum); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pi = proto_tree_add_time(pt, hf_sctp_sack_rtt, tvb, 0, 0, &rtt); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } } @@ -3580,7 +3580,7 @@ dissect_init_chunk(tvbuff_t *chunk_tvb, guint16 chunk_length, packet_info *pinfo /* handle fixed parameters */ proto_tree_add_item(chunk_tree, hf_init_chunk_initiate_tag, chunk_tvb, INIT_CHUNK_INITIATE_TAG_OFFSET, INIT_CHUNK_INITIATE_TAG_LENGTH, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_item(chunk_tree, hf_initiate_tag, chunk_tvb, INIT_CHUNK_INITIATE_TAG_OFFSET, INIT_CHUNK_INITIATE_TAG_LENGTH, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(chunk_tree, hf_init_chunk_adv_rec_window_credit, chunk_tvb, INIT_CHUNK_ADV_REC_WINDOW_CREDIT_OFFSET, INIT_CHUNK_ADV_REC_WINDOW_CREDIT_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(chunk_tree, hf_init_chunk_number_of_outbound_streams, chunk_tvb, INIT_CHUNK_NUMBER_OF_OUTBOUND_STREAMS_OFFSET, INIT_CHUNK_NUMBER_OF_OUTBOUND_STREAMS_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(chunk_tree, hf_init_chunk_number_of_inbound_streams, chunk_tvb, INIT_CHUNK_NUMBER_OF_INBOUND_STREAMS_OFFSET, INIT_CHUNK_NUMBER_OF_INBOUND_STREAMS_LENGTH, ENC_BIG_ENDIAN); @@ -3615,7 +3615,7 @@ dissect_init_ack_chunk(tvbuff_t *chunk_tvb, guint16 chunk_length, packet_info *p /* handle fixed parameters */ proto_tree_add_item(chunk_tree, hf_initack_chunk_initiate_tag, chunk_tvb, INIT_CHUNK_INITIATE_TAG_OFFSET, INIT_CHUNK_INITIATE_TAG_LENGTH, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_item(chunk_tree, hf_initiate_tag, chunk_tvb, INIT_CHUNK_INITIATE_TAG_OFFSET, INIT_CHUNK_INITIATE_TAG_LENGTH, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_item(chunk_tree, hf_initack_chunk_adv_rec_window_credit, chunk_tvb, INIT_CHUNK_ADV_REC_WINDOW_CREDIT_OFFSET, INIT_CHUNK_ADV_REC_WINDOW_CREDIT_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(chunk_tree, hf_initack_chunk_number_of_outbound_streams, chunk_tvb, INIT_CHUNK_NUMBER_OF_OUTBOUND_STREAMS_OFFSET, INIT_CHUNK_NUMBER_OF_OUTBOUND_STREAMS_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(chunk_tree, hf_initack_chunk_number_of_inbound_streams, chunk_tvb, INIT_CHUNK_NUMBER_OF_INBOUND_STREAMS_OFFSET, INIT_CHUNK_NUMBER_OF_INBOUND_STREAMS_LENGTH, ENC_BIG_ENDIAN); @@ -3707,13 +3707,13 @@ dissect_sack_chunk(packet_info *pinfo, tvbuff_t *chunk_tvb, proto_tree *chunk_tr pt = proto_item_add_subtree(pi, ett_sctp_sack_chunk_gap_block_start); pi = proto_tree_add_uint(pt, hf_sack_chunk_gap_block_start_tsn, chunk_tvb, gap_block_offset,SACK_CHUNK_GAP_BLOCK_START_LENGTH, cum_tsn_ack + start); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pi = proto_tree_add_item(block_tree, hf_sack_chunk_gap_block_end, chunk_tvb, gap_block_offset + SACK_CHUNK_GAP_BLOCK_START_LENGTH, SACK_CHUNK_GAP_BLOCK_END_LENGTH, ENC_BIG_ENDIAN); pt = proto_item_add_subtree(pi, ett_sctp_sack_chunk_gap_block_end); pi = proto_tree_add_uint(pt, hf_sack_chunk_gap_block_end_tsn, chunk_tvb, gap_block_offset + SACK_CHUNK_GAP_BLOCK_START_LENGTH, SACK_CHUNK_GAP_BLOCK_END_LENGTH, cum_tsn_ack + end); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); sctp_ack_block(pinfo, ha, chunk_tvb, block_tree, &tsn_start, cum_tsn_ack + end); gap_block_offset += SACK_CHUNK_GAP_BLOCK_LENGTH; @@ -3734,7 +3734,7 @@ dissect_sack_chunk(packet_info *pinfo, tvbuff_t *chunk_tvb, proto_tree *chunk_tr proto_item *pi; pi = proto_tree_add_uint(chunk_tree, hf_sack_chunk_number_tsns_gap_acked, chunk_tvb, 0, 0, tsns_gap_acked); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* If there are a huge number of GAP ACKs, warn the user. 100 is a random * number: it could be tuned. @@ -3842,13 +3842,13 @@ dissect_nr_sack_chunk(packet_info *pinfo, tvbuff_t *chunk_tvb, proto_tree *chunk pt = proto_item_add_subtree(pi, ett_sctp_nr_sack_chunk_gap_block_start); pi = proto_tree_add_uint(pt, hf_nr_sack_chunk_gap_block_start_tsn, chunk_tvb, gap_block_offset,NR_SACK_CHUNK_GAP_BLOCK_START_LENGTH, cum_tsn_ack + start); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pi = proto_tree_add_item(block_tree, hf_nr_sack_chunk_gap_block_end, chunk_tvb, gap_block_offset + NR_SACK_CHUNK_GAP_BLOCK_START_LENGTH, NR_SACK_CHUNK_GAP_BLOCK_END_LENGTH, ENC_BIG_ENDIAN); pt = proto_item_add_subtree(pi, ett_sctp_nr_sack_chunk_gap_block_end); pi = proto_tree_add_uint(pt, hf_nr_sack_chunk_gap_block_end_tsn, chunk_tvb, gap_block_offset + NR_SACK_CHUNK_GAP_BLOCK_START_LENGTH, NR_SACK_CHUNK_GAP_BLOCK_END_LENGTH, cum_tsn_ack + end); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); sctp_ack_block(pinfo, ha, chunk_tvb, block_tree, &tsn_start, cum_tsn_ack + end); gap_block_offset += NR_SACK_CHUNK_GAP_BLOCK_LENGTH; @@ -3868,7 +3868,7 @@ dissect_nr_sack_chunk(packet_info *pinfo, tvbuff_t *chunk_tvb, proto_tree *chunk proto_item *pi; pi = proto_tree_add_uint(chunk_tree, hf_nr_sack_chunk_number_tsns_gap_acked, chunk_tvb, 0, 0, tsns_gap_acked); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* If there are a huge number of GAP ACKs, warn the user. 100 is a random * number: it could be tuned. @@ -3899,13 +3899,13 @@ dissect_nr_sack_chunk(packet_info *pinfo, tvbuff_t *chunk_tvb, proto_tree *chunk pt = proto_item_add_subtree(pi, ett_sctp_nr_sack_chunk_nr_gap_block_start); pi = proto_tree_add_uint(pt, hf_nr_sack_chunk_nr_gap_block_start_tsn, chunk_tvb, nr_gap_block_offset, NR_SACK_CHUNK_NR_GAP_BLOCK_START_LENGTH, cum_tsn_ack + start); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); pi = proto_tree_add_item(block_tree, hf_nr_sack_chunk_nr_gap_block_end, chunk_tvb, nr_gap_block_offset + NR_SACK_CHUNK_NR_GAP_BLOCK_START_LENGTH, NR_SACK_CHUNK_NR_GAP_BLOCK_END_LENGTH, ENC_BIG_ENDIAN); pt = proto_item_add_subtree(pi, ett_sctp_nr_sack_chunk_nr_gap_block_end); pi = proto_tree_add_uint(pt, hf_nr_sack_chunk_nr_gap_block_end_tsn, chunk_tvb, nr_gap_block_offset + NR_SACK_CHUNK_NR_GAP_BLOCK_START_LENGTH, NR_SACK_CHUNK_NR_GAP_BLOCK_END_LENGTH, cum_tsn_ack + end); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* sctp_ack_block(pinfo, ha, chunk_tvb, block_tree, &tsn_start, cum_tsn_ack + end); */ nr_gap_block_offset += NR_SACK_CHUNK_NR_GAP_BLOCK_LENGTH; @@ -3925,7 +3925,7 @@ dissect_nr_sack_chunk(packet_info *pinfo, tvbuff_t *chunk_tvb, proto_tree *chunk proto_item *pi; pi = proto_tree_add_uint(chunk_tree, hf_nr_sack_chunk_number_tsns_nr_gap_acked, chunk_tvb, 0, 0, tsns_nr_gap_acked); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* If there are a huge number of GAP ACKs, warn the user. 100 is a random * number: it could be tuned. @@ -4703,9 +4703,9 @@ dissect_sctp_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea proto_tree_add_item(sctp_tree, hf_destination_port, tvb, DESTINATION_PORT_OFFSET, DESTINATION_PORT_LENGTH, ENC_BIG_ENDIAN); vt = proto_tree_add_item(sctp_tree, hf_verification_tag, tvb, VERIFICATION_TAG_OFFSET, VERIFICATION_TAG_LENGTH, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_item(sctp_tree, hf_port, tvb, SOURCE_PORT_OFFSET, SOURCE_PORT_LENGTH, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item(sctp_tree, hf_port, tvb, DESTINATION_PORT_OFFSET, DESTINATION_PORT_LENGTH, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } else { sctp_tree = NULL; sctp_item = NULL; @@ -4753,7 +4753,7 @@ dissect_sctp_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea /* add assoc_index and move it behind the verification tag */ pi = proto_tree_add_uint(sctp_tree, hf_sctp_assoc_index, tvb, 0 , 0, sctp_info.assoc_index); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); proto_tree_move_item(sctp_tree, vt, pi); } diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index 5f8a55c9fd..6540d1755a 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -916,7 +916,7 @@ static void dissect_key_mgmt(tvbuff_t *tvb, packet_info * pinfo, proto_item * ti if (found_match) { proto_item *ti2 = proto_tree_add_item(key_tree, hf_key_mgmt_data, keymgmt_tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti2); + proto_item_set_hidden(ti2); } else { proto_tree_add_item(key_tree, hf_key_mgmt_data, keymgmt_tvb, 0, -1, ENC_NA); @@ -1043,7 +1043,7 @@ dissect_sdp_media(tvbuff_t *tvb, packet_info* pinfo, proto_item *ti, ENC_UTF_8|ENC_NA, wmem_packet_scope(), &media_port_str); DPRINT(("parsed media_port=%s", media_port_str)); if (g_ascii_isdigit(media_port_str[0])) { - PROTO_ITEM_SET_HIDDEN(it); + proto_item_set_hidden(it); media_port_valid = ws_strtou16(media_port_str, NULL, &media_port); pi = proto_tree_add_uint(sdp_media_tree, hf_media_port, tvb, offset, tokenlen, media_port); @@ -1074,7 +1074,7 @@ dissect_sdp_media(tvbuff_t *tvb, packet_info* pinfo, proto_item *ti, ENC_UTF_8|ENC_NA, wmem_packet_scope(), &media_port_str); DPRINT(("parsed media_port=%s", media_port_str)); if (g_ascii_isdigit(media_port_str[0])) { - PROTO_ITEM_SET_HIDDEN(it); + proto_item_set_hidden(it); media_port_valid = ws_strtou16(media_port_str, NULL, &media_port); pi = proto_tree_add_uint(sdp_media_tree, hf_media_port, tvb, offset, tokenlen, media_port); @@ -1300,7 +1300,7 @@ decode_sdp_fmtp(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, gint offset format_specific_parameter = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tokenlen, ENC_UTF_8|ENC_NA); item = proto_tree_add_uint(tree, hf_sdp_fmtp_mpeg4_profile_level_id, tvb, offset, tokenlen, (guint32)strtol((char*)format_specific_parameter, NULL, 10)); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } else if (strcmp((char*)field_name, "config") == 0) { /* String including "=" */ tokenlen = end_offset - offset; @@ -1322,14 +1322,14 @@ decode_sdp_fmtp(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, gint offset format_specific_parameter = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tokenlen, ENC_UTF_8|ENC_NA); item = proto_tree_add_uint(tree, hf_sdp_fmtp_h263_profile, tvb, offset, tokenlen, (guint32)strtol((char*)format_specific_parameter, NULL, 10)); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } else if (strcmp((char*)field_name, "level") == 0) { offset++; tokenlen = end_offset - offset; format_specific_parameter = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tokenlen, ENC_UTF_8|ENC_NA); item = proto_tree_add_uint(tree, hf_sdp_fmtp_h263_level, tvb, offset, tokenlen, (guint32)strtol((char*)format_specific_parameter, NULL, 10)); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } @@ -1365,7 +1365,7 @@ decode_sdp_fmtp(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, gint offset } } else { item = proto_tree_add_expert_format(tree, pinfo, &ei_sdp_invalid_conversion, tvb, offset, tokenlen, "Incorrectly coded, must be three bytes"); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } else if (strcmp(field_name, "packetization-mode") == 0) { offset++; @@ -1373,7 +1373,7 @@ decode_sdp_fmtp(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, gint offset format_specific_parameter = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tokenlen, ENC_UTF_8|ENC_NA); item = proto_tree_add_uint(tree, hf_sdp_h264_packetization_mode, tvb, offset, tokenlen, (guint32)strtol((char*)format_specific_parameter, NULL, 10)); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } else if (strcmp(field_name, "sprop-parameter-sets") == 0) { /* The value of the parameter is the base64 [6] representation of the initial @@ -2836,15 +2836,15 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) if (stored_setup_info->hf_id) { if (stored_setup_info->hf_type == SDP_TRACE_ID_HF_TYPE_STR) { item = proto_tree_add_string(sdp_tree, stored_setup_info->hf_id, tvb, 0, 0, stored_setup_info->trace_id.str); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (stored_setup_info->add_hidden == TRUE) { - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); } } else if (stored_setup_info->hf_type == SDP_TRACE_ID_HF_TYPE_GUINT32) { item = proto_tree_add_uint(sdp_tree, stored_setup_info->hf_id, tvb, 0, 0, stored_setup_info->trace_id.num); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (stored_setup_info->add_hidden == TRUE) { - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); } } } diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index ba3acbb1ba..6fe42176ea 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -1345,7 +1345,7 @@ dissect_fmdata_frame(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, int of else if (cfg_data->sf_loc == FM_CONFIG_SF_LOC_CFG) { ai_sf_fp = ai->sf_fp; fmdata_ai_sf_item = proto_tree_add_float(fmdata_ai_ch_tree, hf_selfm_fmdata_ai_sf_fp, tvb, offset, ch_size, ai_sf_fp); - PROTO_ITEM_SET_GENERATED(fmdata_ai_sf_item); + proto_item_set_generated(fmdata_ai_sf_item); } /* If there was no scale factor, default value to 1 */ else { @@ -1794,10 +1794,10 @@ dissect_fastmsg_readresp_frame(tvbuff_t *tvb, proto_tree *fastmsg_tree, packet_i pi_type = proto_tree_add_uint(fastmsg_tag_tree, hf_selfm_fmdata_data_type, payload_tvb, payload_offset, 0, dataitem->data_type); pi_qty = proto_tree_add_uint(fastmsg_tag_tree, hf_selfm_fmdata_quantity, payload_tvb, payload_offset, 0, dataitem->quantity ); - PROTO_ITEM_SET_GENERATED(pi_fnum); - PROTO_ITEM_SET_GENERATED(pi_type); + proto_item_set_generated(pi_fnum); + proto_item_set_generated(pi_type); proto_item_set_len(pi_type, data_size); - PROTO_ITEM_SET_GENERATED(pi_qty); + proto_item_set_generated(pi_qty); proto_item_set_len(pi_qty, data_size); /* Data Item Type determines how to decode */ diff --git a/epan/dissectors/packet-shim6.c b/epan/dissectors/packet-shim6.c index 4a061be637..19d39f49d0 100644 --- a/epan/dissectors/packet-shim6.c +++ b/epan/dissectors/packet-shim6.c @@ -301,7 +301,7 @@ dissect_shimopts(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info *pinfo /* Content Length */ proto_tree_add_item(opt_tree, hf_shim6_opt_len, tvb, offset + 2, 2, ENC_BIG_ENDIAN); ti = proto_tree_add_uint(opt_tree, hf_shim6_opt_total_len, tvb, offset+2, 2, total_len); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Option Type Specific */ switch (tvb_get_ntohs(tvb, offset) >> 1) @@ -576,8 +576,8 @@ dissect_shim6(tvbuff_t *tvb, packet_info * pinfo, proto_tree *tree, void* data) ti_len = proto_tree_add_item(shim_tree, hf_shim6_len, tvb, offset, 1, ENC_BIG_ENDIAN); ti = proto_tree_add_uint(shim_tree, hf_shim6_len_oct, tvb, offset, 1, len); proto_item_append_text(ti, " bytes"); - PROTO_ITEM_SET_GENERATED(ti); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_generated(ti); + proto_item_set_hidden(ti); proto_item_append_text(ti_len, " (%d bytes)", len); offset += 1; diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index 0742f3370b..949443715b 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -4957,7 +4957,7 @@ dissect_sigcomp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sigcomp_tr proto_item *ti; ti = proto_tree_add_uint(sigcomp_tree, hf_sigcomp_remaining_message_bytes, tvb, offset, 0, msg_len); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if ( decompress ) { @@ -5030,7 +5030,7 @@ dissect_sigcomp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sigcomp_tr /* Show compression ratio achieved */ ti = proto_tree_add_uint(sigcomp_tree, hf_sigcomp_compression_ratio, decomp_tvb, 0, 0, compression_ratio); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if ( display_raw_txt ) tvb_raw_text_add(decomp_tvb, top_tree); @@ -5139,7 +5139,7 @@ dissect_sigcomp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sigcomp_tr msg_len = tvb_reported_length_remaining(tvb, offset); if (msg_len>0) { proto_item *ti = proto_tree_add_item(sigcomp_tree, hf_sigcomp_remaining_sigcomp_message, tvb, offset, -1, ENC_NA); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if ( decompress ) { @@ -5161,7 +5161,7 @@ dissect_sigcomp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sigcomp_tr /* Show compression ratio achieved */ ti = proto_tree_add_uint(sigcomp_tree, hf_sigcomp_compression_ratio, decomp_tvb, 0, 0, compression_ratio); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if ( display_raw_txt ) tvb_raw_text_add(decomp_tvb, top_tree); @@ -5201,7 +5201,7 @@ dissect_udvm_bytecode(tvbuff_t *udvm_tvb, packet_info* pinfo, proto_tree *sigcom item = proto_tree_add_uint_format(sigcomp_udvm_tree, hf_sigcomp_udvm_instruction, udvm_tvb, offset, 1, instruction_no, "######### UDVM instruction %u at UDVM-address %u (0x%x) #########", instruction_no,UDVM_address,UDVM_address); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); proto_tree_add_item(sigcomp_udvm_tree, hf_sigcomp_udvm_instr, udvm_tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; switch ( instruction ) { @@ -6079,7 +6079,7 @@ dissect_udvm_bytecode(tvbuff_t *udvm_tvb, packet_info* pinfo, proto_tree *sigcom } else { item2 = proto_tree_add_uint_format_value(sigcomp_udvm_tree, hf_udvm_state_ret_pri, udvm_tvb, offset, 1, 0, "0 (Not in the uploaded code as UDVM buffer initialized to Zero"); - PROTO_ITEM_SET_GENERATED(item2); + proto_item_set_generated(item2); } if ( tvb_reported_length_remaining(udvm_tvb, offset) != 0 ) { len = tvb_reported_length_remaining(udvm_tvb, offset); diff --git a/epan/dissectors/packet-simulcrypt.c b/epan/dissectors/packet-simulcrypt.c index d048b546dc..a6d4fb34fa 100644 --- a/epan/dissectors/packet-simulcrypt.c +++ b/epan/dissectors/packet-simulcrypt.c @@ -1231,7 +1231,7 @@ dissect_simulcrypt_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(simulcrypt_header_tree, hf_simulcrypt_message_type, tvb, offset, 2, ENC_BIG_ENDIAN); simulcrypt_item = proto_tree_add_uint_format_value(simulcrypt_header_tree, hf_simulcrypt_interface, tvb, offset, 2, iftype, "%s", val_to_str_const(iftype, interfacenames, "Unknown")); - PROTO_ITEM_SET_GENERATED (simulcrypt_item); + proto_item_set_generated (simulcrypt_item); offset+=2; /* Message Length 2 Bytes */ diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 7dfa33c27a..aed92066de 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -1527,7 +1527,7 @@ dfilter_store_sip_from_addr(tvbuff_t *tvb,proto_tree *tree,guint parameter_offse proto_item *pi; pi = proto_tree_add_item(tree, hf_sip_from_addr, tvb, parameter_offset, parameter_len, ENC_UTF_8|ENC_NA); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } static proto_item * @@ -2807,7 +2807,7 @@ static void dissect_sip_via_header(tvbuff_t *tvb, proto_tree *tree, gint start_o ti = proto_tree_add_uint(tree, hf_sip_via_oc_val, tvb, parameter_name_end + 1, current_offset - parameter_name_end - 1, (guint32)strtoul(value, NULL, 10)); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else if (g_ascii_strcasecmp(param_name, "oc-seq") == 0) { proto_item *ti; @@ -2824,7 +2824,7 @@ static void dissect_sip_via_header(tvbuff_t *tvb, proto_tree *tree, gint start_o ts.nsecs = (guint32)strtoul(value, NULL, 10) * 1000; ti = proto_tree_add_time(tree, hf_sip_oc_seq_timestamp, tvb, parameter_name_end + 1, current_offset - parameter_name_end - 1, &ts); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } } @@ -2918,7 +2918,7 @@ static void dissect_sip_session_id_header(tvbuff_t *tvb, proto_tree *tree, gint */ e_guid_t guid; - PROTO_ITEM_SET_HIDDEN(pi); + proto_item_set_hidden(pi); guid.data1 = (bytes->data[0] << 24) | (bytes->data[1] << 16) | (bytes->data[2] << 8) | bytes->data[3]; guid.data2 = (bytes->data[4] << 8) | bytes->data[5]; @@ -3678,7 +3678,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info parameter_len, ENC_UTF_8|ENC_NA); item = proto_tree_add_item(sip_element_tree, hf_sip_tag, tvb, parameter_offset, parameter_len, ENC_UTF_8|ENC_NA); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); /* Tag indicates in-dialog messages, in case we have a INVITE, SUBSCRIBE or REFER, mark it */ switch (current_method_idx) { @@ -3740,7 +3740,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info parameter_len, ENC_UTF_8|ENC_NA); item = proto_tree_add_item(sip_element_tree, hf_sip_tag, tvb, parameter_offset, parameter_len, ENC_UTF_8|ENC_NA); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); } }/* hdr_tree */ break; @@ -4115,9 +4115,9 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info hf_sip_call_id_gen, tvb, offset, next_offset - offset, value); - PROTO_ITEM_SET_GENERATED(gen_item); + proto_item_set_generated(gen_item); if (sip_hide_generatd_call_ids) { - PROTO_ITEM_SET_HIDDEN(gen_item); + proto_item_set_hidden(gen_item); } sip_proto_set_format_text(hdr_tree, sip_element_item, tvb, offset, linelen); } @@ -4295,7 +4295,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info ti_c = proto_tree_add_item(hdr_tree, hf_sip_auth, tvb, offset, next_offset-offset, ENC_UTF_8|ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti_c); + proto_item_set_hidden(ti_c); /* Authentication-Info does not begin with the scheme name */ if (hf_index != POS_AUTHENTICATION_INFO) @@ -4811,26 +4811,26 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info proto_item *item; item = proto_tree_add_boolean(reqresp_tree, hf_sip_resend, tvb, orig_offset, 0, resend_for_packet > 0); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (resend_for_packet > 0) { item = proto_tree_add_uint(reqresp_tree, hf_sip_original_frame, tvb, orig_offset, 0, resend_for_packet); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (request_for_response > 0) { item = proto_tree_add_uint(reqresp_tree, hf_sip_matching_request_frame, tvb, orig_offset, 0, request_for_response); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(reqresp_tree, hf_sip_response_time, tvb, orig_offset, 0, response_time); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if ((line_type == STATUS_LINE)&&(strcmp(cseq_method, "BYE") == 0)){ item = proto_tree_add_uint(reqresp_tree, hf_sip_release_time, tvb, orig_offset, 0, response_time); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } } diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index 28db7a1f73..b6afaca0ce 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -2343,7 +2343,7 @@ static void skinny_reqrep_add_request(ptvcursor_t *cursor, packet_info * pinfo, DPRINT(("SKINNY: show request in tree: frame/key=%d\n", pinfo->num)); proto_item *it; it = proto_tree_add_uint(tree, hf_skinny_response_in, tvb, 0, 0, req_resp->response_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { DPRINT(("SKINNY: no request found for frame/key=%d\n", pinfo->num)); } @@ -2374,11 +2374,11 @@ static void skinny_reqrep_add_response(ptvcursor_t *cursor, packet_info * pinfo, proto_item *it; nstime_t ns; it = proto_tree_add_uint(tree, hf_skinny_response_to, tvb, 0, 0, req_resp->request_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &req_resp->request_time); it = proto_tree_add_time(tree, hf_skinny_response_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { DPRINT(("SKINNY: no response found for frame/key=%d\n", pinfo->num)); } diff --git a/epan/dissectors/packet-skinny.c.in b/epan/dissectors/packet-skinny.c.in index 0fc8e7afc4..f643e4bee0 100644 --- a/epan/dissectors/packet-skinny.c.in +++ b/epan/dissectors/packet-skinny.c.in @@ -323,7 +323,7 @@ static void skinny_reqrep_add_request(ptvcursor_t *cursor, packet_info * pinfo, DPRINT(("SKINNY: show request in tree: frame/key=%d\n", pinfo->num)); proto_item *it; it = proto_tree_add_uint(tree, hf_skinny_response_in, tvb, 0, 0, req_resp->response_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { DPRINT(("SKINNY: no request found for frame/key=%d\n", pinfo->num)); } @@ -354,11 +354,11 @@ static void skinny_reqrep_add_response(ptvcursor_t *cursor, packet_info * pinfo, proto_item *it; nstime_t ns; it = proto_tree_add_uint(tree, hf_skinny_response_to, tvb, 0, 0, req_resp->request_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->fd->abs_ts, &req_resp->request_time); it = proto_tree_add_time(tree, hf_skinny_response_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { DPRINT(("SKINNY: no response found for frame/key=%d\n", pinfo->num)); } diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index f5876fe5f5..087d436b96 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -466,13 +466,13 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *ti2 = proto_tree_add_item(slsk_tree, hf_slsk_compr_packet, tvb, offset, -1, ENC_NA); proto_tree *slsk_compr_packet_tree = proto_item_add_subtree(ti2, ett_slsk_compr_packet); - PROTO_ITEM_SET_GENERATED(ti2); + proto_item_set_generated(ti2); ti = proto_tree_add_uint(slsk_tree, hf_slsk_compressed_packet_length, tvb, offset, 0, comprlen); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); uncomprlen = tvb_reported_length_remaining(uncompr_tvb, 0); ti = proto_tree_add_uint(slsk_tree, hf_slsk_uncompressed_packet_length, tvb, offset, 0, uncomprlen); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); add_new_data_source(pinfo, uncompr_tvb, "Uncompressed SoulSeek data"); uncompr_tvb_offset = 0; @@ -528,9 +528,9 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } }else { ti = proto_tree_add_item(slsk_tree, hf_slsk_compr_packet, tvb, offset, -1, ENC_NA); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(slsk_tree, hf_slsk_compressed_packet_length, tvb, offset, 0, comprlen); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); offset += tvb_captured_length_remaining(tvb, offset); } } @@ -573,20 +573,20 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (uncompr_tvb == NULL) { ti = proto_tree_add_item(slsk_tree, hf_slsk_compr_packet, tvb, offset, tvb_captured_length_remaining(tvb, offset), ENC_NA); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); offset += tvb_captured_length_remaining(tvb, offset); expert_add_info(pinfo, ti, &ei_slsk_decompression_failed); } else { proto_item *ti2 = proto_tree_add_item(slsk_tree, hf_slsk_compr_packet, tvb, offset, -1, ENC_NA); proto_tree *slsk_compr_packet_tree = proto_item_add_subtree(ti2, ett_slsk_compr_packet); - PROTO_ITEM_SET_GENERATED(ti2); + proto_item_set_generated(ti2); ti = proto_tree_add_uint(slsk_tree, hf_slsk_compressed_packet_length, tvb, offset, 0, comprlen); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); uncomprlen = tvb_captured_length_remaining(uncompr_tvb, 0); ti = proto_tree_add_uint(slsk_tree, hf_slsk_uncompressed_packet_length, tvb, offset, 0, uncomprlen); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); add_new_data_source(pinfo, uncompr_tvb, "Uncompressed SoulSeek data"); uncompr_tvb_offset = 0; @@ -639,9 +639,9 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } }else { ti = proto_tree_add_item(slsk_tree, hf_slsk_compr_packet, tvb, offset, -1, ENC_NA); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(slsk_tree, hf_slsk_compressed_packet_length, tvb, offset, 0, comprlen); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); offset += tvb_captured_length_remaining(tvb, offset); } } @@ -1033,13 +1033,13 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *ti2 = proto_tree_add_item(slsk_tree, hf_slsk_compr_packet, tvb, offset, -1, ENC_NA); proto_tree *slsk_compr_packet_tree = proto_item_add_subtree(ti2, ett_slsk_compr_packet); - PROTO_ITEM_SET_GENERATED(ti2); + proto_item_set_generated(ti2); ti = proto_tree_add_uint(slsk_tree, hf_slsk_compressed_packet_length, tvb, offset, 0, comprlen); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); uncomprlen = tvb_captured_length_remaining(uncompr_tvb, 0); ti = proto_tree_add_uint(slsk_tree, hf_slsk_uncompressed_packet_length, tvb, offset, 0, uncomprlen); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); add_new_data_source(pinfo, uncompr_tvb, "Uncompressed SoulSeek data"); uncompr_tvb_offset = 0; @@ -1102,9 +1102,9 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } }else { ti = proto_tree_add_item(slsk_tree, hf_slsk_compr_packet, tvb, offset, -1, ENC_NA); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(slsk_tree, hf_slsk_compressed_packet_length, tvb, offset, 0, comprlen); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); offset += tvb_captured_length_remaining(tvb, offset); } } diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 523f83b8ca..6c33dc83be 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -2320,7 +2320,7 @@ dissect_file_ext_attr_bits(tvbuff_t *tvb, proto_tree *parent_tree, int offset, item = proto_tree_add_bitmask_value_with_flags(parent_tree, tvb, offset, hf_smb_file_eattr, ett_smb_file_attributes, mask_fields, mask, BMT_NO_APPEND); if (len == 0) - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); offset += len; @@ -3089,7 +3089,7 @@ dissect_empty(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offse if (si->sip && (si->sip->extra_info_type == SMB_EI_FILENAME)) { item = proto_tree_add_string(tree, hf_smb_file_name, tvb, 0, 0, (const char *)si->sip->extra_info); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } @@ -3115,9 +3115,9 @@ dissect_rename_file_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * smb_rename_saved_info_t *rni = (smb_rename_saved_info_t *)si->sip->extra_info; item = proto_tree_add_string(tree, hf_smb_old_file_name, tvb, 0, 0, rni->old_name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_string(tree, hf_smb_file_name, tvb, 0, 0, rni->new_name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } @@ -3266,22 +3266,22 @@ dissect_smb_uid(tvbuff_t *tvb, proto_tree *parent_tree, int offset, smb_info_t * if (smb_uid->domain) { proto_item_append_text(item, "%s", smb_uid->domain); subitem = proto_tree_add_string(tree, hf_smb_primary_domain, tvb, 0, 0, smb_uid->domain); - PROTO_ITEM_SET_GENERATED(subitem); + proto_item_set_generated(subitem); } if (smb_uid->account) { proto_item_append_text(item, "\\%s", smb_uid->account); subitem = proto_tree_add_string(tree, hf_smb_account, tvb, 0, 0, smb_uid->account); - PROTO_ITEM_SET_GENERATED(subitem); + proto_item_set_generated(subitem); } if (smb_uid->domain && smb_uid->account) proto_item_append_text(item, ")"); if (smb_uid->logged_in > 0) { subitem = proto_tree_add_uint(tree, hf_smb_logged_in, tvb, 0, 0, smb_uid->logged_in); - PROTO_ITEM_SET_GENERATED(subitem); + proto_item_set_generated(subitem); } if (smb_uid->logged_out > 0) { subitem = proto_tree_add_uint(tree, hf_smb_logged_out, tvb, 0, 0, smb_uid->logged_out); - PROTO_ITEM_SET_GENERATED(subitem); + proto_item_set_generated(subitem); } } offset += 2; @@ -3332,15 +3332,15 @@ dissect_smb_tid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_item_append_text(it, " (%s)", tid_info->filename); it = proto_tree_add_string(tr, hf_smb_path, tvb, 0, 0, tid_info->filename); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } it = proto_tree_add_uint(tr, hf_smb_mapped_in, tvb, 0, 0, tid_info->opened_in); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } if (tid_info->closed_in) { it = proto_tree_add_uint(tr, hf_smb_unmapped_in, tvb, 0, 0, tid_info->closed_in); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } @@ -3706,7 +3706,7 @@ dissect_nt_create_bits(tvbuff_t *tvb, proto_tree *parent_tree, int offset, fields, mask, BMT_NO_APPEND); if (len == 0) - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); offset += len; @@ -3755,7 +3755,7 @@ dissect_smb_access_mask_bits(tvbuff_t *tvb, proto_tree *parent_tree, fields, mask, BMT_NO_APPEND); if (len == 0) - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); offset += len; return offset; @@ -3792,7 +3792,7 @@ dissect_nt_share_access_bits(tvbuff_t *tvb, proto_tree *parent_tree, item = proto_tree_add_bitmask_value(parent_tree, tvb, offset, hf_smb_share_access, ett_smb_nt_share_access, fields, mask); if (len == 0) - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); offset += len; @@ -3848,7 +3848,7 @@ dissect_nt_create_options_bits(tvbuff_t *tvb, proto_tree *parent_tree, item = proto_tree_add_bitmask_value_with_flags(parent_tree, tvb, offset, hf_smb_create_options, ett_smb_nt_create_options, fields, mask, BMT_NO_APPEND); if (len == 0) - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); offset += len; @@ -3887,7 +3887,7 @@ dissect_smb_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, it = proto_tree_add_uint(tree, hf_smb_fid, tvb, offset, len, fid); if (is_generated) { - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } tr = proto_item_add_subtree(it, ett_smb_fid); col_append_fstr(pinfo->cinfo, COL_INFO, ", FID: 0x%04x", fid); @@ -3951,19 +3951,19 @@ dissect_smb_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, if (fid_info->opened_in) { it = proto_tree_add_uint(tr, hf_smb_opened_in, tvb, 0, 0, fid_info->opened_in); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } if (fid_info->closed_in) { it = proto_tree_add_uint(tr, hf_smb_closed_in, tvb, 0, 0, fid_info->closed_in); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } if (fid_info->opened_in) { if (fid_info->fsi && fid_info->fsi->filename) { it = proto_tree_add_string(tr, hf_smb_file_name, tvb, 0, 0, fid_info->fsi->filename); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); proto_item_append_text(tr, " (%s)", fid_info->fsi->filename); dissect_nt_create_bits(tvb, tr, 0, 0, fid_info->fsi->create_flags); dissect_smb_access_mask_bits(tvb, tr, 0, 0, fid_info->fsi->access_mask); @@ -3971,7 +3971,7 @@ dissect_smb_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, dissect_nt_share_access_bits(tvb, tr, 0, 0, fid_info->fsi->share_access); dissect_nt_create_options_bits(tvb, tr, 0, 0, fid_info->fsi->create_options); it = proto_tree_add_uint(tr, hf_smb_nt_create_disposition, tvb, 0, 0, fid_info->fsi->create_disposition); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } @@ -4737,9 +4737,9 @@ dissect_read_file_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, it = proto_tree_add_uint64(tree, hf_smb_file_rw_offset, tvb, 0, 0, rwi->offset); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); it = proto_tree_add_uint(tree, hf_smb_file_rw_length, tvb, 0, 0, rwi->len); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); /* we need the fid for the call to dcerpc below */ fid = rwi->fid; @@ -4844,9 +4844,9 @@ dissect_write_file_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, it = proto_tree_add_uint64(tree, hf_smb_file_rw_offset, tvb, 0, 0, rwi->offset); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); it = proto_tree_add_uint(tree, hf_smb_file_rw_length, tvb, 0, 0, rwi->len); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } /* remaining */ @@ -4911,9 +4911,9 @@ dissect_write_file_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, it = proto_tree_add_uint64(tree, hf_smb_file_rw_offset, tvb, 0, 0, rwi->offset); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); it = proto_tree_add_uint(tree, hf_smb_file_rw_length, tvb, 0, 0, rwi->len); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } BYTE_COUNT; @@ -6271,7 +6271,7 @@ dissect_locking_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre smb_lock_info_t *li; if (tree) { litem = proto_tree_add_item(tree, hf_smb_lock_type, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(litem); + proto_item_set_generated(litem); ltree = proto_item_add_subtree(litem, ett_smb_lock_type); proto_tree_add_boolean(ltree, hf_smb_lock_type_large, tvb, 0, 0, ld->type); @@ -6843,9 +6843,9 @@ dissect_read_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i it = proto_tree_add_uint64(tree, hf_smb_file_rw_offset, tvb, 0, 0, rwi->offset); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); it = proto_tree_add_uint(tree, hf_smb_file_rw_length, tvb, 0, 0, rwi->len); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } BYTE_COUNT; @@ -6910,9 +6910,9 @@ dissect_read_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, it = proto_tree_add_uint64(tree, hf_smb_file_rw_offset, tvb, 0, 0, rwi->offset); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); it = proto_tree_add_uint(tree, hf_smb_file_rw_length, tvb, 0, 0, rwi->len); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); /* we need the fid for the call to dcerpc below */ fid = rwi->fid; @@ -7110,9 +7110,9 @@ dissect_write_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, it = proto_tree_add_uint64(tree, hf_smb_file_rw_offset, tvb, 0, 0, rwi->offset); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); it = proto_tree_add_uint(tree, hf_smb_file_rw_length, tvb, 0, 0, rwi->len); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } @@ -7212,9 +7212,9 @@ dissect_write_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, it = proto_tree_add_uint64(tree, hf_smb_file_rw_offset, tvb, 0, 0, rwi->offset); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); it = proto_tree_add_uint(tree, hf_smb_file_rw_length, tvb, 0, 0, rwi->len); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } @@ -16580,10 +16580,10 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree "<UNKNOWN> since information level wasn't found in request packet"); else item = proto_tree_add_uint(tree, hf_smb_ff2_information_level, tvb, 0, 0, t2i->info_level); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (t2i->name) { item = proto_tree_add_string(tree, hf_smb_search_pattern, tvb, 0, 0, t2i->name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } break; @@ -16593,10 +16593,10 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree "<UNKNOWN> since information level wasn't found in request packet"); else item = proto_tree_add_uint(tree, hf_smb_qpi_loi, tvb, 0, 0, t2i->info_level); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (t2i->name) { item = proto_tree_add_string(tree, hf_smb_file_name, tvb, 0, 0, t2i->name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } break; @@ -16606,7 +16606,7 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree "<UNKNOWN> since information level wasn't found in request packet"); else item = proto_tree_add_uint(tree, hf_smb_qpi_loi, tvb, 0, 0, t2i->info_level); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); break; case 0x0003: /* QUERY_FS_INFORMATION */ @@ -16615,7 +16615,7 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree "<UNKNOWN> since information level wasn't found in request packet"); else item = proto_tree_add_uint(tree, hf_smb_qfsi_information_level, tvb, 0, 0, si->info_level); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); break; case 0x0004: /* SET_FS_INFORMATION */ @@ -16624,7 +16624,7 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree "<UNKNOWN> since information level wasn't found in request packet"); else item = proto_tree_add_uint(tree, hf_smb_sfsi_information_level, tvb, 0, 0, si->info_level); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); break; } @@ -17843,14 +17843,14 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* da case SMB_COM_NT_CANCEL: tmp_item = proto_tree_add_uint(htree, hf_smb_cancel_to, tvb, 0, 0, sip->frame_req); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); break; case SMB_COM_TRANSACTION_SECONDARY: case SMB_COM_TRANSACTION2_SECONDARY: case SMB_COM_NT_TRANSACT_SECONDARY: tmp_item = proto_tree_add_uint(htree, hf_smb_continuation_to, tvb, 0, 0, sip->frame_req); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); break; } } else { @@ -18026,17 +18026,17 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* da if (si->request) { if (sip->frame_res != 0) { tmp_item = proto_tree_add_uint(htree, hf_smb_response_in, tvb, 0, 0, sip->frame_res); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); } } else { if (sip->frame_req != 0) { tmp_item = proto_tree_add_uint(htree, hf_smb_response_to, tvb, 0, 0, sip->frame_req); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); t = pinfo->abs_ts; nstime_delta(&deltat, &t, &sip->req_time); tmp_item = proto_tree_add_time(htree, hf_smb_time, tvb, 0, 0, &deltat); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); } } } diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index c1ecadd2b6..28708cd66f 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -1235,25 +1235,25 @@ smb2_add_session_info(proto_tree *tree, tvbuff_t *tvb, gint start, smb2_sesid_in if (ses->acct_name) { item = proto_tree_add_string(tree, hf_smb2_acct_name, tvb, start, 0, ses->acct_name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); proto_item_append_text(item, " Acct:%s", ses->acct_name); } if (ses->domain_name) { item = proto_tree_add_string(tree, hf_smb2_domain_name, tvb, start, 0, ses->domain_name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); proto_item_append_text(item, " Domain:%s", ses->domain_name); } if (ses->host_name) { item = proto_tree_add_string(tree, hf_smb2_host_name, tvb, start, 0, ses->host_name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); proto_item_append_text(item, " Host:%s", ses->host_name); } if (ses->auth_frame != (guint32)-1) { item = proto_tree_add_uint(tree, hf_smb2_auth_frame, tvb, start, 0, ses->auth_frame); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } @@ -3247,7 +3247,7 @@ dissect_smb2_session_setup_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree hash_item = proto_tree_add_bytes_with_length(tree, hf_smb2_preauth_hash, tvb, 0, tvb_captured_length(tvb), ssi->preauth_hash_req, SMB2_PREAUTH_HASH_SIZE); - PROTO_ITEM_SET_GENERATED(hash_item); + proto_item_set_generated(hash_item); } /* buffer code */ @@ -3571,7 +3571,7 @@ dissect_smb2_session_setup_response(tvbuff_t *tvb, packet_info *pinfo, proto_tre hash_item = proto_tree_add_bytes_with_length(tree, hf_smb2_preauth_hash, tvb, 0, tvb_captured_length(tvb), ssi->preauth_hash_res, SMB2_PREAUTH_HASH_SIZE); - PROTO_ITEM_SET_GENERATED(hash_item); + proto_item_set_generated(hash_item); } /* session_setup is special and we don't use dissect_smb2_error_response() here! */ @@ -4585,7 +4585,7 @@ dissect_smb2_find_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr if (si->saved) { /* infolevel */ item = proto_tree_add_uint(tree, hf_smb2_find_info_level, tvb, offset, 0, si->saved->infolevel); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (!pinfo->fd->visited && si->saved && si->saved->extra_info_type == SMB2_EI_FINDPATTERN) { @@ -4709,7 +4709,7 @@ dissect_smb2_negotiate_protocol_request(tvbuff_t *tvb, packet_info *pinfo, proto hf_smb2_preauth_hash, tvb, 0, tvb_captured_length(tvb), ssi->preauth_hash_req, SMB2_PREAUTH_HASH_SIZE); - PROTO_ITEM_SET_GENERATED(hash_item); + proto_item_set_generated(hash_item); } /* buffer code */ @@ -4813,7 +4813,7 @@ dissect_smb2_negotiate_protocol_response(tvbuff_t *tvb, packet_info *pinfo, prot hf_smb2_preauth_hash, tvb, 0, tvb_captured_length(tvb), ssi->preauth_hash_res, SMB2_PREAUTH_HASH_SIZE); - PROTO_ITEM_SET_GENERATED(hash_item); + proto_item_set_generated(hash_item); } switch (si->status) { @@ -5018,12 +5018,12 @@ dissect_smb2_class_infolevel(packet_info *pinfo, tvbuff_t *tvb, int offset, prot /* class */ item = proto_tree_add_uint(tree, hf_smb2_class, tvb, offset, 1, cl); if (si->flags & SMB2_FLAGS_RESPONSE) { - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } /* infolevel */ item = proto_tree_add_uint(tree, hfindex, tvb, offset+1, 1, il); if (si->flags & SMB2_FLAGS_RESPONSE) { - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } offset += 2; @@ -5299,7 +5299,7 @@ dissect_smb2_infolevel(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (si->status == 0x80000005) { proto_item *item; item = proto_tree_add_item(tree, hf_smb2_truncated, tvb, old_offset, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } return offset; } @@ -5772,7 +5772,7 @@ dissect_file_data_smb2_pipe(tvbuff_t *raw_tvb, packet_info *pinfo, proto_tree *t proto_item *item; item = proto_tree_add_uint(top_tree, hf_smb2_pipe_reassembled_in, tvb, 0, 0, fd_head->reassembled_in); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); goto clean_up_and_exit; } @@ -9507,14 +9507,14 @@ dissect_smb2_tid_sesid(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, if (!si->tree) return offset; item = proto_tree_add_string(tid_tree, hf_smb2_tree, tvb, tid_offset, 4, si->tree->name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); proto_item_append_text(tid_item, " %s", si->tree->name); item = proto_tree_add_uint(tid_tree, hf_smb2_share_type, tvb, tid_offset, 0, si->tree->share_type); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(tid_tree, hf_smb2_tcon_frame, tvb, tid_offset, 0, si->tree->connect_frame); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } return offset; @@ -9761,7 +9761,7 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea if (ssi->frame_res) { proto_item *tmp_item; tmp_item = proto_tree_add_uint(header_tree, hf_smb2_response_in, tvb, 0, 0, ssi->frame_res); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); } } else { if (ssi->frame_req) { @@ -9769,12 +9769,12 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea nstime_t t, deltat; tmp_item = proto_tree_add_uint(header_tree, hf_smb2_response_to, tvb, 0, 0, ssi->frame_req); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); t = pinfo->abs_ts; nstime_delta(&deltat, &t, &ssi->req_time); tmp_item = proto_tree_add_time(header_tree, hf_smb2_time, tvb, 0, 0, &deltat); - PROTO_ITEM_SET_GENERATED(tmp_item); + proto_item_set_generated(tmp_item); } } if (si->file != NULL) { diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c index c45f67cc84..2ad4c80bec 100644 --- a/epan/dissectors/packet-smtp.c +++ b/epan/dissectors/packet-smtp.c @@ -818,7 +818,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ hidden_item = proto_tree_add_boolean(smtp_tree, hf_smtp_req, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); if (session_state->username_frame == pinfo->num) { if (decrypt == NULL) { @@ -1034,7 +1034,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (tree) { hidden_item = proto_tree_add_boolean(smtp_tree, hf_smtp_rsp, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } loffset = offset; diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index 18d67d3290..339d05a732 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -2705,7 +2705,7 @@ dissect_snmp_SNMPv3Message(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off expert_field* expert; authen_item = proto_tree_add_boolean(authen_tree, hf_snmp_msgAuthentication, tvb, 0, 0, usm_p.authOK); - PROTO_ITEM_SET_GENERATED(authen_item); + proto_item_set_generated(authen_item); if (usm_p.authOK) { expert = &ei_snmp_authentication_ok; diff --git a/epan/dissectors/packet-snort.c b/epan/dissectors/packet-snort.c index 3386287e6f..32e1b57393 100644 --- a/epan/dissectors/packet-snort.c +++ b/epan/dissectors/packet-snort.c @@ -757,7 +757,7 @@ static void snort_show_alert(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo /* Show link forward to where alert is now shown! */ ti = proto_tree_add_uint(tree, hf_snort_reassembled_in, tvb, 0, 0, alert->reassembled_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); return; } else { @@ -765,7 +765,7 @@ static void snort_show_alert(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo /* Show link back to segment where alert was detected. */ ti = proto_tree_add_uint(tree, hf_snort_reassembled_from, tvb, 0, 0, alert->original_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Should find this if look late enough.. */ reassembled_tvb = get_data_source_tvb_by_name(pinfo, "Reassembled TCP"); @@ -798,36 +798,36 @@ static void snort_show_alert(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo alert->raw_alert_ts_fixed = TRUE; } ti = proto_tree_add_string(snort_tree, hf_snort_raw_alert, tvb, 0, 0, alert->raw_alert); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Rule classification */ if (alert->classification) { ti = proto_tree_add_string(snort_tree, hf_snort_classification, tvb, 0, 0, alert->classification); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Put rule fields under a rule subtree */ rule_ti = proto_tree_add_string_format(snort_tree, hf_snort_rule, tvb, 0, 0, "", "Rule"); - PROTO_ITEM_SET_GENERATED(rule_ti); + proto_item_set_generated(rule_ti); rule_tree = proto_item_add_subtree(rule_ti, ett_snort_rule); /* msg/description */ ti = proto_tree_add_string(rule_tree, hf_snort_msg, tvb, 0, 0, alert->msg); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Snort ID */ ti = proto_tree_add_uint(rule_tree, hf_snort_sid, tvb, 0, 0, alert->sid); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Rule revision */ ti = proto_tree_add_uint(rule_tree, hf_snort_rev, tvb, 0, 0, alert->rev); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Generator seems to correspond to gid. */ ti = proto_tree_add_uint(rule_tree, hf_snort_generator, tvb, 0, 0, alert->gen); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Default priority is 2 - very few rules have a different priority... */ ti = proto_tree_add_uint(rule_tree, hf_snort_priority, tvb, 0, 0, alert->prio); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* If we know the rule for this alert, show some of the rule fields */ if (rule && rule->rule_string) { @@ -847,32 +847,32 @@ static void snort_show_alert(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo ti = proto_tree_add_string(rule_tree, hf_snort_rule_string, tvb, 0, 0, rule->rule_string); } - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Protocol from rule */ ti = proto_tree_add_string(rule_tree, hf_snort_rule_protocol, tvb, 0, 0, rule->protocol); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Show file alert came from */ ti = proto_tree_add_string(rule_tree, hf_snort_rule_filename, tvb, 0, 0, rule->file); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Line number within file */ ti = proto_tree_add_uint(rule_tree, hf_snort_rule_line_number, tvb, 0, 0, rule->line_number); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Show IP vars */ for (n=0; n < rule->relevant_vars.num_ip_vars; n++) { ti = proto_tree_add_none_format(rule_tree, hf_snort_rule_ip_var, tvb, 0, 0, "IP Var: ($%s -> %s)", rule->relevant_vars.ip_vars[n].name, rule->relevant_vars.ip_vars[n].value); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Show Port vars */ for (n=0; n < rule->relevant_vars.num_port_vars; n++) { ti = proto_tree_add_none_format(rule_tree, hf_snort_rule_port_var, tvb, 0, 0, "Port Var: ($%s -> %s)", rule->relevant_vars.port_vars[n].name, rule->relevant_vars.port_vars[n].value); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } @@ -1028,8 +1028,8 @@ static void snort_show_alert(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo ti = proto_tree_add_string(snort_tree, hf_snort_reference, tvb, 0, 0, expand_reference(g_snort_config, rule->references[n])); /* Make clickable */ - PROTO_ITEM_SET_URL(ti); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_url(ti); + proto_item_set_generated(ti); } } @@ -1041,29 +1041,29 @@ static void snort_show_alert(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo /* Create tree for these items */ stats_ti = proto_tree_add_string_format(snort_tree, hf_snort_global_stats, tvb, 0, 0, "", "Global Stats"); - PROTO_ITEM_SET_GENERATED(rule_ti); + proto_item_set_generated(rule_ti); stats_tree = proto_item_add_subtree(stats_ti, ett_snort_global_stats); /* Get overall number of rules */ get_global_rule_stats(g_snort_config, alert->sid, &number_rule_files, &number_rules, &alerts_detected, &this_rule_alerts_detected); ti = proto_tree_add_uint(stats_tree, hf_snort_global_stats_rule_file_count, tvb, 0, 0, number_rule_files); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(stats_tree, hf_snort_global_stats_rule_count, tvb, 0, 0, number_rules); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Overall alert stats (total, and where this one comes in order) */ ti = proto_tree_add_uint(stats_tree, hf_snort_global_stats_total_alerts_count, tvb, 0, 0, alerts_detected); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(stats_tree, hf_snort_global_stats_alert_match_number, tvb, 0, 0, alert->overall_match_number); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (rule) { /* Stats just for this rule (overall, and where this one comes in order) */ ti = proto_tree_add_uint(stats_tree, hf_snort_global_stats_rule_alerts_count, tvb, 0, 0, this_rule_alerts_detected); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(stats_tree, hf_snort_global_stats_rule_match_number, tvb, 0, 0, alert->rule_match_number); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Add a summary to the stats root */ proto_item_append_text(stats_ti, " (%u rules from %u files, #%u of %u alerts seen (%u/%u for sid %u))", diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index 594c0483df..4e7a14064a 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -557,7 +557,7 @@ client_display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, gchar* str; ti = proto_tree_add_uint( tree, hf_socks_ver, tvb, offset, 0, 5); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_item( tree, hf_socks_subnegotiation_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -638,7 +638,7 @@ server_display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, col_append_str(pinfo->cinfo, COL_INFO, " User authentication reply"); ti = proto_tree_add_uint( tree, hf_socks_ver, tvb, offset, 0, 5); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_item( tree, hf_socks_subnegotiation_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -655,7 +655,7 @@ server_display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, col_append_str(pinfo->cinfo, COL_INFO, " GSSAPI authentication reply"); ti = proto_tree_add_uint( tree, hf_socks_ver, tvb, offset, 0, 5); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_item( tree, hf_socks_subnegotiation_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1120,19 +1120,19 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { if ( pinfo->num > hash_info->start_done_frame){ /* add info to tree */ ti = proto_tree_add_uint( socks_tree, hf_socks_ver, tvb, offset, 0, hash_info->version); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint( socks_tree, hf_socks_cmd, tvb, offset, 0, hash_info->command); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (hash_info->dst_addr.type == AT_IPv4) { ti = proto_tree_add_ipv4( socks_tree, hf_socks_ip_dst, tvb, offset, 0, *((const guint32*)hash_info->dst_addr.data)); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else if (hash_info->dst_addr.type == AT_IPv6) { ti = proto_tree_add_ipv6( socks_tree, hf_socks_ip6_dst, tvb, offset, 0, (const ws_in6_addr *)hash_info->dst_addr.data); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* no fake address for ping & traceroute */ @@ -1140,7 +1140,7 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { if (( hash_info->command != PING_COMMAND) && ( hash_info->command != TRACERT_COMMAND)){ ti = proto_tree_add_uint( socks_tree, hf_socks_dstport, tvb, offset, 0, hash_info->port); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } else { if (hash_info->server_port == pinfo->destport) { diff --git a/epan/dissectors/packet-sprt.c b/epan/dissectors/packet-sprt.c index f8fe324608..e126c12e36 100644 --- a/epan/dissectors/packet-sprt.c +++ b/epan/dissectors/packet-sprt.c @@ -835,17 +835,17 @@ static void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Stream setup by %s (frame %u)", p_conv_data->method, p_conv_data->frame_number); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); sprt_setup_tree = proto_item_add_subtree(ti, ett_sprt_setup); if (sprt_setup_tree) { /* Add details into subtree */ proto_item* item = proto_tree_add_uint(sprt_setup_tree, hf_sprt_setup_frame, tvb, 0, 0, p_conv_data->frame_number); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_string(sprt_setup_tree, hf_sprt_setup_method, tvb, 0, 0, p_conv_data->method); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } @@ -1209,18 +1209,18 @@ dissect_sprt_data(tvbuff_t *tvb, payload_length--; } ti = proto_tree_add_uint(sprt_payload_tree, hf_sprt_payload_i_octet_dlci_setup_by_connect_frame, tvb, 0, 0, p_conv_data->connect_frame_number); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; case DLCI_ABSENT: ti = proto_tree_add_item(sprt_payload_tree, hf_sprt_payload_i_octet_no_dlci, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(sprt_payload_tree, hf_sprt_payload_i_octet_dlci_setup_by_connect_frame, tvb, 0, 0, p_conv_data->connect_frame_number); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; case DLCI_UNKNOWN: /* e.g., we didn't see the CONNECT msg so we don't know if there is a DLCI */ default: ti = proto_tree_add_item(sprt_payload_tree, hf_sprt_payload_i_octet_dlci_presence_unknown, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); break; } } diff --git a/epan/dissectors/packet-srp.c b/epan/dissectors/packet-srp.c index f9cdf7d002..9506e2beae 100644 --- a/epan/dissectors/packet-srp.c +++ b/epan/dissectors/packet-srp.c @@ -155,7 +155,7 @@ static int dissect_srp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, } else { hidden_item = proto_tree_add_boolean(srp_tree, hf_srp_crc_bad, tvb, crc_offset, 2, TRUE); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_uint_format_value(srp_tree, hf_srp_crc, tvb, crc_offset, 2, crc, "0x%04x (incorrect, should be 0x%04x)", diff --git a/epan/dissectors/packet-stt.c b/epan/dissectors/packet-stt.c index 29d94ce3c1..e7262fbf10 100644 --- a/epan/dissectors/packet-stt.c +++ b/epan/dissectors/packet-stt.c @@ -417,7 +417,7 @@ dissect_stt_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *stt_tree, } /* Show if any part of this is set to aid debugging bad implementations. */ if (attributes == 0) { - PROTO_ITEM_SET_HIDDEN(vlan_item); + proto_item_set_hidden(vlan_item); } offset += 2; diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index b81e064fd2..9e2f30e623 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -737,14 +737,14 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole it=proto_tree_add_uint(stun_tree, hf_stun_duplicate, tvb, offset, 0, stun_trans->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } if (stun_trans->rep_frame) { proto_item *it; it=proto_tree_add_uint(stun_tree, hf_stun_response_in, tvb, offset, 0, stun_trans->rep_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else { @@ -754,7 +754,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole it=proto_tree_add_uint(stun_tree, hf_stun_duplicate, tvb, offset, 0, stun_trans->rep_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } if (msg_type_class == RESPONSE || msg_type_class == ERROR_RESPONSE) { /* This is a response */ @@ -765,12 +765,12 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole it=proto_tree_add_uint(stun_tree, hf_stun_response_to, tvb, offset, 0, stun_trans->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); nstime_delta(&ns, &pinfo->abs_ts, &stun_trans->req_time); it=proto_tree_add_time(stun_tree, hf_stun_time, tvb, offset, 0, &ns); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } @@ -1049,7 +1049,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole Add host-order port into tree. */ clear_port = tvb_get_ntohs(tvb, offset+2) ^ (magic_cookie_first_word >> 16); ti = proto_tree_add_uint(att_tree, hf_stun_att_port, tvb, offset+2, 2, clear_port); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (att_length < 8) break; @@ -1062,7 +1062,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole Add in network order tree. */ clear_ip = tvb_get_ipv4(tvb, offset+4) ^ g_htonl(magic_cookie_first_word); ti = proto_tree_add_ipv4(att_tree, hf_stun_att_ipv4, tvb, offset+4, 4, clear_ip); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); { const gchar *ipstr; @@ -1097,7 +1097,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole IPv6[3] = IPv6[3] ^ g_htonl(transaction_id[2]); ti = proto_tree_add_ipv6(att_tree, hf_stun_att_ipv6, tvb, offset+4, 16, (const ws_in6_addr *)IPv6); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } break; diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index e1877c0f09..ff07d13b55 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -2209,7 +2209,7 @@ dissect_sua_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *sua_t } if (assoc && assoc->assoc_id !=0) { assoc_item = proto_tree_add_uint(tree, hf_sua_assoc_id, message_tvb, 0, 0, assoc->assoc_id); - PROTO_ITEM_SET_GENERATED(assoc_item); + proto_item_set_generated(assoc_item); #if 0 assoc_tree = proto_item_add_subtree(assoc_item, ett_sua_assoc); proto_tree_add_debug_text(assoc_tree, message_tvb, 0, 0, "routing_ind %u", assoc->calling_routing_ind); diff --git a/epan/dissectors/packet-syslog.c b/epan/dissectors/packet-syslog.c index 949e53848c..c14b2f915b 100644 --- a/epan/dissectors/packet-syslog.c +++ b/epan/dissectors/packet-syslog.c @@ -309,7 +309,7 @@ dissect_syslog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ proto_item *mtp3_item; mtp3_item = proto_tree_add_boolean(syslog_tree, hf_syslog_msu_present, tvb, msg_off, msg_len, TRUE); - PROTO_ITEM_SET_GENERATED(mtp3_item); + proto_item_set_generated(mtp3_item); } } diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index 7bfb5f6ca3..059a78307b 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -1197,17 +1197,17 @@ show_setup_info(tvbuff_t *tvb, proto_tree *tree, t38_conv *p_t38_conversation) "Stream setup by %s (frame %u)", p_t38_conversation->setup_method, p_t38_conversation->setup_frame_number); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); t38_setup_tree = proto_item_add_subtree(ti, ett_t38_setup); if (t38_setup_tree) { /* Add details into subtree */ proto_item* item = proto_tree_add_uint(t38_setup_tree, hf_t38_setup_frame, tvb, 0, 0, p_t38_conversation->setup_frame_number); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_string(t38_setup_tree, hf_t38_setup_method, tvb, 0, 0, p_t38_conversation->setup_method); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index 6b4f5f3a13..6e8bb2112a 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -918,7 +918,7 @@ dissect_tacplus_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi hidden_item = proto_tree_add_boolean(tacplus_tree, hf_tacplus_response, tvb, 0, 0, TRUE); } - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); version = tvb_get_guint8(tvb,0); proto_tree_add_uint_format_value(tacplus_tree, hf_tacplus_majvers, tvb, 0, 1, diff --git a/epan/dissectors/packet-tango.c b/epan/dissectors/packet-tango.c index 34c1d51079..1e3a6cbc0d 100644 --- a/epan/dissectors/packet-tango.c +++ b/epan/dissectors/packet-tango.c @@ -4487,7 +4487,7 @@ process_RequestOperation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, M } /* fill-up the field */ pi=proto_tree_add_string(ptree, hf_operationrequest, tvb, 0, 0, operation); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); return pi; } diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index 2f6a69345e..d94dc9a6a2 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -755,7 +755,7 @@ dissect_tcap_OrigTransactionID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, hf_index, BER_CLASS_APP, 8, TRUE, dissect_tcap_OCTET_STRING_SIZE_1_4); - PROTO_ITEM_SET_GENERATED(actx->created_item); + proto_item_set_generated(actx->created_item); offset = saved_offset; subtree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_otid, NULL, "Source Transaction ID"); @@ -842,7 +842,7 @@ dissect_tcap_DestTransactionID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, hf_index, BER_CLASS_APP, 9, TRUE, dissect_tcap_OCTET_STRING_SIZE_1_4); - PROTO_ITEM_SET_GENERATED(actx->created_item); + proto_item_set_generated(actx->created_item); offset = saved_offset; subtree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_dtid, NULL, "Destination Transaction ID"); @@ -2235,12 +2235,12 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_context=p_tcaphash_begincall->context; if (gtcap_DisplaySRT && tree) { stat_tree = proto_tree_add_subtree(tree, tvb, 0, -1, ett_tcap_stat, &stat_item, "Stat"); - PROTO_ITEM_SET_GENERATED(stat_item); + proto_item_set_generated(stat_item); pi = proto_tree_add_uint_format(stat_tree, hf_tcapsrt_Duplicate, tvb, 0, 0, p_tcaphash_context->first_frame, "Duplicate with session %u in frame %u", p_tcaphash_context->session_id,p_tcaphash_context->first_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } return p_tcaphash_context; } /* Previous session closed */ @@ -2277,9 +2277,9 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_context && p_tcaphash_context->session_id) { stat_tree = proto_tree_add_subtree(tree, tvb, 0, 0, ett_tcap_stat, &stat_item, "Stat"); - PROTO_ITEM_SET_GENERATED(stat_item); + proto_item_set_generated(stat_item); pi = proto_tree_add_uint(stat_tree, hf_tcapsrt_SessionId, tvb, 0,0, p_tcaphash_context->session_id); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* add link to response frame, if available */ /* p_tcaphash_begincall->context->last_frame) */ @@ -2291,7 +2291,7 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_context->last_frame, "End of session in frame %u", p_tcaphash_context->last_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } } return p_tcaphash_context; @@ -2451,9 +2451,9 @@ tcaphash_cont_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_context && p_tcaphash_context->session_id) { stat_tree = proto_tree_add_subtree(tree, tvb, 0, -1, ett_tcap_stat, &stat_item, "Stat"); - PROTO_ITEM_SET_GENERATED(stat_item); + proto_item_set_generated(stat_item); pi = proto_tree_add_uint(stat_tree, hf_tcapsrt_SessionId, tvb, 0,0, p_tcaphash_context->session_id); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } return p_tcaphash_context; @@ -2553,10 +2553,10 @@ tcaphash_end_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, #endif if (gtcap_DisplaySRT && tree) { stat_tree = proto_tree_add_subtree(tree, tvb, 0, -1, ett_tcap_stat, &stat_item, "Stat"); - PROTO_ITEM_SET_GENERATED(stat_item); + proto_item_set_generated(stat_item); pi = proto_tree_add_uint(stat_tree, hf_tcapsrt_SessionId, tvb, 0,0, p_tcaphash_context->session_id); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } #ifdef DEBUG_TCAPSRT @@ -2568,13 +2568,13 @@ tcaphash_end_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_context->first_frame, "Begin of session in frame %u", p_tcaphash_context->first_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* Calculate Service Response Time */ nstime_delta(&delta, &pinfo->abs_ts, &p_tcaphash_context->begin_time); /* display Service Response Time and make it filterable */ pi = proto_tree_add_time(stat_tree, hf_tcapsrt_SessionTime, tvb, 0, 0, &delta); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } /* Close the context and remove it (if needed) */ tcapsrt_close(p_tcaphash_context,pinfo); @@ -2676,10 +2676,10 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (gtcap_DisplaySRT && tree) { stat_tree = proto_tree_add_subtree(tree, tvb, 0, -1, ett_tcap_stat, &stat_item, "Stat"); - PROTO_ITEM_SET_GENERATED(stat_item); + proto_item_set_generated(stat_item); pi = proto_tree_add_uint(stat_tree, hf_tcapsrt_SessionId, tvb, 0,0, p_tcaphash_context->session_id); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); #ifdef DEBUG_TCAPSRT dbg(20,"Display framereqlink %d ",p_tcaphash_context->first_frame); @@ -2689,13 +2689,13 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_context->first_frame, "Begin of session in frame %u", p_tcaphash_context->first_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* Calculate Service Response Time */ nstime_delta(&delta, &pinfo->abs_ts, &p_tcaphash_context->begin_time); /* display Service Response Time and make it filterable */ pi = proto_tree_add_time(stat_tree, hf_tcapsrt_SessionTime, tvb, 0, 0, &delta); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } break; } /* Lastframe=0, so take it */ @@ -2768,10 +2768,10 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (gtcap_DisplaySRT && tree) { stat_tree = proto_tree_add_subtree(tree, tvb, 0, -1, ett_tcap_stat, &stat_item, "Stat"); - PROTO_ITEM_SET_GENERATED(stat_item); + proto_item_set_generated(stat_item); pi = proto_tree_add_uint(stat_tree, hf_tcapsrt_SessionId, tvb, 0,0, p_tcaphash_context->session_id); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); #ifdef DEBUG_TCAPSRT dbg(20,"Display framereqlink %d ",p_tcaphash_context->first_frame); @@ -2781,13 +2781,13 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_context->first_frame, "Begin of session in frame %u", p_tcaphash_context->first_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* Calculate Service Response Time */ nstime_delta(&delta, &pinfo->abs_ts, &p_tcaphash_context->begin_time); /* display Service Response Time and make it filterable */ pi = proto_tree_add_time(stat_tree, hf_tcapsrt_SessionTime, tvb, 0, 0, &delta); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } p_tcaphash_context=p_tcaphash_ansicall->context; } /* test with Timeout */ @@ -2820,9 +2820,9 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_context && p_tcaphash_context->session_id) { stat_tree = proto_tree_add_subtree(tree, tvb, 0, -1, ett_tcap_stat, &stat_item, "Stat"); - PROTO_ITEM_SET_GENERATED(stat_item); + proto_item_set_generated(stat_item); pi = proto_tree_add_uint(stat_tree, hf_tcapsrt_SessionId, tvb, 0,0, p_tcaphash_context->session_id); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } @@ -2837,7 +2837,7 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_ansicall->context->last_frame, "End of session in frame %u", p_tcaphash_ansicall->context->last_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } else { /* Response */ #ifdef DEBUG_TCAPSRT dbg(20,"Display framereqlink %d ",p_tcaphash_context->first_frame); @@ -2848,13 +2848,13 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p_tcaphash_context->first_frame, "Begin of session in frame %u", p_tcaphash_context->first_frame); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* Calculate Service Response Time */ nstime_delta(&delta, &pinfo->abs_ts, &p_tcaphash_context->begin_time); /* display Service Response Time and make it filterable */ pi = proto_tree_add_time(stat_tree, hf_tcapsrt_SessionTime, tvb, 0, 0, &delta); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } } /* Request or Response */ } diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index cad29dc2bd..8e37def181 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -1610,11 +1610,11 @@ tcp_print_timestamps(packet_info *pinfo, tvbuff_t *tvb, proto_tree *parent_tree, return; tree=proto_tree_add_subtree(parent_tree, tvb, 0, 0, ett_tcp_timestamps, &item, "Timestamps"); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); nstime_delta(&ts, &pinfo->abs_ts, &tcpd->ts_first); item = proto_tree_add_time(tree, hf_tcp_ts_relative, tvb, 0, 0, &ts); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if( !tcppd ) tcppd = (struct tcp_per_packet_data_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_tcp, pinfo->curr_layer_num); @@ -1622,7 +1622,7 @@ tcp_print_timestamps(packet_info *pinfo, tvbuff_t *tvb, proto_tree *parent_tree, if( tcppd ) { item = proto_tree_add_time(tree, hf_tcp_ts_delta, tvb, 0, 0, &tcppd->ts_del); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } @@ -1634,7 +1634,7 @@ print_pdu_tracking_data(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tcp_tree, col_prepend_fence_fstr(pinfo->cinfo, COL_INFO, "[Continuation to #%u] ", msp->first_frame); item=proto_tree_add_uint(tcp_tree, hf_tcp_continuation_to, tvb, 0, 0, msp->first_frame); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } /* if we know that a PDU starts inside this segment, return the adjusted @@ -1689,12 +1689,12 @@ scan_for_next_pdu(tvbuff_t *tvb, proto_tree *tcp_tree, packet_info *pinfo, int o nstime_t ns; item=proto_tree_add_uint(tcp_tree, hf_tcp_pdu_last_frame, tvb, 0, 0, msp->last_frame); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); nstime_delta(&ns, &msp->last_frame_time, &pinfo->abs_ts); item = proto_tree_add_time(tcp_tree, hf_tcp_pdu_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } @@ -2368,10 +2368,10 @@ tcp_sequence_number_analysis_print_retransmission(packet_info * pinfo, if (ta->rto_ts.secs || ta->rto_ts.nsecs) { flags_item = proto_tree_add_time(flags_tree, hf_tcp_analysis_rto, tvb, 0, 0, &ta->rto_ts); - PROTO_ITEM_SET_GENERATED(flags_item); + proto_item_set_generated(flags_item); flags_item=proto_tree_add_uint(flags_tree, hf_tcp_analysis_rto_frame, tvb, 0, 0, ta->rto_frame); - PROTO_ITEM_SET_GENERATED(flags_item); + proto_item_set_generated(flags_item); } } /* TCP Fast Retransmission */ @@ -2489,7 +2489,7 @@ tcp_sequence_number_analysis_print_duplicate(packet_info * pinfo, tvb, 0, 0, "This is a TCP duplicate ack" ); - PROTO_ITEM_SET_GENERATED(flags_item); + proto_item_set_generated(flags_item); col_prepend_fence_fstr(pinfo->cinfo, COL_INFO, "[TCP Dup ACK %u#%u] ", ta->dupack_frame, @@ -2499,10 +2499,10 @@ tcp_sequence_number_analysis_print_duplicate(packet_info * pinfo, } flags_item=proto_tree_add_uint(tree, hf_tcp_analysis_duplicate_ack_num, tvb, 0, 0, ta->dupack_num); - PROTO_ITEM_SET_GENERATED(flags_item); + proto_item_set_generated(flags_item); flags_item=proto_tree_add_uint(tree, hf_tcp_analysis_duplicate_ack_frame, tvb, 0, 0, ta->dupack_frame); - PROTO_ITEM_SET_GENERATED(flags_item); + proto_item_set_generated(flags_item); expert_add_info_format(pinfo, flags_item, &ei_tcp_analysis_duplicate_ack, "Duplicate ACK (#%u)", ta->dupack_num); } } @@ -2548,7 +2548,7 @@ tcp_sequence_number_analysis_print_bytes_in_flight(packet_info * pinfo _U_, hf_tcp_analysis_bytes_in_flight, tvb, 0, 0, ta->bytes_in_flight); - PROTO_ITEM_SET_GENERATED(flags_item); + proto_item_set_generated(flags_item); } } @@ -2581,7 +2581,7 @@ mptcp_analysis_add_subflows(packet_info *pinfo _U_, tvbuff_t *tvb, proto_item *item; item=proto_tree_add_item(parent_tree, hf_mptcp_analysis_subflows, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); tree=proto_item_add_subtree(item, ett_mptcp_analysis_subflows); @@ -2590,12 +2590,12 @@ mptcp_analysis_add_subflows(packet_info *pinfo _U_, tvbuff_t *tvb, struct tcp_analysis *sf = (struct tcp_analysis *)wmem_list_frame_data(it); proto_item *subflow_item; subflow_item=proto_tree_add_uint(tree, hf_mptcp_analysis_subflows_stream_id, tvb, 0, 0, sf->stream); - PROTO_ITEM_SET_HIDDEN(subflow_item); + proto_item_set_hidden(subflow_item); proto_item_append_text(item, " %d", sf->stream); } - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } /* Compute raw dsn if relative tcp seq covered by DSS mapping */ @@ -2642,7 +2642,7 @@ guint64 rawdsn64low, guint64 rawdsn64high else { item = proto_tree_add_uint(tree, hf_mptcp_reinjected_in, tvb, 0, 0, packet->frame); } - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } return packet; @@ -2729,7 +2729,7 @@ mptcp_analysis_dsn_lookup(packet_info *pinfo , tvbuff_t *tvb, DISSECTOR_ASSERT(mapping); item = proto_tree_add_uint(parent_tree, hf_mptcp_related_mapping, tvb, 0, 0, mapping->frame); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } @@ -2767,7 +2767,7 @@ mptcp_analysis_dsn_lookup(packet_info *pinfo , tvbuff_t *tvb, packet ); } - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); /* We can do this only if rawdsn64 is valid ! if enabled, look for overlapping mappings on other subflows */ @@ -2817,9 +2817,9 @@ mptcp_add_analysis_subtree(packet_info *pinfo, tvbuff_t *tvb, proto_tree *parent } item=proto_tree_add_item(parent_tree, hf_mptcp_analysis, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); tree=proto_item_add_subtree(item, ett_mptcp_analysis); - PROTO_ITEM_SET_GENERATED(tree); + proto_item_set_generated(tree); /* set field with mptcp stream */ if(mptcpd->master) { @@ -2835,10 +2835,10 @@ mptcp_add_analysis_subtree(packet_info *pinfo, tvbuff_t *tvb, proto_tree *parent 0, FALSE); } - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(tree, hf_mptcp_stream, tvb, 0, 0, mptcpd->stream); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); /* retrieve saved analysis of packets, else create it */ mptcppd = (mptcp_per_packet_data_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_mptcp, pinfo->curr_layer_num); @@ -2870,7 +2870,7 @@ tcp_sequence_number_analysis_print_push_bytes_sent(packet_info * pinfo _U_, hf_tcp_analysis_push_bytes_sent, tvb, 0, 0, ta->push_bytes_sent); - PROTO_ITEM_SET_GENERATED(flags_item); + proto_item_set_generated(flags_item); } } @@ -2895,7 +2895,7 @@ tcp_print_sequence_number_analysis(packet_info *pinfo, tvbuff_t *tvb, proto_tree } item=proto_tree_add_item(parent_tree, hf_tcp_analysis, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); tree=proto_item_add_subtree(item, ett_tcp_analysis); /* encapsulate all proto_tree_add_xxx in ifs so we only print what @@ -2903,19 +2903,19 @@ tcp_print_sequence_number_analysis(packet_info *pinfo, tvbuff_t *tvb, proto_tree if(ta->frame_acked) { item = proto_tree_add_uint(tree, hf_tcp_analysis_acks_frame, tvb, 0, 0, ta->frame_acked); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); /* only display RTT if we actually have something we are acking */ if( ta->ts.secs || ta->ts.nsecs ) { item = proto_tree_add_time(tree, hf_tcp_analysis_ack_rtt, tvb, 0, 0, &ta->ts); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } if (!nstime_is_zero(&tcpd->ts_first_rtt)) { item = proto_tree_add_time(tree, hf_tcp_analysis_first_rtt, tvb, 0, 0, &(tcpd->ts_first_rtt)); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if(ta->bytes_in_flight) { @@ -2926,7 +2926,7 @@ tcp_print_sequence_number_analysis(packet_info *pinfo, tvbuff_t *tvb, proto_tree if(ta->flags) { item = proto_tree_add_item(tree, hf_tcp_analysis_flags, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); flags_tree=proto_item_add_subtree(item, ett_tcp_analysis); /* print results for reused tcp ports */ @@ -3137,7 +3137,7 @@ again: if (ipfd_head->reassembled_in != 0) { item = proto_tree_add_uint(tcp_tree, hf_tcp_reassembled_in, tvb, 0, 0, ipfd_head->reassembled_in); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } } @@ -3584,7 +3584,7 @@ again: */ item = proto_tree_add_uint(tcp_tree, hf_tcp_reassembled_in, tvb, 0, 0, ipfd_head->reassembled_in); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } /* @@ -3783,13 +3783,13 @@ tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, item=proto_tree_add_uint((proto_tree *)p_get_proto_data(pinfo->pool, pinfo, proto_tcp, curr_layer_num), hf_tcp_pdu_size, tvb, offset, plen, plen); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); #if 0 } else { item = proto_tree_add_expert_format((proto_tree *)p_get_proto_data(pinfo->pool, pinfo, proto_tcp, curr_layer_num), tvb, offset, -1, "PDU Size: %u cut short at %u",plen,captured_length_remaining); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } #endif @@ -4069,7 +4069,7 @@ dissect_tcpopt_wscale(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* gen_pi = proto_tree_add_uint(wscale_tree, hf_tcp_option_wscale_multiplier, tvb, offset, 1, 1 << shift); - PROTO_ITEM_SET_GENERATED(gen_pi); + proto_item_set_generated(gen_pi); val = tvb_get_guint8(tvb, offset); proto_item_append_text(wscale_pi, ": %u (multiply by %u)", val, 1 << shift); @@ -4157,7 +4157,7 @@ dissect_tcpopt_sack(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d /* Show number of SACK ranges in this option as a generated field */ tf = proto_tree_add_uint(field_tree, hf_tcp_option_sack_range_count, tvb, 0, 0, num_sack_ranges); - PROTO_ITEM_SET_GENERATED(tf); + proto_item_set_generated(tf); return tvb_captured_length(tvb); } @@ -4451,11 +4451,11 @@ dissect_tcpopt_mptcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* item = proto_tree_add_uint(mptcp_tree, hf_mptcp_expected_token, tvb, offset, 0, tcpd->fwd->mptcp_subflow->meta->token); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint64(mptcp_tree, hf_mptcp_expected_idsn, tvb, offset, 0, tcpd->fwd->mptcp_subflow->meta->base_dsn); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); /* last ACK of 3WHS, repeats both keys */ if (optlen == 20) { @@ -4582,7 +4582,7 @@ dissect_tcpopt_mptcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* proto_item_append_text(item, " (Relative)"); } - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } else { /* ignore and continue */ @@ -4634,7 +4634,7 @@ dissect_tcpopt_mptcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* proto_item_append_text(item, " (Relative)"); } - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } else { /* ignore and continue */ @@ -4713,7 +4713,7 @@ dissect_tcpopt_mptcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* case TCPOPT_MPTCP_REMOVE_ADDR: item = proto_tree_add_uint(mptcp_tree, hf_mptcp_number_of_removed_addresses, tvb, start_offset+2, 1, optlen - 3); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); offset += 1; while(offset < start_offset + (int)optlen) { proto_tree_add_item(mptcp_tree, hf_tcp_option_mptcp_address_id, tvb, offset, @@ -5140,11 +5140,11 @@ dissect_tcpopt_snack(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* hidden_item = proto_tree_add_uint(field_tree, hf_tcp_option_snack_le, tvb, offset + 2, 2, hole_start); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_uint(field_tree, hf_tcp_option_snack_re, tvb, offset + 4, 2, hole_end); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_expert_format(field_tree, pinfo, &ei_tcp_option_snack_sequence, tvb, offset+2, 4, "SNACK Sequence %u - %u%s", hole_start, hole_end, ((tcp_relative_seq) ? " (relative)" : "")); @@ -5375,7 +5375,7 @@ dissect_tcpopt_rvbd_probe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v value is 0, but filtering is usually done for value 2 */ ver_pi = proto_tree_add_uint(field_tree, hf_tcp_option_rvbd_probe_version1, tvb, offset + PROBE_VERSION_TYPE_OFFSET, 1, ver); - PROTO_ITEM_SET_HIDDEN(ver_pi); + proto_item_set_hidden(ver_pi); switch (type) { @@ -6013,9 +6013,9 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) proto_tree_add_item(tcp_tree, hf_tcp_srcport, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tcp_tree, hf_tcp_dstport, tvb, offset + 2, 2, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_item(tcp_tree, hf_tcp_port, tvb, offset, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item(tcp_tree, hf_tcp_port, tvb, offset + 2, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* If we're dissecting the headers of a TCP packet in an ICMP packet * then go ahead and put the sequence numbers in the tree now (because @@ -6131,7 +6131,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if (tcpd) { item = proto_tree_add_uint(tcp_tree, hf_tcp_stream, tvb, offset, 0, tcpd->stream); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); /* Copy the stream index into the header as well to make it available * to tap listeners. @@ -6182,7 +6182,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tcph->th_have_seglen = TRUE; pi = proto_tree_add_uint(ti, hf_tcp_len, tvb, offset+12, 1, tcph->th_seglen); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); /* handle TCP seq# analysis parse all new segments we see */ if(tcp_analyze_seq) { @@ -6273,7 +6273,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) } else { tf=proto_tree_add_uint(tcp_tree, hf_tcp_nxtseq, tvb, offset, 0, nxtseq); } - PROTO_ITEM_SET_GENERATED(tf); + proto_item_set_generated(tf); } tf = proto_tree_add_uint(tcp_tree, hf_tcp_ack, tvb, offset + 8, 4, tcph->th_ack); @@ -6307,13 +6307,13 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tf_fin = proto_tree_add_boolean(field_tree, hf_tcp_flags_fin, tvb, offset + 13, 1, tcph->th_flags); tf = proto_tree_add_string(field_tree, hf_tcp_flags_str, tvb, offset + 12, 2, flags_str_first_letter); - PROTO_ITEM_SET_GENERATED(tf); + proto_item_set_generated(tf); /* As discussed in bug 5541, it is better to use two separate * fields for the real and calculated window size. */ proto_tree_add_uint(tcp_tree, hf_tcp_window_size_value, tvb, offset + 14, 2, real_window); scaled_pi = proto_tree_add_uint(tcp_tree, hf_tcp_window_size, tvb, offset + 14, 2, tcph->th_win); - PROTO_ITEM_SET_GENERATED(scaled_pi); + proto_item_set_generated(scaled_pi); if( !(tcph->th_flags&TH_SYN) && tcpd ) { switch (tcpd->fwd->win_scale) { @@ -6333,18 +6333,18 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) win_scale, "%d (%s)", win_scale, (override_with_pref) ? "missing - taken from preference" : "unknown"); - PROTO_ITEM_SET_GENERATED(scaled_pi); + proto_item_set_generated(scaled_pi); } break; case -2: scaled_pi = proto_tree_add_int_format_value(tcp_tree, hf_tcp_window_size_scalefactor, tvb, offset + 14, 2, tcpd->fwd->win_scale, "%d (no window scaling used)", tcpd->fwd->win_scale); - PROTO_ITEM_SET_GENERATED(scaled_pi); + proto_item_set_generated(scaled_pi); break; default: scaled_pi = proto_tree_add_int_format_value(tcp_tree, hf_tcp_window_size_scalefactor, tvb, offset + 14, 2, 1<<tcpd->fwd->win_scale, "%d", 1<<tcpd->fwd->win_scale); - PROTO_ITEM_SET_GENERATED(scaled_pi); + proto_item_set_generated(scaled_pi); } } } @@ -6448,11 +6448,11 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) checksum_tree = proto_item_add_subtree(item, ett_tcp_checksum); item = proto_tree_add_uint(checksum_tree, hf_tcp_checksum_calculated, tvb, offset + 16, 2, 0x0000); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); /* XXX - What should this special status be? */ item = proto_tree_add_uint(checksum_tree, hf_tcp_checksum_status, tvb, offset + 16, 0, 4); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); expert_add_info(pinfo, item, &ei_tcp_checksum_ffff); col_append_str(pinfo->cinfo, COL_INFO, " [TCP CHECKSUM 0xFFFF]"); @@ -6466,7 +6466,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) calc_item = proto_tree_add_uint(tcp_tree, hf_tcp_checksum_calculated, tvb, offset + 16, 2, in_cksum_shouldbe(th_sum, computed_cksum)); - PROTO_ITEM_SET_GENERATED(calc_item); + proto_item_set_generated(calc_item); /* Checksum is valid, so we're willing to desegment it. */ if (computed_cksum == 0) { @@ -6711,7 +6711,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if (tcp_display_process_info && tcpd && ((tcpd->fwd && tcpd->fwd->process_info && tcpd->fwd->process_info->command) || (tcpd->rev && tcpd->rev->process_info && tcpd->rev->process_info->command))) { field_tree = proto_tree_add_subtree(tcp_tree, tvb, offset, 0, ett_tcp_process_info, &ti, "Process Information"); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (tcpd->fwd && tcpd->fwd->process_info && tcpd->fwd->process_info->command) { proto_tree_add_uint(field_tree, hf_tcp_proc_dst_uid, tvb, 0, 0, tcpd->fwd->process_info->process_uid); proto_tree_add_uint(field_tree, hf_tcp_proc_dst_pid, tvb, 0, 0, tcpd->fwd->process_info->process_pid); diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index 71f4f8eec3..9afe780cac 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -2093,7 +2093,7 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto proto_item *pi; pi = proto_tree_add_string(sub_tree, hf_tds_type_varbyte_column_name, tvb, 0, (gint) strlen(name), (const char *)name); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } if(plp) { diff --git a/epan/dissectors/packet-tfp.c b/epan/dissectors/packet-tfp.c index 943a856c7b..2380428a37 100644 --- a/epan/dissectors/packet-tfp.c +++ b/epan/dissectors/packet-tfp.c @@ -127,7 +127,7 @@ dissect_tfp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { hf_tfp_uid, tvb, byte_offset, byte_count_tfp_uid, &tfp_uid_string[0], "%s", &tfp_uid_string[0]); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_item(tfp_tree, hf_tfp_uid_numeric, diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c index 61388fd643..6f222f7da8 100644 --- a/epan/dissectors/packet-tftp.c +++ b/epan/dissectors/packet-tftp.c @@ -382,13 +382,13 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, if (tftp_info->source_file) { ti = proto_tree_add_string(tftp_tree, hf_tftp_source_file, tvb, 0, 0, tftp_info->source_file); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (tftp_info->destination_file) { ti = proto_tree_add_string(tftp_tree, hf_tftp_destination_file, tvb, 0, 0, tftp_info->destination_file); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } @@ -466,7 +466,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, } ti = proto_tree_add_uint(tftp_tree, hf_tftp_full_blocknum, tvb, 0, 0, blocknum); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Sequence analysis on blocknums (first pass only) */ if (!PINFO_FD_VISITED(pinfo)) { @@ -579,7 +579,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, } ti = proto_tree_add_uint(tftp_tree, hf_tftp_full_blocknum, tvb, 0, 0, blocknum); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); col_append_fstr(pinfo->cinfo, COL_INFO, ", Block: %u", blocknum); diff --git a/epan/dissectors/packet-thread.c b/epan/dissectors/packet-thread.c index e11a606bda..533eb2f2cd 100644 --- a/epan/dissectors/packet-thread.c +++ b/epan/dissectors/packet-thread.c @@ -1649,7 +1649,7 @@ dissect_thread_mc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat build_u8 = tvb_get_guint8(tvb, offset); build |= (guint16)build_u8 >> 4; pi = proto_tree_add_uint(tlv_tree, hf_thread_mc_tlv_vendor_stack_ver_build, tvb, 0, 0, build); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); proto_tree_add_item(tlv_tree, hf_thread_mc_tlv_vendor_stack_ver_rev, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(tlv_tree, hf_thread_mc_tlv_vendor_stack_ver_min, tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-tibia.c b/epan/dissectors/packet-tibia.c index c715d81ffc..322e9a34f6 100644 --- a/epan/dissectors/packet-tibia.c +++ b/epan/dissectors/packet-tibia.c @@ -1226,31 +1226,31 @@ dissect_game_packet(struct tibia_convo *convo, tvbuff_t *tvb, int offset, packet if (convo->has.session_key) { if (convo->session_key) { ti = proto_tree_add_string(tree, hf_tibia_session_key_convo, tvb, offset, 0, (const char*)convo->session_key); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } else { if (convo->acc) { ti = proto_tree_add_string(tree, hf_tibia_acc_name_convo, tvb, offset, 0, (const char*)convo->acc); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (convo->pass) { ti = proto_tree_add_string(tree, hf_tibia_acc_pass_convo, tvb, offset, 0, (const char*)convo->pass); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } } if (show_char_name && convo->char_name) { ti = proto_tree_add_string(tree, hf_tibia_char_name_convo, tvb, offset, 0, (const char*)convo->char_name); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (is_xtea_encrypted) { if (pinfo->num > convo->xtea_framenum) { if (show_xtea_key && convo->has.xtea) { ti = proto_tree_add_bytes_with_length(tree, hf_tibia_xtea_key, tvb, 0, 0, (guint8*)convo->xtea_key, XTEA_KEY_LEN); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } int end = offset + len; diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 732cfe5094..fd9218413c 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -2053,7 +2053,7 @@ dissect_tipc_int_prot_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tipc_tr no_of_segments-1); item = proto_tree_add_bytes_format(tipc_tree, hf_tipc_data_fragment, tvb, offset, -1, NULL, "Segmented message size %u bytes -> No segments = %i", reassembled_msg_length, no_of_segments); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } new_tvb = process_reassembled_data(tvb, offset, pinfo, diff --git a/epan/dissectors/packet-tls.c b/epan/dissectors/packet-tls.c index 36e82ea51b..c7637ff32b 100644 --- a/epan/dissectors/packet-tls.c +++ b/epan/dissectors/packet-tls.c @@ -1516,7 +1516,7 @@ again: */ item=proto_tree_add_uint(tree, *ssl_segment_items.hf_reassembled_in, tvb, 0, 0, ipfd_head->reassembled_in); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } /* @@ -1907,7 +1907,7 @@ dissect_ssl3_record(tvbuff_t *tvb, packet_info *pinfo, content_type = record->type; ti = proto_tree_add_uint(ssl_record_tree, hf_tls_record_content_type, tvb, content_type_offset, 1, record->type); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } ssl_check_record_length(&dissect_ssl3_hf, pinfo, record_length, length_pi, version, decrypted); @@ -2699,7 +2699,7 @@ dissect_ssl2_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ti = proto_tree_add_uint(ssl_record_tree, hf_tls_record_version, tvb, initial_offset, 0, 0x0002); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Encrypted Data"); @@ -2731,7 +2731,7 @@ dissect_ssl2_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ti = proto_tree_add_uint(ssl_record_tree, hf_tls_record_version, tvb, initial_offset, 0, 0x0002); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* add the record length */ tvb_ensure_bytes_exist(tvb, offset, record_length_length); diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c index 766101dc87..d40c2044ac 100644 --- a/epan/dissectors/packet-tns.c +++ b/epan/dissectors/packet-tns.c @@ -1192,7 +1192,7 @@ dissect_tns_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data hidden_item = proto_tree_add_boolean(tns_tree, hf_tns_response, tvb, offset, 0, TRUE); } - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); chksum = tvb_get_ntohs(tvb, offset+2); if (chksum == 0 || chksum == 4) diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c index 72cd30d086..c91c2d5253 100644 --- a/epan/dissectors/packet-tr.c +++ b/epan/dissectors/packet-tr.c @@ -556,15 +556,15 @@ dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) proto_tree_add_ether(tr_tree, hf_tr_dst, tr_tvb, 2, 6, (const guint8 *)trh->dst.data); proto_tree_add_ether(tr_tree, hf_tr_src, tr_tvb, 8, 6, (const guint8 *)trh->src.data); hidden_item = proto_tree_add_ether(tr_tree, hf_tr_addr, tr_tvb, 2, 6, (const guint8 *)trh->dst.data); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_ether(tr_tree, hf_tr_addr, tr_tvb, 8, 6, (const guint8 *)trh->src.data); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); proto_tree_add_boolean(tr_tree, hf_tr_sr, tr_tvb, 8, 1, source_routed); /* non-source-routed version of src addr */ hidden_item = proto_tree_add_ether(tr_tree, hf_tr_src, tr_tvb, 8, 6, trn_shost_nonsr); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); if (source_routed) { /* RCF Byte 1 */ @@ -652,15 +652,15 @@ add_ring_bridge_pairs(int rcf_len, tvbuff_t *tvb, proto_tree *tree) segment = tvb_get_ntohs(tvb, RIF_OFFSET) >> 4; wmem_strbuf_append_printf(buf, "%03X", segment); hidden_item = proto_tree_add_uint(tree, hf_tr_rif_ring, tvb, TR_MIN_HEADER_LEN + 2, 2, segment); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } segment = tvb_get_ntohs(tvb, RIF_OFFSET + 1 + j) >> 4; brdgnmb = tvb_get_guint8(tvb, RIF_OFFSET + j) & 0x0f; wmem_strbuf_append_printf(buf, "-%01X-%03X", brdgnmb, segment); hidden_item = proto_tree_add_uint(tree, hf_tr_rif_ring, tvb, TR_MIN_HEADER_LEN + 3 + j, 2, segment); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_uint(tree, hf_tr_rif_bridge, tvb, TR_MIN_HEADER_LEN + 2 + j, 1, brdgnmb); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } proto_tree_add_string(tree, hf_tr_rif, tvb, TR_MIN_HEADER_LEN + 2, rcf_len, wmem_strbuf_get_str(buf)); diff --git a/epan/dissectors/packet-tsdns.c b/epan/dissectors/packet-tsdns.c index 380ee7b0e7..8a16d37803 100644 --- a/epan/dissectors/packet-tsdns.c +++ b/epan/dissectors/packet-tsdns.c @@ -63,7 +63,7 @@ static int dissect_tsdns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo tsdns_tree = proto_item_add_subtree(ti, ett_tsdns); hidden_item = proto_tree_add_item(tsdns_tree, hf_tsdns_data, tvb, offset, -1, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); if (request) { // request is DOMAIN\n\r\r\r\n hidden_item = proto_tree_add_boolean(tsdns_tree, hf_tsdns_request, tvb, 0, 0, 1); // using pLen - 5 as the last chars are \n\r\r\r\n which are just indicating the end of the request @@ -82,7 +82,7 @@ static int dissect_tsdns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo proto_tree_add_uint(tsdns_tree, hf_tsdns_response_port, tvb, 0, pLen, port); } } - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); return tvb_captured_length(tvb); diff --git a/epan/dissectors/packet-u3v.c b/epan/dissectors/packet-u3v.c index 4b59ecdaea..4b1ab269a9 100644 --- a/epan/dissectors/packet-u3v.c +++ b/epan/dissectors/packet-u3v.c @@ -1443,7 +1443,7 @@ dissect_u3v_read_mem_ack(proto_tree *u3v_telegram_tree, tvbuff_t *tvb, packet_in /* Bootstrap register known address */ if (have_address) { item = proto_tree_add_uint64(u3v_telegram_tree, hf_u3v_address, tvb, 0,0 , addr); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (is_known_bootstrap_register(addr, u3v_conv_info)) { dissect_u3v_register(addr, u3v_telegram_tree, tvb, offset, byte_count, u3v_conv_info); @@ -1479,7 +1479,7 @@ dissect_u3v_write_mem_ack(proto_tree *u3v_telegram_tree, tvbuff_t *tvb, packet_i if (have_address) { item = proto_tree_add_uint64(u3v_telegram_tree, hf_u3v_address, tvb, 0,0 , addr); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } /* Number of bytes successfully written to the device register map */ if ( length == 4 ) { diff --git a/epan/dissectors/packet-ubertooth.c b/epan/dissectors/packet-ubertooth.c index 81a53dde99..8aca75afd6 100644 --- a/epan/dissectors/packet-ubertooth.c +++ b/epan/dissectors/packet-ubertooth.c @@ -1739,7 +1739,7 @@ dissect_ubertooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat command_item = proto_tree_add_uint(main_tree, hf_response, tvb, offset, 0, command_response); command_tree = proto_item_add_subtree(command_item, ett_command); - PROTO_ITEM_SET_GENERATED(command_item); + proto_item_set_generated(command_item); switch (command_response) { case 1: /* Rx Symbols */ @@ -1960,7 +1960,7 @@ dissect_ubertooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat break; case 53: /* Read Register */ sub_item = proto_tree_add_uint(main_tree, hf_register, tvb, offset, 0, register_id); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); if (try_val_to_str_ext(register_id, ®ister_vals_ext)) proto_item_append_text(sub_item, " [%s]", val_to_str_ext_const(register_id, ®ister_description_vals_ext, "Unknown")); diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index a7df2c84ac..20080c31fb 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -803,7 +803,7 @@ udp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, item=proto_tree_add_uint((proto_tree *)p_get_proto_data(pinfo->pool, pinfo, hfi_udp->id, curr_layer_num), &hfi_udp_pdu_size, tvb, offset, plen, plen); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); /* * Construct a tvbuff containing the amount of the payload we have @@ -928,16 +928,16 @@ udp_print_timestamps(packet_info *pinfo, tvbuff_t *tvb, proto_tree *parent_tree, udp_p_info_t *udp_per_packet_data = (udp_p_info_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto, pinfo->curr_layer_num); tree = proto_tree_add_subtree(parent_tree, tvb, 0, 0, ett_udp_timestamps, &item, "Timestamps"); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); nstime_delta(&ts, &pinfo->abs_ts, &udp_data->ts_first); item = proto_tree_add_time(tree, &hfi_udp_ts_relative, tvb, 0, 0, &ts); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (udp_per_packet_data && udp_per_packet_data->ts_delta_valid) { item = proto_tree_add_time(tree, &hfi_udp_ts_delta, tvb, 0, 0, &udp_per_packet_data->ts_delta); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } @@ -1005,9 +1005,9 @@ dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 ip_proto) p_add_proto_data(pinfo->pool, pinfo, hfi_udp_dstport.id, pinfo->curr_layer_num, GUINT_TO_POINTER(udph->uh_dport)); hidden_item = proto_tree_add_item(udp_tree, &hfi_udp_port, tvb, offset, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); hidden_item = proto_tree_add_item(udp_tree, &hfi_udp_port, tvb, offset + 2, 2, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); /* The beginning port number, 32768 + 666 (33434), is from LBL's traceroute.c source code and this code * further assumes that 3 attempts are made per hop */ @@ -1054,7 +1054,7 @@ dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 ip_proto) udph->uh_sum_cov = reported_len; } item = proto_tree_add_uint(udp_tree, &hfi_udp_length, tvb, offset + 4, 0, udph->uh_ulen); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if ((udph->uh_sum_cov < 8) || (udph->uh_sum_cov > udph->uh_ulen)) { /* Bogus coverage - it includes the header, so it must be >= 8, and no larger then the IP payload size. */ proto_item_append_text(len_cov_item, " (bogus, must be >= 8 and <= %u)", udph->uh_ulen); @@ -1088,7 +1088,7 @@ dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 ip_proto) /* XXX - What should this special status be? */ item = proto_tree_add_uint(checksum_tree, &hfi_udp_checksum_status, tvb, offset + 6, 0, 4); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } else if (!pinfo->fragmented && (len >= reported_len) && (len >= udph->uh_sum_cov) && (reported_len >= udph->uh_sum_cov) && @@ -1143,7 +1143,7 @@ dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 ip_proto) calc_item = proto_tree_add_uint(checksum_tree, &hfi_udp_checksum_calculated, tvb, offset + 6, 2, udph->uh_sum); } - PROTO_ITEM_SET_GENERATED(calc_item); + proto_item_set_generated(calc_item); } else { proto_tree_add_checksum(udp_tree, tvb, offset + 6, &hfi_udp_checksum, hfi_udp_checksum_status.id, &ei_udp_checksum_bad, pinfo, 0, ENC_BIG_ENDIAN, PROTO_CHECKSUM_NO_FLAGS); @@ -1164,7 +1164,7 @@ dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 ip_proto) udpd = get_udp_conversation_data(conv, pinfo); if (udpd) { item = proto_tree_add_uint(udp_tree, &hfi_udp_stream, tvb, offset, 0, udpd->stream); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); /* Copy the stream index into the header as well to make it available * to tap listeners. @@ -1176,7 +1176,7 @@ dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 ip_proto) if (udpd && ((udpd->fwd && udpd->fwd->command) || (udpd->rev && udpd->rev->command))) { process_tree = proto_tree_add_subtree(udp_tree, tvb, offset, 0, ett_udp_process_info, &ti, "Process Information"); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (udpd->fwd && udpd->fwd->command) { proto_tree_add_uint(process_tree, &hfi_udp_proc_dst_uid, tvb, 0, 0, udpd->fwd->process_uid); proto_tree_add_uint(process_tree, &hfi_udp_proc_dst_pid, tvb, 0, 0, udpd->fwd->process_pid); diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index 14af35d98f..216615076b 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -736,7 +736,7 @@ dissect_tb_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, 0, chan+1); proto_item_append_text(no_tb_ti, " (of size %d)", p_fp_info->chan_tf_size[chan]); - PROTO_ITEM_SET_GENERATED(no_tb_ti); + proto_item_set_generated(no_tb_ti); } /* Show TBs from non-empty channels */ @@ -766,11 +766,11 @@ dissect_tb_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if ( p_fp_info->channel == CHANNEL_RACH_FDD) { /*In RACH we don't have any QE field, hence go back 8 bits.*/ crci_bit = tvb_get_bits8(tvb, crci_bit_offset+n-8, 1); item = proto_tree_add_item(data_tree, hf_fp_crci[n%8], tvb, (crci_bit_offset+n-8)/8, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } else { crci_bit = tvb_get_bits8(tvb, crci_bit_offset+n, 1); item = proto_tree_add_item(data_tree, hf_fp_crci[n%8], tvb, (crci_bit_offset+n)/8, 1, ENC_BIG_ENDIAN); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } @@ -1283,14 +1283,14 @@ dissect_hsdpa_capacity_allocation(packet_info *pinfo, proto_tree *tree, /* Calculated and show effective rate enabled */ if (credits == 2047) { rate_ti = proto_tree_add_item(tree, hf_fp_hsdsch_unlimited_rate, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(rate_ti); + proto_item_set_generated(rate_ti); } else { if (interval != 0) { /* Cast on credits is safe, since we know it won't exceed 10^11 */ rate_ti = proto_tree_add_uint(tree, hf_fp_hsdsch_calculated_rate, tvb, 0, 0, (guint16)credits * max_pdu_length * (1000 / (interval*10))); - PROTO_ITEM_SET_GENERATED(rate_ti); + proto_item_set_generated(rate_ti); } } @@ -1361,13 +1361,13 @@ dissect_hsdpa_capacity_allocation_type_2(packet_info *pinfo, proto_tree *tree, /* Calculated and show effective rate enabled */ if (credits == 65535) { rate_ti = proto_tree_add_item(tree, hf_fp_hsdsch_unlimited_rate, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(rate_ti); + proto_item_set_generated(rate_ti); } else { if (interval != 0) { rate_ti = proto_tree_add_uint(tree, hf_fp_hsdsch_calculated_rate, tvb, 0, 0, credits * max_pdu_length * (1000 / (interval*10))); - PROTO_ITEM_SET_GENERATED(rate_ti); + proto_item_set_generated(rate_ti); } } @@ -2050,11 +2050,11 @@ dissect_pch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, (p_fp_info->paging_indications+7) / 8, ENC_NA); proto_item_append_text(ti, " (%u bits)", p_fp_info->paging_indications); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); relevant_pi_tree = proto_item_add_subtree(ti, ett_fp_pch_relevant_pi); ti = proto_tree_add_uint(relevant_pi_tree, hf_fp_relevant_pi_frame, tvb, 0, 0, p_fp_info->relevant_paging_indications->frame_number); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else { /* PI info not attached. Check if this frame has any Transport Blocks (i.e. RRC payloads) */ @@ -5827,7 +5827,7 @@ dissect_fp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat proto_item *item= proto_tree_add_uint(fp_tree, hf_fp_ul_setup_frame, tvb, 0, 0, p_conv_data->ul_frame_number); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } else { /* CRNC -> Node B */ @@ -5836,7 +5836,7 @@ dissect_fp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat /* Maybe the frame number should be stored in the proper location already in nbap?, in ul_frame_number*/ proto_item *item= proto_tree_add_uint(fp_tree, hf_fp_dl_setup_frame, tvb, 0, 0, p_conv_data->ul_frame_number); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (p_fp_info == NULL) { p_fp_info = fp_set_per_packet_inf_from_conv(p_conv, p_conv_data, tvb, pinfo, fp_tree); @@ -5864,19 +5864,19 @@ dissect_fp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat proto_item *temp_ti; release_ti = proto_tree_add_item(fp_tree, hf_fp_release, tvb, 0, 0, ENC_NA); - PROTO_ITEM_SET_GENERATED(release_ti); + proto_item_set_generated(release_ti); proto_item_append_text(release_ti, " R%u (%d/%d)", p_fp_info->release, p_fp_info->release_year, p_fp_info->release_month); release_tree = proto_item_add_subtree(release_ti, ett_fp_release); temp_ti = proto_tree_add_uint(release_tree, hf_fp_release_version, tvb, 0, 0, p_fp_info->release); - PROTO_ITEM_SET_GENERATED(temp_ti); + proto_item_set_generated(temp_ti); temp_ti = proto_tree_add_uint(release_tree, hf_fp_release_year, tvb, 0, 0, p_fp_info->release_year); - PROTO_ITEM_SET_GENERATED(temp_ti); + proto_item_set_generated(temp_ti); temp_ti = proto_tree_add_uint(release_tree, hf_fp_release_month, tvb, 0, 0, p_fp_info->release_month); - PROTO_ITEM_SET_GENERATED(temp_ti); + proto_item_set_generated(temp_ti); } /* Show channel type in info column, tree */ @@ -5899,17 +5899,17 @@ dissect_fp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat /* Add channel type as a generated field */ ti = proto_tree_add_uint(fp_tree, hf_fp_channel_type, tvb, 0, 0, p_fp_info->channel); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Add division type as a generated field */ if (p_fp_info->release == 7) { ti = proto_tree_add_uint(fp_tree, hf_fp_division, tvb, 0, 0, p_fp_info->division); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Add link direction as a generated field */ ti = proto_tree_add_uint(fp_tree, hf_fp_direction, tvb, 0, 0, p_fp_info->is_uplink); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* Don't currently handle IuR-specific formats, but it's useful to even see the channel type and direction */ @@ -5925,7 +5925,7 @@ dissect_fp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat ddi_config_ti = proto_tree_add_string_format(fp_tree, hf_fp_ddi_config, tvb, offset, 0, "", "DDI Config ("); - PROTO_ITEM_SET_GENERATED(ddi_config_ti); + proto_item_set_generated(ddi_config_ti); ddi_config_tree = proto_item_add_subtree(ddi_config_ti, ett_fp_ddi_config); /* Add each entry */ @@ -5935,10 +5935,10 @@ dissect_fp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat p_fp_info->edch_ddi[n], p_fp_info->edch_macd_pdu_size[n]); ti = proto_tree_add_uint(ddi_config_tree, hf_fp_ddi_config_ddi, tvb, 0, 0, p_fp_info->edch_ddi[n]); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(ddi_config_tree, hf_fp_ddi_config_macd_pdu_size, tvb, 0, 0, p_fp_info->edch_macd_pdu_size[n]); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } proto_item_append_text(ddi_config_ti, ")"); @@ -5989,7 +5989,7 @@ dissect_fp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat entity_ti = proto_tree_add_uint(fp_tree, hf_fp_hsdsch_entity, tvb, 0, 0, p_fp_info->hsdsch_entity); - PROTO_ITEM_SET_GENERATED(entity_ti); + proto_item_set_generated(entity_ti); } switch (p_fp_info->hsdsch_entity) { case entity_not_specified: @@ -6035,7 +6035,7 @@ dissect_fp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat entity_ti = proto_tree_add_uint(fp_tree, hf_fp_edch_entity, tvb, 0, 0, p_fp_info->edch_type); - PROTO_ITEM_SET_GENERATED(entity_ti); + proto_item_set_generated(entity_ti); } dissect_e_dch_channel_info(tvb, pinfo, fp_tree, offset, p_fp_info, p_fp_info->channel == CHANNEL_EDCH_COMMON, diff --git a/epan/dissectors/packet-umts_mac.c b/epan/dissectors/packet-umts_mac.c index 105c2c2ba8..60737bd8a2 100644 --- a/epan/dissectors/packet-umts_mac.c +++ b/epan/dissectors/packet-umts_mac.c @@ -294,10 +294,10 @@ static guint16 tree_add_common_dcch_dtch_fields(tvbuff_t *tvb, packet_info *pinf proto_item *temp; proto_tree *resolved_urnti_tree; temp = proto_tree_add_uint(tree, hf_mac_resolved_urnti, tvb, 0, 0, fp_crnti_allocation_info->urnti); - PROTO_ITEM_SET_GENERATED(temp); + proto_item_set_generated(temp); resolved_urnti_tree = proto_item_add_subtree(temp, ett_mac_resolved_urnti); temp = proto_tree_add_uint(resolved_urnti_tree , hf_mac_crnti_urnti_match_frame, tvb, 0, 0, fp_crnti_allocation_info->alloc_frame_number); - PROTO_ITEM_SET_GENERATED(temp); + proto_item_set_generated(temp); } else { /* Using C-RNTI */ @@ -315,7 +315,7 @@ static guint16 tree_add_common_dcch_dtch_fields(tvbuff_t *tvb, packet_info *pinf bitoffs += 4; if(rlcinf){ temp = proto_tree_add_uint(tree, hf_mac_lch_id, tvb, 0, 0, rlcinf->rbid[fpinf->cur_tb]); - PROTO_ITEM_SET_GENERATED(temp); + proto_item_set_generated(temp); } } return bitoffs; @@ -335,7 +335,7 @@ static int dissect_mac_fdd_pch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr pch_tree = proto_item_add_subtree(ti, ett_mac_pch); proto_item_append_text(ti, " (PCCH)"); channel_type = proto_tree_add_uint(pch_tree, hf_mac_channel, tvb, 0, 0, MAC_PCCH); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); } call_dissector_with_data(rlc_pcch_handle, tvb, pinfo, tree, data); return tvb_captured_length(tvb); @@ -386,7 +386,7 @@ static int dissect_mac_fdd_rach(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t case TCTF_CCCH_RACH_FDD: proto_item_append_text(ti, " (CCCH)"); channel_type = proto_tree_add_uint(rach_tree, hf_mac_channel, tvb, 0, 0, MAC_CCCH); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); next_tvb = tvb_new_octet_aligned(tvb, bitoffs, fpinf->chan_tf_size[chan] - bitoffs); add_new_data_source(pinfo, next_tvb, "Octet-Aligned CCCH Data"); call_dissector_with_data(rlc_ccch_handle, next_tvb, pinfo, tree, data); @@ -406,7 +406,7 @@ static int dissect_mac_fdd_rach(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t case MAC_CONTENT_DCCH: proto_item_append_text(ti, " (DCCH)"); channel_type = proto_tree_add_uint(rach_tree, hf_mac_channel, tvb, 0, 0, MAC_DCCH); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); next_tvb = tvb_new_octet_aligned(tvb, bitoffs, fpinf->chan_tf_size[chan] - bitoffs); add_new_data_source(pinfo, next_tvb, "Octet-Aligned DCCH Data"); call_dissector_with_data(rlc_dcch_handle, next_tvb, pinfo, tree, data); @@ -414,7 +414,7 @@ static int dissect_mac_fdd_rach(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t case MAC_CONTENT_PS_DTCH: proto_item_append_text(ti, " (PS DTCH)"); channel_type = proto_tree_add_uint(rach_tree, hf_mac_channel, tvb, 0, 0, MAC_DTCH); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); next_tvb = tvb_new_octet_aligned(tvb, bitoffs, fpinf->chan_tf_size[chan] - bitoffs); add_new_data_source(pinfo, next_tvb, "Octet-Aligned DTCH Data"); call_dissector_with_data(rlc_ps_dtch_handle, next_tvb, pinfo, tree, data); @@ -483,7 +483,7 @@ static int dissect_mac_fdd_fach(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t case TCTF_CCCH_FACH_FDD: proto_item_append_text(ti, " (CCCH)"); channel_type = proto_tree_add_uint(fach_tree, hf_mac_channel, tvb, 0, 0, MAC_CCCH); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); /* CCCH over FACH is always octet aligned */ next_tvb = tvb_new_subset_remaining(tvb, 1); call_dissector_with_data(rlc_ccch_handle, next_tvb, pinfo, tree, data); @@ -504,7 +504,7 @@ static int dissect_mac_fdd_fach(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t case MAC_CONTENT_DCCH: proto_item_append_text(ti, " (DCCH)"); channel_type = proto_tree_add_uint(fach_tree, hf_mac_channel, tvb, 0, 0, MAC_DCCH); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); next_tvb = tvb_new_octet_aligned(tvb, bitoffs, fpinf->chan_tf_size[chan] - bitoffs); add_new_data_source(pinfo, next_tvb, "Octet-Aligned DCCH Data"); call_dissector_with_data(rlc_dcch_handle, next_tvb, pinfo, tree, data); @@ -512,7 +512,7 @@ static int dissect_mac_fdd_fach(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t case MAC_CONTENT_PS_DTCH: proto_item_append_text(ti, " (PS DTCH)"); channel_type = proto_tree_add_uint(fach_tree, hf_mac_channel, tvb, 0, 0, MAC_DTCH); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); next_tvb = tvb_new_octet_aligned(tvb, bitoffs, fpinf->chan_tf_size[chan] - bitoffs); add_new_data_source(pinfo, next_tvb, "Octet-Aligned DCCH Data"); call_dissector_with_data(rlc_ps_dtch_handle, next_tvb, pinfo, tree, data); @@ -530,7 +530,7 @@ static int dissect_mac_fdd_fach(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t case TCTF_CTCH_FACH_FDD: proto_item_append_text(ti, " (CTCH)"); channel_type = proto_tree_add_uint(fach_tree, hf_mac_channel, tvb, 0, 0, MAC_CTCH); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); /* CTCH over FACH is always octet aligned */ next_tvb = tvb_new_subset_remaining(tvb, 1); call_dissector_with_data(rlc_ctch_handle, next_tvb, pinfo, tree, data); @@ -539,7 +539,7 @@ static int dissect_mac_fdd_fach(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t case TCTF_BCCH_FACH_FDD: proto_item_append_text(ti, " (BCCH)"); channel_type = proto_tree_add_uint(fach_tree, hf_mac_channel, tvb, 0, 0, MAC_BCCH); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); /*We need to skip the first two bits (the TCTF bits), and since there is no MAC header, send rest to RRC*/ next_tvb= tvb_new_octet_aligned(tvb, 2, (tvb_reported_length(tvb)*8)-2); @@ -616,7 +616,7 @@ static int dissect_mac_fdd_dch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr /*Show logical channel id*/ channel_type = proto_tree_add_uint(dch_tree, hf_mac_lch_id, tvb, 0, 0, macinf->lchid[pos]); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); if(macinf->lchid[pos]!= 255){ if(macinf->fake_chid[pos]){ @@ -627,32 +627,32 @@ static int dissect_mac_fdd_dch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr } channel_type = proto_tree_add_uint(dch_tree, hf_mac_channel, tvb, 0, 0, MAC_DCCH); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); /*Transport channel printout*/ channel_type = proto_tree_add_uint(dch_tree, hf_mac_trch_id, tvb, 0, 0, macinf->trchid[pos]); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); call_dissector_with_data(rlc_dcch_handle, next_tvb, pinfo, tree, data); break; case MAC_CONTENT_PS_DTCH: proto_item_append_text(ti, " (PS DTCH)"); /*Show logical channel id*/ channel_type = proto_tree_add_uint(dch_tree, hf_mac_lch_id, tvb, 0, 0, macinf->lchid[pos]); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); if(macinf->lchid[pos]== 255){ expert_add_info(pinfo, channel_type, &ei_mac_no_logical_channel); } channel_type = proto_tree_add_uint(dch_tree, hf_mac_channel, tvb, 0, 0, MAC_DTCH); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); call_dissector_with_data(rlc_ps_dtch_handle, next_tvb, pinfo, tree, data); break; case MAC_CONTENT_CS_DTCH: proto_item_append_text(ti, " (CS DTCH)"); /*Show logical channel id*/ channel_type = proto_tree_add_uint(dch_tree, hf_mac_lch_id, tvb, 0, 0, macinf->lchid[pos]); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); if(macinf->lchid[pos]!= 255){ if(macinf->fake_chid[pos]){ expert_add_info(pinfo, channel_type, &ei_mac_faked_logical_channel_id); @@ -662,11 +662,11 @@ static int dissect_mac_fdd_dch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr } channel_type = proto_tree_add_uint(dch_tree, hf_mac_channel, tvb, 0, 0, MAC_DTCH); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); /*Transport channel printout*/ channel_type = proto_tree_add_uint(dch_tree, hf_mac_trch_id, tvb, 0, 0, macinf->trchid[pos]); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); break; default: @@ -1057,7 +1057,7 @@ static int dissect_mac_fdd_edch_type2(tvbuff_t *tvb, packet_info *pinfo, proto_t macis_sdu_tree = proto_item_add_subtree(ti, ett_mac_edch_type2_sdu); proto_item_append_text(ti, " (Logical channel=%u, Len=%u)", lchid, sdulength); temp = proto_tree_add_uint(ti, hf_mac_lch_id, tvb, 0, 0, lchid); - PROTO_ITEM_SET_GENERATED(temp); + proto_item_set_generated(temp); /*Set up information needed for MAC and lower layers*/ rlcinf->mode[sdu_no] = lchId_rlc_map[lchid]; /* Set RLC mode by lchid to RLC_MODE map in nbap.h */ rlcinf->ueid[sdu_no] = p_fp_info->com_context_id; @@ -1113,10 +1113,10 @@ static int dissect_mac_fdd_edch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t /*Show the logical channel id*/ channel_type = proto_tree_add_uint(edch_tree, hf_mac_lch_id, tvb, 0, 0, macinf->lchid[pos]); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); channel_type = proto_tree_add_uint(edch_tree, hf_mac_channel, tvb, 0, 0, MAC_DCCH); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); call_dissector_with_data(rlc_dcch_handle, tvb, pinfo, tree, data); @@ -1126,10 +1126,10 @@ static int dissect_mac_fdd_edch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t /*Show the logical channel id*/ channel_type = proto_tree_add_uint(edch_tree, hf_mac_lch_id, tvb, 0, 0, macinf->lchid[pos]); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); channel_type = proto_tree_add_uint(edch_tree, hf_mac_channel, tvb, 0, 0, MAC_DTCH); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); call_dissector_with_data(rlc_ps_dtch_handle, tvb, pinfo, tree, data); break; @@ -1268,7 +1268,7 @@ static int dissect_mac_fdd_hsdsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree proto_item_append_text(ti, " (CCCH)"); /*Set the logical channel id if it exists */ channel_type = proto_tree_add_uint(hsdsch_tree, hf_mac_lch_id, tvb, 0, 0, macinf->lchid[pos]); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); if(macinf->lchid[pos] != 255){ if(macinf->fake_chid[pos]){ expert_add_info(pinfo, channel_type, &ei_mac_faked_logical_channel_id); @@ -1278,20 +1278,20 @@ static int dissect_mac_fdd_hsdsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree } /*Set the type of channel*/ channel_type = proto_tree_add_uint(hsdsch_tree, hf_mac_channel, tvb, 0, 0, MAC_DCCH); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); /*Set the MACd-Flow ID*/ channel_type = proto_tree_add_uint(hsdsch_tree, hf_mac_macdflowd_id, tvb, 0, 0, macinf->macdflow_id[pos]); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); call_dissector_with_data(rlc_ccch_handle, next_tvb, pinfo, tree, data); break; case MAC_CONTENT_DCCH: proto_item_append_text(ti, " (DCCH)"); /* channel_type = proto_tree_add_uint(hsdsch_tree, hf_mac_channel_hsdsch, tvb, 0, 0, MAC_DCCH); - PROTO_ITEM_SET_GENERATED(channel_type)*/ + proto_item_set_generated(channel_type)*/ /*Set the logical channel id if it exists */ channel_type = proto_tree_add_uint(hsdsch_tree, hf_mac_lch_id, tvb, 0, 0, macinf->lchid[pos]); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); if(macinf->lchid[pos] != 255){ if(macinf->fake_chid[pos]){ expert_add_info(pinfo, channel_type, &ei_mac_faked_logical_channel_id); @@ -1303,11 +1303,11 @@ static int dissect_mac_fdd_hsdsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /*Set the type of channel*/ channel_type = proto_tree_add_uint(hsdsch_tree, hf_mac_channel, tvb, 0, 0, MAC_DCCH); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); /*Set the MACd-Flow ID*/ channel_type = proto_tree_add_uint(hsdsch_tree, hf_mac_macdflowd_id, tvb, 0, 0, macinf->macdflow_id[pos]); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); call_dissector_with_data(rlc_dcch_handle, next_tvb, pinfo, tree, data); break; case MAC_CONTENT_PS_DTCH: @@ -1315,7 +1315,7 @@ static int dissect_mac_fdd_hsdsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /*Set the logical channel id if it exists */ channel_type = proto_tree_add_uint(hsdsch_tree, hf_mac_lch_id, tvb, 0, 0, macinf->lchid[pos]); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); if(macinf->lchid[pos] != 255){ if(macinf->fake_chid[pos]){ expert_add_info(pinfo, channel_type, &ei_mac_faked_logical_channel_id); @@ -1327,11 +1327,11 @@ static int dissect_mac_fdd_hsdsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /*Sets the channel type*/ channel_type = proto_tree_add_uint(hsdsch_tree, hf_mac_channel, tvb, 0, 0, MAC_DTCH); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); /*Set the MACd-Flow ID*/ channel_type = proto_tree_add_uint(hsdsch_tree, hf_mac_macdflowd_id, tvb, 0, 0, macinf->macdflow_id[pos]); - PROTO_ITEM_SET_GENERATED(channel_type); + proto_item_set_generated(channel_type); call_dissector_with_data(rlc_ps_dtch_handle, next_tvb, pinfo, tree, data); break; diff --git a/epan/dissectors/packet-umts_rlc.c b/epan/dissectors/packet-umts_rlc.c index 007fb3fa75..426f354658 100644 --- a/epan/dissectors/packet-umts_rlc.c +++ b/epan/dissectors/packet-umts_rlc.c @@ -762,7 +762,7 @@ tree_add_li(enum rlc_mode mode, struct rlc_li *li, guint8 li_idx, guint32 hdr_of if (li->li > tvb_reported_length_remaining(tvb, hdr_offs)) return li_tree; if (li->len > li->li) return li_tree; ti = proto_tree_add_item(li_tree, hf_rlc_li_data, tvb, hdr_offs + li->li - li->len, li->len, ENC_NA); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); } return li_tree; @@ -1388,13 +1388,13 @@ add_channel_info(packet_info * pinfo, proto_tree * tree, fp_info * fpinf, rlc_in channel_tree = proto_item_add_subtree(item, ett_rlc_channel); proto_item_append_text(item, " (rbid: %u, dir: %s, uid: 0x%08x)", rlcinf->rbid[fpinf->cur_tb], val_to_str_const(pinfo->link_dir, rlc_dir_vals, "Unknown"), rlcinf->ueid[fpinf->cur_tb]); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(channel_tree, hf_rlc_channel_rbid, NULL, 0, 0, rlcinf->rbid[fpinf->cur_tb]); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(channel_tree, hf_rlc_channel_dir, NULL, 0, 0, pinfo->link_dir); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(channel_tree, hf_rlc_channel_ueid, NULL, 0, 0, rlcinf->ueid[fpinf->cur_tb]); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } @@ -1982,11 +1982,11 @@ dissect_rlc_um(enum rlc_channel_type channel, tvbuff_t *tvb, packet_info *pinfo, truncated_ti = proto_tree_add_boolean(tree, hf_rlc_header_only, tvb, 0, 0, is_truncated); if (is_truncated) { - PROTO_ITEM_SET_GENERATED(truncated_ti); + proto_item_set_generated(truncated_ti); expert_add_info(pinfo, truncated_ti, &ei_rlc_header_only); return; } else { - PROTO_ITEM_SET_HIDDEN(truncated_ti); + proto_item_set_hidden(truncated_ti); } } @@ -2414,11 +2414,11 @@ dissect_rlc_am(enum rlc_channel_type channel, tvbuff_t *tvb, packet_info *pinfo, truncated_ti = proto_tree_add_boolean(tree, hf_rlc_header_only, tvb, 0, 0, is_truncated); if (is_truncated) { - PROTO_ITEM_SET_GENERATED(truncated_ti); + proto_item_set_generated(truncated_ti); expert_add_info(pinfo, truncated_ti, &ei_rlc_header_only); return; } else { - PROTO_ITEM_SET_HIDDEN(truncated_ti); + proto_item_set_hidden(truncated_ti); } } diff --git a/epan/dissectors/packet-usb-com.c b/epan/dissectors/packet-usb-com.c index 0a42db6f57..279069c139 100644 --- a/epan/dissectors/packet-usb-com.c +++ b/epan/dissectors/packet-usb-com.c @@ -565,7 +565,7 @@ dissect_usb_com_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi ti = proto_tree_add_uint(subtree, hf_usb_com_control_subclass, tvb, 0, 0, usb_conv_info->interfaceSubclass); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); is_request = (pinfo->srcport==NO_ENDPOINT); col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s", @@ -584,7 +584,7 @@ dissect_usb_com_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi } else { ti = proto_tree_add_uint(subtree, hf_usb_com_control_response_code, tvb, 0, 0, usb_trans_info->setup.request); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } switch (usb_trans_info->setup.request) diff --git a/epan/dissectors/packet-usb-dfu.c b/epan/dissectors/packet-usb-dfu.c index b5f4fddd33..0f23609886 100644 --- a/epan/dissectors/packet-usb-dfu.c +++ b/epan/dissectors/packet-usb-dfu.c @@ -336,21 +336,21 @@ dissect_usb_dfu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) command_item = proto_tree_add_uint(main_tree, hf_response, tvb, offset, 0, command_response); command_tree = proto_item_add_subtree(command_item, ett_command); - PROTO_ITEM_SET_GENERATED(command_item); + proto_item_set_generated(command_item); if (command_data) { command_item = proto_tree_add_uint(main_tree, hf_setup_interface, tvb, offset, 0, command_data->interface); - PROTO_ITEM_SET_GENERATED(command_item); + proto_item_set_generated(command_item); command_item = proto_tree_add_uint(main_tree, hf_command_in_frame, tvb, offset, 0, command_data->command_frame_number); - PROTO_ITEM_SET_GENERATED(command_item); + proto_item_set_generated(command_item); } switch (command_response) { case 0x02: /* Upload */ if (block_number != -1) { sub_item = proto_tree_add_uint(main_tree, hf_setup_block_number, tvb, offset, 0, block_number); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); col_append_fstr(pinfo->cinfo, COL_INFO, " Block Number=%u", block_number); } diff --git a/epan/dissectors/packet-usb-i1d3.c b/epan/dissectors/packet-usb-i1d3.c index 94ba3bdc17..f8e043fc06 100644 --- a/epan/dissectors/packet-usb-i1d3.c +++ b/epan/dissectors/packet-usb-i1d3.c @@ -233,7 +233,7 @@ static void dissect_usb_i1d3_command( proto_item *response_item = proto_tree_add_uint( tree, hf_usb_i1d3_response_in, tvb, 0, 0, transaction->response); - PROTO_ITEM_SET_GENERATED(response_item); + proto_item_set_generated(response_item); } const gchar *command_code_string = try_val_to_str( @@ -405,14 +405,14 @@ static void dissect_usb_i1d3_response( proto_item *request_item = proto_tree_add_uint( tree, hf_usb_i1d3_request_in, tvb, 0, 0, transaction ? transaction->request : 0); - PROTO_ITEM_SET_GENERATED(request_item); + proto_item_set_generated(request_item); if (!transaction) { expert_add_info(pinfo, request_item, &ei_usb_i1d3_unexpected_response); } else { proto_item *command_code_item = proto_tree_add_uint( tree, hf_usb_i1d3_command_code, tvb, 0, 0, transaction->command_code); - PROTO_ITEM_SET_GENERATED(command_code_item); + proto_item_set_generated(command_code_item); } const gchar *command_string = transaction ? try_val_to_str( @@ -593,11 +593,11 @@ static void dissect_usb_i1d3_response( proto_item *offset_item = proto_tree_add_uint( tree, hf_usb_i1d3_readintee_offset, tvb, 0, 0, transaction->offset); - PROTO_ITEM_SET_GENERATED(offset_item); + proto_item_set_generated(offset_item); proto_item *length_item = proto_tree_add_uint( tree, hf_usb_i1d3_readintee_length, tvb, 0, 0, transaction->length); - PROTO_ITEM_SET_GENERATED(length_item); + proto_item_set_generated(length_item); proto_tree_add_item( tree, hf_usb_i1d3_readintee_data, tvb, 4, transaction->length, ENC_NA); @@ -611,11 +611,11 @@ static void dissect_usb_i1d3_response( proto_item *offset_item = proto_tree_add_uint( tree, hf_usb_i1d3_readextee_offset, tvb, 0, 0, transaction->offset); - PROTO_ITEM_SET_GENERATED(offset_item); + proto_item_set_generated(offset_item); proto_item *length_item = proto_tree_add_uint( tree, hf_usb_i1d3_readextee_length, tvb, 0, 0, transaction->length); - PROTO_ITEM_SET_GENERATED(length_item); + proto_item_set_generated(length_item); proto_tree_add_item( tree, hf_usb_i1d3_readextee_data, tvb, 5, transaction->length, ENC_NA); diff --git a/epan/dissectors/packet-usb-video.c b/epan/dissectors/packet-usb-video.c index 492a02d83e..150a9c58ee 100644 --- a/epan/dissectors/packet-usb-video.c +++ b/epan/dissectors/packet-usb-video.c @@ -1836,14 +1836,14 @@ dissect_usb_vid_get_set(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, ti = proto_tree_add_uint(tree, hf_usb_vid_control_interface, tvb, 0, 0, usb_trans_info->setup.wIndex & 0xFF); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(tree, hf_usb_vid_control_entity, tvb, 0, 0, entity_id); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint_format_value(tree, hf_usb_vid_control_selector, tvb, 0, 0, control_sel, "%s (0x%02x)", short_name, control_sel); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (!is_request || (usb_trans_info->setup.request == USB_SETUP_SET_CUR)) diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index dcd82a09e9..e9367772ac 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -3484,7 +3484,7 @@ try_dissect_next_protocol(proto_tree *tree, tvbuff_t *next_tvb, packet_info *pin usb_tap_queue_packet(pinfo, urb_type, usb_conv_info); sub_item = proto_tree_add_uint(urb_tree, hf_usb_bInterfaceClass, next_tvb, 0, 0, usb_conv_info->interfaceClass); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); break; default: @@ -3952,16 +3952,16 @@ usb_set_addr(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, guint16 bus_id str_dst_addr = address_to_str(wmem_packet_scope(), &pinfo->dst); sub_item = proto_tree_add_string(tree, hf_usb_src, tvb, 0, 0, str_src_addr); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); sub_item = proto_tree_add_string(tree, hf_usb_addr, tvb, 0, 0, str_src_addr); - PROTO_ITEM_SET_HIDDEN(sub_item); + proto_item_set_hidden(sub_item); sub_item = proto_tree_add_string(tree, hf_usb_dst, tvb, 0, 0, str_dst_addr); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); sub_item = proto_tree_add_string(tree, hf_usb_addr, tvb, 0, 0, str_dst_addr); - PROTO_ITEM_SET_HIDDEN(sub_item); + proto_item_set_hidden(sub_item); } @@ -4002,7 +4002,7 @@ static usb_trans_info_t if (usb_trans_info->response_in) { ti = proto_tree_add_uint(tree, hf_usb_response_in, tvb, 0, 0, usb_trans_info->response_in); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } else { @@ -4028,12 +4028,12 @@ static usb_trans_info_t if (usb_trans_info && usb_trans_info->request_in) { ti = proto_tree_add_uint(tree, hf_usb_request_in, tvb, 0, 0, usb_trans_info->request_in); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); t = pinfo->abs_ts; nstime_delta(&deltat, &t, &usb_trans_info->req_time); ti = proto_tree_add_time(tree, hf_usb_time, tvb, 0, 0, &deltat); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } @@ -4160,7 +4160,7 @@ dissect_linux_usb_iso_transfer(packet_info *pinfo _U_, proto_tree *urb_tree, guint32 iso_len = 0; tii = proto_tree_add_uint(urb_tree, hf_usb_bInterfaceClass, tvb, offset, 0, usb_conv_info->interfaceClass); - PROTO_ITEM_SET_GENERATED(tii); + proto_item_set_generated(tii); /* All fields which belong to Linux usbmon headers are in host-endian * byte order. The fields coming from the USB communication are in little @@ -4254,7 +4254,7 @@ dissect_usbip_iso_transfer(packet_info *pinfo _U_, proto_tree *urb_tree, guint32 iso_len = 0; tii = proto_tree_add_uint(urb_tree, hf_usb_bInterfaceClass, tvb, offset, 0, usb_conv_info->interfaceClass); - PROTO_ITEM_SET_GENERATED(tii); + proto_item_set_generated(tii); /* All fields which belong to usbip are in big-endian byte order. * unlike the linux kernel, the usb isoc descriptor is appended at @@ -4319,7 +4319,7 @@ dissect_darwin_usb_iso_transfer(packet_info *pinfo _U_, proto_tree *tree, usb_he len -= offset; tii = proto_tree_add_uint(tree, hf_usb_bInterfaceClass, tvb, offset, 0, usb_conv_info->interfaceClass); - PROTO_ITEM_SET_GENERATED(tii); + proto_item_set_generated(tii); status = tvb_get_guint32(tvb, 8, ENC_LITTLE_ENDIAN); iso_numdesc = tvb_get_guint32(tvb, 12, ENC_LITTLE_ENDIAN); @@ -4747,9 +4747,9 @@ dissect_netmon_usb_port(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, v usb_port_tree = proto_item_add_subtree(ti, ett_usbport); generated = proto_tree_add_uint(usb_port_tree, hf_usbport_event_id, tvb, 0, 0, provider_id_data->event_id); - PROTO_ITEM_SET_GENERATED(generated); + proto_item_set_generated(generated); generated = proto_tree_add_bitmask_value(usb_port_tree, tvb, 0, hf_usbport_keyword, ett_usbport_keyword, keyword_fields, provider_id_data->keyword); - PROTO_ITEM_SET_GENERATED(generated); + proto_item_set_generated(generated); switch (provider_id_data->event_id) { @@ -4912,7 +4912,7 @@ dissect_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, case URB_BULK: case URB_INTERRUPT: item = proto_tree_add_uint(tree, hf_usb_bInterfaceClass, tvb, 0, 0, usb_conv_info->interfaceClass); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); switch (header_type) { diff --git a/epan/dissectors/packet-usbip.c b/epan/dissectors/packet-usbip.c index d13fe568f6..93084fbfb2 100644 --- a/epan/dissectors/packet-usbip.c +++ b/epan/dissectors/packet-usbip.c @@ -280,7 +280,7 @@ dissect_device_list_response(packet_info *pinfo, proto_tree *tree, num_of_intf = tvb_get_guint8(tvb, offset + 0x137); ti_dev = proto_tree_add_uint(tree, hf_usbip_device, tvb, offset, 0x138 + 4 * num_of_intf, i + 1); - PROTO_ITEM_SET_GENERATED(ti_dev); + proto_item_set_generated(ti_dev); dev_tree = proto_item_add_subtree(ti_dev, ett_usbip_dev); offset = dissect_device(dev_tree, tvb, offset); @@ -409,7 +409,7 @@ dissect_cmd_unlink(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, ti = proto_tree_add_uint(tree, hf_usbip_vic_frame, NULL, 0, 0, victim->cmd_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } return offset; } @@ -430,7 +430,7 @@ dissect_ret_unlink(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, victim->ret_frame = pinfo->num; ti = proto_tree_add_uint(tree, hf_usbip_vic_frame, NULL, 0, 0, victim->cmd_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } proto_tree_add_item(tree, hf_usbip_status, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -564,16 +564,16 @@ usbip_dissect_urb(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree, ti = proto_tree_add_uint(tree, hf_usbip_cmd_frame, NULL, 0, 0, usbip_trans->cmd_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(tree, hf_usbip_ret_frame, NULL, 0, 0, usbip_trans->ret_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(tree, hf_usbip_devid, NULL, 0, 0, devid); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(tree, hf_usbip_direction, NULL, 0, 0, dir); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(tree, hf_usbip_ep, NULL, 0, 0, ep); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree_add_item(tree, hf_usbip_devid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; diff --git a/epan/dissectors/packet-v5dl.c b/epan/dissectors/packet-v5dl.c index b98414ff3d..76c7795078 100644 --- a/epan/dissectors/packet-v5dl.c +++ b/epan/dissectors/packet-v5dl.c @@ -178,7 +178,7 @@ dissect_v5dl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (direction != P2P_DIR_UNKNOWN) { direction_ti = proto_tree_add_uint(v5dl_tree, hf_v5dl_direction, tvb, 0, 0, pinfo->p2p_dir); - PROTO_ITEM_SET_GENERATED(direction_ti); + proto_item_set_generated(direction_ti); } addr_ti = proto_tree_add_uint(v5dl_tree, hf_v5dl_ef, tvb, diff --git a/epan/dissectors/packet-v5ef.c b/epan/dissectors/packet-v5ef.c index 62e49f5835..fbee6dda6e 100644 --- a/epan/dissectors/packet-v5ef.c +++ b/epan/dissectors/packet-v5ef.c @@ -102,7 +102,7 @@ dissect_v5ef(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (direction != P2P_DIR_UNKNOWN) { direction_ti = proto_tree_add_uint(v5ef_tree, hf_v5ef_direction, tvb, 0, 0, direction); - PROTO_ITEM_SET_GENERATED(direction_ti); + proto_item_set_generated(direction_ti); } addr_ti = proto_tree_add_uint(v5ef_tree, hf_v5ef_address, tvb, diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c index 01bcd72645..e987c289ed 100644 --- a/epan/dissectors/packet-vlan.c +++ b/epan/dissectors/packet-vlan.c @@ -317,7 +317,7 @@ dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (gbl_resolv_flags.vlan_name) { item = proto_tree_add_string(vlan_tree, &hfi_vlan_id_name, tvb, 0, 2, get_vlan_name(wmem_packet_scope(), vlan_id)); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } diff --git a/epan/dissectors/packet-whois.c b/epan/dissectors/packet-whois.c index 4c89e62901..07cbeb433d 100644 --- a/epan/dissectors/packet-whois.c +++ b/epan/dissectors/packet-whois.c @@ -115,7 +115,7 @@ dissect_whois(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree && whois_trans->rep_frame) { ti = proto_tree_add_uint(whois_tree, hf_whois_answer_in, tvb, 0, 0, whois_trans->rep_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } else if (tree && whois_trans->rep_frame) { proto_tree_add_item(whois_tree, hf_whois_answer, tvb, 0, -1, ENC_ASCII|ENC_NA); @@ -124,12 +124,12 @@ dissect_whois(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ti = proto_tree_add_uint(whois_tree, hf_whois_answer_to, tvb, 0, 0, whois_trans->req_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (pinfo->num == whois_trans->rep_frame) { nstime_delta(&ns, &pinfo->abs_ts, &whois_trans->req_time); ti = proto_tree_add_time(whois_tree, hf_whois_response_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } } diff --git a/epan/dissectors/packet-windows-common.c b/epan/dissectors/packet-windows-common.c index dee5ce9309..e60556f8ac 100644 --- a/epan/dissectors/packet-windows-common.c +++ b/epan/dissectors/packet-windows-common.c @@ -1578,20 +1578,20 @@ dissect_nt_sid(tvbuff_t *tvb, int offset, proto_tree *parent_tree, subtree, hf_nt_sid_wkwn, tvb, offset_sid_start, wkwn_sid1_len, wmem_strbuf_get_str(wkwn_sid1_str), "%s", wmem_strbuf_get_str(wkwn_sid1_str)); proto_item_append_text(hidden_item, " (%s)", mapped_name); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } if (wmem_strbuf_get_len(wkwn_sid2_str) > 0) { hidden_item = proto_tree_add_string_format_value( subtree, hf_nt_sid_wkwn, tvb, offset_sid_start, wkwn_sid2_len, wmem_strbuf_get_str(wkwn_sid2_str), "%s", wmem_strbuf_get_str(wkwn_sid2_str)); proto_item_append_text(hidden_item, " (%s)", wmem_strbuf_get_str(label_str)); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } if (domain_sid && wmem_strbuf_get_len(domain_str) > 0) { hidden_item = proto_tree_add_string_format_value( subtree, hf_nt_sid_domain, tvb, offset_sid_start + 12, 12, wmem_strbuf_get_str(domain_str), "%s", wmem_strbuf_get_str(domain_str)); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } /* If requested, return SID string with mapped name */ diff --git a/epan/dissectors/packet-wireguard.c b/epan/dissectors/packet-wireguard.c index 6e554a0b86..6d60573cd6 100644 --- a/epan/dissectors/packet-wireguard.c +++ b/epan/dissectors/packet-wireguard.c @@ -1227,12 +1227,12 @@ wg_dissect_key_extra(proto_tree *tree, tvbuff_t *tvb, const wg_qqword *pubkey, g wg_skey_t *skey = (wg_skey_t *)g_hash_table_lookup(wg_static_keys, pubkey->data); has_private = skey && has_private_key(&skey->priv_key); ti = proto_tree_add_boolean(tree, hf_wg_static_known_pubkey, tvb, 0, 0, !!skey); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } int hf_known_privkey = is_ephemeral ? hf_wg_ephemeral_known_privkey : hf_wg_static_known_privkey; ti = proto_tree_add_boolean(tree, hf_known_privkey, tvb, 0, 0, has_private); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } #endif /* WG_DECRYPTION_SUPPORTED */ @@ -1339,10 +1339,10 @@ wg_dissect_mac1_pubkey(proto_tree *tree, tvbuff_t *tvb, const wg_skey_t *skey) } ti = proto_tree_add_string(tree, hf_wg_receiver_pubkey, tvb, 0, 0, pubkey_to_string(&skey->pub_key)); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); proto_tree *key_tree = proto_item_add_subtree(ti, ett_key_info); ti = proto_tree_add_boolean(key_tree, hf_wg_receiver_pubkey_known_privkey, tvb, 0, 0, !!has_private_key(&skey->priv_key)); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } #endif /* WG_DECRYPTION_SUPPORTED */ @@ -1401,11 +1401,11 @@ wg_dissect_handshake_initiation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *w wg_session_t *session = wg_pinfo->session; if (session) { ti = proto_tree_add_uint(wg_tree, hf_wg_stream, tvb, 0, 0, session->stream); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (session && session->response_frame) { ti = proto_tree_add_uint(wg_tree, hf_wg_response_in, tvb, 0, 0, session->response_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } return 148; @@ -1445,7 +1445,7 @@ wg_dissect_handshake_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *wg_ #ifdef WG_DECRYPTION_SUPPORTED if (session && session->hs) { ti = proto_tree_add_boolean(wg_tree, hf_wg_handshake_ok, tvb, 0, 0, !!session->hs->empty_ok); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } #endif /* WG_DECRYPTION_SUPPORTED */ proto_tree_add_item(wg_tree, hf_wg_mac1, tvb, 60, 16, ENC_NA); @@ -1466,9 +1466,9 @@ wg_dissect_handshake_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *wg_ } if (session) { ti = proto_tree_add_uint(wg_tree, hf_wg_stream, tvb, 0, 0, session->stream); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint(wg_tree, hf_wg_response_to, tvb, 0, 0, session->initiator_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } return 92; @@ -1500,10 +1500,10 @@ wg_dissect_handshake_cookie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *wg_tr } if (session) { ti = proto_tree_add_uint(wg_tree, hf_wg_stream, tvb, 0, 0, session->stream); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); /* XXX check for cookie reply from Initiator to Responder */ ti = proto_tree_add_uint(wg_tree, hf_wg_response_to, tvb, 0, 0, session->initiator_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } return 64; @@ -1549,7 +1549,7 @@ wg_dissect_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *wg_tree, wg_packe } if (session) { ti = proto_tree_add_uint(wg_tree, hf_wg_stream, tvb, 0, 0, session->stream); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } #ifdef WG_DECRYPTION_SUPPORTED diff --git a/epan/dissectors/packet-wisun.c b/epan/dissectors/packet-wisun.c index 4cb6bd5fd8..5a850a2ea2 100644 --- a/epan/dissectors/packet-wisun.c +++ b/epan/dissectors/packet-wisun.c @@ -487,9 +487,9 @@ dissect_wisun_fcie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint of set_address(&pinfo->dl_src, AT_EUI64, 8, p_addr); copy_address_shallow(&pinfo->src, &pinfo->dl_src); proto_item* src = proto_tree_add_eui64(tree, hf_wisun_fcie_src, tvb, 0, 0, hints->map_rec->addr64); - PROTO_ITEM_SET_GENERATED(src); + proto_item_set_generated(src); proto_item* frm = proto_tree_add_uint(tree, hf_wisun_fcie_initial_frame, tvb, 0, 0, hints->map_rec->start_fnum); - PROTO_ITEM_SET_GENERATED(frm); + proto_item_set_generated(frm); } else { expert_add_info(pinfo, tree, &ei_wisun_edfe_start_not_found); } @@ -991,7 +991,7 @@ static int dissect_wisun_eapol_relay(tvbuff_t *tvb, packet_info *pinfo, proto_tr up = (tvb_get_guint8(tvb, offset+6) & 0x80) == 0; // Key Info ACK==0 } proto_item* diritem = proto_tree_add_boolean(subtree, hf_wisun_eapol_relay_direction, tvb, offset, 0, (guint32) up); - PROTO_ITEM_SET_GENERATED(diritem); + proto_item_set_generated(diritem); int r = call_dissector(eapol_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree); diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index a162b0d4bc..7da7d7c2a7 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -4469,7 +4469,7 @@ add_headers (proto_tree *tree, tvbuff_t *tvb, int hf, packet_info *pinfo) } hidden_item = proto_tree_add_string(wsp_headers, hf_hdr_name_string, tvb, hdr_start, offset - hdr_start, hdr_str); - PROTO_ITEM_SET_HIDDEN(hidden_item); + proto_item_set_hidden(hidden_item); } else if (hdr_id > 0) { /* Shorthand HCP switch */ codepage = hdr_id; proto_tree_add_uint (wsp_headers, hf_wsp_header_shift_code, diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c index 8f0e5caee5..73a7a9cf30 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -400,7 +400,7 @@ dissect_x509ce_T_uniformResourceIdentifier(gboolean implicit_tag _U_, tvbuff_t * #line 190 "./asn1/x509ce/x509ce.cnf" - PROTO_ITEM_SET_URL(actx->created_item); + proto_item_set_url(actx->created_item); return offset; diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c index 2992c9db2f..cb552df81b 100644 --- a/epan/dissectors/packet-xmcp.c +++ b/epan/dissectors/packet-xmcp.c @@ -463,7 +463,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, error_code = (error_class * 100) + error_number; it = proto_tree_add_uint(attr_tree, xmcp_attr_error_code, tvb, (offset+2), 2, error_code); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); proto_item_append_text(attr_tree, ": %d", error_code); col_append_fstr(pinfo->cinfo, COL_INFO, ", error %d (%s)", error_code, val_to_str_const(error_code, error_codes, "Unknown")); @@ -940,7 +940,7 @@ dissect_xmcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* if (xmcp_trans->response_frame) { ti = proto_tree_add_uint(xmcp_tree, hf_xmcp_response_in, tvb, 0, 0, xmcp_trans->response_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } else if (xmcp_msg_type_class != XMCP_CLASS_RESERVED) { if (xmcp_trans->request_frame) { @@ -948,11 +948,11 @@ dissect_xmcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* ti = proto_tree_add_uint(xmcp_tree, hf_xmcp_response_to, tvb, 0, 0, xmcp_trans->request_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); nstime_delta(&ns, &pinfo->abs_ts, &xmcp_trans->request_time); ti = proto_tree_add_time(xmcp_tree, hf_xmcp_time, tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else { /* This is a response, but we don't know about a request for this response? */ expert_add_info(pinfo, ti, &ei_xmcp_response_without_request); @@ -1013,7 +1013,7 @@ dissect_xmcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* if (xmcp_msg_is_keepalive) { ti = proto_tree_add_none_format(xmcp_tree, hf_xmcp_msg_is_keepalive, tvb, 0, 0, "This is a Keepalive message"); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (xmcp_msg_type_method != XMCP_METHOD_KEEPALIVE) { col_prepend_fstr(pinfo->cinfo, COL_INFO, "[Keepalive] "); } diff --git a/epan/dissectors/packet-xmpp-core.c b/epan/dissectors/packet-xmpp-core.c index af5c5bd04f..8cc07fce0e 100644 --- a/epan/dissectors/packet-xmpp-core.c +++ b/epan/dissectors/packet-xmpp-core.c @@ -147,21 +147,21 @@ xmpp_iq(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *pac if (jingle_sid) { proto_item *it = proto_tree_add_string(tree, hf_xmpp_jingle_session, tvb, 0, 0, jingle_sid); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } ibb_sid = (gchar *)wmem_tree_lookup_string(xmpp_info->ibb_sessions, attr_id->value, WMEM_TREE_STRING_NOCASE); if (ibb_sid) { proto_item *it = proto_tree_add_string(tree, hf_xmpp_ibb, tvb, 0, 0, ibb_sid); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } gtalk_sid = (gchar *)wmem_tree_lookup_string(xmpp_info->gtalk_sessions, attr_id->value, WMEM_TREE_STRING_NOCASE); if (gtalk_sid) { proto_item *it = proto_tree_add_string(tree, hf_xmpp_gtalk, tvb, 0, 0, gtalk_sid); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } reqresp_trans = (xmpp_transaction_t *)wmem_tree_lookup_string(xmpp_info->req_resp, attr_id->value, WMEM_TREE_STRING_NOCASE); @@ -171,7 +171,7 @@ xmpp_iq(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *pac if (reqresp_trans->req_frame == pinfo->num) { if (reqresp_trans->resp_frame) { proto_item *it = proto_tree_add_uint(tree, hf_xmpp_response_in, tvb, 0, 0, reqresp_trans->resp_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { expert_add_info(pinfo, xmpp_iq_item, &ei_xmpp_packet_without_response); @@ -180,7 +180,7 @@ xmpp_iq(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *pac } else { if (reqresp_trans->req_frame) { proto_item *it = proto_tree_add_uint(tree, hf_xmpp_response_to, tvb, 0, 0, reqresp_trans->req_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } else { expert_add_info(pinfo, xmpp_iq_item, &ei_xmpp_packet_without_response); @@ -400,7 +400,7 @@ xmpp_message(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t if (ibb_sid) { proto_item *it = proto_tree_add_string(tree, hf_xmpp_ibb, tvb, 0, 0, ibb_sid); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } diff --git a/epan/dissectors/packet-xmpp-utils.c b/epan/dissectors/packet-xmpp-utils.c index 240aa99d47..30b3f43127 100644 --- a/epan/dissectors/packet-xmpp-utils.c +++ b/epan/dissectors/packet-xmpp-utils.c @@ -722,7 +722,7 @@ children_foreach_hide_func(proto_node *node, gpointer data) { int *i = (int *)data; if((*i) == 0) - PROTO_ITEM_SET_HIDDEN(node); + proto_item_set_hidden(node); (*i)++; } @@ -731,7 +731,7 @@ children_foreach_show_func(proto_node *node, gpointer data) { int *i = (int *)data; if((*i) == 0) - PROTO_ITEM_SET_VISIBLE(node); + proto_item_set_visible(node); (*i)++; } diff --git a/epan/dissectors/packet-xmpp.c b/epan/dissectors/packet-xmpp.c index f021b2855f..f164612461 100644 --- a/epan/dissectors/packet-xmpp.c +++ b/epan/dissectors/packet-xmpp.c @@ -488,7 +488,7 @@ dissect_xmpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ else outin_item = proto_tree_add_boolean(xmpp_tree, hf_xmpp_in, tvb, 0, 0, TRUE); - PROTO_ITEM_SET_HIDDEN(outin_item); + proto_item_set_hidden(outin_item); /*it hides tree generated by XML dissector*/ diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index 7a18c5f6be..2c04aa29f0 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -627,7 +627,7 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void /* Display inferred source address info */ ti = proto_tree_add_eui64(nwk_tree, hf_zbee_nwk_src64, tvb, offset, 0, nwk_hints->map_rec->addr64); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if ( nwk_hints->map_rec->start_fnum ) { ti = proto_tree_add_uint(nwk_tree, hf_zbee_nwk_src64_origin, tvb, 0, 0, @@ -636,7 +636,7 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void else { ti = proto_tree_add_uint_format_value(nwk_tree, hf_zbee_nwk_src64_origin, tvb, 0, 0, 0, "Pre-configured"); } - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } } } diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c index 9e6016c781..48085c042f 100644 --- a/epan/dissectors/packet-zbee-security.c +++ b/epan/dissectors/packet-zbee-security.c @@ -717,7 +717,7 @@ dissect_zbee_secure(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree, guint o if ( decrypted ) { if ( tree && key_rec ) { key_item = proto_tree_add_bytes(sec_tree, hf_zbee_sec_key, tvb, 0, ZBEE_SEC_CONST_KEYSIZE, key_rec->key); - PROTO_ITEM_SET_GENERATED(key_item); + proto_item_set_generated(key_item); if ( key_rec->frame_num == ZBEE_SEC_PC_KEY ) { ti = proto_tree_add_string(sec_tree, hf_zbee_sec_decryption_key, tvb, 0, 0, key_rec->label); @@ -725,7 +725,7 @@ dissect_zbee_secure(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree, guint o ti = proto_tree_add_uint(sec_tree, hf_zbee_sec_key_origin, tvb, 0, 0, key_rec->frame_num); } - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* Found a key that worked, setup the new tvbuff_t and return */ diff --git a/epan/dissectors/packet-zebra.c b/epan/dissectors/packet-zebra.c index bf74446cbc..dd1e7f640a 100644 --- a/epan/dissectors/packet-zebra.c +++ b/epan/dissectors/packet-zebra.c @@ -2276,7 +2276,7 @@ dissect_zebra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U zebra_tree = proto_item_add_subtree(ti, ett_zebra); ti = proto_tree_add_boolean(zebra_tree, hf_zebra_request, tvb, offset, 0, request); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); for (;;) { guint8 headermarker, version; diff --git a/epan/dissectors/packet-zvt.c b/epan/dissectors/packet-zvt.c index 4eaafeb631..01cc2783f6 100644 --- a/epan/dissectors/packet-zvt.c +++ b/epan/dissectors/packet-zvt.c @@ -787,7 +787,7 @@ dissect_zvt_apdu(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tre if (zvt_trans && zvt_trans->resp_frame == pinfo->num) { it = proto_tree_add_uint(apdu_tree, hf_zvt_resp_to, NULL, 0, 0, zvt_trans->rqst_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else { @@ -804,7 +804,7 @@ dissect_zvt_apdu(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tre zvt_trans->resp_frame!=0) { it = proto_tree_add_uint(apdu_tree, hf_zvt_resp_in, NULL, 0, 0, zvt_trans->resp_frame); - PROTO_ITEM_SET_GENERATED(it); + proto_item_set_generated(it); } } else { diff --git a/epan/dvb_chartbl.c b/epan/dvb_chartbl.c index efc39b608e..3f6ef66fbc 100644 --- a/epan/dvb_chartbl.c +++ b/epan/dvb_chartbl.c @@ -274,7 +274,7 @@ dvb_add_chartbl(proto_tree *tree, int hf, pi = proto_tree_add_bytes_format(tree, hf, tvb, 0, 0, NULL, "Default character table (Latin)"); - PROTO_ITEM_SET_GENERATED(pi); + proto_item_set_generated(pi); } else { proto_tree_add_bytes_format_value(tree, hf, diff --git a/epan/expert.c b/epan/expert.c index b9737d4e4d..ae54bacd5c 100644 --- a/epan/expert.c +++ b/epan/expert.c @@ -481,12 +481,12 @@ expert_create_tree(proto_item *pi, int group, int severity, const char *msg) val_to_str(severity, expert_severity_vals, "Unknown (%u)"), val_to_str(group, expert_group_vals, "Unknown (%u)"), msg); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (group == PI_MALFORMED) { /* Add hidden malformed protocol filter */ proto_item *malformed_ti = proto_tree_add_item(tree, proto_malformed, NULL, 0, 0, ENC_NA); - PROTO_ITEM_SET_HIDDEN(malformed_ti); + proto_item_set_hidden(malformed_ti); } return proto_item_add_subtree(ti, ett_subexpert); @@ -536,22 +536,22 @@ expert_set_info_vformat(packet_info *pinfo, proto_item *pi, int group, int sever if (hf_index == -1) { /* If no filterable expert info, just add the message */ ti = proto_tree_add_string(tree, hf_expert_msg, NULL, 0, 0, formatted); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else { /* If filterable expert info, hide the "generic" form of the message, and generate the formatted filterable expert info */ ti = proto_tree_add_none_format(tree, hf_index, NULL, 0, 0, "%s", formatted); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_string(tree, hf_expert_msg, NULL, 0, 0, formatted); - PROTO_ITEM_SET_HIDDEN(ti); + proto_item_set_hidden(ti); } ti = proto_tree_add_uint_format_value(tree, hf_expert_severity, NULL, 0, 0, severity, "%s", val_to_str_const(severity, expert_severity_vals, "Unknown")); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); ti = proto_tree_add_uint_format_value(tree, hf_expert_group, NULL, 0, 0, group, "%s", val_to_str_const(group, expert_group_vals, "Unknown")); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); tap = have_tap_listener(expert_tap); diff --git a/epan/print.c b/epan/print.c index f381ef5c45..b6e92ce9b9 100644 --- a/epan/print.c +++ b/epan/print.c @@ -170,7 +170,7 @@ proto_tree_print_node(proto_node *node, gpointer data) g_assert(fi); /* Don't print invisible entries. */ - if (PROTO_ITEM_IS_HIDDEN(node) && (prefs.display_hidden_proto_items == FALSE)) + if (proto_item_is_hidden(node) && (prefs.display_hidden_proto_items == FALSE)) return; /* Give up if we've already gotten an error. */ @@ -186,12 +186,12 @@ proto_tree_print_node(proto_node *node, gpointer data) proto_item_fill_label(fi, label_str); } - if (PROTO_ITEM_IS_GENERATED(node)) + if (proto_item_is_generated(node)) label_ptr = g_strconcat("[", label_ptr, "]", NULL); pdata->success = print_line(pdata->stream, pdata->level, label_ptr); - if (PROTO_ITEM_IS_GENERATED(node)) + if (proto_item_is_generated(node)) g_free(label_ptr); if (!pdata->success) @@ -534,7 +534,7 @@ proto_tree_write_node_pdml(proto_node *node, gpointer data) print_escaped_xml(pdata->fh, label_ptr); } - if (PROTO_ITEM_IS_HIDDEN(node) && (prefs.display_hidden_proto_items == FALSE)) + if (proto_item_is_hidden(node) && (prefs.display_hidden_proto_items == FALSE)) fprintf(pdata->fh, "\" hide=\"yes"); fprintf(pdata->fh, "\" size=\"%d", fi->length); diff --git a/epan/proto.c b/epan/proto.c index 2104d99c4c..8e1007bbeb 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -5675,7 +5675,7 @@ proto_tree_set_representation_value(proto_item *pi, const char *format, va_list /* If the tree (GUI) or item isn't visible it's pointless for us to generate the protocol * items string representation */ - if (PTREE_DATA(pi)->visible && !PROTO_ITEM_IS_HIDDEN(pi)) { + if (PTREE_DATA(pi)->visible && !proto_item_is_hidden(pi)) { int ret = 0; field_info *fi = PITEM_FINFO(pi); header_field_info *hf; @@ -5728,7 +5728,7 @@ proto_tree_set_representation(proto_item *pi, const char *format, va_list ap) DISSECTOR_ASSERT(fi); - if (!PROTO_ITEM_IS_HIDDEN(pi)) { + if (!proto_item_is_hidden(pi)) { ITEM_LABEL_NEW(PNODE_POOL(pi), fi->rep); ret = g_vsnprintf(fi->rep->representation, ITEM_LABEL_LENGTH, format, ap); @@ -6328,7 +6328,7 @@ proto_item_append_text(proto_item *pi, const char *format, ...) return; } - if (!PROTO_ITEM_IS_HIDDEN(pi)) { + if (!proto_item_is_hidden(pi)) { /* * If we don't already have a representation, * generate the default representation. @@ -6363,7 +6363,7 @@ proto_item_prepend_text(proto_item *pi, const char *format, ...) return; } - if (!PROTO_ITEM_IS_HIDDEN(pi)) { + if (!proto_item_is_hidden(pi)) { /* * If we don't already have a representation, * generate the default representation. @@ -9870,7 +9870,7 @@ check_for_offset(proto_node *node, gpointer data) offset_search_t *offsearch = (offset_search_t *)data; /* !fi == the top most container node which holds nothing */ - if (fi && !PROTO_ITEM_IS_HIDDEN(node) && !PROTO_ITEM_IS_GENERATED(node) && fi->ds_tvb && offsearch->tvb == fi->ds_tvb) { + if (fi && !proto_item_is_hidden(node) && !proto_item_is_generated(node) && fi->ds_tvb && offsearch->tvb == fi->ds_tvb) { if (offsearch->offset >= (guint) fi->start && offsearch->offset < (guint) (fi->start + fi->length)) { @@ -12284,17 +12284,17 @@ proto_tree_add_checksum(proto_tree *tree, tvbuff_t *tvb, const guint offset, if (flags & PROTO_CHECKSUM_NOT_PRESENT) { ti = proto_tree_add_uint_format_value(tree, hf_checksum, tvb, offset, len, 0, "[missing]"); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); if (hf_checksum_status != -1) { ti2 = proto_tree_add_uint(tree, hf_checksum_status, tvb, offset, len, PROTO_CHECKSUM_E_NOT_PRESENT); - PROTO_ITEM_SET_GENERATED(ti2); + proto_item_set_generated(ti2); } return ti; } if (flags & PROTO_CHECKSUM_GENERATED) { ti = proto_tree_add_uint(tree, hf_checksum, tvb, offset, len, computed_checksum); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } else { ti = proto_tree_add_item_ret_uint(tree, hf_checksum, tvb, offset, len, encoding, &checksum); if (flags & PROTO_CHECKSUM_VERIFY) { @@ -12303,7 +12303,7 @@ proto_tree_add_checksum(proto_tree *tree, tvbuff_t *tvb, const guint offset, proto_item_append_text(ti, " [correct]"); if (hf_checksum_status != -1) { ti2 = proto_tree_add_uint(tree, hf_checksum_status, tvb, offset, 0, PROTO_CHECKSUM_E_GOOD); - PROTO_ITEM_SET_GENERATED(ti2); + proto_item_set_generated(ti2); } incorrect_checksum = FALSE; } else if (flags & PROTO_CHECKSUM_IN_CKSUM) { @@ -12314,7 +12314,7 @@ proto_tree_add_checksum(proto_tree *tree, tvbuff_t *tvb, const guint offset, proto_item_append_text(ti, " [correct]"); if (hf_checksum_status != -1) { ti2 = proto_tree_add_uint(tree, hf_checksum_status, tvb, offset, 0, PROTO_CHECKSUM_E_GOOD); - PROTO_ITEM_SET_GENERATED(ti2); + proto_item_set_generated(ti2); } incorrect_checksum = FALSE; } @@ -12323,7 +12323,7 @@ proto_tree_add_checksum(proto_tree *tree, tvbuff_t *tvb, const guint offset, if (incorrect_checksum) { if (hf_checksum_status != -1) { ti2 = proto_tree_add_uint(tree, hf_checksum_status, tvb, offset, 0, PROTO_CHECKSUM_E_BAD); - PROTO_ITEM_SET_GENERATED(ti2); + proto_item_set_generated(ti2); } if (flags & PROTO_CHECKSUM_ZERO) { proto_item_append_text(ti, " [incorrect]"); @@ -12339,7 +12339,7 @@ proto_tree_add_checksum(proto_tree *tree, tvbuff_t *tvb, const guint offset, if (hf_checksum_status != -1) { proto_item_append_text(ti, " [unverified]"); ti2 = proto_tree_add_uint(tree, hf_checksum_status, tvb, offset, 0, PROTO_CHECKSUM_E_UNVERIFIED); - PROTO_ITEM_SET_GENERATED(ti2); + proto_item_set_generated(ti2); } } } diff --git a/epan/proto.h b/epan/proto.h index 609046208b..4fd393d786 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -834,53 +834,6 @@ typedef proto_node proto_item; /* add more, see https://wiki.wireshark.org/Development/ExpertInfo */ - -/** is this protocol field hidden from the protocol tree display (used for filtering only)? */ -/* HIDING PROTOCOL FIELDS IS DEPRECATED, IT'S CONSIDERED TO BE BAD GUI DESIGN! */ -#define PROTO_ITEM_IS_HIDDEN(proto_item) \ - ((proto_item) ? FI_GET_FLAG(PITEM_FINFO(proto_item), FI_HIDDEN) : 0) -/** mark this protocol field to be hidden from the protocol tree display (used for filtering only) */ -/* HIDING PROTOCOL FIELDS IS DEPRECATED, IT'S CONSIDERED TO BE BAD GUI DESIGN! */ -#define PROTO_ITEM_SET_HIDDEN(proto_item) \ - do { \ - if (proto_item) \ - FI_SET_FLAG(PITEM_FINFO(proto_item), FI_HIDDEN); \ - } while(0) -/** mark this protocol field to be visible from the protocol tree display */ -#define PROTO_ITEM_SET_VISIBLE(proto_item) \ - do { \ - if (proto_item) \ - FI_RESET_FLAG(PITEM_FINFO(proto_item), FI_HIDDEN); \ - } while(0) - -/** is this protocol field generated by Wireshark (and not read from the packet data)? */ -#define PROTO_ITEM_IS_GENERATED(proto_item) \ - ((proto_item) ? FI_GET_FLAG(PITEM_FINFO(proto_item), FI_GENERATED) : 0) -/** mark this protocol field as generated by Wireshark (and not read from the packet data) */ -#define PROTO_ITEM_SET_GENERATED(proto_item) \ - do { \ - if (proto_item) \ - FI_SET_FLAG(PITEM_FINFO(proto_item), FI_GENERATED); \ - } while(0) -/** is this protocol field actually a URL? */ -#define PROTO_ITEM_IS_URL(proto_item) \ - ((proto_item) ? FI_GET_FLAG(PITEM_FINFO(proto_item), FI_URL) : 0) -/** mark this protocol field as a URL */ -#define PROTO_ITEM_SET_URL(proto_item) \ - do { \ - if (proto_item) \ - FI_SET_FLAG(PITEM_FINFO(proto_item), FI_URL); \ - } while(0) - -typedef void (*proto_tree_foreach_func)(proto_node *, gpointer); -typedef gboolean (*proto_tree_traverse_func)(proto_node *, gpointer); - -extern gboolean proto_tree_traverse_post_order(proto_tree *tree, - proto_tree_traverse_func func, gpointer data); - -WS_DLL_PUBLIC void proto_tree_children_foreach(proto_tree *tree, - proto_tree_foreach_func func, gpointer data); - /** Retrieve the field_info from a proto_node */ #define PNODE_FINFO(proto_node) ((proto_node)->finfo) @@ -896,6 +849,94 @@ WS_DLL_PUBLIC void proto_tree_children_foreach(proto_tree *tree, /** Retrieve the wmem_allocator_t from a proto_node */ #define PNODE_POOL(proto_node) ((proto_node)->tree_data->pinfo->pool) +/** Is this protocol field hidden from the protocol tree display? Used for filtering only. + * @deprecated HIDING PROTOCOL FIELDS IS DEPRECATED. IT'S CONSIDERED TO BE BAD GUI DESIGN! + * @param ti The item to check. May be NULL. + * @return TRUE if the item is hidden, FALSE otherwise. + */ +static inline gboolean proto_item_is_hidden(proto_item *ti) { + if (ti) { + return FI_GET_FLAG(PITEM_FINFO(ti), FI_HIDDEN); + } + return FALSE; +} +#define PROTO_ITEM_IS_HIDDEN(ti) proto_item_is_hidden((ti)) + +/** Mark this protocol field to be hidden from the protocol tree display. Used for filtering only. + * @deprecated HIDING PROTOCOL FIELDS IS DEPRECATED. IT'S CONSIDERED TO BE BAD GUI DESIGN! + * @param ti The item to hide. May be NULL. + */ +static inline void proto_item_set_hidden(proto_item *ti) { + if (ti) { + FI_SET_FLAG(PITEM_FINFO(ti), FI_HIDDEN); + } +} +#define PROTO_ITEM_SET_HIDDEN(ti) proto_item_set_hidden((ti)) + +/** Mark this protocol field to be visible from the protocol tree display. + * @param ti The item to hide. May be NULL. + */ +static inline void proto_item_set_visible(proto_item *ti) { + if (ti) { + FI_RESET_FLAG(PITEM_FINFO(ti), FI_HIDDEN); + } +} +#define PROTO_ITEM_SET_VISIBLE(ti) proto_item_set_visible((ti)) + +/** Is this protocol field generated by Wireshark (and not read from the packet data)? + * @param ti The item to check. May be NULL. + * @return TRUE if the item is generated, FALSE otherwise. + */ +static inline gboolean proto_item_is_generated(proto_item *ti) { + if (ti) { + return FI_GET_FLAG(PITEM_FINFO(ti), FI_GENERATED); + } + return FALSE; +} +#define PROTO_ITEM_IS_GENERATED(ti) proto_item_is_generated((ti)) + +/** Mark this protocol field as generated by Wireshark (and not read from the packet data). + * @param ti The item to mark as generated. May be NULL. + */ +static inline void proto_item_set_generated(proto_item *ti) { + if (ti) { + FI_SET_FLAG(PITEM_FINFO(ti), FI_GENERATED); + } +} +#define PROTO_ITEM_SET_GENERATED(ti) proto_item_set_generated((ti)) + +/** Is this protocol field actually a URL? + * @brief proto_item_is_url + * @param ti The item to check. May be NULL. + * @return TRUE if the item is a URL, FALSE otherwise. + */ +static inline gboolean proto_item_is_url(proto_item *ti) { + if (ti) { + return FI_GET_FLAG(PITEM_FINFO(ti), FI_URL); + } + return FALSE; +} +#define PROTO_ITEM_IS_URL(ti) proto_item_is_url((ti)) + +/** Mark this protocol field as a URL +* @param ti The item to mark as a URL. May be NULL. + */ +static inline void proto_item_set_url(proto_item *ti) { + if (ti) { + FI_SET_FLAG(PITEM_FINFO(ti), FI_URL); + } +} +#define PROTO_ITEM_SET_URL(ti) proto_item_set_url((ti)) + +typedef void (*proto_tree_foreach_func)(proto_node *, gpointer); +typedef gboolean (*proto_tree_traverse_func)(proto_node *, gpointer); + +extern gboolean proto_tree_traverse_post_order(proto_tree *tree, + proto_tree_traverse_func func, gpointer data); + +WS_DLL_PUBLIC void proto_tree_children_foreach(proto_tree *tree, + proto_tree_foreach_func func, gpointer data); + #ifdef HAVE_PLUGINS typedef struct { void (*register_protoinfo)(void); /* routine to call to register protocol information */ diff --git a/epan/reassemble.c b/epan/reassemble.c index 26f14588f0..183141f9ed 100644 --- a/epan/reassemble.c +++ b/epan/reassemble.c @@ -2682,7 +2682,7 @@ show_fragment(fragment_item *fd, const int offset, const fragment_items *fit, fd->len, plurality(fd->len, "", "s")); } - PROTO_ITEM_SET_GENERATED(fei); + proto_item_set_generated(fei); mark_frame_as_depended_upon(pinfo, fd->frame); if (fd->flags & (FD_OVERLAP|FD_OVERLAPCONFLICT |FD_MULTIPLETAILS|FD_TOOLONGFRAGMENT) ) { @@ -2697,28 +2697,28 @@ show_fragment(fragment_item *fd, const int offset, const fragment_items *fit, *(fit->hf_fragment_overlap), tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(fei); + proto_item_set_generated(fei); } if (fd->flags&FD_OVERLAPCONFLICT) { fei=proto_tree_add_boolean(fet, *(fit->hf_fragment_overlap_conflict), tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(fei); + proto_item_set_generated(fei); } if (fd->flags&FD_MULTIPLETAILS) { fei=proto_tree_add_boolean(fet, *(fit->hf_fragment_multiple_tails), tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(fei); + proto_item_set_generated(fei); } if (fd->flags&FD_TOOLONGFRAGMENT) { fei=proto_tree_add_boolean(fet, *(fit->hf_fragment_too_long_fragment), tvb, 0, 0, TRUE); - PROTO_ITEM_SET_GENERATED(fei); + proto_item_set_generated(fei); } } } @@ -2754,7 +2754,7 @@ show_fragment_tree(fragment_head *fd_head, const fragment_items *fit, pinfo->fragmented = FALSE; *fi = proto_tree_add_item(tree, *(fit->hf_fragments), tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_GENERATED(*fi); + proto_item_set_generated(*fi); ft = proto_item_add_subtree(*fi, *(fit->ett_fragments)); first_frag = TRUE; @@ -2769,19 +2769,19 @@ show_fragment_tree(fragment_head *fd_head, const fragment_items *fit, if (fit->hf_fragment_count) { proto_item *fli = proto_tree_add_uint(ft, *(fit->hf_fragment_count), tvb, 0, 0, count); - PROTO_ITEM_SET_GENERATED(fli); + proto_item_set_generated(fli); } if (fit->hf_reassembled_length) { proto_item *fli = proto_tree_add_uint(ft, *(fit->hf_reassembled_length), tvb, 0, 0, tvb_captured_length (tvb)); - PROTO_ITEM_SET_GENERATED(fli); + proto_item_set_generated(fli); } if (fit->hf_reassembled_data) { proto_item *fli = proto_tree_add_item(ft, *(fit->hf_reassembled_data), tvb, 0, tvb_captured_length(tvb), ENC_NA); - PROTO_ITEM_SET_GENERATED(fli); + proto_item_set_generated(fli); } return show_fragment_errs_in_col(fd_head, fit, pinfo); @@ -2806,7 +2806,7 @@ show_fragment_seq_tree(fragment_head *fd_head, const fragment_items *fit, pinfo->fragmented = FALSE; *fi = proto_tree_add_item(tree, *(fit->hf_fragments), tvb, 0, -1, ENC_NA); - PROTO_ITEM_SET_GENERATED(*fi); + proto_item_set_generated(*fi); ft = proto_item_add_subtree(*fi, *(fit->ett_fragments)); offset = 0; @@ -2829,19 +2829,19 @@ show_fragment_seq_tree(fragment_head *fd_head, const fragment_items *fit, if (fit->hf_fragment_count) { proto_item *fli = proto_tree_add_uint(ft, *(fit->hf_fragment_count), tvb, 0, 0, count); - PROTO_ITEM_SET_GENERATED(fli); + proto_item_set_generated(fli); } if (fit->hf_reassembled_length) { proto_item *fli = proto_tree_add_uint(ft, *(fit->hf_reassembled_length), tvb, 0, 0, tvb_captured_length (tvb)); - PROTO_ITEM_SET_GENERATED(fli); + proto_item_set_generated(fli); } if (fit->hf_reassembled_data) { proto_item *fli = proto_tree_add_item(ft, *(fit->hf_reassembled_data), tvb, 0, tvb_captured_length(tvb), ENC_NA); - PROTO_ITEM_SET_GENERATED(fli); + proto_item_set_generated(fli); } return show_fragment_errs_in_col(fd_head, fit, pinfo); diff --git a/epan/wslua/init_wslua.c b/epan/wslua/init_wslua.c index 58db9ce736..1b76f28e92 100644 --- a/epan/wslua/init_wslua.c +++ b/epan/wslua/init_wslua.c @@ -182,7 +182,7 @@ int dissect_lua(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void* data push_Tvb(L,tvb); push_Pinfo(L,pinfo); lua_tree = push_TreeItem(L, tree, proto_tree_add_item(tree, hf_wslua_fake, tvb, 0, 0, ENC_NA)); - PROTO_ITEM_SET_HIDDEN(lua_tree->item); + proto_item_set_hidden(lua_tree->item); if ( lua_pcall(L,3,1,0) ) { proto_tree_add_expert_format(tree, pinfo, &ei_lua_error, tvb, 0, 0, "Lua Error: %s", lua_tostring(L,-1)); @@ -281,7 +281,7 @@ gboolean heur_dissect_lua(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, v push_Tvb(L,tvb); push_Pinfo(L,pinfo); lua_tree = push_TreeItem(L, tree, proto_tree_add_item(tree, hf_wslua_fake, tvb, 0, 0, ENC_NA)); - PROTO_ITEM_SET_HIDDEN(lua_tree->item); + proto_item_set_hidden(lua_tree->item); if ( lua_pcall(L,3,1,0) ) { proto_tree_add_expert_format(tree, pinfo, &ei_lua_error, tvb, 0, 0, diff --git a/epan/wslua/wslua_tree.c b/epan/wslua/wslua_tree.c index 641ec02ed8..ecf0d7045d 100644 --- a/epan/wslua/wslua_tree.c +++ b/epan/wslua/wslua_tree.c @@ -767,7 +767,7 @@ static int TreeItem_get_visible(lua_State* L) { static int TreeItem_get_generated(lua_State* L) { TreeItem ti = checkTreeItem(L,1); - lua_pushboolean(L, PROTO_ITEM_IS_GENERATED(ti->item)); + lua_pushboolean(L, proto_item_is_generated(ti->item)); return 1; } @@ -785,7 +785,7 @@ WSLUA_METHOD TreeItem_set_generated(lua_State *L) { gboolean set = wslua_optbool(L, WSLUA_OPTARG_TreeItem_set_generated_BOOL, TRUE); if (set) { - PROTO_ITEM_SET_GENERATED(ti->item); + proto_item_set_generated(ti->item); } else { if (ti->item) FI_RESET_FLAG(PITEM_FINFO(ti->item), FI_GENERATED); @@ -804,7 +804,7 @@ WSLUA_METHOD TreeItem_set_generated(lua_State *L) { static int TreeItem_get_hidden(lua_State* L) { TreeItem ti = checkTreeItem(L,1); - lua_pushboolean(L, PROTO_ITEM_IS_HIDDEN(ti->item)); + lua_pushboolean(L, proto_item_is_hidden(ti->item)); return 1; } @@ -822,9 +822,9 @@ WSLUA_METHOD TreeItem_set_hidden(lua_State *L) { gboolean set = wslua_optbool(L, WSLUA_OPTARG_TreeItem_set_hidden_BOOL, TRUE); if (set) { - PROTO_ITEM_SET_HIDDEN(ti->item); + proto_item_set_hidden(ti->item); } else { - PROTO_ITEM_SET_VISIBLE(ti->item); + proto_item_set_visible(ti->item); } /* copy the TreeItem userdata so we give it back */ |