diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-10-16 23:38:49 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-10-16 23:38:49 +0000 |
| commit | 293049dfbac0ea7db5651f4f4a0820465421550e (patch) | |
| tree | 4d2c6162e3fa0d91a2c747c36d3eaadaa5b9691f | |
| parent | 0bef3129f30acfecfe2201147a42188d6fbe08ad (diff) | |
Do some conversions of proto_tree_add_item() 'encoding' arg.
(previously missed).
57 FT_BOOLEAN: FALSE-->ENC_BIG_ENDIAN
31 FT_BOOLEAN: TRUE-->ENC_LITTLE_ENDIAN
10 FT_BYTES: ENC_BIG_ENDIAN-->ENC_NA
1 FT_BYTES: ENC_LITTLE_ENDIAN-->ENC_NA
21 FT_BYTES: FALSE-->ENC_NA
2 FT_BYTES: TRUE-->ENC_NA
2 FT_IPXNET: ENC_BIG_ENDIAN-->ENC_NA
6 FT_IPv6: ENC_BIG_ENDIAN-->ENC_NA
1 FT_IPv6: FALSE-->ENC_NA
6 FT_NONE: ENC_BIG_ENDIAN-->ENC_NA
19 FT_NONE: FALSE-->ENC_NA
3 FT_NONE: TRUE-->ENC_NA
1 FT_STRING: ENC_BIG_ENDIAN-->ENC_ASCII|ENC_NA
1 FT_STRING: ENC_LITTLE_ENDIAN-->ENC_ASCII|ENC_NA
5 FT_STRING: FALSE-->ENC_ASCII|ENC_NA
1 FT_STRING: TRUE-->ENC_ASCII|ENC_NA
4 FT_STRINGZ: ENC_NA-->ENC_ASCII|ENC_NA
8 FT_STRINGZ: FALSE-->ENC_ASCII|ENC_NA
1 FT_INT32: FALSE-->ENC_BIG_ENDIAN
1 FT_INT32: TRUE-->ENC_LITTLE_ENDIAN
11 FT_UINT8: 0-->ENC_BIG_ENDIAN
111 FT_UINT8: FALSE-->ENC_BIG_ENDIAN
17 FT_UINT8: TRUE-->ENC_LITTLE_ENDIAN
1 FT_UINT16: 0-->ENC_BIG_ENDIAN
68 FT_UINT16: FALSE-->ENC_BIG_ENDIAN
18 FT_UINT16: TRUE-->ENC_LITTLE_ENDIAN
4 FT_UINT24: FALSE-->ENC_BIG_ENDIAN
70 FT_UINT32: FALSE-->ENC_BIG_ENDIAN
1 FT_UINT32: TRUE-->ENC_LITTLE_ENDIAN
4 FT_UINT64: FALSE-->ENC_BIG_ENDIAN
1 FT_UINT64: TRUE-->ENC_LITTLE_ENDIAN
1 FT_UINT_STRING: FALSE-->ENC_ASCII|ENC_BIG_ENDIAN
svn path=/trunk/; revision=39442
80 files changed, 489 insertions, 489 deletions
diff --git a/epan/dissectors/packet-2dparityfec.c b/epan/dissectors/packet-2dparityfec.c index 5acc0e7caa..d44637df16 100644 --- a/epan/dissectors/packet-2dparityfec.c +++ b/epan/dissectors/packet-2dparityfec.c @@ -146,7 +146,7 @@ static void dissect_2dparityfec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_length_recovery, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_rfc2733_ext, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_pt_recovery, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_mask, tvb, offset, 3, FALSE); offset += 3; + proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_mask, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_ts_recovery, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_ts_pro_mpeg_ext, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_row_flag, tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-ancp.c b/epan/dissectors/packet-ancp.c index 19d406d6ca..367b87cb5f 100644 --- a/epan/dissectors/packet-ancp.c +++ b/epan/dissectors/packet-ancp.c @@ -310,7 +310,7 @@ dissect_ancp_port_up_dn_mgmt(tvbuff_t *tvb, proto_tree *ancp_tree, gint offset) ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(ancp_tree, hf_ancp_label, tvb, offset, 8, FALSE); + proto_tree_add_item(ancp_tree, hf_ancp_label, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; /* Start of the Extension Block */ @@ -407,10 +407,10 @@ dissect_ancp_port_up_dn_mgmt(tvbuff_t *tvb, proto_tree *ancp_tree, gint offset) case TLV_PING_OPAQUE_DATA: /* 2 32b values*/ proto_tree_add_item(tlv_tree, hf_ancp_oam_opaque, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tlv_tree, hf_ancp_oam_opaque, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; case TLV_PING_PARAMS: @@ -452,7 +452,7 @@ dissect_ancp_adj_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ancp_tree, proto_item_append_text(sti, " msec"); sti = proto_tree_add_item(ancp_tree, hf_ancp_adj_code, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); byte = tvb_get_guint8(tvb, offset); offset += 1; adjcode = byte & ADJ_CODE_MASK; @@ -506,7 +506,7 @@ dissect_ancp_adj_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ancp_tree, ancp_cap_tree = proto_item_add_subtree(sti, ett_ancp_tot_len); proto_tree_add_item(ancp_cap_tree, hf_ancp_tot_len, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; for ( ;numcaps; numcaps--) { diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index ce3395d4a5..4af4b6c5e0 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -757,7 +757,7 @@ try_dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, volatile int offset, offset = dissect_ber_identifier(pinfo, tree, tvb, start_offset, NULL, NULL, NULL); offset = dissect_ber_length(pinfo, tree, tvb, offset, NULL, NULL); } - item = ber_proto_tree_add_item(pinfo, tree, hf_ber_unknown_BER_OCTETSTRING, tvb, offset, len, ENC_BIG_ENDIAN); + item = ber_proto_tree_add_item(pinfo, tree, hf_ber_unknown_BER_OCTETSTRING, tvb, offset, len, ENC_NA); next_tree = proto_item_add_subtree(item, ett_ber_octet_string); offset = try_dissect_unknown_ber(pinfo, tvb, offset, next_tree, nest_level+1); } diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index ffc031a6d4..60efbc56d5 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -547,7 +547,7 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case BTOBEX_CODE_VALS_SET_PATH: proto_tree_add_item(st, hf_flags, next_tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(st, hf_set_path_flags_0, next_tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(st, hf_set_path_flags_1, next_tvb, offset, 1, FALSE); + proto_tree_add_item(st, hf_set_path_flags_1, next_tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(st, hf_constants, next_tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 116af236db..b4355bd2fe 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -2808,8 +2808,8 @@ dissect_cip_cco_all_attribute_common( proto_tree *cmd_tree, tvbuff_t *tvb, int o /* Add the data to the tree */ proto_tree_add_item(confg_tree, hf_cip_cco_con_type, tvb, offset, 2, ENC_LITTLE_ENDIAN ); - proto_tree_add_item(confg_tree, hf_cip_cco_ot_rtf, tvb, offset, 2, TRUE ); - proto_tree_add_item(confg_tree, hf_cip_cco_to_rtf, tvb, offset, 2, TRUE ); + proto_tree_add_item(confg_tree, hf_cip_cco_ot_rtf, tvb, offset, 2, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(confg_tree, hf_cip_cco_to_rtf, tvb, offset, 2, ENC_LITTLE_ENDIAN ); /* Target device id */ tdii = proto_tree_add_text( cmd_tree, tvb, offset+2, 10, "Target Device ID"); diff --git a/epan/dissectors/packet-dcerpc-browser.c b/epan/dissectors/packet-dcerpc-browser.c index db7edbf81b..5614a7f150 100644 --- a/epan/dissectors/packet-dcerpc-browser.c +++ b/epan/dissectors/packet-dcerpc-browser.c @@ -107,7 +107,7 @@ dissect_browser_TYPE_4_data(tvbuff_t *tvb, int offset, hf_browser_unknown_long, &len); proto_tree_add_item(tree, hf_browser_unknown_bytes, tvb, offset, len, - FALSE); + ENC_NA); offset += len; if (offset < old_offset) THROW(ReportedBoundsError); @@ -157,7 +157,7 @@ dissect_browser_TYPE_3_data(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_browser_unknown_long, &len); proto_tree_add_item(tree, hf_browser_unknown_bytes, tvb, offset, len, - FALSE); + ENC_NA); offset += len; if (offset < old_offset) THROW(ReportedBoundsError); @@ -764,7 +764,7 @@ dissect_browser_TYPE_9_data(tvbuff_t *tvb, int offset, hf_browser_unknown_long, &len); proto_tree_add_item(tree, hf_browser_unknown_bytes, tvb, offset, len, - FALSE); + ENC_NA); offset += len; if (offset < old_offset) THROW(ReportedBoundsError); @@ -956,7 +956,7 @@ dissect_browser_TYPE_12_data(tvbuff_t *tvb, int offset, hf_browser_unknown_long, &len); proto_tree_add_item(tree, hf_browser_unknown_bytes, tvb, offset, len, - FALSE); + ENC_NA); offset += len; if (offset < old_offset) THROW(ReportedBoundsError); diff --git a/epan/dissectors/packet-dcerpc-tapi.c b/epan/dissectors/packet-dcerpc-tapi.c index 72f2f545ba..b8b59f2666 100644 --- a/epan/dissectors/packet-dcerpc-tapi.c +++ b/epan/dissectors/packet-dcerpc-tapi.c @@ -128,7 +128,7 @@ dissect_tapi_TYPE_1(tvbuff_t *tvb, int offset, } proto_tree_add_item(tree, hf_tapi_unknown_bytes, tvb, offset, - di->array_actual_count, FALSE); + di->array_actual_count, ENC_NA); offset += di->array_actual_count; return offset; diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c index 272b9a24e5..e4285683a8 100644 --- a/epan/dissectors/packet-dcp-etsi.c +++ b/epan/dissectors/packet-dcp-etsi.c @@ -582,7 +582,7 @@ dissect_af (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) offset += 1; pt = tvb_get_guint8 (tvb, offset); if (tree) - proto_tree_add_item (af_tree, hf_edcp_pt, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (af_tree, hf_edcp_pt, tvb, offset, 1, ENC_ASCII|ENC_NA); offset += 1; next_tvb = tvb_new_subset (tvb, offset, payload_len, -1); offset += payload_len; diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index 33678a3082..39efe29950 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -1971,7 +1971,7 @@ dissect_dect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(DectTree, hf_dect_slot, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; - proto_tree_add_item(DectTree, hf_dect_framenumber, tvb, offset, 1, FALSE); + proto_tree_add_item(DectTree, hf_dect_framenumber, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(DectTree, hf_dect_rssi, tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-dlm3.c b/epan/dissectors/packet-dlm3.c index b790c5e06e..8b75e25499 100644 --- a/epan/dissectors/packet-dlm3.c +++ b/epan/dissectors/packet-dlm3.c @@ -648,7 +648,7 @@ dissect_dlm3_rcom_lock(tvbuff_t *tvb, proto_tree *tree, sub_offset = offset; proto_tree_add_item(sub_tree, hf_dlm3_rl_name_contents, tvb, sub_offset, - namelen, ENC_LITTLE_ENDIAN); + namelen, ENC_ASCII|ENC_NA); sub_offset += namelen; proto_tree_add_item(sub_tree, diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 3897dc1260..fca90a7369 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -2786,7 +2786,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, goto bad_rr; afdpart_len = tvb_get_guint8(tvb, cur_offset) & DNS_APL_AFDLENGTH; proto_tree_add_item(rr_tree, hf_dns_apl_negation, tvb, cur_offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(rr_tree, hf_dns_apl_afdlength, tvb, cur_offset, 1, FALSE); + proto_tree_add_item(rr_tree, hf_dns_apl_afdlength, tvb, cur_offset, 1, ENC_BIG_ENDIAN); cur_offset += 1; rr_len -= 1; @@ -3242,7 +3242,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(field_tree, hf_dns_flags_truncated, tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_dns_flags_tentative, - tvb, offset + DNS_FLAGS, 2, FALSE); + tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN); if (flags & F_RESPONSE) { proto_tree_add_item(field_tree, hf_dns_flags_rcode, tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c index ca5c3600ec..628c493d75 100644 --- a/epan/dissectors/packet-dplay.c +++ b/epan/dissectors/packet-dplay.c @@ -862,7 +862,7 @@ static gint dissect_type13_message(proto_tree *tree, tvbuff_t *tvb, gint offset) offset = dissect_packed_player(tree, tvb, offset); if (pw_ofs) offset = display_unicode_string(tree, hf_dplay_type_13_password, tvb, offset); - proto_tree_add_item(tree, hf_dplay_type_13_tick_count, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; + proto_tree_add_item(tree, hf_dplay_type_13_tick_count, tvb, offset, 4, ENC_NA); offset += 4; return offset; } diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c index 6f45443c97..12c6545a55 100644 --- a/epan/dissectors/packet-dsi.c +++ b/epan/dissectors/packet-dsi.c @@ -264,10 +264,10 @@ dissect_dsi_attention(tvbuff_t *tvb, proto_tree *dsi_tree, gint offset) ti = proto_tree_add_item(tree, hf_dsi_attn_flag, tvb, offset, 2, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(ti, ett_dsi_attn_flag); - proto_tree_add_item(tree, hf_dsi_attn_flag_shutdown, tvb, offset, 2, FALSE); - proto_tree_add_item(tree, hf_dsi_attn_flag_crash, tvb, offset, 2, FALSE); - proto_tree_add_item(tree, hf_dsi_attn_flag_msg, tvb, offset, 2, FALSE); - proto_tree_add_item(tree, hf_dsi_attn_flag_reconnect, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_dsi_attn_flag_shutdown, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_dsi_attn_flag_crash, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_dsi_attn_flag_msg, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_dsi_attn_flag_reconnect, tvb, offset, 2, ENC_BIG_ENDIAN); /* FIXME */ if ((flag & 0xf000) != 0x3000) proto_tree_add_item(tree, hf_dsi_attn_flag_time, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c index 65d0513506..069f41071c 100644 --- a/epan/dissectors/packet-ehs.c +++ b/epan/dissectors/packet-ehs.c @@ -482,7 +482,7 @@ static void common_secondary_header_dissector ( proto_tree* ehs_secondary_header ++(*offset); /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_pdss_reserved_3, tvb, *offset, 2, ENC_BIG_ENDIAN ); */ - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_gse_pkt_id, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_gse_pkt_id, tvb, *offset, 2, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_payload_vs_core_id, tvb, *offset, 2, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_apid, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; @@ -1117,7 +1117,7 @@ dissect_ehs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_new_data_flag, tvb, offset, 1, ENC_BIG_ENDIAN ); /* proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_pad1, tvb, offset, 1, ENC_BIG_ENDIAN ); */ proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_hold_flag, tvb, offset, 1, ENC_BIG_ENDIAN ); - proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_sign_flag, tvb, offset, 1, FALSE ); + proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_sign_flag, tvb, offset, 1, ENC_BIG_ENDIAN ); ++offset; /* proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_pad2, tvb, offset, 1, ENC_BIG_ENDIAN ); */ diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index 6114dab1d9..4ec68cca84 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -726,7 +726,7 @@ dissect_eigrp_auth_tlv (proto_tree *tree, tvbuff_t *tvb, offset += 4; proto_tree_add_item(tree, hf_eigrp_auth_keyseq, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_nullpad, tvb, offset, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_eigrp_nullpad, tvb, offset, 8, ENC_NA); offset += 8; switch (auth_type) { @@ -736,7 +736,7 @@ dissect_eigrp_auth_tlv (proto_tree *tree, tvbuff_t *tvb, "Invalid auth len %u:", auth_len); } else { proto_tree_add_item(tree, hf_eigrp_auth_digest, tvb, offset, - EIGRP_AUTH_TYPE_MD5_LEN, ENC_BIG_ENDIAN); + EIGRP_AUTH_TYPE_MD5_LEN, ENC_NA); } break; @@ -747,7 +747,7 @@ dissect_eigrp_auth_tlv (proto_tree *tree, tvbuff_t *tvb, } else { proto_tree_add_item(tree, hf_eigrp_auth_digest, tvb, offset, - EIGRP_AUTH_TYPE_SHA256_LEN, ENC_BIG_ENDIAN); + EIGRP_AUTH_TYPE_SHA256_LEN, ENC_NA); } break; @@ -801,7 +801,7 @@ dissect_eigrp_seq_tlv (proto_tree *tree, tvbuff_t *tvb, case 16: /* IPv6 */ proto_tree_add_item(tree, hf_eigrp_seq_ipv6addr, tvb, offset, addr_len, - ENC_BIG_ENDIAN); + ENC_NA); break; default: expert_add_info_format(pinfo, ti_addrlen, PI_MALFORMED, PI_ERROR, @@ -1189,7 +1189,7 @@ dissect_eigrp_ipx_addr (proto_item *ti, proto_tree *tree, tvbuff_t *tvb, proto_item *ti_dst; ti_dst = proto_tree_add_item(tree, hf_eigrp_ipx_dest, tvb, offset, 4, - ENC_BIG_ENDIAN); + ENC_NA); /* add it to the top level line */ proto_item_append_text(ti," = %s", @@ -1316,17 +1316,17 @@ dissect_eigrp_service (proto_item *ti, proto_tree *tree, tvbuff_t *tvb, proto_tree_add_item(reach_tree, hf_eigrp_saf_reachability_addr_ipv4, reach_tvb, 6, 4, ENC_BIG_ENDIAN); proto_tree_add_item(reach_tree, hf_eigrp_nullpad, reach_tvb, 10, 12, - ENC_BIG_ENDIAN); + ENC_NA); break; case EIGRP_AF_IPv6: proto_tree_add_item(reach_tree, hf_eigrp_saf_reachability_addr_ipv6, - reach_tvb, 6, 16, ENC_BIG_ENDIAN); + reach_tvb, 6, 16, ENC_NA); break; default: /* just print zeros... */ proto_tree_add_item(reach_tree, hf_eigrp_saf_reachability_addr_hex, - reach_tvb, 6, 16, ENC_BIG_ENDIAN); + reach_tvb, 6, 16, ENC_NA); break; } sub_offset += 22; @@ -1593,13 +1593,13 @@ dissect_eigrp_nexthop (proto_tree *tree, tvbuff_t *tvb, guint16 afi, int offset) case EIGRP_SF_IPv6: case EIGRP_AF_IPv6: proto_tree_add_item(tree, hf_eigrp_ipv6_nexthop, tvb, offset, 16, - ENC_BIG_ENDIAN); + ENC_NA); offset += 16; break; case EIGRP_AF_IPX: proto_tree_add_item(tree, hf_eigrp_ipx_nexthop_net, tvb, offset, 4, - ENC_BIG_ENDIAN); + ENC_NA); offset += 4; proto_tree_add_item(tree, hf_eigrp_ipx_nexthop_host, tvb, offset, 6, ENC_BIG_ENDIAN); @@ -1804,7 +1804,7 @@ dissect_eigrp_ipv6_tlv (proto_item *ti, proto_tree *tree, tvbuff_t *tvb, int unreachable = FALSE; proto_tree_add_item(tree, hf_eigrp_ipv6_nexthop, tvb, offset, 16, - ENC_BIG_ENDIAN); + ENC_NA); offset += 16; /* dissect external data if needed */ diff --git a/epan/dissectors/packet-evrc.c b/epan/dissectors/packet-evrc.c index f89bcdfc3b..d439bcf5ea 100644 --- a/epan/dissectors/packet-evrc.c +++ b/epan/dissectors/packet-evrc.c @@ -311,7 +311,7 @@ dissect_evrc_aux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, evrc_varia } proto_tree_add_item(evrc_tree, hf_mode_request, tvb, offset, 1, FALSE); - proto_tree_add_item(evrc_tree, hf_evrc_frame_count, tvb, offset, 1, FALSE); + proto_tree_add_item(evrc_tree, hf_evrc_frame_count, tvb, offset, 1, ENC_BIG_ENDIAN); /* * number of frames in PACKET is frame_count + 1 diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index d7a8b79996..fec1afe218 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -930,7 +930,7 @@ dissect_swils_efp (tvbuff_t *tvb, proto_tree *efp_tree, guint8 isreq _U_) break; case FC_SWILS_LRECTYPE_MCAST: - proto_tree_add_item (lrec_tree, hf_swils_efp_mcast_grpno, tvb, offset+1, 1, 0); + proto_tree_add_item (lrec_tree, hf_swils_efp_mcast_grpno, tvb, offset+1, 1, ENC_BIG_ENDIAN); break; } offset += efp.reclen; @@ -1401,9 +1401,9 @@ dissect_swils_mergereq (tvbuff_t *tvb, proto_tree *mr_tree, guint8 isreq) } else { proto_tree_add_item (mr_tree, hf_swils_zone_status, tvb, - offset+5, 1, 0); + offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (mr_tree, hf_swils_zone_reason, tvb, - offset+6, 1, 0); + offset+6, 1, ENC_BIG_ENDIAN); proto_tree_add_text (mr_tree, tvb, offset+7, 1, "Vendor Unique: 0x%x", tvb_get_guint8 (tvb, offset+7)); @@ -1437,9 +1437,9 @@ dissect_swils_aca (tvbuff_t *tvb, proto_tree *aca_tree, guint8 isreq) } else { proto_tree_add_item (aca_tree, hf_swils_zone_status, tvb, - offset+5, 1, 0); + offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (aca_tree, hf_swils_zone_reason, tvb, - offset+6, 1, 0); + offset+6, 1, ENC_BIG_ENDIAN); proto_tree_add_text (aca_tree, tvb, offset+7, 1, "Vendor Unique: 0x%x", tvb_get_guint8 (tvb, offset+7)); @@ -1456,9 +1456,9 @@ dissect_swils_rca (tvbuff_t *tvb, proto_tree *rca_tree, guint8 isreq) if (rca_tree) { if (!isreq) { proto_tree_add_item (rca_tree, hf_swils_zone_status, tvb, - offset+5, 1, 0); + offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (rca_tree, hf_swils_zone_reason, tvb, - offset+6, 1, 0); + offset+6, 1, ENC_BIG_ENDIAN); proto_tree_add_text (rca_tree, tvb, offset+7, 1, "Vendor Unique: 0x%x", tvb_get_guint8 (tvb, offset+7)); @@ -1548,9 +1548,9 @@ dissect_swils_sfc (tvbuff_t *tvb, proto_tree *sfc_tree, guint8 isreq) } else { proto_tree_add_item (sfc_tree, hf_swils_zone_status, tvb, - offset+5, 1, 0); + offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (sfc_tree, hf_swils_zone_reason, tvb, - offset+6, 1, 0); + offset+6, 1, ENC_BIG_ENDIAN); proto_tree_add_text (sfc_tree, tvb, offset+7, 1, "Vendor Unique: 0x%x", tvb_get_guint8 (tvb, offset+7)); @@ -1567,9 +1567,9 @@ dissect_swils_ufc (tvbuff_t *tvb, proto_tree *ufc_tree, guint8 isreq) if (ufc_tree) { if (!isreq) { proto_tree_add_item (ufc_tree, hf_swils_zone_status, tvb, - offset+5, 1, 0); + offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (ufc_tree, hf_swils_zone_reason, tvb, - offset+6, 1, 0); + offset+6, 1, ENC_BIG_ENDIAN); proto_tree_add_text (ufc_tree, tvb, offset+7, 1, "Vendor Unique: 0x%x", tvb_get_guint8 (tvb, offset+7)); diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c index 023dd31d37..18d8cbf887 100644 --- a/epan/dissectors/packet-gdsdb.c +++ b/epan/dissectors/packet-gdsdb.c @@ -1026,16 +1026,16 @@ gdsdb_prepare(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) if(tree) { offset = 4; proto_tree_add_item(tree, hf_gdsdb_prepare_transaction, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_prepare_statement, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_prepare_dialect, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_prepare_querystr, tvb, - offset, 4, FALSE); + offset, 4, ENC_ASCII|ENC_BIG_ENDIAN); length = tvb_get_ntohl(tvb, offset); offset += length + 6; proto_tree_add_uint_format_value(tree, @@ -1043,7 +1043,7 @@ gdsdb_prepare(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) length, "%i data bytes", length); offset += tvb_get_ntohl(tvb, offset) + 6; proto_tree_add_item(tree, hf_gdsdb_prepare_bufferlength, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); } return tvb_length(tvb); diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index f71dc20e60..e278c7562d 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.c @@ -424,7 +424,7 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* RFC2637 Section 4.1 : Enhanced GRE Header */ if (is_ppp && type!=ETHERTYPE_CDMA2000_A10_UBS) { - proto_tree_add_item(gre_tree, hf_gre_key_payload_length, tvb, offset, 2, FALSE); + proto_tree_add_item(gre_tree, hf_gre_key_payload_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(gre_tree, hf_gre_key_call_id, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-h263.c b/epan/dissectors/packet-h263.c index 58f6ba2a42..68339de63e 100644 --- a/epan/dissectors/packet-h263.c +++ b/epan/dissectors/packet-h263.c @@ -687,7 +687,7 @@ static void dissect_h263_data( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr } } if( tree ) - proto_tree_add_item( h263_payload_tree, hf_h263_data, tvb, offset, -1, FALSE ); + proto_tree_add_item( h263_payload_tree, hf_h263_data, tvb, offset, -1, ENC_NA ); } void diff --git a/epan/dissectors/packet-h263p.c b/epan/dissectors/packet-h263p.c index bd93efa49b..524f131546 100644 --- a/epan/dissectors/packet-h263p.c +++ b/epan/dissectors/packet-h263p.c @@ -95,7 +95,7 @@ dissect_h263P( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) proto_tree_add_item( h263P_tree, hf_h263P_rr, tvb, offset, 2, ENC_BIG_ENDIAN ); proto_tree_add_item( h263P_tree, hf_h263P_pbit, tvb, offset, 2, ENC_BIG_ENDIAN ); proto_tree_add_item( h263P_tree, hf_h263P_vbit, tvb, offset, 2, ENC_BIG_ENDIAN ); - proto_tree_add_item( h263P_tree, hf_h263P_plen, tvb, offset, 2, FALSE ); + proto_tree_add_item( h263P_tree, hf_h263P_plen, tvb, offset, 2, ENC_BIG_ENDIAN ); proto_tree_add_item( h263P_tree, hf_h263P_pebit, tvb, offset, 2, ENC_BIG_ENDIAN ); offset = offset +2; /* diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index 1439032cf7..f66c37ddc6 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -1247,7 +1247,7 @@ static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset, proto_tree_add_item(codec_tree, hf_iax2_cap_g726, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN ); proto_tree_add_item(codec_tree, hf_iax2_cap_adpcm, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN ); proto_tree_add_item(codec_tree, hf_iax2_cap_slinear, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN ); - proto_tree_add_item(codec_tree, hf_iax2_cap_lpc10, tvb, offset + 2, ies_len, FALSE ); + proto_tree_add_item(codec_tree, hf_iax2_cap_lpc10, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN ); proto_tree_add_item(codec_tree, hf_iax2_cap_g729a, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN ); proto_tree_add_item(codec_tree, hf_iax2_cap_speex, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN ); proto_tree_add_item(codec_tree, hf_iax2_cap_ilbc, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN ); @@ -1558,7 +1558,7 @@ dissect_fullpacket (tvbuff_t * tvb, guint32 offset, iax2_add_ts_fields(pinfo, iax2_tree, iax_packet, (guint16)ts); proto_tree_add_item (iax2_tree, hf_iax2_oseqno, tvb, offset+6, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (iax2_tree, hf_iax2_iseqno, tvb, offset+7, 1, ENC_BIG_ENDIAN); @@ -1747,7 +1747,7 @@ static guint32 dissect_minivideopacket (tvbuff_t * tvb, guint32 offset, PROTO_ITEM_SET_GENERATED(item); } - proto_tree_add_item (iax2_tree, hf_iax2_minividts, tvb, offset, 2, FALSE); + proto_tree_add_item (iax2_tree, hf_iax2_minividts, tvb, offset, 2, ENC_BIG_ENDIAN); iax2_add_ts_fields(pinfo, iax2_tree, iax_packet, (guint16)ts); proto_tree_add_item (iax2_tree, hf_iax2_minividmarker, tvb, offset, 2, ENC_BIG_ENDIAN); } else { @@ -1845,7 +1845,7 @@ static guint32 dissect_trunkcall_ts (tvbuff_t * tvb, guint32 offset, proto_tree proto_tree_add_item(call_tree, hf_iax2_trunk_call_len, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(call_tree, hf_iax2_trunk_call_scallno, tvb, offset + 2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(call_tree, hf_iax2_trunk_call_ts, tvb, offset + 4, 2, FALSE); + proto_tree_add_item(call_tree, hf_iax2_trunk_call_ts, tvb, offset + 4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(call_tree, hf_iax2_trunk_call_data, tvb, offset + 6, rlen, ENC_NA); } offset += 6 + rlen; @@ -1920,7 +1920,7 @@ static guint32 dissect_trunkpacket (tvbuff_t * tvb, guint32 offset, proto_tree_add_boolean(field_tree, hf_iax2_trunk_cmddata_ts, tvb, offset + 1, 1, cmddata); /* Timestamp */ - proto_tree_add_item(iax2_tree, hf_iax2_trunk_ts, tvb, offset + 2, 4, FALSE); + proto_tree_add_item(iax2_tree, hf_iax2_trunk_ts, tvb, offset + 2, 4, ENC_BIG_ENDIAN); } offset += 6; diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c index 32e7cd2518..8b85468651 100644 --- a/epan/dissectors/packet-icep.c +++ b/epan/dissectors/packet-icep.c @@ -1133,7 +1133,7 @@ static void dissect_icep_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree offset++; proto_tree_add_item(icep_tree, hf_icep_message_size, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; } else { offset += ICEP_HEADER_SIZE; diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 74764c5de8..652c79d24b 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -1527,7 +1527,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree /* Digital Signature */ par_len = opt_len - 20; - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_digital_signature_padding , tvb, opt_offset, par_len, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_digital_signature_padding , tvb, opt_offset, par_len, ENC_NA); opt_offset += par_len; /* Padding */ @@ -1899,7 +1899,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree /* Encrypted Handover Key */ par_len = opt_len-6-padd_length; - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_hkr_encrypted_handover_key, tvb, opt_offset, par_len, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_hkr_encrypted_handover_key, tvb, opt_offset, par_len, ENC_NA); opt_offset += par_len; /* Padding */ @@ -2005,7 +2005,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree /* Digital Signature */ par_len = opt_len - 20; - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_digital_signature_padding , tvb, opt_offset, par_len, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_digital_signature_padding , tvb, opt_offset, par_len, ENC_NA); opt_offset += par_len; /* Padding */ /* TODO: Calculate padding length and exlude from the signature */ @@ -2309,7 +2309,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 8; break; case 18: - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_target_prefix, tvb, opt_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_target_prefix, tvb, opt_offset, 16, ENC_NA); proto_item_append_text(ti, " %s/%d", tvb_ip6_to_str(tvb, opt_offset), prefix_len); opt_offset += 16; break; @@ -3687,7 +3687,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 8; /* Address */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_da_raddr, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_da_raddr, tvb, offset, 16, ENC_NA); offset += 16; break; } diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 6cb736aff1..919c43cb44 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -7620,7 +7620,7 @@ dissect_roaming_consortium(packet_info *pinfo, proto_tree *tree, } item = proto_tree_add_item(tree, hf_ieee80211_tag_roaming_consortium_oi1, - tvb, offset, oi1_len, ENC_BIG_ENDIAN); + tvb, offset, oi1_len, ENC_NA); add_manuf(item, tvb, offset); offset += oi1_len; @@ -7632,13 +7632,13 @@ dissect_roaming_consortium(packet_info *pinfo, proto_tree *tree, if (oi2_len > 0) { proto_tree_add_item(tree, hf_ieee80211_tag_roaming_consortium_oi2, - tvb, offset, oi2_len, ENC_BIG_ENDIAN); + tvb, offset, oi2_len, ENC_NA); offset += oi2_len; } if (end > offset) { proto_tree_add_item(tree, hf_ieee80211_tag_roaming_consortium_oi3, - tvb, offset, end - offset, ENC_BIG_ENDIAN); + tvb, offset, end - offset, ENC_NA); } return 2 + len; diff --git a/epan/dissectors/packet-image-gif.c b/epan/dissectors/packet-image-gif.c index 6b6b61d1ed..651e080123 100644 --- a/epan/dissectors/packet-image-gif.c +++ b/epan/dissectors/packet-image-gif.c @@ -181,10 +181,10 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) proto_item_append_text(ti, ", Version: %s", str); gif_tree = proto_item_add_subtree(ti, ett_gif); /* GIF signature */ - proto_tree_add_item(gif_tree, hf_version, tvb, 0, 6, TRUE); + proto_tree_add_item(gif_tree, hf_version, tvb, 0, 6, ENC_ASCII|ENC_NA); /* Screen descriptor */ - proto_tree_add_item(gif_tree, hf_screen_width, tvb, 6, 2, TRUE); - proto_tree_add_item(gif_tree, hf_screen_height, tvb, 8, 2, TRUE); + proto_tree_add_item(gif_tree, hf_screen_width, tvb, 6, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(gif_tree, hf_screen_height, tvb, 8, 2, ENC_LITTLE_ENDIAN); peek = tvb_get_guint8(tvb, 10); /* Bitfield gccc 0ppp @@ -208,19 +208,19 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) image_bpp, plurality(image_bpp, "", "s")); subtree = proto_item_add_subtree(ti, ett_global_flags); proto_tree_add_item(subtree, hf_global_color_map_present, - tvb, 10, 1, TRUE); + tvb, 10, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_global_color_resolution, - tvb, 10, 1, TRUE); + tvb, 10, 1, ENC_LITTLE_ENDIAN); if (version == GIF_89a) { proto_tree_add_item(subtree, hf_global_color_map_ordered, - tvb, 10, 1, TRUE); + tvb, 10, 1, ENC_LITTLE_ENDIAN); } proto_tree_add_item(subtree, hf_global_image_bpp, - tvb, 10, 1, TRUE); + tvb, 10, 1, ENC_LITTLE_ENDIAN); /* Background color */ proto_tree_add_item(gif_tree, hf_background_color, - tvb, 11, 1, TRUE); + tvb, 11, 1, ENC_LITTLE_ENDIAN); /* byte at offset 12 is 0x00 - reserved in GIF87a but encodes the * pixel aspect ratio in GIF89a as: @@ -245,7 +245,7 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) if (color_map_present) { len = 3 * (1 << image_bpp); proto_tree_add_item(gif_tree, hf_global_color_map, - tvb, 13, len, TRUE); + tvb, 13, len, ENC_NA); } else { len = 0; } @@ -311,11 +311,11 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) */ ti = proto_tree_add_item(gif_tree, hf_extension, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_extension); offset++; proto_tree_add_item(subtree, hf_extension_label, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); peek = tvb_get_guint8(tvb, offset); proto_item_append_text(ti, ": %s", val_to_str(peek, vals_extensions, @@ -345,18 +345,18 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) */ ti = proto_tree_add_item(gif_tree, hf_image, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_image); offset++; /* Screen descriptor */ proto_tree_add_item(subtree, hf_image_left, - tvb, offset, 2, TRUE); offset += 2; + tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(subtree, hf_image_top, - tvb, offset, 2, TRUE); offset += 2; + tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(subtree, hf_image_width, - tvb, offset, 2, TRUE); offset += 2; + tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(subtree, hf_image_height, - tvb, offset, 2, TRUE); offset += 2; + tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* bit field */ peek = tvb_get_guint8(tvb, offset); color_map_present = peek & 0x80; @@ -373,15 +373,15 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) image_bpp, plurality(image_bpp, "", "s")); subtree2 = proto_item_add_subtree(ti2, ett_local_flags); proto_tree_add_item(subtree2, hf_local_color_map_present, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree2, hf_local_color_resolution, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); if (version == GIF_89a) { proto_tree_add_item(subtree2, hf_local_color_map_ordered, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); } proto_tree_add_item(subtree2, hf_global_image_bpp, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* Local color map @@ -391,7 +391,7 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) if (color_map_present) { len = 3 * (1 << image_bpp); proto_tree_add_item(subtree, hf_local_color_map, - tvb, offset, len, TRUE); + tvb, offset, len, ENC_NA); } else { len = 0; } @@ -399,7 +399,7 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) item_len += len; proto_tree_add_item(subtree, hf_image_code_size, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; do { /* Read length of data block */ @@ -414,7 +414,7 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) } else { /* GIF processing stops at this very byte */ proto_tree_add_item(gif_tree, hf_trailer, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_NA); break; } } /* while */ diff --git a/epan/dissectors/packet-image-jfif.c b/epan/dissectors/packet-image-jfif.c index b6a02278ab..1e18bce6af 100644 --- a/epan/dissectors/packet-image-jfif.c +++ b/epan/dissectors/packet-image-jfif.c @@ -373,13 +373,13 @@ process_marker_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, return; ti = proto_tree_add_item(tree, hf_marker_segment, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_marker_segment); proto_item_append_text(ti, ": %s (0x%04X)", marker_name, marker); - proto_tree_add_item(subtree, hf_marker, tvb, 0, 2, FALSE); + proto_tree_add_item(subtree, hf_marker, tvb, 0, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_len, tvb, 2, 2, FALSE); + proto_tree_add_item(subtree, hf_len, tvb, 2, 2, ENC_BIG_ENDIAN); proto_tree_add_text(subtree, tvb, 4, -1, "Remaining segment data (%u bytes)", len - 2); @@ -399,29 +399,29 @@ process_sof_header(proto_tree *tree, tvbuff_t *tvb, guint32 len _U_, return; ti = proto_tree_add_item(tree, hf_sof_header, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_marker_segment); proto_item_append_text(ti, ": %s (0x%04X)", marker_name, marker); - proto_tree_add_item(subtree, hf_marker, tvb, 0, 2, FALSE); + proto_tree_add_item(subtree, hf_marker, tvb, 0, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_len, tvb, 2, 2, FALSE); + proto_tree_add_item(subtree, hf_len, tvb, 2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_sof_precision, tvb, 4, 1, FALSE); + proto_tree_add_item(subtree, hf_sof_precision, tvb, 4, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_sof_lines, tvb, 5, 2, FALSE); + proto_tree_add_item(subtree, hf_sof_lines, tvb, 5, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_sof_samples_per_line, tvb, 7, 2, FALSE); + proto_tree_add_item(subtree, hf_sof_samples_per_line, tvb, 7, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_sof_nf, tvb, 9, 1, FALSE); + proto_tree_add_item(subtree, hf_sof_nf, tvb, 9, 1, ENC_BIG_ENDIAN); { guint8 count = tvb_get_guint8(tvb, 9); guint32 offset = 10; while (count > 0) { - proto_tree_add_item(subtree, hf_sof_c_i, tvb, offset++, 1, FALSE); - proto_tree_add_item(subtree, hf_sof_h_i, tvb, offset, 1, FALSE); - proto_tree_add_item(subtree, hf_sof_v_i, tvb, offset++, 1, FALSE); - proto_tree_add_item(subtree, hf_sof_tq_i, tvb, offset++, 1, FALSE); + proto_tree_add_item(subtree, hf_sof_c_i, tvb, offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_sof_h_i, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_sof_v_i, tvb, offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_sof_tq_i, tvb, offset++, 1, ENC_BIG_ENDIAN); count--; } } @@ -442,31 +442,31 @@ process_sos_header(proto_tree *tree, tvbuff_t *tvb, guint32 len _U_, return; ti = proto_tree_add_item(tree, hf_sos_header, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_marker_segment); proto_item_append_text(ti, ": %s (0x%04X)", marker_name, marker); - proto_tree_add_item(subtree, hf_marker, tvb, 0, 2, FALSE); + proto_tree_add_item(subtree, hf_marker, tvb, 0, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_len, tvb, 2, 2, FALSE); + proto_tree_add_item(subtree, hf_len, tvb, 2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_sos_ns, tvb, 4, 1, FALSE); + proto_tree_add_item(subtree, hf_sos_ns, tvb, 4, 1, ENC_BIG_ENDIAN); { guint8 count = tvb_get_guint8(tvb, 4); offset = 5; while (count > 0) { - proto_tree_add_item(subtree, hf_sos_cs_j, tvb, offset++, 1, FALSE); - proto_tree_add_item(subtree, hf_sos_td_j, tvb, offset, 1, FALSE); - proto_tree_add_item(subtree, hf_sos_ta_j, tvb, offset++, 1, FALSE); + proto_tree_add_item(subtree, hf_sos_cs_j, tvb, offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_sos_td_j, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_sos_ta_j, tvb, offset++, 1, ENC_BIG_ENDIAN); count--; } } - proto_tree_add_item(subtree, hf_sos_ss, tvb, offset++, 1, FALSE); - proto_tree_add_item(subtree, hf_sos_se, tvb, offset++, 1, FALSE); + proto_tree_add_item(subtree, hf_sos_ss, tvb, offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_sos_se, tvb, offset++, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_sos_ah, tvb, offset, 1, FALSE); - proto_tree_add_item(subtree, hf_sos_al, tvb, offset++, 1, FALSE); + proto_tree_add_item(subtree, hf_sos_ah, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_sos_al, tvb, offset++, 1, ENC_BIG_ENDIAN); } /* Process an APP0 block. @@ -488,16 +488,16 @@ process_app0_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, return; ti = proto_tree_add_item(tree, hf_marker_segment, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_marker_segment); proto_item_append_text(ti, ": %s (0x%04X)", marker_name, marker); - proto_tree_add_item(subtree, hf_marker, tvb, 0, 2, FALSE); + proto_tree_add_item(subtree, hf_marker, tvb, 0, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_len, tvb, 2, 2, FALSE); + proto_tree_add_item(subtree, hf_len, tvb, 2, 2, ENC_BIG_ENDIAN); str = tvb_get_ephemeral_stringz(tvb, 4, &str_size); - ti = proto_tree_add_item(subtree, hf_identifier, tvb, 4, str_size, FALSE); + ti = proto_tree_add_item(subtree, hf_identifier, tvb, 4, str_size, ENC_ASCII|ENC_NA); if (strcmp(str, "JFIF") == 0) { /* Version */ ti = proto_tree_add_none_format(subtree, hf_version, @@ -506,30 +506,30 @@ process_app0_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, tvb_get_guint8(tvb, 10)); subtree_details = proto_item_add_subtree(ti, ett_details); proto_tree_add_item(subtree_details, hf_version_major, - tvb, 9, 1, FALSE); + tvb, 9, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree_details, hf_version_minor, - tvb, 10, 1, FALSE); + tvb, 10, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_units, - tvb, 11, 1, FALSE); + tvb, 11, 1, ENC_BIG_ENDIAN); /* Aspect ratio */ proto_tree_add_item(subtree, hf_xdensity, - tvb, 12, 2, FALSE); + tvb, 12, 2, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_ydensity, - tvb, 14, 2, FALSE); + tvb, 14, 2, ENC_BIG_ENDIAN); /* Thumbnail */ proto_tree_add_item(subtree, hf_xthumbnail, - tvb, 16, 1, FALSE); + tvb, 16, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_ythumbnail, - tvb, 17, 1, FALSE); + tvb, 17, 1, ENC_BIG_ENDIAN); { guint16 x = tvb_get_guint8(tvb, 16); guint16 y = tvb_get_guint8(tvb, 17); if (x || y) { proto_tree_add_item(subtree, hf_rgb, - tvb, 18, 3 * (x * y), FALSE); + tvb, 18, 3 * (x * y), ENC_NA); offset = 18 + (3 * (x * y)); } else { offset = 18; @@ -537,7 +537,7 @@ process_app0_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, } } else if (strcmp(str, "JFXX") == 0) { proto_tree_add_item(subtree, hf_extension_code, - tvb, 9, 1, FALSE); + tvb, 9, 1, ENC_BIG_ENDIAN); { guint8 code = tvb_get_guint8(tvb, 9); switch (code) { @@ -580,18 +580,18 @@ process_app1_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, return; ti = proto_tree_add_item(tree, hf_marker_segment, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_marker_segment); proto_item_append_text(ti, ": %s (0x%04X)", marker_name, marker); - proto_tree_add_item(subtree, hf_marker, tvb, offset, 2, FALSE); + proto_tree_add_item(subtree, hf_marker, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(subtree, hf_len, tvb, offset, 2, FALSE); + proto_tree_add_item(subtree, hf_len, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; str = tvb_get_ephemeral_stringz(tvb, offset, &str_size); - ti = proto_tree_add_item(subtree, hf_identifier, tvb, offset, str_size, FALSE); + ti = proto_tree_add_item(subtree, hf_identifier, tvb, offset, str_size, ENC_ASCII|ENC_NA); offset += str_size; if (strcmp(str, "Exif") == 0) { /* @@ -738,16 +738,16 @@ process_app2_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, return; ti = proto_tree_add_item(tree, hf_marker_segment, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_marker_segment); proto_item_append_text(ti, ": %s (0x%04X)", marker_name, marker); - proto_tree_add_item(subtree, hf_marker, tvb, 0, 2, FALSE); + proto_tree_add_item(subtree, hf_marker, tvb, 0, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_len, tvb, 2, 2, FALSE); + proto_tree_add_item(subtree, hf_len, tvb, 2, 2, ENC_BIG_ENDIAN); str = tvb_get_ephemeral_stringz(tvb, 4, &str_size); - ti = proto_tree_add_item(subtree, hf_identifier, tvb, 4, str_size, FALSE); + ti = proto_tree_add_item(subtree, hf_identifier, tvb, 4, str_size, ENC_ASCII|ENC_NA); if (strcmp(str, "FPXR") == 0) { proto_tree_add_text(tree, tvb, 0, -1, "Exif FlashPix APP2 application marker"); } else { @@ -781,7 +781,7 @@ dissect_jfif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) ti = proto_tree_add_item(tree, proto_jfif, tvb, 0, -1, FALSE); subtree = proto_item_add_subtree(ti, ett_jfif); - proto_tree_add_item(subtree, hf_marker, tvb, 0, 2, FALSE); + proto_tree_add_item(subtree, hf_marker, tvb, 0, 2, ENC_BIG_ENDIAN); } offset = 2; /* skip MARKER_SOI */ @@ -841,12 +841,12 @@ dissect_jfif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) } else { /* Marker but no segment */ /* Length = 2 */ proto_tree_add_item(subtree, hf_marker, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } } else { /* Reserved! */ ti = proto_tree_add_item(subtree, hf_marker, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); proto_item_append_text(ti, " (Reserved)"); return tvb_len; } diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index 4a6f60c442..56b382c56a 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -4878,7 +4878,7 @@ static void parse_PERF_PortCounters(proto_tree* parentTree, tvbuff_t* tvb, packe local_offset += 40; /* skip reserved field */ local_offset += 1; /* skip reserved field */ proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortSelect, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; - proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_CounterSelect, tvb, local_offset, 2, FALSE); local_offset += 2; + proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_CounterSelect, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_SymbolErrorCounter, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_LinkErrorRecoveryCounter, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_LinkDownedCounter, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; @@ -4893,8 +4893,8 @@ static void parse_PERF_PortCounters(proto_tree* parentTree, tvbuff_t* tvb, packe proto_tree_add_bits_item(perf_tree, hf_infiniband_PortCounters_ExcessiveBufferOverrunErrors, tvb, local_offset*8 + 4, 4, FALSE); local_offset += 1; local_offset += 2; /* skip reserved field */ proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_VL15Dropped, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; - proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortXmitData, tvb, local_offset, 4, FALSE); local_offset += 4; - proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortRcvData, tvb, local_offset, 4, FALSE); local_offset += 4; + proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortXmitData, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; + proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortRcvData, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortXmitPkts, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortRcvPkts, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; @@ -4921,10 +4921,10 @@ static void parse_PERF_PortCountersExtended(proto_tree* parentTree, tvbuff_t* tv local_offset += 40; /* skip reserved field */ local_offset += 1; /* skip reserved field */ proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortSelect, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; - proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_CounterSelect, tvb, local_offset, 2, FALSE); local_offset += 2; + proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_CounterSelect, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; local_offset += 4; /* skip reserved field */ - proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortXmitData, tvb, local_offset, 8, FALSE); local_offset += 8; - proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortRcvData, tvb, local_offset, 8, FALSE); local_offset += 8; + proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortXmitData, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; + proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortRcvData, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortXmitPkts, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortRcvPkts, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortUnicastXmitPkts, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; diff --git a/epan/dissectors/packet-ipmi-se.c b/epan/dissectors/packet-ipmi-se.c index 605229a1ea..5f179a6d73 100644 --- a/epan/dissectors/packet-ipmi-se.c +++ b/epan/dissectors/packet-ipmi-se.c @@ -1802,7 +1802,7 @@ parse_platform_event(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ipmi_se_evt_rev, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_uint_format_value(tree, hf_ipmi_se_evt_sensor_type, tvb, 1, 1, stype, "%s (0x%02x)", si->desc, stype); - proto_tree_add_item(tree, hf_ipmi_se_evt_sensor_num, tvb, 2, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_evt_sensor_num, tvb, 2, 1, ENC_LITTLE_ENDIAN); ti = proto_tree_add_item(tree, hf_ipmi_se_evt_byte3, tvb, 3, 1, ENC_LITTLE_ENDIAN); s_tree = proto_item_add_subtree(ti, ett_ipmi_se_evt_byte3); proto_tree_add_item(s_tree, hf_ipmi_se_evt_dir, tvb, 3, 1, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-ipmi-transport.c b/epan/dissectors/packet-ipmi-transport.c index 1d7c20240a..f9f5654cee 100644 --- a/epan/dissectors/packet-ipmi-transport.c +++ b/epan/dissectors/packet-ipmi-transport.c @@ -1278,7 +1278,7 @@ serial_09(tvbuff_t *tvb, proto_tree *tree) static void serial_10(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial10_set_sel, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial10_set_sel, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_serial10_init_str, tvb, 1, tvb_length(tvb) - 1, ENC_ASCII|ENC_NA); } diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index e1e1ec2910..5c39fc79cf 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -1242,7 +1242,7 @@ dissect_shimopts(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info *pinfo proto_tree_add_item(opt_tree, hf_ipv6_shim6_opt_type, tvb, offset, 2, ENC_BIG_ENDIAN); /* Critical */ - proto_tree_add_item(opt_tree, hf_ipv6_shim6_opt_critical, tvb, offset+1, 1, FALSE); + proto_tree_add_item(opt_tree, hf_ipv6_shim6_opt_critical, tvb, offset+1, 1, ENC_BIG_ENDIAN); /* Content Length */ proto_tree_add_item(opt_tree, hf_ipv6_shim6_opt_len, tvb, offset + 2, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index e61197457b..989c3400b3 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -2737,7 +2737,7 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += COOKIE_SIZE; hdr.next_payload = tvb_get_guint8(tvb, offset); - proto_tree_add_item(isakmp_tree, hf_isakmp_nextpayload, tvb, offset, 1, FALSE); + proto_tree_add_item(isakmp_tree, hf_isakmp_nextpayload, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -2860,7 +2860,7 @@ dissect_payload_header(tvbuff_t *tvb, int offset, int length, ntree = proto_item_add_subtree(ti, ett_isakmp_payload); - proto_tree_add_item(ntree, hf_isakmp_nextpayload, tvb, offset, 1, FALSE); + proto_tree_add_item(ntree, hf_isakmp_nextpayload, tvb, offset, 1, ENC_BIG_ENDIAN); if (isakmp_version == 2) { proto_tree_add_item(ntree, hf_isakmp_criticalpayload, tvb, offset+1, 1, ENC_BIG_ENDIAN); @@ -3467,7 +3467,7 @@ _U_ offset_end = offset + length; transform_type = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_isakmp_trans_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_trans_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; offset += 1; /* Reserved */ @@ -3512,7 +3512,7 @@ _U_ #endif /* HAVE_LIBGCRYPT */ if (isakmp_version == 2) { - proto_tree_add_item(tree, hf_isakmp_key_exch_dh_group, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_isakmp_key_exch_dh_group, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 4; length -= 4; } @@ -3546,10 +3546,10 @@ dissect_id(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_v id_type = tvb_get_guint8(tvb, offset); if (isakmp_version == 1) { - proto_tree_add_item(tree, hf_isakmp_id_type_v1, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_id_type_v1, tvb, offset, 1, ENC_BIG_ENDIAN); }else if (isakmp_version == 2) { - proto_tree_add_item(tree, hf_isakmp_id_type_v2, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_id_type_v2, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; length -= 1; @@ -3638,10 +3638,10 @@ dissect_cert(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp if (isakmp_version == 1) { - proto_tree_add_item(tree, hf_isakmp_cert_encoding_v1, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_cert_encoding_v1, tvb, offset, 1, ENC_BIG_ENDIAN); }else if (isakmp_version == 2) { - proto_tree_add_item(tree, hf_isakmp_cert_encoding_v2, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_cert_encoding_v2, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; @@ -3660,10 +3660,10 @@ dissect_certreq(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isa if (isakmp_version == 1) { - proto_tree_add_item(tree, hf_isakmp_certreq_type_v1, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_certreq_type_v1, tvb, offset, 1, ENC_BIG_ENDIAN); }else if (isakmp_version == 2) { - proto_tree_add_item(tree, hf_isakmp_certreq_type_v2, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_certreq_type_v2, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; @@ -3697,7 +3697,7 @@ static void dissect_auth(tvbuff_t *tvb, int offset, int length, proto_tree *tree) { - proto_tree_add_item(tree, hf_isakmp_auth_meth, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_auth_meth, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -3809,10 +3809,10 @@ dissect_notif(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakm if (isakmp_version == 1) { - proto_tree_add_item(tree, hf_isakmp_notify_msgtype_v1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_msgtype_v1, tvb, offset, 2, ENC_BIG_ENDIAN); }else if (isakmp_version == 2) { - proto_tree_add_item(tree, hf_isakmp_notify_msgtype_v2, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_msgtype_v2, tvb, offset, 2, ENC_BIG_ENDIAN); } offset += 2; length -= 2; @@ -3893,7 +3893,7 @@ dissect_notif(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakm offset += tvb_get_guint8(tvb, offset+1) + 2; break; case 16409: /* TICKET_LT_OPAQUE */ - proto_tree_add_item(tree, hf_isakmp_notify_data_ticket_lifetime, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_ticket_lifetime, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(tree, hf_isakmp_notify_data_ticket_data, tvb, offset, length, ENC_NA); @@ -3910,7 +3910,7 @@ dissect_notif(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakm proto_tree_add_item(tree, hf_isakmp_notify_data_qcd_token_secret_data, tvb, offset, length, ENC_NA); break; case 16422: /* IKEV2_MESSAGE_ID_SYNC */ - proto_tree_add_item(tree, hf_isakmp_notify_data_ha_nonce_data, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_ha_nonce_data, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_isakmp_notify_data_ha_expected_send_req_msg_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -3991,7 +3991,7 @@ dissect_vid(tvbuff_t *tvb, int offset, int length, proto_tree *tree) offset +=4; proto_tree_add_item(tree, hf_isakmp_vid_cp_version, tvb, offset, 4, ENC_BIG_ENDIAN); offset +=4; - proto_tree_add_item(tree, hf_isakmp_vid_cp_timestamp, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_isakmp_vid_cp_timestamp, tvb, offset, 4, ENC_BIG_ENDIAN); offset +=4; proto_tree_add_item(tree, hf_isakmp_vid_cp_reserved, tvb, offset, 4, ENC_BIG_ENDIAN); offset +=4; @@ -4252,7 +4252,7 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs } break; case XAUTH_TYPE: /* 16520 */ - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_type, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_type, tvb, offset, optlen, ENC_BIG_ENDIAN); proto_item_append_text(cfg_attr_type_item," : %s", rval_to_str(tvb_get_ntohs(tvb, offset), cfgattr_xauth_type, "Unknown %d")); break; case XAUTH_USER_NAME: /* 16521 */ @@ -4315,7 +4315,7 @@ dissect_config(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isak offset_end = offset + length; if (isakmp_version == 1) { - proto_tree_add_item(tree, hf_isakmp_cfg_type_v1,tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_cfg_type_v1,tvb, offset, 1, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_isakmp_cfg_identifier,tvb, offset, 1, ENC_BIG_ENDIAN); @@ -4323,7 +4323,7 @@ dissect_config(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isak } else if (isakmp_version == 2) { - proto_tree_add_item(tree, hf_isakmp_cfg_type_v2,tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_cfg_type_v2,tvb, offset, 1, ENC_BIG_ENDIAN); offset += 4; } @@ -4347,10 +4347,10 @@ dissect_nat_original_address(tvbuff_t *tvb, int offset, int length, proto_tree * id_type = tvb_get_guint8(tvb, offset); if (isakmp_version == 1) { - proto_tree_add_item(tree, hf_isakmp_id_type_v1, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_id_type_v1, tvb, offset, 1, ENC_BIG_ENDIAN); }else if (isakmp_version == 2) { - proto_tree_add_item(tree, hf_isakmp_id_type_v2, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_id_type_v2, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; length -= 1; @@ -4389,7 +4389,7 @@ dissect_ts(tvbuff_t *tvb, int offset, int length, proto_tree *tree) while (length > 0) { tstype = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_isakmp_ts_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; diff --git a/epan/dissectors/packet-isis.c b/epan/dissectors/packet-isis.c index 78bc9c6d64..40759333f9 100644 --- a/epan/dissectors/packet-isis.c +++ b/epan/dissectors/packet-isis.c @@ -187,19 +187,19 @@ dissect_isis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_tree_add_item(isis_tree, hf_isis_version2, tvb, offset, 1, - FALSE ); + ENC_BIG_ENDIAN ); } offset += 1; if (tree) { proto_tree_add_item(isis_tree, hf_isis_reserved, tvb, offset, 1, - FALSE ); + ENC_BIG_ENDIAN ); } offset += 1; if (tree) { proto_tree_add_item(isis_tree, hf_isis_max_area_adr, tvb, offset, 1, - FALSE ); + ENC_BIG_ENDIAN ); } offset += 1; diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c index 682f33289c..b006cf59e3 100644 --- a/epan/dissectors/packet-ismacryp.c +++ b/epan/dissectors/packet-ismacryp.c @@ -573,7 +573,7 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p /* IV */ if (first_au_flag == TRUE && iv_length != 0) { - ismacryp_item = proto_tree_add_item(ismacryp_header_tree, hf_ismacryp_iv, tvb, poffset->offset_bytes, iv_length, FALSE); + ismacryp_item = proto_tree_add_item(ismacryp_header_tree, hf_ismacryp_iv, tvb, poffset->offset_bytes, iv_length, ENC_NA); proto_item_append_text(ismacryp_item, ": Length=%d bytes",iv_length); /* add IV info */ if ( check_col( pinfo->cinfo, COL_INFO) ) { col_append_fstr( pinfo->cinfo, COL_INFO, @@ -585,7 +585,7 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p if (first_au_flag == FALSE && delta_iv_length != 0) { ismacryp_item = proto_tree_add_item(ismacryp_header_tree, hf_ismacryp_delta_iv, - tvb, poffset->offset_bytes, delta_iv_length, FALSE); + tvb, poffset->offset_bytes, delta_iv_length, ENC_NA); proto_item_append_text(ismacryp_item, ": Length=%d bytes",delta_iv_length); /* add delta IV info */ if ( check_col( pinfo->cinfo, COL_INFO) ) { col_append_fstr( pinfo->cinfo, COL_INFO, @@ -598,7 +598,7 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p { /* (first AU or KI for each AU) and non-zero KeyIndicator size */ ismacryp_item = proto_tree_add_item(ismacryp_header_tree, hf_ismacryp_key_indicator, - tvb, poffset->offset_bytes, key_indicator_length, FALSE); + tvb, poffset->offset_bytes, key_indicator_length, ENC_NA); proto_item_append_text(ismacryp_item,": Length=%d bytes",key_indicator_length); /* add KI info */ if ( check_col( pinfo->cinfo, COL_INFO) ) { col_append_fstr( pinfo->cinfo, COL_INFO, diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index a8838779e1..07a78dfe49 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -3261,8 +3261,8 @@ extern int dissect_codec_mode(proto_tree *tree, tvbuff_t *tvb, int offset, int l } if ( len > 4 ) { offset = offset + 1; - proto_tree_add_item(tree, hf_optimisation_mode, tvb, offset, 1, TRUE); - proto_tree_add_item(tree, hf_max_codec_modes, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_optimisation_mode, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_max_codec_modes, tvb, offset, 1, ENC_LITTLE_ENDIAN); } offset = offset + 1; break; diff --git a/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c index 20537f1251..3a9bea071e 100644 --- a/epan/dissectors/packet-json.c +++ b/epan/dissectors/packet-json.c @@ -231,12 +231,12 @@ static void after_value(void *tvbparse_data, const void *wanted_data _U_, tvbpar str[tok->len - 2] = '\0'; proto_tree_add_string(tree, hf_json_value_string, tok->tvb, tok->offset, tok->len, str); } else - proto_tree_add_item(tree, hf_json_value_string, tok->tvb, tok->offset, tok->len, FALSE); + proto_tree_add_item(tree, hf_json_value_string, tok->tvb, tok->offset, tok->len, ENC_ASCII|ENC_NA); break; case JSON_TOKEN_NUMBER: /* XXX, convert to number */ - proto_tree_add_item(tree, hf_json_value_number, tok->tvb, tok->offset, tok->len, FALSE); + proto_tree_add_item(tree, hf_json_value_number, tok->tvb, tok->offset, tok->len, ENC_ASCII|ENC_NA); break; case JSON_TOKEN_FALSE: diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index bbb3b99658..cf184ad7f1 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -1864,11 +1864,11 @@ dissect_l2tp_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - proto_tree_add_item(l2tp_tree, hf_l2tp_tunnel, tvb, idx, 2, FALSE); + proto_tree_add_item(l2tp_tree, hf_l2tp_tunnel, tvb, idx, 2, ENC_BIG_ENDIAN); } idx += 2; if (tree) { - proto_tree_add_item(l2tp_tree, hf_l2tp_session, tvb, idx, 2, FALSE); + proto_tree_add_item(l2tp_tree, hf_l2tp_session, tvb, idx, 2, ENC_BIG_ENDIAN); } idx += 2; diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c index 20f1d524c0..680b8480a0 100644 --- a/epan/dissectors/packet-linx.c +++ b/epan/dissectors/packet-linx.c @@ -325,10 +325,10 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ proto_tree_add_item(multicore_header_tree, hf_linx_nexthdr, tvb, 0, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(multicore_header_tree, hf_linx_multicore_reserved, tvb, 0, 4, FALSE); - proto_tree_add_item(multicore_header_tree, hf_linx_multicore_dcoreid, tvb, 0, 4, FALSE); - proto_tree_add_item(multicore_header_tree, hf_linx_multicore_scoreid, tvb, 0, 4, FALSE); - proto_tree_add_item(multicore_header_tree, hf_linx_multicore_reserved1, tvb, 0, 4, FALSE); + proto_tree_add_item(multicore_header_tree, hf_linx_multicore_reserved, tvb, 0, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(multicore_header_tree, hf_linx_multicore_dcoreid, tvb, 0, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(multicore_header_tree, hf_linx_multicore_scoreid, tvb, 0, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(multicore_header_tree, hf_linx_multicore_reserved1, tvb, 0, 4, ENC_BIG_ENDIAN); offset += 4; /* read main header*/ @@ -360,11 +360,11 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ proto_tree_add_item(main_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(main_header_tree, hf_linx_main_version , linx_tvb, offset, 4, FALSE); - proto_tree_add_item(main_header_tree, hf_linx_main_reserved , linx_tvb, offset, 4, FALSE); - proto_tree_add_item(main_header_tree, hf_linx_main_connection, linx_tvb, offset, 4, FALSE); - proto_tree_add_item(main_header_tree, hf_linx_main_bundle , linx_tvb, offset, 4, FALSE); - proto_tree_add_item(main_header_tree, hf_linx_main_pkgsize , linx_tvb, offset, 4, FALSE); + proto_tree_add_item(main_header_tree, hf_linx_main_version , linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(main_header_tree, hf_linx_main_reserved , linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(main_header_tree, hf_linx_main_connection, linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(main_header_tree, hf_linx_main_bundle , linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(main_header_tree, hf_linx_main_pkgsize , linx_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; while (nexthdr != ETHCM_NONE) { @@ -404,11 +404,11 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) item = proto_tree_add_text(linx_tree, linx_tvb, offset, (4+2*size), "Connection Header"); conn_header_tree = proto_item_add_subtree(item, ett_linx_main); proto_tree_add_item(conn_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(conn_header_tree, hf_linx_conn_cmd , linx_tvb, offset, 4, FALSE); - proto_tree_add_item(conn_header_tree, hf_linx_conn_size , linx_tvb, offset, 4, FALSE); - proto_tree_add_item(conn_header_tree, hf_linx_conn_winsize , linx_tvb, offset, 4, FALSE); - proto_tree_add_item(conn_header_tree, hf_linx_conn_reserved, linx_tvb, offset, 4, FALSE); - proto_tree_add_item(conn_header_tree, hf_linx_conn_publcid , linx_tvb, offset, 4, FALSE); + proto_tree_add_item(conn_header_tree, hf_linx_conn_cmd , linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(conn_header_tree, hf_linx_conn_size , linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(conn_header_tree, hf_linx_conn_winsize , linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(conn_header_tree, hf_linx_conn_reserved, linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(conn_header_tree, hf_linx_conn_publcid , linx_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* MEDIA ADDRESS */ if (size == 6) { @@ -420,7 +420,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += (2*size); /* Feature Negotiation String */ if(version > 2) { - proto_tree_add_item(conn_header_tree, hf_linx_conn_feat_neg_str, linx_tvb, offset, -1, FALSE); + proto_tree_add_item(conn_header_tree, hf_linx_conn_feat_neg_str, linx_tvb, offset, -1, ENC_ASCII|ENC_NA); offset += tvb_strnlen(linx_tvb, offset, -1); } break; @@ -445,10 +445,10 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) item = proto_tree_add_text(linx_tree, linx_tvb, offset, 4, "NACK Header"); nack_header_tree = proto_item_add_subtree(item, ett_linx_main); proto_tree_add_item(nack_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(nack_header_tree, hf_linx_nack_reserv1, linx_tvb, offset, 4, FALSE); - proto_tree_add_item(nack_header_tree, hf_linx_nack_count , linx_tvb, offset, 4, FALSE); - proto_tree_add_item(nack_header_tree, hf_linx_nack_reserv2, linx_tvb, offset, 4, FALSE); - proto_tree_add_item(nack_header_tree, hf_linx_nack_seqno , linx_tvb, offset, 4, FALSE); + proto_tree_add_item(nack_header_tree, hf_linx_nack_reserv1, linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(nack_header_tree, hf_linx_nack_count , linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(nack_header_tree, hf_linx_nack_reserv2, linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(nack_header_tree, hf_linx_nack_seqno , linx_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; @@ -490,22 +490,22 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) item = proto_tree_add_text(linx_tree, linx_tvb, offset, 12, "Udata Header"); udata_header_tree = proto_item_add_subtree(item, ett_linx_main); proto_tree_add_item(udata_header_tree, hf_linx_nexthdr, linx_tvb, offset, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(udata_header_tree, hf_linx_udata_reserved , linx_tvb, offset, 4, FALSE); - proto_tree_add_item(udata_header_tree, hf_linx_udata_morefrags, linx_tvb, offset, 4, FALSE); - proto_tree_add_item(udata_header_tree, hf_linx_udata_fragno , linx_tvb, offset, 4, FALSE); + proto_tree_add_item(udata_header_tree, hf_linx_udata_reserved , linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(udata_header_tree, hf_linx_udata_morefrags, linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(udata_header_tree, hf_linx_udata_fragno , linx_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* signo removed in version 3 and linkaddresses extended to 32 bits */ if(version == 2) { - proto_tree_add_item(udata_header_tree, hf_linx_udata_signo , linx_tvb, offset, 4, FALSE); + proto_tree_add_item(udata_header_tree, hf_linx_udata_signo , linx_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(udata_header_tree, hf_linx_udata_dstaddr16, linx_tvb, offset, 4, FALSE); - proto_tree_add_item(udata_header_tree, hf_linx_udata_srcaddr16, linx_tvb, offset, 4, FALSE); + proto_tree_add_item(udata_header_tree, hf_linx_udata_dstaddr16, linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(udata_header_tree, hf_linx_udata_srcaddr16, linx_tvb, offset, 4, ENC_BIG_ENDIAN); dword = tvb_get_ntohl(linx_tvb, offset); } else { - proto_tree_add_item(udata_header_tree, hf_linx_udata_dstaddr32, linx_tvb, offset, 4, FALSE); + proto_tree_add_item(udata_header_tree, hf_linx_udata_dstaddr32, linx_tvb, offset, 4, ENC_BIG_ENDIAN); dword = tvb_get_ntohl(linx_tvb, offset); offset += 4; - proto_tree_add_item(udata_header_tree, hf_linx_udata_srcaddr32, linx_tvb, offset, 4, FALSE); + proto_tree_add_item(udata_header_tree, hf_linx_udata_srcaddr32, linx_tvb, offset, 4, ENC_BIG_ENDIAN); if(dword == 0 && tvb_get_ntohl(linx_tvb, offset) == 0) { dword = 0; } else { @@ -526,12 +526,12 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) rlnh_header_tree = proto_item_add_subtree(item, ett_linx_main); if(version == 1) { - proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_msg_type32, linx_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_msg_type32, linx_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else { /* in version 2 of the rlnh protocol the length of the message type is restricted to 8 bits */ - proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_msg_reserved, linx_tvb, offset, 4, FALSE); - proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_msg_type8, linx_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_msg_reserved, linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_msg_type8, linx_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } @@ -540,43 +540,43 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* XXX what is this? */ break; case RLNH_QUERY_NAME: - proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_src_linkaddr, linx_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_src_linkaddr, linx_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_name, linx_tvb, offset, -1, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_name, linx_tvb, offset, -1, ENC_ASCII|ENC_NA); offset += tvb_strnlen(linx_tvb, offset, -1); break; case RLNH_PUBLISH: - proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_src_linkaddr, linx_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_src_linkaddr, linx_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_name, linx_tvb, offset, -1, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_name, linx_tvb, offset, -1, ENC_ASCII|ENC_NA); offset += tvb_strnlen(linx_tvb, offset, -1); break; case RLNH_UNPUBLISH: - proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_src_linkaddr, linx_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_src_linkaddr, linx_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; case RLNH_UNPUBLISH_ACK: - proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_src_linkaddr, linx_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_src_linkaddr, linx_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; case RLNH_INIT: - proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_version, linx_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_version, linx_tvb, offset, 4, ENC_BIG_ENDIAN); /* This is not working if nodes are at different versions. Only the latest value will be saved in rlnh_version */ rlnh_version = tvb_get_ntohl(linx_tvb, offset); offset += 4; break; case RLNH_INIT_REPLY: - proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_status, linx_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_status, linx_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; if(rlnh_version > 1) { - proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_feat_neg_str, linx_tvb, offset, -1, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_feat_neg_str, linx_tvb, offset, -1, ENC_ASCII|ENC_NA); offset += tvb_strnlen(linx_tvb, offset, -1); } break; case RLNH_PUBLISH_PEER: - proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_src_linkaddr, linx_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_src_linkaddr, linx_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_peer_linkaddr, linx_tvb, offset, -1, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_peer_linkaddr, linx_tvb, offset, -1, ENC_BIG_ENDIAN); offset += tvb_strnlen(linx_tvb, offset, -1); break; default: @@ -607,10 +607,10 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) item = proto_tree_add_text(linx_tree, linx_tvb, offset, 4, "Ack Header"); ack_header_tree = proto_item_add_subtree(item, ett_linx_main); proto_tree_add_item(ack_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(ack_header_tree, hf_linx_ack_request , linx_tvb, offset, 4, FALSE); - proto_tree_add_item(ack_header_tree, hf_linx_ack_reserved, linx_tvb, offset, 4, FALSE); - proto_tree_add_item(ack_header_tree, hf_linx_ack_ackno , linx_tvb, offset, 4, FALSE); - proto_tree_add_item(ack_header_tree, hf_linx_ack_seqno , linx_tvb, offset, 4, FALSE); + proto_tree_add_item(ack_header_tree, hf_linx_ack_request , linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ack_header_tree, hf_linx_ack_reserved, linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ack_header_tree, hf_linx_ack_ackno , linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ack_header_tree, hf_linx_ack_seqno , linx_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; @@ -628,9 +628,9 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) item = proto_tree_add_text(linx_tree, linx_tvb, offset, 4, "Fragmentation Header"); frag_header_tree = proto_item_add_subtree(item, ett_linx_main); proto_tree_add_item(frag_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(frag_header_tree, hf_linx_frag_reserved , linx_tvb, offset, 4, FALSE); - proto_tree_add_item(frag_header_tree, hf_linx_frag_morefrags, linx_tvb, offset, 4, FALSE); - proto_tree_add_item(frag_header_tree, hf_linx_frag_fragno , linx_tvb, offset, 4, FALSE); + proto_tree_add_item(frag_header_tree, hf_linx_frag_reserved , linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(frag_header_tree, hf_linx_frag_morefrags, linx_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(frag_header_tree, hf_linx_frag_fragno , linx_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index 99a1965981..fc40fa85c3 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -2763,7 +2763,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* TA value */ ta_value = tvb_get_guint8(tvb, offset) & 0x3f; ta_ti = proto_tree_add_item(tree, hf_mac_lte_control_timing_advance, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); if (ta_value == 31) { expert_add_info_format(pinfo, ta_ti, PI_SEQUENCE, @@ -2816,7 +2816,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* Check 2 Reserved bits */ reserved = (tvb_get_guint8(tvb, offset) & 0xc0) >> 6; ti = proto_tree_add_item(phr_tree, hf_mac_lte_control_power_headroom_reserved, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); if (reserved != 0) { expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, "Power Headroom Reserved bits not zero (found 0x%x)", reserved); diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index 181515ea51..af54fecd9b 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -1541,7 +1541,7 @@ static void dissect_pmip6_opt_lla(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int ti = proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s", optp->name); field_tree = proto_item_add_subtree(ti, *optp->subtree_index); - proto_tree_add_item(field_tree, hf_pmip6_opt_lila_lla, tvb, offset + 2, 16, FALSE); + proto_tree_add_item(field_tree, hf_pmip6_opt_lila_lla, tvb, offset + 2, 16, ENC_NA); } } diff --git a/epan/dissectors/packet-mongo.c b/epan/dissectors/packet-mongo.c index 0ec06528ba..f5c937c930 100644 --- a/epan/dissectors/packet-mongo.c +++ b/epan/dissectors/packet-mongo.c @@ -131,7 +131,7 @@ dissect_fullcollectionname(tvbuff_t *tvb, guint offset, proto_tree *tree) proto_item *ti; proto_tree *fcn_tree; - ti = proto_tree_add_item(tree, hf_mongo_fullcollectionname, tvb, offset, -1, ENC_NA); + ti = proto_tree_add_item(tree, hf_mongo_fullcollectionname, tvb, offset, -1, ENC_ASCII|ENC_NA); fcn_length = tvb_strsize(tvb, offset); /* If this doesn't find anything, we'll just throw an exception below */ diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index 4b03533395..055bff7e2e 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -970,13 +970,13 @@ dissect_tsp(tvbuff_t *tvb, volatile gint offset, packet_info *pinfo, if (e_flags & MP2T_AF_E_SS_FLAG_MASK) { proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_st, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_dnau_32_30, tvb, offset, 1, FALSE); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_dnau_32_30, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_m_1, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_dnau_29_15, tvb, offset, 2, FALSE); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_dnau_29_15, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_m_2, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_dnau_14_0, tvb, offset, 2, FALSE); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_dnau_14_0, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_m_3, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } diff --git a/epan/dissectors/packet-mrp-msrp.c b/epan/dissectors/packet-mrp-msrp.c index fb0c151fbc..e9944001d1 100644 --- a/epan/dissectors/packet-mrp-msrp.c +++ b/epan/dissectors/packet-mrp-msrp.c @@ -496,7 +496,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) msg_length = 1 + 1 + 2 + attribute_list_length; msg_ti = proto_tree_add_item(msrp_tree, hf_msrp_message, tvb, MSRP_MESSAGE_GROUP_OFFSET + msg_offset, - msg_length, FALSE); + msg_length, ENC_NA); msg_tree = proto_item_add_subtree(msg_ti, ett_msg); /* Append AttributeType description to the end of the "Message" heading */ @@ -511,7 +511,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ attr_list_ti = proto_tree_add_item(msg_tree, hf_msrp_attribute_list, tvb, MSRP_ATTRIBUTE_LIST_GROUP_OFFSET + msg_offset, - attribute_list_length, FALSE); + attribute_list_length, ENC_NA); attr_list_tree = proto_item_add_subtree(attr_list_ti, ett_attr_list); @@ -539,7 +539,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) vect_attr_ti = proto_tree_add_item(attr_list_tree, hf_msrp_vector_attribute, tvb, MSRP_VECTOR_ATTRIBUTE_GROUP_OFFSET + msg_offset + vect_offset, - vect_attr_len, FALSE); + vect_attr_len, ENC_NA); vect_attr_tree = proto_item_add_subtree(vect_attr_ti, ett_vect_attr); @@ -555,7 +555,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ first_value_ti = proto_tree_add_item(vect_attr_tree, hf_msrp_first_value, tvb, MSRP_FIRST_VALUE_GROUP_OFFSET + msg_offset + vect_offset, - attribute_length, FALSE); + attribute_length, ENC_NA); first_value_tree = proto_item_add_subtree(first_value_ti, ett_first_value); /* Add Domain components to First Value tree */ @@ -585,7 +585,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ first_value_ti = proto_tree_add_item(vect_attr_tree, hf_msrp_first_value, tvb, MSRP_FIRST_VALUE_GROUP_OFFSET + msg_offset + vect_offset, - attribute_length, FALSE); + attribute_length, ENC_NA); first_value_tree = proto_item_add_subtree(first_value_ti, ett_first_value); /* Decode StreamID */ diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c index 087c3bd94d..5e4ed2ede5 100644 --- a/epan/dissectors/packet-msdp.c +++ b/epan/dissectors/packet-msdp.c @@ -349,7 +349,7 @@ static void dissect_msdp_notification(tvbuff_t *tvb, packet_info *pinfo, proto_t guint8 error, error_sub; const value_string *vals; - proto_tree_add_item(tree, hf_msdp_not_o, tvb, *offset, 1, FALSE); + proto_tree_add_item(tree, hf_msdp_not_o, tvb, *offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_msdp_not_error, tvb, *offset, 1, ENC_BIG_ENDIAN); error = tvb_get_guint8(tvb, *offset); error &= 0x7F; /* Error is 7-bit field. O-bit is bit 8 */ diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index b869083c64..f82be08fe8 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -587,7 +587,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(ncp_tree, hf_ncp_packet_seqno, tvb, commhdr + 12, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ncp_tree, hf_ncp_delay_time, - tvb, commhdr + 16, 4, FALSE); + tvb, commhdr + 16, 4, ENC_BIG_ENDIAN); ncp_burst_seqno = tvb_get_ntohs(tvb, commhdr+20); proto_tree_add_item(ncp_tree, hf_ncp_burst_seqno, tvb, commhdr + 20, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 5b0aa56629..9af4a0fa05 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -1504,7 +1504,7 @@ dissect_execute_cdb_request(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_execute_cdb_flags(tvb, offset, pinfo, tree); /* timeout */ - proto_tree_add_item(tree, hf_ndmp_execute_cdb_timeout, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_execute_cdb_timeout, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* datain_len */ @@ -2528,17 +2528,17 @@ dissect_file_stats(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *pa offset += 4; /* owner */ - proto_tree_add_item(tree, hf_ndmp_file_owner, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_file_owner, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* group */ - proto_tree_add_item(tree, hf_ndmp_file_group, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_file_group, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /*XXX here we should do proper dissection of mode for unix or fattr for nt, call appropriate functions in nfs/smb*/ /* fattr */ - proto_tree_add_item(tree, hf_ndmp_file_fattr, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_file_fattr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /*file size*/ diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 1187c4a1c4..6d77f15c55 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -2389,7 +2389,7 @@ address_item(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset = ndps_string(tvb, hf_object_name, ndps_tree, foffset, NULL); break; case 13: - proto_tree_add_item(ndps_tree, hf_ndps_attrib_boolean, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attrib_boolean, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 14: @@ -2721,7 +2721,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) switch(attribute_type) { case 0: /* Null */ - proto_tree_add_item(ndps_tree, hf_ndps_data, tvb, foffset+4, tvb_get_ntohl(tvb, foffset), FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_data, tvb, foffset+4, tvb_get_ntohl(tvb, foffset), ENC_NA); break; case 1: /* Text */ case 2: /* Descriptive Name */ @@ -2864,7 +2864,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset += 8; break; case 34: /* Boolean */ - proto_tree_add_item(ndps_tree, hf_ndps_attrib_boolean, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attrib_boolean, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 36: /* Object Identifier */ @@ -3475,7 +3475,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) proto_tree_add_item(ndps_tree, hf_ndps_ydimension_n64, tvb, foffset, 8, ENC_NA); foffset += 8; } - proto_tree_add_item(ndps_tree, hf_ndps_long_edge_feeds, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_long_edge_feeds, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_tree_add_item(ndps_tree, hf_ndps_xmin_n64, tvb, foffset, 8, ENC_NA); foffset += 8; @@ -3500,7 +3500,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset += 8; proto_tree_add_item(ndps_tree, hf_ndps_size_inc_in_feed, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_long_edge_feeds, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_long_edge_feeds, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_tree_add_item(ndps_tree, hf_ndps_xmin_n64, tvb, foffset, 8, ENC_NA); foffset += 8; @@ -3774,7 +3774,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) break; case 104: /* Cardinal or Enum or Time */ card_enum_time = tvb_get_ntohl(tvb, foffset); - proto_tree_add_item(ndps_tree, hf_ndps_card_enum_time, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_card_enum_time, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; switch (card_enum_time) { @@ -4610,7 +4610,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g { case 0: /* Create Job */ foffset = ndps_string(tvb, hf_ndps_pa_name, ndps_tree, foffset, NULL); - proto_tree_add_item(ndps_tree, hf_sub_complete, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_sub_complete, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Transfer Method"); atree = proto_item_add_subtree(aitem, ett_ndps); @@ -4684,7 +4684,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g length_remaining = tvb_length_remaining(tvb, foffset); if (length_remaining == -1 || length > (guint32) length_remaining) /* Segmented Data */ { - proto_tree_add_item(btree, hf_ndps_data, tvb, foffset, -1, FALSE); + proto_tree_add_item(btree, hf_ndps_data, tvb, foffset, -1, ENC_NA); return foffset; } if (length==4) @@ -4762,7 +4762,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = ndps_string(tvb, hf_ndps_pa_name, ndps_tree, foffset, NULL); proto_tree_add_item(ndps_tree, hf_local_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_sub_complete, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_sub_complete, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Transfer Method"); atree = proto_item_add_subtree(aitem, ett_ndps); @@ -4915,7 +4915,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g } foffset += length; foffset += (length%2); - proto_tree_add_item(ndps_tree, hf_ndps_abort_flag, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_abort_flag, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; number_of_items = tvb_get_ntohl(tvb, foffset); proto_tree_add_uint(ndps_tree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items); @@ -5145,7 +5145,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g atree = proto_item_add_subtree(aitem, ett_ndps); foffset = objectidentification(tvb, atree, foffset); proto_item_set_end(aitem, tvb, foffset); - proto_tree_add_item(ndps_tree, hf_ndps_force, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_force, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Reference Object Option"); atree = proto_item_add_subtree(aitem, ett_ndps); @@ -5388,7 +5388,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset += 4; proto_tree_add_item(ndps_tree, hf_get_status_flag, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_data, tvb, foffset+4, tvb_get_ntohl(tvb, foffset), FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_data, tvb, foffset+4, tvb_get_ntohl(tvb, foffset), ENC_NA); break; case 0x00000019: /* Device Control */ proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); @@ -5556,7 +5556,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g } foffset += length; foffset += (length%2); - proto_tree_add_item(ndps_tree, hf_ndps_abort_flag, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_abort_flag, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } break; @@ -5734,7 +5734,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g } foffset += length; foffset += (length%2); - proto_tree_add_item(ndps_tree, hf_ndps_abort_flag, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_abort_flag, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } break; @@ -5920,7 +5920,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g } foffset += length; foffset += (length%2); - proto_tree_add_item(ndps_tree, hf_ndps_abort_flag, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_abort_flag, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } break; @@ -6150,7 +6150,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g } foffset += length; foffset += (length%2); - proto_tree_add_item(ndps_tree, hf_ndps_abort_flag, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_abort_flag, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } break; @@ -6350,7 +6350,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g } foffset += length; foffset += (length%2); - proto_tree_add_item(ndps_tree, hf_ndps_abort_flag, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_abort_flag, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; default: @@ -7591,7 +7591,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int atree = proto_item_add_subtree(aitem, ett_ndps); proto_tree_add_item(atree, hf_ndps_service_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(atree, hf_ndps_service_enabled, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_service_enabled, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); } @@ -7869,7 +7869,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset = ndps_string(tvb, hf_ndps_method_name, atree, foffset, NULL); foffset = ndps_string(tvb, hf_ndps_method_ver, atree, foffset, NULL); foffset = ndps_string(tvb, hf_ndps_file_name, atree, foffset, NULL); - proto_tree_add_item(atree, hf_ndps_admin_submit, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_admin_submit, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); /* End of DeliveryMethod */ @@ -7887,7 +7887,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset = ndps_string(tvb, hf_ndps_method_name, atree, foffset, NULL); foffset = ndps_string(tvb, hf_ndps_method_ver, atree, foffset, NULL); foffset = ndps_string(tvb, hf_ndps_file_name, atree, foffset, NULL); - proto_tree_add_item(atree, hf_ndps_admin_submit, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_admin_submit, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); /* End of DeliveryMethod */ @@ -8215,7 +8215,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset += 4; proto_tree_add_item(ndps_tree, hf_file_timestamp, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_data, tvb, foffset, -1, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_data, tvb, foffset, -1, ENC_NA); break; case 0x00000007: /* Get Resource File Date */ proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 32dfcaf534..8beac73dba 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -3111,17 +3111,17 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case 82: /* IF_NAME */ ti = proto_tree_add_item(pdutree, hf_cflow_if_name, - tvb, offset, length, ENC_NA); + tvb, offset, length, ENC_ASCII|ENC_NA); break; case 83: /* IF_DESCR */ ti = proto_tree_add_item(pdutree, hf_cflow_if_descr, - tvb, offset, length, ENC_NA); + tvb, offset, length, ENC_ASCII|ENC_NA); break; case 84: /* SAMPLER_NAME */ ti = proto_tree_add_item(pdutree, hf_cflow_sampler_name, - tvb, offset, length, ENC_NA); + tvb, offset, length, ENC_ASCII|ENC_NA); break; case 85: /* BYTES_PERMANENT */ diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c index 10228a7d31..e76bff4279 100644 --- a/epan/dissectors/packet-nlsp.c +++ b/epan/dissectors/packet-nlsp.c @@ -443,7 +443,7 @@ nlsp_dissect_nlsp_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset, 1, ENC_BIG_ENDIAN); } else { proto_tree_add_item(tree, hf_nlsp_hello_multicast, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); } proto_tree_add_item(tree, hf_nlsp_hello_circuit_type, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -1068,7 +1068,7 @@ nlsp_dissect_nlsp_lsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree) { proto_tree_add_item(tree, hf_nlsp_lsp_p, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_nlsp_lsp_attached_flag, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_nlsp_lsp_lspdbol, tvb, diff --git a/epan/dissectors/packet-oicq.c b/epan/dissectors/packet-oicq.c index d75f403549..9ed13eb34a 100644 --- a/epan/dissectors/packet-oicq.c +++ b/epan/dissectors/packet-oicq.c @@ -150,7 +150,7 @@ dissect_oicq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(oicq_tree, hf_oicq_seq, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(oicq_tree, hf_oicq_qqid, tvb, offset, 4, FALSE); + proto_tree_add_item(oicq_tree, hf_oicq_qqid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(oicq_tree, hf_oicq_data, tvb, offset, -1, ENC_ASCII|ENC_NA); diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index e8e8349c88..f2700c6b56 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -1163,7 +1163,7 @@ static int dissect_pdcp_feedback_packet(proto_tree *tree, /* Code */ code = tvb_get_guint8(tvb, offset) & 0x07; - ti = proto_tree_add_item(feedback_tree, hf_pdcp_lte_rohc_feedback_code, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(feedback_tree, hf_pdcp_lte_rohc_feedback_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Optional length field */ @@ -2071,7 +2071,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* Bitmap tree */ if (tvb_length_remaining(tvb, offset) > 0) { bitmap_ti = proto_tree_add_item(pdcp_tree, hf_pdcp_lte_bitmap, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); bitmap_tree = proto_item_add_subtree(bitmap_ti, ett_pdcp_rohc_report_bitmap); diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c index 168cbc23c9..cb8605a3d3 100644 --- a/epan/dissectors/packet-pim.c +++ b/epan/dissectors/packet-pim.c @@ -466,7 +466,7 @@ dissect_pimv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb_ip_to_str(tvb, offset)); offset += 4; - proto_tree_add_item(pimopt_tree, hf_pim_rpt, tvb, offset, 1, FALSE); + proto_tree_add_item(pimopt_tree, hf_pim_rpt, tvb, offset, 1, ENC_BIG_ENDIAN); pref = tvb_get_ntohl(tvb, offset) & 0x7fffffff; proto_tree_add_uint_format(pimopt_tree, hf_pim_metric_pref, tvb, offset, 4, pref, @@ -785,7 +785,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { break; case 2: /* LAN Prune Delay Option */ - proto_tree_add_item(opt_tree, hf_pim_t, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(opt_tree, hf_pim_t, tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_pim_propagation_delay, tvb, offset + 4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_pim_override_interval, tvb, offset + 6, 2, ENC_BIG_ENDIAN); proto_item_append_text(opt_item, @@ -1111,7 +1111,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_text(pimopt_tree, tvb, offset, advance, "Source: %s", s); offset += advance; - proto_tree_add_item(pimopt_tree, hf_pim_rpt, tvb, offset, 1, FALSE); + proto_tree_add_item(pimopt_tree, hf_pim_rpt, tvb, offset, 1, ENC_BIG_ENDIAN); pref = tvb_get_ntohl(tvb, offset) & 0x7fffffff; proto_tree_add_uint_format(pimopt_tree, hf_pim_metric_pref, tvb, offset, 4, pref, @@ -1190,7 +1190,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { "Originator: %s", s); offset += advance; - proto_tree_add_item(pimopt_tree, hf_pim_rpt, tvb, offset, 1, FALSE); + proto_tree_add_item(pimopt_tree, hf_pim_rpt, tvb, offset, 1, ENC_BIG_ENDIAN); pref = tvb_get_ntohl(tvb, offset) & 0x7fffffff; proto_tree_add_uint_format(pimopt_tree, hf_pim_metric_pref, tvb, offset, 4, pref, diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c index 025a3c477e..97e56c1cfc 100644 --- a/epan/dissectors/packet-pnrp.c +++ b/epan/dissectors/packet-pnrp.c @@ -653,7 +653,7 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, ENC_BIG_ENDIAN); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_certChain, tvb, offset + 4, data_length-4, FALSE); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_certChain, tvb, offset + 4, data_length-4, ENC_NA); } /* There might be padding, so fill up to the next byte */ @@ -929,7 +929,7 @@ static void dissect_encodedCPA_structure(tvbuff_t *tvb, gint offset, gint length /* Reserved */ proto_tree_add_text(pnrp_encodedCPA_tree, tvb, offset + 7, 1, "Reserved"); /* Not After */ - proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_notAfter, tvb, offset+8, 8, FALSE); + proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_notAfter, tvb, offset+8, 8, ENC_BIG_ENDIAN); /* Service Location */ proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_serviceLocation, tvb, offset+16, 16, ENC_NA); diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 6fb66d696d..79e1e88b2c 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -4514,7 +4514,7 @@ dissect_pap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { message_length = tvb_get_guint8(tvb, offset); offset +=1; - proto_tree_add_item(data_tree, hf_pap_message, tvb, offset, message_length, FALSE); + proto_tree_add_item(data_tree, hf_pap_message, tvb, offset, message_length, ENC_ASCII|ENC_NA); message = tvb_format_text(tvb, offset, message_length); offset += message_length; diff --git a/epan/dissectors/packet-pptp.c b/epan/dissectors/packet-pptp.c index e5e9c90a2a..c77e00b030 100644 --- a/epan/dissectors/packet-pptp.c +++ b/epan/dissectors/packet-pptp.c @@ -340,7 +340,7 @@ static void dissect_out_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_pptp_call_id, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_call_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_call_serial_number, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -358,7 +358,7 @@ dissect_out_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_framing_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pptp_packet_receive_window_size, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_packet_receive_window_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_packet_processing_delay, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -381,7 +381,7 @@ dissect_out_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_pptp_call_id, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_call_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_peer_call_id, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -396,10 +396,10 @@ dissect_out_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_cause, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_pptp_connect_speed, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_connect_speed, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pptp_packet_receive_window_size, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_packet_receive_window_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_packet_processing_delay, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -413,7 +413,7 @@ dissect_in_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_pptp_call_id, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_call_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_call_serial_number, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -444,7 +444,7 @@ static void dissect_in_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_pptp_call_id, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_call_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_peer_call_id, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -456,7 +456,7 @@ dissect_in_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_error, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_pptp_packet_receive_window_size, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_packet_receive_window_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_packet_processing_delay, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -475,10 +475,10 @@ dissect_in_connected(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); offset += 2; - proto_tree_add_item(tree, hf_pptp_connect_speed, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_connect_speed, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pptp_packet_receive_window_size, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_packet_receive_window_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_packet_processing_delay, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -491,7 +491,7 @@ static void dissect_clear_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_pptp_call_id, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_call_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); @@ -501,7 +501,7 @@ static void dissect_disc_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_pptp_call_id, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_call_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_disc_result, tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-pw-atm.c b/epan/dissectors/packet-pw-atm.c index 4d17121545..7268e36e0b 100644 --- a/epan/dissectors/packet-pw-atm.c +++ b/epan/dissectors/packet-pw-atm.c @@ -1239,10 +1239,10 @@ void dissect_control_word(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree } if (pd->mode == PWATM_MODE_AAL5_SDU) { - proto_tree_add_item(tree2, hf_pref_cw_a5s_t, tvb, 0, 1, FALSE); - proto_tree_add_item(tree2, hf_pref_cw_a5s_e, tvb, 0, 1, FALSE); - proto_tree_add_item(tree2, hf_pref_cw_a5s_c, tvb, 0, 1, FALSE); - proto_tree_add_item(tree2, hf_pref_cw_a5s_u, tvb, 0, 1, FALSE); + proto_tree_add_item(tree2, hf_pref_cw_a5s_t, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree2, hf_pref_cw_a5s_e, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree2, hf_pref_cw_a5s_c, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree2, hf_pref_cw_a5s_u, tvb, 0, 1, ENC_BIG_ENDIAN); /* * rfc4717: [When FRF.8.1 Frame Relay/ATM PVC Service Interworking [RFC3916] * traffic is being transported, the CPCS-UU Least Significant Bit @@ -1521,7 +1521,7 @@ int dissect_cell_header(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_tree_add_uint(tree2, hf_cell_h_vpi, tvb, 0, 2, (unsigned)pd->vpi); proto_tree_add_uint(tree2, hf_cell_h_vci, tvb, 1, 3, (unsigned)pd->vci); - item2 = proto_tree_add_item(tree2, hf_cell_h_pti, tvb, 3, 1, FALSE); + item2 = proto_tree_add_item(tree2, hf_cell_h_pti, tvb, 3, 1, ENC_BIG_ENDIAN); if (NULL == match_strval(pd->pti,atm_pt_vals)) { expert_add_info_format(pinfo, item2, PI_UNDECODED, PI_WARN, @@ -1536,11 +1536,11 @@ int dissect_cell_header(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) pd->pti); } - proto_tree_add_item(tree2, hf_cell_h_clp, tvb, 3, 1, FALSE); + proto_tree_add_item(tree2, hf_cell_h_clp, tvb, 3, 1, ENC_BIG_ENDIAN); } else if (MODE_11_OR_AAL5_PDU(pd->mode)) { - item2 = proto_tree_add_item(tree2, hf_cell_h_m , tvb, 0, 1, FALSE); + item2 = proto_tree_add_item(tree2, hf_cell_h_m , tvb, 0, 1, ENC_BIG_ENDIAN); if ((0 != pd->cwb3.m) && MODE_11(pd->mode)) { expert_add_info_format(pinfo, item2, PI_MALFORMED, PI_ERROR @@ -1548,7 +1548,7 @@ int dissect_cell_header(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) " M bit must be 0 to distinguish from AAL5 PDU mode"); } - item2 = proto_tree_add_item(tree2, hf_cell_h_v , tvb, 0, 1, FALSE); + item2 = proto_tree_add_item(tree2, hf_cell_h_v , tvb, 0, 1, ENC_BIG_ENDIAN); if ((0 == pd->cwb3.v) && (PWATM_MODE_11_VPC == pd->mode)) { expert_add_info_format(pinfo, item2, PI_MALFORMED, PI_ERROR @@ -1585,7 +1585,7 @@ int dissect_cell_header(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (MODE_11(pd->mode)) { - item2 = proto_tree_add_item(tree2, hf_cell_h_pti, tvb, 0, 1, FALSE); + item2 = proto_tree_add_item(tree2, hf_cell_h_pti, tvb, 0, 1, ENC_BIG_ENDIAN); if (NULL == match_strval(pd->pti,atm_pt_vals)) { expert_add_info_format(pinfo, item2, PI_UNDECODED, PI_WARN, @@ -1595,11 +1595,11 @@ int dissect_cell_header(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) } else { - proto_tree_add_item(tree2, hf_aal5_pdu_u, tvb, 0, 1, FALSE); - proto_tree_add_item(tree2, hf_aal5_pdu_e, tvb, 0, 1, FALSE); + proto_tree_add_item(tree2, hf_aal5_pdu_u, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree2, hf_aal5_pdu_e, tvb, 0, 1, ENC_BIG_ENDIAN); } - proto_tree_add_item(tree2, hf_cell_h_clp, tvb, 0, 1, FALSE); + proto_tree_add_item(tree2, hf_cell_h_clp, tvb, 0, 1, ENC_BIG_ENDIAN); if (PWATM_MODE_11_VPC == pd->mode) { diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c index a81a410683..4e3eabef25 100644 --- a/epan/dissectors/packet-pw-cesopsn.c +++ b/epan/dissectors/packet-pw-cesopsn.c @@ -283,7 +283,7 @@ void dissect_pw_cesopsn( tvbuff_t * tvb_original ,"Bits 0..3 of Control Word must be 0"); } - item3 = proto_tree_add_item(tree3, hf_cw_lm, tvb, 0, 1, FALSE); + item3 = proto_tree_add_item(tree3, hf_cw_lm, tvb, 0, 1, ENC_BIG_ENDIAN); if (properties & PWC_CW_SUSPECT_LM) { expert_add_info_format(pinfo, item3, PI_UNDECODED, PI_WARN diff --git a/epan/dissectors/packet-radiotap.c b/epan/dissectors/packet-radiotap.c index f83fcb725a..9e82b2b055 100644 --- a/epan/dissectors/packet-radiotap.c +++ b/epan/dissectors/packet-radiotap.c @@ -1441,72 +1441,72 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_tree_add_item(present_tree, hf_radiotap_present_tsft, tvb, - offset + 4, 4, TRUE); + offset + 4, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(present_tree, hf_radiotap_present_flags, tvb, - offset + 4, 4, TRUE); + offset + 4, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(present_tree, hf_radiotap_present_rate, tvb, - offset + 4, 4, TRUE); + offset + 4, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(present_tree, hf_radiotap_present_channel, tvb, - offset + 4, 4, TRUE); + offset + 4, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(present_tree, hf_radiotap_present_fhss, tvb, - offset + 4, 4, TRUE); + offset + 4, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(present_tree, hf_radiotap_present_dbm_antsignal, - tvb, offset + 4, 4, TRUE); + tvb, offset + 4, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(present_tree, hf_radiotap_present_dbm_antnoise, - tvb, offset + 4, 4, TRUE); + tvb, offset + 4, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(present_tree, hf_radiotap_present_lock_quality, - tvb, offset + 4, 4, TRUE); + tvb, offset + 4, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(present_tree, hf_radiotap_present_tx_attenuation, - tvb, offset + 4, 4, TRUE); + tvb, offset + 4, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(present_tree, hf_radiotap_present_db_tx_attenuation, - tvb, offset + 4, 4, TRUE); + tvb, offset + 4, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(present_tree, hf_radiotap_present_dbm_tx_attenuation, - tvb, offset + 4, 4, TRUE); + tvb, offset + 4, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(present_tree, hf_radiotap_present_antenna, tvb, - offset + 4, 4, TRUE); + offset + 4, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(present_tree, hf_radiotap_present_db_antsignal, - tvb, offset + 4, 4, TRUE); + tvb, offset + 4, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(present_tree, hf_radiotap_present_db_antnoise, - tvb, offset + 4, 4, TRUE); + tvb, offset + 4, 4, ENC_LITTLE_ENDIAN); if (radiotap_bit14_fcs) { proto_tree_add_item(present_tree, hf_radiotap_present_hdrfcs, - tvb, offset + 4, 4, TRUE); + tvb, offset + 4, 4, ENC_LITTLE_ENDIAN); } else { proto_tree_add_item(present_tree, hf_radiotap_present_rxflags, - tvb, offset + 4, 4, TRUE); + tvb, offset + 4, 4, ENC_LITTLE_ENDIAN); } proto_tree_add_item(present_tree, hf_radiotap_present_xchannel, tvb, - offset + 4, 4, TRUE); + offset + 4, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(present_tree, hf_radiotap_present_mcs, tvb, - offset + 4, 4, TRUE); + offset + 4, 4, ENC_LITTLE_ENDIAN); always_bits: proto_tree_add_item(present_tree, hf_radiotap_present_rtap_ns, tvb, - offset + 4, 4, TRUE); + offset + 4, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(present_tree, hf_radiotap_present_vendor_ns, tvb, - offset + 4, 4, TRUE); + offset + 4, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(present_tree, hf_radiotap_present_ext, tvb, - offset + 4, 4, TRUE); + offset + 4, 4, ENC_LITTLE_ENDIAN); } } diff --git a/epan/dissectors/packet-ripng.c b/epan/dissectors/packet-ripng.c index 5fdd77a479..a7cca25d39 100644 --- a/epan/dissectors/packet-ripng.c +++ b/epan/dissectors/packet-ripng.c @@ -101,7 +101,7 @@ dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { offset += 16; /* Route Tag */ - proto_tree_add_item(rte_tree, hf_ripng_rte_route_tag, tvb, offset, 2, FALSE); + proto_tree_add_item(rte_tree, hf_ripng_rte_route_tag, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Prefix Length */ @@ -110,7 +110,7 @@ dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { offset += 1; /* Metric */ - proto_tree_add_item(rte_tree, hf_ripng_rte_metric, tvb, offset, 1, FALSE); + proto_tree_add_item(rte_tree, hf_ripng_rte_metric, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(rte_ti, " Metric: %u", tvb_get_guint8(tvb, offset)); offset += 1; } diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c index d14ec89443..fb01ba36e8 100644 --- a/epan/dissectors/packet-sbus.c +++ b/epan/dissectors/packet-sbus.c @@ -912,7 +912,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Continue adding stuff to the main tree*/ sbus_attribut = tvb_get_guint8(tvb,offset); proto_tree_add_item(sbus_tree, - hf_sbus_attribut, tvb, offset, 1, FALSE); + hf_sbus_attribut, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (sbus_attribut == SBUS_REQUEST) { @@ -1063,7 +1063,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_sbus_week_day, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(sbusdata_tree, - hf_sbus_date, tvb, offset, 3, FALSE); + hf_sbus_date, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; proto_tree_add_item(sbusdata_tree, hf_sbus_time, tvb, offset, 3, ENC_BIG_ENDIAN); @@ -1455,7 +1455,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case SBUS_GET_PROGRAM_BLOCK_LIST: proto_tree_add_item(sbus_tree, hf_sbus_rdwr_list_type, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; break; @@ -1568,7 +1568,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_sbus_week_day, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(sbusdata_tree, - hf_sbus_date, tvb, offset, 3, FALSE); + hf_sbus_date, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; proto_tree_add_item(sbusdata_tree, hf_sbus_time, tvb, offset, 3, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 46443289d4..0c8d43fdff 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -4118,7 +4118,7 @@ dissect_scsi_fix_snsinfo (tvbuff_t *tvb, proto_tree *sns_tree, guint offset) proto_tree_add_text (sns_tree, tvb, offset+8, 4, "Command-Specific Information: %s", tvb_bytes_to_str (tvb, offset+8, 4)); - proto_tree_add_item (sns_tree, hf_scsi_ascascq, tvb, offset+12, 2, 0); + proto_tree_add_item (sns_tree, hf_scsi_ascascq, tvb, offset+12, 2, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_item (sns_tree, hf_scsi_asc, tvb, offset+12, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); hidden_item = proto_tree_add_item (sns_tree, hf_scsi_ascq, tvb, offset+13, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-sercosiii.c b/epan/dissectors/packet-sercosiii.c index 94f1d19da2..9f400f8633 100644 --- a/epan/dissectors/packet-sercosiii.c +++ b/epan/dissectors/packet-sercosiii.c @@ -790,8 +790,8 @@ void dissect_siii_mst(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) ti = proto_tree_add_text(subtree, tvb, 1, 1, "Phase Field"); subtree2 = proto_item_add_subtree(ti, ett_siii_mst_phase); - proto_tree_add_item(subtree2, hf_siii_mst_phase, tvb, 1, 1, TRUE); - proto_tree_add_item(subtree2, hf_siii_mst_cyclecnt, tvb, 1, 1, TRUE); + proto_tree_add_item(subtree2, hf_siii_mst_phase, tvb, 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree2, hf_siii_mst_cyclecnt, tvb, 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_siii_mst_crc32, tvb, 2, 4, ENC_LITTLE_ENDIAN); } @@ -825,8 +825,8 @@ void dissect_siii_mdt_devctrl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree subtree = proto_item_add_subtree(ti, ett_siii_mdt_devctrl); proto_tree_add_item(subtree, hf_siii_at_dev_control_ident, tvb, 0, 2, ENC_LITTLE_ENDIAN); - proto_tree_add_item(subtree, hf_siii_mdt_dev_control_change_topology, tvb, 0, 2, TRUE); - proto_tree_add_item(subtree, hf_siii_mdt_dev_control_top_control, tvb, 0, 2, TRUE); + proto_tree_add_item(subtree, hf_siii_mdt_dev_control_change_topology, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree, hf_siii_mdt_dev_control_top_control, tvb, 0, 2, ENC_LITTLE_ENDIAN); } void dissect_siii_mdt_svc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint devno _U_) /* devno will be needed in later versions */ @@ -1002,14 +1002,14 @@ void dissect_siii_at_devstat(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * ti = proto_tree_add_item(tree, hf_siii_at_dev_status, tvb, 0, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(ti, ett_siii_at_devstatus); - proto_tree_add_item(subtree, hf_siii_at_dev_status_commwarning, tvb, 0, 2, TRUE); - proto_tree_add_item(subtree, hf_siii_at_dev_status_change_topology, tvb, 0, 2, TRUE); - proto_tree_add_item(subtree, hf_siii_at_dev_status_top_status, tvb, 0, 2, TRUE); - proto_tree_add_item(subtree, hf_siii_at_dev_status_inactive_port_status, tvb, 0, 2, TRUE); - proto_tree_add_item(subtree, hf_siii_at_dev_status_errorconnection, tvb, 0, 2, TRUE); - proto_tree_add_item(subtree, hf_siii_at_dev_status_slave_valid, tvb, 0, 2, TRUE); - proto_tree_add_item(subtree, hf_siii_at_dev_status_proc_command_change, tvb, 0, 2, TRUE); - proto_tree_add_item(subtree, hf_siii_at_dev_status_parameterization_level_active, tvb, 0, 2, TRUE); + proto_tree_add_item(subtree, hf_siii_at_dev_status_commwarning, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree, hf_siii_at_dev_status_change_topology, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree, hf_siii_at_dev_status_top_status, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree, hf_siii_at_dev_status_inactive_port_status, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree, hf_siii_at_dev_status_errorconnection, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree, hf_siii_at_dev_status_slave_valid, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree, hf_siii_at_dev_status_proc_command_change, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree, hf_siii_at_dev_status_parameterization_level_active, tvb, 0, 2, ENC_LITTLE_ENDIAN); } void dissect_siii_at_hp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index 3e517354d7..47d0c3590e 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.c @@ -608,10 +608,10 @@ dissect_parameter(tvbuff_t *tvb, int offset, proto_tree *tree, { proto_tree_add_item(param_tree, hf_proposed_tsdu_maximum_size_i2r, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(param_tree, hf_proposed_tsdu_maximum_size_r2i, - tvb, offset+2, 2, FALSE); + tvb, offset+2, 2, ENC_BIG_ENDIAN); } break; diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index e324a10a20..09a17e79bd 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -2168,11 +2168,11 @@ dissect_sflow_5_processor_information(proto_tree *counter_data_tree, tvbuff_t *t struct processor proc; tvb_memcpy(tvb, (guint8 *) & proc, offset, sizeof (proc)); - proto_tree_add_item(counter_data_tree, hf_sflow_5_cpu_5s, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_cpu_5s, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_cpu_1m, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_cpu_1m, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_cpu_5m, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_cpu_5m, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(counter_data_tree, hf_sflow_5_total_memory, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; diff --git a/epan/dissectors/packet-simulcrypt.c b/epan/dissectors/packet-simulcrypt.c index effd2889b0..85f0b2254d 100644 --- a/epan/dissectors/packet-simulcrypt.c +++ b/epan/dissectors/packet-simulcrypt.c @@ -1079,7 +1079,7 @@ dissect_eis_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo proto_tree_add_item(tree, hf_simulcrypt_error_information, tvb, offset, plen, ENC_NA); break; case SIMULCRYPT_EIS_ERROR_DESCRIPTION: - proto_tree_add_item(tree, hf_simulcrypt_error_description, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_error_description, tvb, offset, plen, ENC_ASCII|ENC_NA); break; default: /* Unknown parameter type */ @@ -1237,18 +1237,18 @@ dissect_simulcrypt_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Simulcrypt_header_tree analysis */ /* Message Version 1 Byte */ - proto_tree_add_item(simulcrypt_header_tree, hf_simulcrypt_version, tvb, offset, 1, FALSE); + proto_tree_add_item(simulcrypt_header_tree, hf_simulcrypt_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; /* Message Type 2 Bytes */ - proto_tree_add_item(simulcrypt_header_tree, hf_simulcrypt_message_type, tvb, offset, 2, FALSE); + proto_tree_add_item(simulcrypt_header_tree, hf_simulcrypt_message_type, tvb, offset, 2, ENC_BIG_ENDIAN); simulcrypt_item = proto_tree_add_uint_format(simulcrypt_header_tree, hf_simulcrypt_interface, tvb, offset, 2, iftype, "Interface: %s", val_to_str(iftype, interfacenames, "Unknown")); PROTO_ITEM_SET_GENERATED (simulcrypt_item); offset+=2; /* Message Length 2 Bytes */ - simulcrypt_item = proto_tree_add_item(simulcrypt_header_tree, hf_simulcrypt_message_length, tvb, offset, 2, FALSE); + simulcrypt_item = proto_tree_add_item(simulcrypt_header_tree, hf_simulcrypt_message_length, tvb, offset, 2, ENC_BIG_ENDIAN); proto_item_append_text(simulcrypt_item, " (bytes)"); msg_length = tvb_get_ntohs(tvb, offset); /* read 2 byte message length value */ offset+=2; @@ -1331,24 +1331,24 @@ dissect_simulcrypt_data(proto_tree *simulcrypt_tree, proto_item *simulcrypt_item simulcrypt_parameter_tree = proto_item_add_subtree(simulcrypt_item, ett_simulcrypt_parameter); /* add subtree for Length and Value */ switch (iftype) { /* parameter type */ case SIMULCRYPT_ECMG_SCS: - proto_tree_add_item(simulcrypt_parameter_tree, hf_simulcrypt_ecmg_parameter_type, tvb, offset, 2, FALSE); + proto_tree_add_item(simulcrypt_parameter_tree, hf_simulcrypt_ecmg_parameter_type, tvb, offset, 2, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EMMG_MUX: - proto_tree_add_item(simulcrypt_parameter_tree, hf_simulcrypt_emmg_parameter_type, tvb, offset, 2, FALSE); + proto_tree_add_item(simulcrypt_parameter_tree, hf_simulcrypt_emmg_parameter_type, tvb, offset, 2, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_SCS: - proto_tree_add_item(simulcrypt_parameter_tree, hf_simulcrypt_eis_parameter_type, tvb, offset, 2, FALSE); + proto_tree_add_item(simulcrypt_parameter_tree, hf_simulcrypt_eis_parameter_type, tvb, offset, 2, ENC_BIG_ENDIAN); break; case SIMULCRYPT_PSIG_MUX: case SIMULCRYPT_MUX_CIM: case SIMULCRYPT_PSIG_CIP: - proto_tree_add_item(simulcrypt_parameter_tree, hf_simulcrypt_psig_parameter_type, tvb, offset, 2, FALSE); + proto_tree_add_item(simulcrypt_parameter_tree, hf_simulcrypt_psig_parameter_type, tvb, offset, 2, ENC_BIG_ENDIAN); break; default: - proto_tree_add_item(simulcrypt_parameter_tree, hf_simulcrypt_parameter_type, tvb, offset, 2, FALSE); + proto_tree_add_item(simulcrypt_parameter_tree, hf_simulcrypt_parameter_type, tvb, offset, 2, ENC_BIG_ENDIAN); break; } - simulcrypt_item = proto_tree_add_item(simulcrypt_parameter_tree, hf_simulcrypt_parameter_length, tvb, offset+2, 2, FALSE); /* length item */ + simulcrypt_item = proto_tree_add_item(simulcrypt_parameter_tree, hf_simulcrypt_parameter_length, tvb, offset+2, 2, ENC_BIG_ENDIAN); /* length item */ proto_item_append_text(simulcrypt_item, " (bytes)"); offset += 2+2; /* offset --> parameter value */ diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c index 8fb27ea2cf..9ced942d5c 100644 --- a/epan/dissectors/packet-slowprotocols.c +++ b/epan/dissectors/packet-slowprotocols.c @@ -1671,7 +1671,7 @@ dissect_esmc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *treex) } { /* event flag */ event_flag = ((tvb_get_guint8(tvb, offset) & 0x08) != 0); - proto_tree_add_item(tree_a, hf_esmc_event_flag, tvb, offset, 1, FALSE); + proto_tree_add_item(tree_a, hf_esmc_event_flag, tvb, offset, 1, ENC_BIG_ENDIAN); /*stay at the same octet in tvb*/ } if (pref_decode_esmc_timestamp) @@ -1821,7 +1821,7 @@ dissect_esmc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *treex) /* value */ timestamp = (gint32)tvb_get_ntohl(tvb, offset); - item_c = proto_tree_add_item(tree_b, hf_esmc_timestamp, tvb, offset, 4, FALSE); + item_c = proto_tree_add_item(tree_b, hf_esmc_timestamp, tvb, offset, 4, ENC_BIG_ENDIAN); if (!timestamp_valid_flag) proto_item_append_text(item_c, " [invalid]"); offset += 4; diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index deecf20f36..89e19cdc7e 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -482,7 +482,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree "(uncompression failed !)"); } else { - proto_item *ti2 = proto_tree_add_item(slsk_tree, hf_slsk_compr_packet, tvb, offset, -1, FALSE); + proto_item *ti2 = proto_tree_add_item(slsk_tree, hf_slsk_compr_packet, tvb, offset, -1, ENC_NA); proto_tree *slsk_compr_packet_tree = proto_item_add_subtree(ti2, ett_slsk_compr_packet); proto_tree_add_uint_format(slsk_tree, hf_slsk_integer, tvb, offset, -1, 0, @@ -643,7 +643,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree "(uncompression failed !)"); } else { - proto_item *ti2 = proto_tree_add_item(slsk_tree, hf_slsk_compr_packet, tvb, offset, -1, FALSE); + proto_item *ti2 = proto_tree_add_item(slsk_tree, hf_slsk_compr_packet, tvb, offset, -1, ENC_NA); proto_tree *slsk_compr_packet_tree = proto_item_add_subtree(ti2, ett_slsk_compr_packet); proto_tree_add_uint_format(slsk_tree, hf_slsk_integer, tvb, offset, -1, 0, @@ -1186,7 +1186,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree "[uncompression failed !]"); } else { - proto_item *ti2 = proto_tree_add_item(slsk_tree, hf_slsk_compr_packet, tvb, offset, -1, FALSE); + proto_item *ti2 = proto_tree_add_item(slsk_tree, hf_slsk_compr_packet, tvb, offset, -1, ENC_NA); proto_tree *slsk_compr_packet_tree = proto_item_add_subtree(ti2, ett_slsk_compr_packet); proto_tree_add_uint_format(slsk_tree, hf_slsk_integer, tvb, offset, -1, 0, diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 3dd94d90f1..1165becb47 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -2876,9 +2876,9 @@ dissect_ssl3_hnd_finished(tvbuff_t *tvb, case SSL_VER_SSLv3: proto_tree_add_item(tree, hf_ssl_handshake_md5_hash, - tvb, offset, 16, ENC_BIG_ENDIAN); + tvb, offset, 16, ENC_NA); proto_tree_add_item(tree, hf_ssl_handshake_sha_hash, - tvb, offset + 16, 20, ENC_BIG_ENDIAN); + tvb, offset + 16, 20, ENC_NA); break; } } @@ -3801,7 +3801,7 @@ dissect_ssl2_hnd_client_master_key(tvbuff_t *tvb, { tvb_ensure_bytes_exist(tvb, offset, key_arg_length); proto_tree_add_item(tree, hf_ssl2_handshake_key_arg, - tvb, offset, key_arg_length, ENC_BIG_ENDIAN); + tvb, offset, key_arg_length, ENC_NA); } } diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index 4178db562e..1fec09f260 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -632,18 +632,18 @@ static gint dissect_header(tvbuff_t *tvb, proto_tree *tree) guint16 framesize; /* SYNC and flags */ - temp_item = proto_tree_add_item(tree, hf_sync, tvb, offset, 2, FALSE); + temp_item = proto_tree_add_item(tree, hf_sync, tvb, offset, 2, ENC_BIG_ENDIAN); temp_tree = proto_item_add_subtree(temp_item, ett_frtype); - proto_tree_add_item(temp_tree, hf_sync_frtype, tvb, offset, 2, FALSE); - proto_tree_add_item(temp_tree, hf_sync_version, tvb, offset, 2, FALSE); + proto_tree_add_item(temp_tree, hf_sync_frtype, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(temp_tree, hf_sync_version, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* FRAMESIZE */ - proto_tree_add_item(tree, hf_frsize, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_frsize, tvb, offset, 2, ENC_BIG_ENDIAN); framesize = tvb_get_ntohs(tvb, offset); offset += 2; /* IDCODE */ - proto_tree_add_item(tree, hf_idcode, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_idcode, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* SOC */ @@ -662,13 +662,13 @@ static gint dissect_header(tvbuff_t *tvb, proto_tree *tree) /* time quality flags */ temp_item = proto_tree_add_text(tree, tvb, offset, 1, "Time quality flags"); temp_tree = proto_item_add_subtree(temp_item, ett_timequal); - proto_tree_add_item(temp_tree, hf_timeqal_lsdir, tvb, offset, 1, FALSE); - proto_tree_add_item(temp_tree, hf_timeqal_lsocc, tvb, offset, 1, FALSE); - proto_tree_add_item(temp_tree, hf_timeqal_lspend, tvb, offset, 1, FALSE); - proto_tree_add_item(temp_tree, hf_timeqal_timequalindic, tvb, offset, 1, FALSE); + proto_tree_add_item(temp_tree, hf_timeqal_lsdir, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(temp_tree, hf_timeqal_lsocc, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(temp_tree, hf_timeqal_lspend, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(temp_tree, hf_timeqal_timequalindic, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_fracsec, tvb, offset, 3, FALSE); offset += 3; + proto_tree_add_item(tree, hf_fracsec, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; return framesize; } @@ -693,8 +693,8 @@ static int dissect_config_frame(tvbuff_t *tvb, proto_item *config_item) /* TIME_BASE and NUM_PMU */ offset += 1; /* skip the reserved byte */ - proto_tree_add_item(config_tree, hf_conf_timebase, tvb, offset, 3, FALSE); offset += 3; - proto_tree_add_item(config_tree, hf_conf_numpmu, tvb, offset, 2, FALSE); + proto_tree_add_item(config_tree, hf_conf_timebase, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; + proto_tree_add_item(config_tree, hf_conf_numpmu, tvb, offset, 2, ENC_BIG_ENDIAN); /* add number of included PMUs to the text in the list view */ num_pmu = tvb_get_ntohs(tvb, offset); offset += 2; proto_item_append_text(config_item, ", %"G_GUINT16_FORMAT" PMU(s) included", num_pmu); @@ -715,15 +715,15 @@ static int dissect_config_frame(tvbuff_t *tvb, proto_item *config_item) offset += CHNAM_LEN; /* IDCODE */ - proto_tree_add_item(station_tree, hf_idcode, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(station_tree, hf_idcode, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* FORMAT */ temp_item = proto_tree_add_text(station_tree, tvb, offset, 2, "Data format in data frame"); temp_tree = proto_item_add_subtree(temp_item, ett_conf_format); - proto_tree_add_item(temp_tree, hf_conf_formatb3, tvb, offset, 2, FALSE); - proto_tree_add_item(temp_tree, hf_conf_formatb2, tvb, offset, 2, FALSE); - proto_tree_add_item(temp_tree, hf_conf_formatb1, tvb, offset, 2, FALSE); - proto_tree_add_item(temp_tree, hf_conf_formatb0, tvb, offset, 2, FALSE); + proto_tree_add_item(temp_tree, hf_conf_formatb3, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(temp_tree, hf_conf_formatb2, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(temp_tree, hf_conf_formatb1, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(temp_tree, hf_conf_formatb0, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* PHNMR, ANNMR, DGNMR */ @@ -746,8 +746,8 @@ static int dissect_config_frame(tvbuff_t *tvb, proto_item *config_item) offset = dissect_DIGUNIT(tvb, station_tree, offset, num_dg); /* FNOM and CFGCNT */ - proto_tree_add_item(station_tree, hf_conf_fnom, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(station_tree, hf_conf_cfgcnt, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(station_tree, hf_conf_fnom, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; + proto_tree_add_item(station_tree, hf_conf_cfgcnt, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* set the correct length for the "Station :" item */ proto_item_set_len(station_item, offset - oldoffset); @@ -829,14 +829,14 @@ static int dissect_data_frame(tvbuff_t *tvb, /* STAT */ proto_item *temp_item = proto_tree_add_text(block_tree, tvb, offset, 2, "Flags"); proto_tree *temp_tree = proto_item_add_subtree(temp_item, ett_data_stat); - proto_tree_add_item(temp_tree, hf_data_statb15, tvb, offset, 2, FALSE); - proto_tree_add_item(temp_tree, hf_data_statb14, tvb, offset, 2, FALSE); - proto_tree_add_item(temp_tree, hf_data_statb13, tvb, offset, 2, FALSE); - proto_tree_add_item(temp_tree, hf_data_statb12, tvb, offset, 2, FALSE); - proto_tree_add_item(temp_tree, hf_data_statb11, tvb, offset, 2, FALSE); - proto_tree_add_item(temp_tree, hf_data_statb10, tvb, offset, 2, FALSE); - proto_tree_add_item(temp_tree, hf_data_statb05to04, tvb, offset, 2, FALSE); - proto_tree_add_item(temp_tree, hf_data_statb03to00, tvb, offset, 2, FALSE); + proto_tree_add_item(temp_tree, hf_data_statb15, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(temp_tree, hf_data_statb14, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(temp_tree, hf_data_statb13, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(temp_tree, hf_data_statb12, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(temp_tree, hf_data_statb11, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(temp_tree, hf_data_statb10, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(temp_tree, hf_data_statb05to04, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(temp_tree, hf_data_statb03to00, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* PHASORS, (D)FREQ, ANALOG, and DIGITAL */ @@ -864,7 +864,7 @@ static int dissect_command_frame(tvbuff_t *tvb, command_tree = proto_item_add_subtree(command_item, ett_command); /* CMD */ - proto_tree_add_item(command_tree, hf_command, tvb, 0, 2, FALSE); + proto_tree_add_item(command_tree, hf_command, tvb, 0, 2, ENC_BIG_ENDIAN); if (check_col(pinfo->cinfo, COL_INFO)) { const char *s = val_to_str(tvb_get_ntohs(tvb, 0), command_names, "invalid command"); col_append_str(pinfo->cinfo, COL_INFO, ", "); diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c index 0bfb0e4de6..79ba46c79c 100644 --- a/epan/dissectors/packet-tapa.c +++ b/epan/dissectors/packet-tapa.c @@ -396,7 +396,7 @@ dissect_tapa_tunnel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; proto_tree_add_item(tapa_tunnel_tree, hf_tapa_tunnel_tagsetc, tvb, offset, 6, - ENC_BIG_ENDIAN); + ENC_NA); offset += 6; break; diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 8b2875f686..6231f052d1 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -3230,9 +3230,9 @@ dissect_tcpopt_rvbd_trpy(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, proto_tree_add_item(flag_tree, hf_tcp_option_rvbd_trpy_flag_fw_rst_probe, tvb, offset + TRPY_OPTIONS_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(flag_tree, hf_tcp_option_rvbd_trpy_flag_fw_rst_inner, - tvb, offset + TRPY_OPTIONS_OFFSET, 2, FALSE); + tvb, offset + TRPY_OPTIONS_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(flag_tree, hf_tcp_option_rvbd_trpy_flag_fw_rst, - tvb, offset + TRPY_OPTIONS_OFFSET, 2, FALSE); + tvb, offset + TRPY_OPTIONS_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(flag_tree, hf_tcp_option_rvbd_trpy_flag_chksum, tvb, offset + TRPY_OPTIONS_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(flag_tree, hf_tcp_option_rvbd_trpy_flag_oob, diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index a4c3b5a78b..bab7776618 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -927,7 +927,7 @@ dissect_tds_all_headers(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto_ case TDS_HEADER_TRANS_DESCR: if(header_length != 18) expert_add_info_format(pinfo, length_item, PI_MALFORMED, PI_ERROR, "Length should equal 18"); - proto_tree_add_item(header_sub_tree, hf_tds_all_headers_trans_descr, tvb, *offset + 6, 8, TRUE); + proto_tree_add_item(header_sub_tree, hf_tds_all_headers_trans_descr, tvb, *offset + 6, 8, ENC_LITTLE_ENDIAN); proto_tree_add_item(header_sub_tree, hf_tds_all_headers_request_cnt, tvb, *offset + 14, 4, ENC_LITTLE_ENDIAN); break; default: @@ -1810,7 +1810,7 @@ dissect_tds_type_info(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto_tr case TDS_DATA_TYPE_NVARCHAR: /* NVarChar */ item1 = proto_tree_add_item(sub_tree, hf_tds_type_info_collation, tvb, *offset, 5, ENC_NA); collation_tree = proto_item_add_subtree(item1, ett_tds_type_info_collation); - proto_tree_add_item(collation_tree, hf_tds_type_info_collation_lcid, tvb, *offset, 4, TRUE); + proto_tree_add_item(collation_tree, hf_tds_type_info_collation_lcid, tvb, *offset, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(collation_tree, hf_tds_type_info_collation_ign_case, tvb, *offset, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(collation_tree, hf_tds_type_info_collation_ign_accent, tvb, *offset, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(collation_tree, hf_tds_type_info_collation_ign_kana, tvb, *offset, 4, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index deb40ee746..d1cbe94037 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -1112,7 +1112,7 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i if (message_type == TIPCv2_CONMGR_MSG_ACK || (handle_v2_as & (V2_AS_ALL + V2_AS_1_7))) { /* W9 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_conn_mgr_msg_ack, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_conn_mgr_msg_ack, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } break; @@ -1183,7 +1183,7 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i proto_tree_add_string(tipc_tree, hf_tipcv2_cluster_address, tipc_tvb, offset, 4, addr_str_ptr); offset = offset + 4; /* bitmap */ - proto_tree_add_item(tipc_tree, hf_tipcv2_bitmap, tipc_tvb, offset, -1, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_bitmap, tipc_tvb, offset, -1, ENC_NA); break; case TIPCv2_ROUTE_ADDITION: /* 3 */ case TIPCv2_ROUTE_REMOVAL: /* 4 */ diff --git a/epan/dissectors/packet-tivoconnect.c b/epan/dissectors/packet-tivoconnect.c index a833c25462..a7a5e42851 100644 --- a/epan/dissectors/packet-tivoconnect.c +++ b/epan/dissectors/packet-tivoconnect.c @@ -138,7 +138,7 @@ dissect_tivoconnect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else if ( g_ascii_strcasecmp(field,"platform") == 0 ) { proto_tree_add_item(tivoconnect_tree, hf_tivoconnect_platform, tvb, offset+fieldlen, - length-fieldlen-1, FALSE); + length-fieldlen-1, ENC_ASCII|ENC_NA); } else if ( g_ascii_strcasecmp(field,"machine") == 0 ) { proto_tree_add_item(tivoconnect_tree, diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c index 456a576c63..6f97872aa7 100644 --- a/epan/dissectors/packet-tpkt.c +++ b/epan/dissectors/packet-tpkt.c @@ -498,12 +498,12 @@ dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Version */ proto_tree_add_item(tpkt_tree, hf_tpkt_version, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(ti, ", Version: 3"); /* Reserved octet*/ proto_tree_add_item(tpkt_tree, hf_tpkt_reserved, tvb, - offset + 1, 1, FALSE); + offset + 1, 1, ENC_BIG_ENDIAN); /* Length */ proto_tree_add_uint(tpkt_tree, hf_tpkt_length, tvb, diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c index f1146593cb..1a909969f0 100644 --- a/epan/dissectors/packet-turbocell.c +++ b/epan/dissectors/packet-turbocell.c @@ -228,7 +228,7 @@ static void dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre proto_tree_add_uint_format(subframe_tree, hf_turbocell_aggregate_msdu_len, next_tvb, msdu_offset, 2, msdu_length, "MSDU length: %u (0x%04X)", msdu_length,msdu_length); - proto_tree_add_item(subframe_tree, hf_turbocell_aggregate_unknown2, next_tvb, msdu_offset+1, 1, FALSE); + proto_tree_add_item(subframe_tree, hf_turbocell_aggregate_unknown2, next_tvb, msdu_offset+1, 1, ENC_BIG_ENDIAN); msdu_offset += 0x02; remaining_length -= 0x02; diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index 1c0c510727..db965192ab 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -990,18 +990,18 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) break; case 6: /* GSM Coverage Indicator */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_gci, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_gci, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 7: /* 11.2.7 GAN Classmark */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_tura, tvb, ie_offset, 1, FALSE); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_gc, tvb, ie_offset, 1, FALSE); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_uc, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_tura, tvb, ie_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_gc, tvb, ie_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_uc, tvb, ie_offset, 1, ENC_BIG_ENDIAN); /* UMA Protocols (Stage 3) R1.0.3 */ if(ie_len>1){ ie_offset++; - proto_tree_add_item(urr_ie_tree, hf_uma_urr_gmsi, tvb, ie_offset, 1, FALSE); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_psho, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_gmsi, tvb, ie_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_psho, tvb, ie_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(urr_ie_tree, hf_uma_urr_rrs, tvb, ie_offset, 1, ENC_BIG_ENDIAN); } break; @@ -1052,12 +1052,12 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) /* * 11.2.14 GAN Control Channel Description */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_ECMC, tvb, ie_offset, 1, FALSE); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_NMO, tvb, ie_offset, 1, FALSE); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_GPRS, tvb, ie_offset, 1, FALSE); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_DTM, tvb, ie_offset, 1, FALSE); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_ATT, tvb, ie_offset, 1, FALSE); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_MSCR, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_ECMC, tvb, ie_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_NMO, tvb, ie_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_GPRS, tvb, ie_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_DTM, tvb, ie_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_ATT, tvb, ie_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_MSCR, tvb, ie_offset, 1, ENC_BIG_ENDIAN); /* T3212 timeout value */ ie_offset++; proto_tree_add_item(urr_ie_tree, hf_uma_urr_T3212_timer, tvb, ie_offset, 1, ENC_BIG_ENDIAN); @@ -1067,10 +1067,10 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) ie_offset++; /* SGSNR, SGSN Release (octet 6) B1*/ proto_tree_add_item(urr_ie_tree, hf_uma_urr_SGSNR, tvb, ie_offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_ECMP, tvb, ie_offset, 1, FALSE); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_RE, tvb, ie_offset, 1, FALSE); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_PFCFM, tvb, ie_offset, 1, FALSE); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_3GECS, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_ECMP, tvb, ie_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_RE, tvb, ie_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_PFCFM, tvb, ie_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_3GECS, tvb, ie_offset, 1, ENC_BIG_ENDIAN); /* PS HO, PS Handover indicator (octet 6) Bit 6 */ ie_offset++; @@ -1177,7 +1177,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) break; case 33: /* 11.2.33 UL Quality Indication */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_ULQI, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_ULQI, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 34: /* 11.2.34 TLLI @@ -1268,7 +1268,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) proto_tree_add_item(urr_ie_tree, hf_uma_urr_channel, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 52: /* PDU in Error */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_PDU_in_error, tvb, ie_offset, ie_len, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_PDU_in_error, tvb, ie_offset, ie_len, ENC_NA); break; case 53: /* Sample Size @@ -1310,7 +1310,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) } break; case 58: /* 11.2.58 Location Black List indicator */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_LBLI, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_LBLI, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 59: /* 11.2.59 Reset Indicator */ proto_tree_add_item(urr_ie_tree, hf_uma_urr_RI, tvb, ie_offset, 1, ENC_BIG_ENDIAN); @@ -1340,7 +1340,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) str_len = tvb_get_guint8(tvb,ie_offset); ie_offset++; /* UMA Service Zone string, 1st character */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_uma_service_zone_str, tvb, ie_offset, str_len, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_uma_service_zone_str, tvb, ie_offset, str_len, ENC_ASCII|ENC_NA); break; /* 11.2.63 RTP Redundancy Configuration */ case 63: @@ -1394,11 +1394,11 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) break; case 67: /* 11.2.67 Serving GANC table indicator */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_suti, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_suti, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 68: /* 11.2.68 Registration indicators */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_uma_mps, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_uma_mps, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 69: /* 11.2.69 GAN PLMN List */ diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c index f9f11e907e..d776bbd40b 100644 --- a/epan/dissectors/packet-usb-hid.c +++ b/epan/dissectors/packet-usb-hid.c @@ -292,20 +292,20 @@ dissect_usb_hid_report_mainitem_data(packet_info *pinfo _U_, proto_tree *tree, t case USBHID_MAINITEM_TAG_INPUT: case USBHID_MAINITEM_TAG_OUTPUT: case USBHID_MAINITEM_TAG_FEATURE: - proto_tree_add_item(tree, hf_usb_hid_mainitem_bit0, tvb, offset, bSize, TRUE); - proto_tree_add_item(tree, hf_usb_hid_mainitem_bit1, tvb, offset, bSize, TRUE); - proto_tree_add_item(tree, hf_usb_hid_mainitem_bit2, tvb, offset, bSize, TRUE); - proto_tree_add_item(tree, hf_usb_hid_mainitem_bit3, tvb, offset, bSize, TRUE); - proto_tree_add_item(tree, hf_usb_hid_mainitem_bit4, tvb, offset, bSize, TRUE); - proto_tree_add_item(tree, hf_usb_hid_mainitem_bit5, tvb, offset, bSize, TRUE); - proto_tree_add_item(tree, hf_usb_hid_mainitem_bit6, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_mainitem_bit0, tvb, offset, bSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_usb_hid_mainitem_bit1, tvb, offset, bSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_usb_hid_mainitem_bit2, tvb, offset, bSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_usb_hid_mainitem_bit3, tvb, offset, bSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_usb_hid_mainitem_bit4, tvb, offset, bSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_usb_hid_mainitem_bit5, tvb, offset, bSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_usb_hid_mainitem_bit6, tvb, offset, bSize, ENC_LITTLE_ENDIAN); if (bTag == USBHID_MAINITEM_TAG_INPUT) { - proto_tree_add_item(tree, hf_usb_hid_mainitem_bit7_input, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_mainitem_bit7_input, tvb, offset, bSize, ENC_LITTLE_ENDIAN); } else { - proto_tree_add_item(tree, hf_usb_hid_mainitem_bit7, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_mainitem_bit7, tvb, offset, bSize, ENC_LITTLE_ENDIAN); } if (bSize > 1) { - proto_tree_add_item(tree, hf_usb_hid_mainitem_bit8, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_mainitem_bit8, tvb, offset, bSize, ENC_LITTLE_ENDIAN); } else { proto_tree_add_text(tree, tvb, offset, 0, "Bits or bytes: Buffered bytes (default, no second byte present)"); } diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index b28b9d1522..2fdb10a34d 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -841,7 +841,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, for(offset = 1; offset <= num_security_types; offset++){ proto_tree_add_item(tree, hf_vnc_security_type, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); } } per_conversation_info->vnc_next_state = VNC_SESSION_STATE_SECURITY_TYPES; @@ -1152,19 +1152,19 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, offset += 1; proto_tree_add_item(tree, hf_vnc_server_true_color_flag, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_vnc_server_red_max, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_vnc_server_green_max, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_vnc_server_blue_max, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_vnc_server_red_shift, @@ -1398,19 +1398,19 @@ vnc_client_set_pixel_format(tvbuff_t *tvb, packet_info *pinfo, gint *offset, *offset += 1; proto_tree_add_item(tree, hf_vnc_client_true_color_flag, tvb, *offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); *offset += 1; proto_tree_add_item(tree, hf_vnc_client_red_max, tvb, *offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); *offset += 2; proto_tree_add_item(tree, hf_vnc_client_green_max, tvb, *offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); *offset += 2; proto_tree_add_item(tree, hf_vnc_client_blue_max, tvb, *offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); *offset += 2; proto_tree_add_item(tree, hf_vnc_client_red_shift, tvb, *offset, @@ -1530,7 +1530,7 @@ vnc_client_key_event(tvbuff_t *tvb, packet_info *pinfo, gint *offset, proto_tree_add_item(tree, hf_vnc_padding, tvb, *offset, 2, ENC_NA); *offset += 2; /* Skip over 2 bytes of padding */ - proto_tree_add_item(tree, hf_vnc_key, tvb, *offset, 4, FALSE); + proto_tree_add_item(tree, hf_vnc_key, tvb, *offset, 4, ENC_BIG_ENDIAN); *offset += 4; } @@ -1541,14 +1541,14 @@ vnc_client_pointer_event(tvbuff_t *tvb, packet_info *pinfo, gint *offset, { col_set_str(pinfo->cinfo, COL_INFO, "Client pointer event"); - proto_tree_add_item(tree, hf_vnc_button_1_pos, tvb, *offset, 1, FALSE); - proto_tree_add_item(tree, hf_vnc_button_2_pos, tvb, *offset, 1, FALSE); - proto_tree_add_item(tree, hf_vnc_button_3_pos, tvb, *offset, 1, FALSE); - proto_tree_add_item(tree, hf_vnc_button_4_pos, tvb, *offset, 1, FALSE); - proto_tree_add_item(tree, hf_vnc_button_5_pos, tvb, *offset, 1, FALSE); - proto_tree_add_item(tree, hf_vnc_button_6_pos, tvb, *offset, 1, FALSE); - proto_tree_add_item(tree, hf_vnc_button_7_pos, tvb, *offset, 1, FALSE); - proto_tree_add_item(tree, hf_vnc_button_8_pos, tvb, *offset, 1, FALSE); + proto_tree_add_item(tree, hf_vnc_button_1_pos, tvb, *offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_vnc_button_2_pos, tvb, *offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_vnc_button_3_pos, tvb, *offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_vnc_button_4_pos, tvb, *offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_vnc_button_5_pos, tvb, *offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_vnc_button_6_pos, tvb, *offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_vnc_button_7_pos, tvb, *offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_vnc_button_8_pos, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset += 1; proto_tree_add_item(tree, hf_vnc_pointer_x_pos, tvb, *offset, 2, ENC_BIG_ENDIAN); @@ -1987,15 +1987,15 @@ vnc_hextile_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset, } proto_tree_add_item(subrect_tree, - hf_vnc_hextile_subrect_x_pos, tvb, *offset, 1, FALSE); + hf_vnc_hextile_subrect_x_pos, tvb, *offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(subrect_tree, hf_vnc_hextile_subrect_y_pos, tvb, *offset, 1, FALSE); + proto_tree_add_item(subrect_tree, hf_vnc_hextile_subrect_y_pos, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset += 1; - proto_tree_add_item(subrect_tree, hf_vnc_hextile_subrect_width, tvb, *offset, 1, FALSE); + proto_tree_add_item(subrect_tree, hf_vnc_hextile_subrect_width, tvb, *offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(subrect_tree, hf_vnc_hextile_subrect_height, tvb, *offset, 1, FALSE); + proto_tree_add_item(subrect_tree, hf_vnc_hextile_subrect_height, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset += 1; } @@ -2053,11 +2053,11 @@ vnc_zrle_encoding(tvbuff_t *tvb, packet_info *pinfo _U_, gint *offset, proto_item_add_subtree(ti, ett_vnc_zrle_subencoding); proto_tree_add_item(zrle_subencoding_tree, hf_vnc_zrle_rle, - uncomp_tvb, uncomp_offset, 1, FALSE); + uncomp_tvb, uncomp_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(zrle_subencoding_tree, hf_vnc_zrle_palette_size, uncomp_tvb, - uncomp_offset, 1, FALSE); + uncomp_offset, 1, ENC_BIG_ENDIAN); subencoding_type = tvb_get_guint8(uncomp_tvb, uncomp_offset); palette_size = subencoding_type & 0x7F; @@ -2148,7 +2148,7 @@ process_compact_length_and_image_data(tvbuff_t *tvb, gint *offset, proto_tree *t proto_tree_add_uint(tree, hf_vnc_tight_image_len, tvb, *offset - value_length, value_length, length); VNC_BYTES_NEEDED(length); - proto_tree_add_item(tree, hf_vnc_tight_image_data, tvb, *offset, length, FALSE); + proto_tree_add_item(tree, hf_vnc_tight_image_data, tvb, *offset, length, ENC_NA); *offset += length; return 0; /* bytes_needed */ @@ -2170,7 +2170,7 @@ process_tight_rect_filter_palette(tvbuff_t *tvb, packet_info *pinfo, gint *offse DISSECTOR_ASSERT(per_packet_info != NULL); VNC_BYTES_NEEDED(1); - proto_tree_add_item(tree, hf_vnc_tight_palette_num_colors, tvb, *offset, 1, FALSE); + proto_tree_add_item(tree, hf_vnc_tight_palette_num_colors, tvb, *offset, 1, ENC_BIG_ENDIAN); num_colors = tvb_get_guint8(tvb, *offset); *offset += 1; @@ -2184,7 +2184,7 @@ process_tight_rect_filter_palette(tvbuff_t *tvb, packet_info *pinfo, gint *offse palette_bytes = num_colors * per_packet_info->depth / 8; VNC_BYTES_NEEDED(palette_bytes); - proto_tree_add_item(tree, hf_vnc_tight_palette_data, tvb, *offset, palette_bytes, FALSE); + proto_tree_add_item(tree, hf_vnc_tight_palette_data, tvb, *offset, palette_bytes, ENC_NA); *offset += palette_bytes; /* This is the number of bits per pixel *in the image data*, not the actual client depth */ @@ -2238,11 +2238,11 @@ vnc_tight_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset, if (per_packet_info->depth == 24) { VNC_BYTES_NEEDED(3); - proto_tree_add_item(tree, hf_vnc_tight_fill_color, tvb, *offset, 3, FALSE); + proto_tree_add_item(tree, hf_vnc_tight_fill_color, tvb, *offset, 3, ENC_NA); *offset += 3; } else { VNC_BYTES_NEEDED(per_packet_info->bytes_per_pixel); - proto_tree_add_item(tree, hf_vnc_tight_fill_color, tvb, *offset, per_packet_info->bytes_per_pixel, FALSE); + proto_tree_add_item(tree, hf_vnc_tight_fill_color, tvb, *offset, per_packet_info->bytes_per_pixel, ENC_NA); *offset += per_packet_info->bytes_per_pixel; } @@ -2277,7 +2277,7 @@ vnc_tight_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset, /* explicit filter */ VNC_BYTES_NEEDED(1); - proto_tree_add_item(tree, hf_vnc_tight_filter_id, tvb, *offset, 1, FALSE); + proto_tree_add_item(tree, hf_vnc_tight_filter_id, tvb, *offset, 1, ENC_BIG_ENDIAN); filter_id = tvb_get_guint8(tvb, *offset); *offset += 1; @@ -2309,7 +2309,7 @@ vnc_tight_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset, num_bytes = row_size * height; VNC_BYTES_NEEDED(num_bytes); - proto_tree_add_item(tree, hf_vnc_tight_image_data, tvb, *offset, num_bytes, FALSE); + proto_tree_add_item(tree, hf_vnc_tight_image_data, tvb, *offset, num_bytes, ENC_NA); *offset += num_bytes; bytes_needed = 0; diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c index fc996480ce..3129662e65 100644 --- a/epan/dissectors/packet-wps.c +++ b/epan/dissectors/packet-wps.c @@ -1006,7 +1006,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_CREDENTIAL: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_credential, tvb, offset+4, tlv_len, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_credential, tvb, offset+4, tlv_len, ENC_NA); hfindex = hf_eapwps_tlv_credential; break; @@ -1061,7 +1061,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_ENCRYPTED_SETTINGS: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_encrypted_settings, tvb, offset+4, tlv_len, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_encrypted_settings, tvb, offset+4, tlv_len, ENC_NA); hfindex = hf_eapwps_tlv_encrypted_settings; break; @@ -1108,7 +1108,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_IDENTITY_PROOF: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_identity_proof, tvb, offset+4, tlv_len, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_identity_proof, tvb, offset+4, tlv_len, ENC_NA); hfindex = hf_eapwps_tlv_identity_proof; break; @@ -1249,13 +1249,13 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_RADIO_ENABLED: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_radio_enabled, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_radio_enabled, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_radio_enabled; break; case WPS_TLV_TYPE_REBOOT: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_reboot, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_reboot, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_reboot; break; @@ -1267,7 +1267,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_REGISTRAR_ESTABLISHED: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_registrar_established, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_registrar_established, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_registrar_established; break; @@ -1483,13 +1483,13 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_PORTABLE_DEVICE: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_portable_device, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_portable_device, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_portable_device; break; case WPS_TLV_TYPE_AP_SETUP_LOCKED: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_ap_setup_locked, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_ap_setup_locked, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_ap_setup_locked; break; @@ -1519,13 +1519,13 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_KEY_PROVIDED_AUTOMATICALLY: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_key_provided_automatically, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_key_provided_automatically, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_key_provided_automatically; break; case WPS_TLV_TYPE_8021X_ENABLED: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_8021x_enabled, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_8021x_enabled, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_8021x_enabled; break; |