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

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>
This commit is contained in:
Gerald Combs 2019-04-03 14:32:30 -07:00 committed by Anders Broman
parent bdf26a35f6
commit 8d3ac3af86
411 changed files with 3785 additions and 3737 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/libwireshark0.symbols vendored
View File

@ -1133,10 +1133,17 @@ libwireshark.so.0 libwireshark0 #MINVER#
proto_item_get_parent@Base 1.9.1
proto_item_get_parent_nth@Base 1.9.1
proto_item_get_subtree@Base 1.9.1
proto_item_is_hidden@Base 3.1.0
proto_item_is_generated@Base 3.1.0
proto_item_is_url@Base 3.1.0
proto_item_prepend_text@Base 1.9.1
proto_item_set_end@Base 1.9.1
proto_item_set_hidden@Base 3.1.0
proto_item_set_generated@Base 3.1.0
proto_item_set_len@Base 1.9.1
proto_item_set_text@Base 1.9.1
proto_item_set_url@Base 3.1.0
proto_item_set_visible@Base 3.1.0
proto_name_already_registered@Base 2.0.1
proto_node_group_children_by_json_key@Base 2.5.0
proto_node_group_children_by_unique@Base 2.5.0

18
doc/README.dissector
View File

@ -2229,9 +2229,9 @@ proto_tree_add_bitmask() and proto_tree_add_bitmask_text() may not:
than the packet it was called to interpret.
PROTO_ITEM_SET_GENERATED()
proto_item_set_generated()
--------------------------
PROTO_ITEM_SET_GENERATED is used to mark fields as not being read from the
proto_item_set_generated is used to mark fields as not being read from the
captured data directly, but inferred from one or more values.
One of the primary uses of this is the presentation of verification of
@ -2243,9 +2243,9 @@ indicating a generated field.
Header checksum: 0x3d42 [correct]
[Checksum Status: Good (1)]
PROTO_ITEM_SET_HIDDEN()
proto_item_set_hidden()
-----------------------
PROTO_ITEM_SET_HIDDEN is used to hide fields, which have already been added
proto_item_set_hidden is used to hide fields, which have already been added
to the tree, from being visible in the displayed tree.
NOTE that creating hidden fields is actually quite a bad idea from a UI design
@ -2269,7 +2269,7 @@ Rings are 3-digit hex numbers, and bridges are single hex digits:
In the case of RIF, the programmer should use a field with no value and
use proto_tree_add_none_format() to build the above representation. The
programmer can then add the ring and bridge values, one-by-one, with
proto_tree_add_item() and hide them with PROTO_ITEM_SET_HIDDEN() so that the
proto_tree_add_item() and hide them with proto_item_set_hidden() so that the
user can then filter on or search for a particular ring or bridge. Here's a
skeleton of how the programmer might code this.
@ -2283,14 +2283,14 @@ skeleton of how the programmer might code this.
pi = proto_tree_add_item(tree, hf_tr_rif_ring, ...,
ENC_BIG_ENDIAN);
PROTO_ITEM_SET_HIDDEN(pi);
proto_item_set_hidden(pi);
}
for(i = 0; i < num_rings - 1; i++) {
proto_item *pi;
pi = proto_tree_add_item(tree, hf_tr_rif_bridge, ...,
ENC_BIG_ENDIAN);
PROTO_ITEM_SET_HIDDEN(pi);
proto_item_set_hidden(pi);
}
The logical tree has these items:
@ -2310,9 +2310,9 @@ filter is then possible:
tr.rif_ring eq 0x013
PROTO_ITEM_SET_URL
proto_item_set_url
------------------
PROTO_ITEM_SET_URL is used to mark fields as containing a URL. This can only
proto_item_set_url is used to mark fields as containing a URL. This can only
be done with fields of type FT_STRING(Z). If these fields are presented they
are underlined, as could be done in a browser. These fields are sensitive to
clicks as well, launching the configured browser with this URL as parameter.

6
doc/README.request_response_tracking
View File

@ -136,7 +136,7 @@ actual dissector.
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 */
@ -146,11 +146,11 @@ actual dissector.
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->fd->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);
}
}

4
epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c
View File

@ -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;

4
epan/dissectors/asn1/c1222/packet-c1222-template.c
View File

@ -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;

20
epan/dissectors/asn1/camel/packet-camel-template.c
View File

@ -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);

4
epan/dissectors/asn1/gsm_map/gsm_map.cnf
View File

@ -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");
}

4
epan/dissectors/asn1/h225/h225.cnf
View File

@ -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

12
epan/dissectors/asn1/h225/packet-h225-template.c
View File

@ -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);
}
}
}

10
epan/dissectors/asn1/h235/h235.cnf
View File

@ -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

20
epan/dissectors/asn1/h245/h245.cnf
View File

@ -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;
}

14
epan/dissectors/asn1/h248/packet-h248-template.c
View File

@ -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);
}

2
epan/dissectors/asn1/h450/h450.cnf
View File

@ -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

6
epan/dissectors/asn1/h450/packet-h450-template.c
View File

@ -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);

2
epan/dissectors/asn1/ldap/ldap.cnf
View File

@ -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

6
epan/dissectors/asn1/ldap/packet-ldap-template.c
View File

@ -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);
}
}

4
epan/dissectors/asn1/logotypecertextn/logotypecertextn.cnf
View File

@ -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

10
epan/dissectors/asn1/lpp/lpp.cnf
View File

@ -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);

10
epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
View File

@ -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

2
epan/dissectors/asn1/q932/packet-q932-template.c
View File

@ -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);

4
epan/dissectors/asn1/qsig/packet-qsig-template.c
View File

@ -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)

2
epan/dissectors/asn1/ranap/ranap.cnf
View File

@ -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);

6
epan/dissectors/asn1/ros/packet-ros-template.c
View File

@ -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);
}
}

8
epan/dissectors/asn1/rrc/rrc.cnf
View File

@ -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

2
epan/dissectors/asn1/snmp/snmp.cnf
View File

@ -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;

6
epan/dissectors/asn1/t38/packet-t38-template.c
View File

@ -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);
}
}

48
epan/dissectors/asn1/tcap/packet-tcap-template.c
View File

@ -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 */
}

4
epan/dissectors/asn1/tcap/tcap.cnf
View File

@ -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");

2
epan/dissectors/asn1/x509ce/x509ce.cnf
View File

@ -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

2
epan/dissectors/file-elf.c
View File

@ -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");

12
epan/dissectors/file-file.c
View File

@ -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);

2
epan/dissectors/file-pcapng.c
View File

@ -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, &timestamp);
PROTO_ITEM_SET_GENERATED(ti);
proto_item_set_generated(ti);
pinfo->abs_ts = timestamp;
}

14
epan/dissectors/packet-6lowpan.c
View File

@ -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;

4
epan/dissectors/packet-acap.c
View File

@ -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);
}
/*

6
epan/dissectors/packet-acr122.c
View File

@ -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) {

18
epan/dissectors/packet-adb.c
View File

@ -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);
}

10
epan/dissectors/packet-adb_cs.c
View File

@ -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);

2
epan/dissectors/packet-adb_service.c
View File

@ -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;

34
epan/dissectors/packet-adwin.c
View File

@ -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);
}
}

68
epan/dissectors/packet-aeron.c
View File

@ -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);

6
epan/dissectors/packet-afp.c
View File

@ -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);
}
/*

2
epan/dissectors/packet-afs.c
View File

@ -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 */

18
epan/dissectors/packet-alcap.c
View File

@ -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));
}

6
epan/dissectors/packet-amqp.c
View File

@ -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);
}
}

4
epan/dissectors/packet-amr.c
View File

@ -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;
}

4
epan/dissectors/packet-ansi_801.c
View File

@ -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);

4
epan/dissectors/packet-ansi_tcap.c
View File

@ -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;

8
epan/dissectors/packet-aoe.c
View File

@ -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>"));
}
}

12
epan/dissectors/packet-arp.c
View File

@ -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,

22
epan/dissectors/packet-artnet.c
View File

@ -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

2
epan/dissectors/packet-aruba-erm.c
View File

@ -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);

4
epan/dissectors/packet-ascend.c
View File

@ -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);
}

6
epan/dissectors/packet-assa_r3.c
View File

@ -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);
}
}

6
epan/dissectors/packet-at.c
View File

@ -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) */

8
epan/dissectors/packet-atalk.c
View File

@ -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);

2
epan/dissectors/packet-awdl.c
View File

@ -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"));

4
epan/dissectors/packet-beep.c
View File

@ -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++;
}

16
epan/dissectors/packet-bluetooth.c
View File

@ -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;

2
epan/dissectors/packet-brdwlk.c
View File

@ -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;

18
epan/dissectors/packet-btatt.c
View File

@ -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);
}
}

50
epan/dissectors/packet-btavdtp.c
View File

@ -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:

10
epan/dissectors/packet-btavrcp.c
View File

@ -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);
}
}

28
epan/dissectors/packet-bthci_acl.c
View File

@ -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);

8
epan/dissectors/packet-bthci_cmd.c
View File

@ -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;

22
epan/dissectors/packet-bthci_evt.c
View File

@ -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);
}
}

6
epan/dissectors/packet-bthci_sco.c
View File

@ -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);

4
epan/dissectors/packet-bthfp.c
View File

@ -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);

8
epan/dissectors/packet-bthsp.c
View File

@ -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);

32
epan/dissectors/packet-btl2cap.c
View File

@ -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) {

10
epan/dissectors/packet-btle.c
View File

@ -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) &&

6
epan/dissectors/packet-btsdp.c
View File

@ -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,

4
epan/dissectors/packet-c1222.c
View File

@ -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;

20
epan/dissectors/packet-camel.c
View File

@ -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);

4
epan/dissectors/packet-canopen.c
View File

@ -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 */

18
epan/dissectors/packet-catapult-dct2000.c
View File

@ -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);
}
}

8
epan/dissectors/packet-ccsds.c
View File

@ -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;
}

8
epan/dissectors/packet-ceph.c
View File

@ -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);
}

10
epan/dissectors/packet-cigi.c
View File

@ -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.

84
epan/dissectors/packet-cip.c
View File

@ -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)
{

6
epan/dissectors/packet-cipsafety.c
View File

@ -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)
{

10
epan/dissectors/packet-classicstun.c
View File

@ -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:

20
epan/dissectors/packet-coap.c
View File

@ -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);
}
}
}

4
epan/dissectors/packet-collectd.c
View File

@ -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,

6
epan/dissectors/packet-cops.c
View File

@ -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;
}

2
epan/dissectors/packet-corosync-totemnet.c
View File

@ -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;

2
epan/dissectors/packet-coseventcomm.c
View File

@ -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;
}

2
epan/dissectors/packet-cosnaming.c
View File

@ -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;
}

6
epan/dissectors/packet-couchbase.c
View File

@ -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;

2
epan/dissectors/packet-cp2179.c
View File

@ -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);

24
epan/dissectors/packet-cpfi.c
View File

@ -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 */

36
epan/dissectors/packet-cql.c
View File

@ -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

16
epan/dissectors/packet-ctdb.c
View File

@ -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"),

6
epan/dissectors/packet-data.c
View File

@ -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);

18
epan/dissectors/packet-dccp.c
View File

@ -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;

4
epan/dissectors/packet-dcerpc-nt.c
View File

@ -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);
}
/*

60
epan/dissectors/packet-dcerpc-spoolss.c
View File

@ -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 */

38
epan/dissectors/packet-dcerpc.c
View File

@ -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);
/* }*/
}
}

8
epan/dissectors/packet-dcom.c
View File

@ -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;

16
epan/dissectors/packet-devicenet.c
View File

@ -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"));

16
epan/dissectors/packet-dhcp.c
View File

@ -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)) {

Some files were not shown because too many files have changed in this diff Show More