diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-10-10 00:39:31 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-10-10 00:39:31 +0000 |
| commit | 67ee5049d4eaba0c87fe943e5fe8b203cacd378d (patch) | |
| tree | 279279f3db0b5f366362166344c1cc92c0d44b38 | |
| parent | e0820c62d4a87ce424122a54e274b45bd8d64d6d (diff) | |
Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors:
Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
the encoding parameter for proto_tree_add_item() calls which directly reference
an item in hf[] which has a type of:
FT_BOOLEAN
FT_IPv4
FT_EUI64
FT_GUID
FT_UINT_STRING
Also: For type FT_ITv6 use ENC_NA. (This was missed in SVN #39260)
svn path=/trunk/; revision=39328
178 files changed, 1495 insertions, 1495 deletions
diff --git a/epan/dissectors/packet-2dparityfec.c b/epan/dissectors/packet-2dparityfec.c index f74490a7fb..5acc0e7caa 100644 --- a/epan/dissectors/packet-2dparityfec.c +++ b/epan/dissectors/packet-2dparityfec.c @@ -144,12 +144,12 @@ static void dissect_2dparityfec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_snbase_low, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; 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, FALSE); + 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_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, FALSE); - proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_row_flag, tvb, offset, 1, FALSE); + 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); proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_index, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c index 2793e97dc0..fe181d43af 100644 --- a/epan/dissectors/packet-acn.c +++ b/epan/dissectors/packet-acn.c @@ -508,7 +508,7 @@ acn_add_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int off proto_tree_add_item(addr_tree, hf_acn_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Add Address */ - proto_tree_add_item(addr_tree, hf_acn_ipv6, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(addr_tree, hf_acn_ipv6, tvb, offset, 16, ENC_NA); /* Append port and address to tree item */ tvb_get_ipv6(tvb, offset, &IPv6); SET_ADDRESS(&addr, AT_IPv6, sizeof(struct e_in6_addr), &IPv6); diff --git a/epan/dissectors/packet-ancp.c b/epan/dissectors/packet-ancp.c index c92dba87fe..69528b31ab 100644 --- a/epan/dissectors/packet-ancp.c +++ b/epan/dissectors/packet-ancp.c @@ -616,7 +616,7 @@ dissect_ancp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 3; proto_tree_add_item(ancp_tree, hf_ancp_i_flag, tvb, offset, 1, - FALSE); /* treat as 1B, but dont change offset */ + ENC_BIG_ENDIAN); /* treat as 1B, but dont change offset */ sti = proto_tree_add_item(ancp_tree, hf_ancp_submsg_num, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c index e645393605..2368bb4d39 100644 --- a/epan/dissectors/packet-ansi_a.c +++ b/epan/dissectors/packet-ansi_a.c @@ -3169,7 +3169,7 @@ elem_pdsn_ip_addr(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gc curr_offset = offset; - proto_tree_add_item(tree, hf_ansi_a_pdsn_ip_addr, tvb, curr_offset, len, FALSE); + proto_tree_add_item(tree, hf_ansi_a_pdsn_ip_addr, tvb, curr_offset, len, ENC_BIG_ENDIAN); curr_offset += len; @@ -3188,7 +3188,7 @@ elem_s_pdsn_ip_addr(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, curr_offset = offset; - proto_tree_add_item(tree, hf_ansi_a_s_pdsn_ip_addr, tvb, curr_offset, len, FALSE); + proto_tree_add_item(tree, hf_ansi_a_s_pdsn_ip_addr, tvb, curr_offset, len, ENC_BIG_ENDIAN); curr_offset += len; @@ -3948,7 +3948,7 @@ elem_anchor_pdsn_addr(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len curr_offset = offset; - proto_tree_add_item(tree, hf_ansi_a_anchor_ip_addr, tvb, curr_offset, len, FALSE); + proto_tree_add_item(tree, hf_ansi_a_anchor_ip_addr, tvb, curr_offset, len, ENC_BIG_ENDIAN); curr_offset += len; @@ -3967,7 +3967,7 @@ elem_anchor_pp_addr(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, curr_offset = offset; - proto_tree_add_item(tree, hf_ansi_a_anchor_pp_ip_addr, tvb, curr_offset, len, FALSE); + proto_tree_add_item(tree, hf_ansi_a_anchor_pp_ip_addr, tvb, curr_offset, len, ENC_BIG_ENDIAN); curr_offset += len; @@ -8007,7 +8007,7 @@ elem_a2p_bearer_session(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l SHORT_DATA_CHECK(len - (curr_offset - offset), 18); proto_tree_add_item(tree, hf_ansi_a_a2p_bearer_ipv6_addr, - tvb, curr_offset, 16, FALSE); + tvb, curr_offset, 16, ENC_NA); rtp_src_addr.type = AT_IPv6; rtp_src_addr.len = 16; @@ -8022,7 +8022,7 @@ elem_a2p_bearer_session(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l SHORT_DATA_CHECK(len - (curr_offset - offset), 6); proto_tree_add_item(tree, hf_ansi_a_a2p_bearer_ipv4_addr, - tvb, curr_offset, 4, FALSE); + tvb, curr_offset, 4, ENC_BIG_ENDIAN); rtp_src_addr.type = AT_IPv4; rtp_src_addr.len = 4; @@ -8237,7 +8237,7 @@ elem_a2p_bearer_format(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le SHORT_DATA_CHECK(len - (curr_offset - offset), 18); proto_tree_add_item(subtree, hf_ansi_a_a2p_bearer_ipv6_addr, - tvb, curr_offset, 16, FALSE); + tvb, curr_offset, 16, ENC_NA); if (format_assigned) { @@ -8255,7 +8255,7 @@ elem_a2p_bearer_format(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le SHORT_DATA_CHECK(len - (curr_offset - offset), 6); proto_tree_add_item(subtree, hf_ansi_a_a2p_bearer_ipv4_addr, - tvb, curr_offset, 4, FALSE); + tvb, curr_offset, 4, ENC_BIG_ENDIAN); if (format_assigned) { diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c index 9aa70adab8..136e047be5 100644 --- a/epan/dissectors/packet-aodv.c +++ b/epan/dissectors/packet-aodv.c @@ -487,7 +487,7 @@ dissect_aodv_rerr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aodv_tree, for (i = 0; i < dest_count; i++) { proto_tree_add_item(aodv_unreach_dest_tree, hf_aodv_unreach_dest_ipv6, - tvb, offset, INET6_ADDRLEN, ENC_BIG_ENDIAN); + tvb, offset, INET6_ADDRLEN, ENC_NA); offset += INET6_ADDRLEN; proto_tree_add_item(aodv_unreach_dest_tree, hf_aodv_dest_seqno, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -746,7 +746,7 @@ dissect_aodv_draft_01_v6_rerr(tvbuff_t *tvb, packet_info *pinfo, offset += 4; proto_tree_add_item(aodv_unreach_dest_tree, hf_aodv_unreach_dest_ipv6, - tvb, offset, INET6_ADDRLEN, ENC_BIG_ENDIAN); + tvb, offset, INET6_ADDRLEN, ENC_NA); offset += INET6_ADDRLEN; } } diff --git a/epan/dissectors/packet-aruba-papi.c b/epan/dissectors/packet-aruba-papi.c index 96229eeab2..e2c2572490 100644 --- a/epan/dissectors/packet-aruba-papi.c +++ b/epan/dissectors/packet-aruba-papi.c @@ -112,7 +112,7 @@ dissect_papi_debug(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 5; break; case 0x05: - proto_tree_add_item(debug_tree, hf_papi_debug_ipv4, tvb, offset+1, 4, FALSE); + proto_tree_add_item(debug_tree, hf_papi_debug_ipv4, tvb, offset+1, 4, ENC_BIG_ENDIAN); offset += 5; break; case 0x07: @@ -166,10 +166,10 @@ dissect_papi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(papi_tree, hf_papi_hdr_version, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(papi_tree, hf_papi_hdr_ip_destination, tvb, offset, 4, FALSE); + proto_tree_add_item(papi_tree, hf_papi_hdr_ip_destination, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(papi_tree, hf_papi_hdr_ip_source, tvb, offset, 4, FALSE); + proto_tree_add_item(papi_tree, hf_papi_hdr_ip_source, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(papi_tree, hf_papi_hdr_unknown, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-asap.c b/epan/dissectors/packet-asap.c index 3e13913a47..c95528c9a4 100644 --- a/epan/dissectors/packet-asap.c +++ b/epan/dissectors/packet-asap.c @@ -262,7 +262,7 @@ dissect_ipv4_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot static void dissect_ipv6_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - proto_tree_add_item(parameter_tree, hf_parameter_ipv6_address, parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_parameter_ipv6_address, parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH, ENC_NA); proto_item_append_text(parameter_item, " (%s)", tvb_ip6_to_str(parameter_tvb, IPV6_ADDRESS_OFFSET)); } diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c index 2072344a0e..e74d3d5f9f 100644 --- a/epan/dissectors/packet-assa_r3.c +++ b/epan/dissectors/packet-assa_r3.c @@ -3415,7 +3415,7 @@ static void dissect_r3_upstreamfields (tvbuff_t *tvb, guint32 start_offset _U_, proto_tree_add_item (datetime_tree, hf_r3_datetime_hours, tvb, offset + 4, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (datetime_tree, hf_r3_datetime_minutes, tvb, offset + 5, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (datetime_tree, hf_r3_datetime_seconds, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item (datetime_tree, hf_r3_datetime_dst, tvb, offset + 7, 1, TRUE); + proto_tree_add_item (datetime_tree, hf_r3_datetime_dst, tvb, offset + 7, 1, ENC_LITTLE_ENDIAN); } } break; @@ -3637,7 +3637,7 @@ static void dissect_r3_upstreamcommand_queryconfig (tvbuff_t *tvb, guint32 start break; case CONFIGTYPE_BOOL : - proto_tree_add_item (upstreamfield_tree, hf_r3_configitemdata_bool, tvb, offset + 3, 1, TRUE); + proto_tree_add_item (upstreamfield_tree, hf_r3_configitemdata_bool, tvb, offset + 3, 1, ENC_LITTLE_ENDIAN); break; case CONFIGTYPE_8 : @@ -4375,7 +4375,7 @@ static void dissect_r3_upstreammfgfield_checksumresults (tvbuff_t *tvb, guint32 proto_tree_add_item (res_tree, hf_r3_checksumresults_length, tvb, start_offset + i + 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (res_tree, hf_r3_checksumresults_field, tvb, start_offset + i + 1, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item (res_tree, hf_r3_checksumresults_state, tvb, start_offset + i + 2, 1, TRUE); + proto_tree_add_item (res_tree, hf_r3_checksumresults_state, tvb, start_offset + i + 2, 1, ENC_LITTLE_ENDIAN); } } } @@ -4387,7 +4387,7 @@ static void dissect_r3_upstreammfgfield_mortisestatelog (tvbuff_t *tvb, guint32 proto_tree_add_item (tree, hf_r3_mortisestatelog_pointer, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (tree, hf_r3_mortisestatelog_mortisetype, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item (tree, hf_r3_mortisestatelog_waiting, tvb, start_offset + 2, 1, TRUE); + proto_tree_add_item (tree, hf_r3_mortisestatelog_waiting, tvb, start_offset + 2, 1, ENC_LITTLE_ENDIAN); for (start_offset += 3, i = 0; i < l; i += 3) { @@ -4590,7 +4590,7 @@ static void dissect_r3_cmd_setconfig (tvbuff_t *tvb, guint32 start_offset, guint break; case CONFIGTYPE_BOOL : - proto_tree_add_item (sc_tree, hf_r3_configitemdata_bool, payload_tvb, offset + 2, 1, TRUE); + proto_tree_add_item (sc_tree, hf_r3_configitemdata_bool, payload_tvb, offset + 2, 1, ENC_LITTLE_ENDIAN); break; case CONFIGTYPE_8 : @@ -4876,7 +4876,7 @@ static void dissect_r3_cmd_rmtauthretry (tvbuff_t *tvb, guint32 start_offset, gu proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (tree, hf_r3_rmtauthretry_sequence, payload_tvb, 0, 2, ENC_LITTLE_ENDIAN); - proto_tree_add_item (tree, hf_r3_rmtauthretry_retry, payload_tvb, 2, 1, TRUE); + proto_tree_add_item (tree, hf_r3_rmtauthretry_retry, payload_tvb, 2, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmd_filters (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) @@ -4933,7 +4933,7 @@ static void dissect_r3_cmd_alarmconfigure (tvbuff_t *tvb, guint32 start_offset, proto_tree_add_item (alarmcfg_tree, hf_r3_alarm_length, payload_tvb, offset + 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (alarmcfg_tree, hf_r3_alarm_id, payload_tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item (alarmcfg_tree, hf_r3_alarm_state, payload_tvb, offset + 2, 1, TRUE); + proto_tree_add_item (alarmcfg_tree, hf_r3_alarm_state, payload_tvb, offset + 2, 1, ENC_LITTLE_ENDIAN); alarms++; offset += tvb_get_guint8 (payload_tvb, offset); @@ -5292,7 +5292,7 @@ static void dissect_r3_cmdmfg_forceoptions (tvbuff_t *tvb, guint32 start_offset, switch (tvb_get_guint8 (tvb, start_offset + i) - 2) { - case 1 : proto_tree_add_item (force_tree, hf_r3_forceoptions_state_8, tvb, start_offset + i + 2, 1, TRUE); break; + case 1 : proto_tree_add_item (force_tree, hf_r3_forceoptions_state_8, tvb, start_offset + i + 2, 1, ENC_LITTLE_ENDIAN); break; case 2 : proto_tree_add_item (force_tree, hf_r3_forceoptions_state_16, tvb, start_offset + i + 2, 2, ENC_LITTLE_ENDIAN); break; case 3 : proto_tree_add_item (force_tree, hf_r3_forceoptions_state_24, tvb, start_offset + i + 2, 3, ENC_LITTLE_ENDIAN); break; case 4 : proto_tree_add_item (force_tree, hf_r3_forceoptions_state_32, tvb, start_offset + i + 2, 4, ENC_LITTLE_ENDIAN); break; diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index 185ab9d00a..6941e041de 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -4787,7 +4787,7 @@ fTagHeaderTree (tvbuff_t *tvb, proto_tree *tree, guint offset, subtree = proto_item_add_subtree(ti, ett_bacapp_tag); /* details if needed */ - proto_tree_add_item(subtree, hf_BACnetTagClass, tvb, offset, 1, FALSE); + proto_tree_add_item(subtree, hf_BACnetTagClass, tvb, offset, 1, ENC_BIG_ENDIAN); if (tag_is_extended_tag_number(tag)) { proto_tree_add_uint_format(subtree, hf_BACnetContextTagNumber, diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index d448b1c39b..5937f7a46a 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -2293,7 +2293,7 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree) plurality(tlen, "", "s")); } else { proto_tree_add_item(subtree2, hf_bgp_next_hop, tvb, - o + i + aoff, tlen, FALSE); + o + i + aoff, tlen, ENC_BIG_ENDIAN); } break; case BGPTYPE_MULTI_EXIT_DISC: @@ -2343,7 +2343,7 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_uint(subtree2, hf_bgp_aggregator_as, tvb, o + i + aoff, asn_len, aggregator_as); proto_tree_add_item(subtree2, hf_bgp_aggregator_origin, tvb, - o + i + aoff + asn_len, 4, FALSE); + o + i + aoff + asn_len, 4, ENC_BIG_ENDIAN); } break; case BGPTYPE_COMMUNITIES: @@ -2399,7 +2399,7 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree) plurality(tlen, "", "s")); } else { proto_tree_add_item(subtree2, hf_bgp_originator_id, tvb, - o + i + aoff, tlen, FALSE); + o + i + aoff, tlen, ENC_BIG_ENDIAN); } break; case BGPTYPE_MP_REACH_NLRI: @@ -2754,7 +2754,7 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree) subtree3 = proto_item_add_subtree(ti, ett_bgp_ssa); proto_tree_add_item(subtree3, hf_bgp_ssa_t, tvb, - q, 1, FALSE); + q, 1, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_item(subtree3, hf_bgp_ssa_type, tvb, q, 2, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); @@ -2776,9 +2776,9 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree) ti = proto_tree_add_text(subtree3, tvb, q + 6, 1, "Flags"); subtree4 = proto_item_add_subtree(ti, ett_bgp_ssa_subtree) ; proto_tree_add_item(subtree4, hf_bgp_ssa_l2tpv3_s, tvb, - q + 6, 1, FALSE); + q + 6, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree4, hf_bgp_ssa_l2tpv3_unused, tvb, - q + 6, 1, FALSE); + q + 6, 1, ENC_BIG_ENDIAN); ssa_v3_len = tvb_get_guint8(tvb, q + 7); if (ssa_v3_len + 8 == ssa_len){ diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index 85916b3c87..5ed457da97 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -1699,7 +1699,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff, } else if (optlen == 17 && byte == 0) { /* Identifier is a UUID */ proto_tree_add_item(v_tree, hf_bootp_client_identifier_uuid, - tvb, optoff + 1, 16, TRUE); + tvb, optoff + 1, 16, ENC_LITTLE_ENDIAN); /* From RFC 4631 paragraph 6.1 DHCPv4 Client Behavior: To send an RFC 3315-style binding identifier in a DHCPv4 'client identifier' option, the type of the 'client identifier' option is set @@ -1810,7 +1810,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff, } else if (optlen == 17 && byte == 0) { /* Identifier is a UUID */ proto_tree_add_item(v_tree, hf_bootp_client_identifier_uuid, - tvb, optoff + 1, 16, TRUE); + tvb, optoff + 1, 16, ENC_LITTLE_ENDIAN); } else { /* otherwise, it's opaque data */ } @@ -2252,7 +2252,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff, proto_tree_add_item(v_tree, hf_bootp_option_6RD_ipv4_mask_len, tvb, optoff, 1, ENC_BIG_ENDIAN); proto_tree_add_item(v_tree, hf_bootp_option_6RD_prefix_len, tvb, optoff+1, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(v_tree, hf_bootp_option_6RD_prefix, tvb, optoff+2, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(v_tree, hf_bootp_option_6RD_prefix, tvb, optoff+2, 16, ENC_NA); proto_tree_add_item(v_tree, hf_bootp_option_6RD_border_relay_ip, tvb, optoff+18, 4, ENC_BIG_ENDIAN); /* More Border Relay IPv4 addresses included */ diff --git a/epan/dissectors/packet-btamp.c b/epan/dissectors/packet-btamp.c index 9e615a6f4e..dd34161095 100644 --- a/epan/dissectors/packet-btamp.c +++ b/epan/dissectors/packet-btamp.c @@ -280,7 +280,7 @@ dissect_getinforesponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto offset, 2, "PAL Capabilities"); btamp_controller_tree=proto_item_add_subtree(ti_controller, ett_btamp_caps); - proto_tree_add_item(btamp_controller_tree, hf_btamp_pal_caps_guaranteed, tvb, offset, 2, TRUE); + proto_tree_add_item(btamp_controller_tree, hf_btamp_pal_caps_guaranteed, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; proto_tree_add_item(tree, hf_btamp_amp_assoc_size, tvb, offset, 2, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 53b8204eb2..0d27b260fc 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -582,7 +582,7 @@ dissect_configrequest(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t col_append_fstr(pinfo->cinfo, COL_INFO, " (DCID: 0x%04x)", dcid); - proto_tree_add_item(tree, hf_btl2cap_continuation_flag, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_continuation_flag, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; if(tvb_length_remaining(tvb, offset)){ @@ -720,7 +720,7 @@ dissect_configresponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ proto_tree_add_item(tree, hf_btl2cap_scid, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(tree, hf_btl2cap_continuation_flag, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_continuation_flag, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; result = tvb_get_letohs(tvb, offset); diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index 390a552f56..ffc031a6d4 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -519,7 +519,7 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else { proto_tree_add_item(st, hf_response_code, next_tvb, offset, 1, ENC_BIG_ENDIAN); } - proto_tree_add_item(st, hf_final_flag, next_tvb, offset, 1, FALSE); + proto_tree_add_item(st, hf_final_flag, next_tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* length */ @@ -546,7 +546,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, FALSE); + 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); offset++; diff --git a/epan/dissectors/packet-bvlc.c b/epan/dissectors/packet-bvlc.c index 198d43a116..b04c5043e2 100644 --- a/epan/dissectors/packet-bvlc.c +++ b/epan/dissectors/packet-bvlc.c @@ -211,7 +211,7 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* List of BDT Entries: N*10-octet */ while ((bvlc_length - offset) > 9) { proto_tree_add_item(bdt_tree, hf_bvlc_bdt_ip, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(bdt_tree, hf_bvlc_bdt_port, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -251,7 +251,7 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* List of FDT Entries: N*10-octet */ while ((bvlc_length - offset) > 9) { proto_tree_add_item(fdt_tree, hf_bvlc_fdt_ip, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(fdt_tree, hf_bvlc_fdt_port, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -270,7 +270,7 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 0x08: /* Delete-Foreign-Device-Table-Entry */ /* FDT Entry: 6-octets */ proto_tree_add_item(bvlc_tree, hf_bvlc_fdt_ip, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(bvlc_tree, hf_bvlc_fdt_port, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -284,7 +284,7 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ /* proto_tree_add_bytes_format(); */ proto_tree_add_item(bvlc_tree, hf_bvlc_fwd_ip, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(bvlc_tree, hf_bvlc_fwd_port, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index 1e60137305..f6d72d2146 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -955,7 +955,7 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_ { while (offset_end-offset > 0) { - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_ipv6_list, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_ipv6_list, tvb, offset, 16, ENC_NA); offset += 16; } @@ -976,7 +976,7 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_ break; case TYPE_CAPWAP_CONTROL_IPV6_ADDRESS: /* CAPWAP Control IPv6 Address (11) */ - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_capwap_control_ipv6, tvb, offset+4, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_capwap_control_ipv6, tvb, offset+4, 16, ENC_NA); proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_capwap_control_wtp_count, tvb, offset+20, 2, ENC_BIG_ENDIAN); break; diff --git a/epan/dissectors/packet-ccsds.c b/epan/dissectors/packet-ccsds.c index bc31a6feed..ebc3da8e87 100644 --- a/epan/dissectors/packet-ccsds.c +++ b/epan/dissectors/packet-ccsds.c @@ -383,7 +383,7 @@ dissect_ccsds(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(secondary_header_tree, tvb, offset-5, 5, "%s = Embedded Time", time_string); proto_tree_add_item(secondary_header_tree, hf_ccsds_timeid, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(secondary_header_tree, hf_ccsds_checkword_flag, tvb, offset, 1, FALSE); + proto_tree_add_item(secondary_header_tree, hf_ccsds_checkword_flag, tvb, offset, 1, ENC_BIG_ENDIAN); /* Global Preference: how to handle checkword flag */ switch (global_dissect_checkword) { diff --git a/epan/dissectors/packet-classicstun.c b/epan/dissectors/packet-classicstun.c index 0dc3dd46ef..010709dd71 100644 --- a/epan/dissectors/packet-classicstun.c +++ b/epan/dissectors/packet-classicstun.c @@ -412,13 +412,13 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 1: if (att_length < 8) break; - proto_tree_add_item(att_tree, classicstun_att_ipv4, tvb, offset+4, 4, FALSE); + proto_tree_add_item(att_tree, classicstun_att_ipv4, tvb, offset+4, 4, ENC_BIG_ENDIAN); break; case 2: if (att_length < 20) break; - proto_tree_add_item(att_tree, classicstun_att_ipv6, tvb, offset+4, 16, FALSE); + proto_tree_add_item(att_tree, classicstun_att_ipv6, tvb, offset+4, 16, ENC_NA); break; } break; @@ -426,8 +426,8 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case CHANGE_REQUEST: if (att_length < 4) break; - proto_tree_add_item(att_tree, classicstun_att_change_ip, tvb, offset, 4, FALSE); - proto_tree_add_item(att_tree, classicstun_att_change_port, tvb, offset, 4, FALSE); + proto_tree_add_item(att_tree, classicstun_att_change_ip, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(att_tree, classicstun_att_change_port, tvb, offset, 4, ENC_BIG_ENDIAN); break; case USERNAME: @@ -507,7 +507,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 1: if (att_length < 8) break; - proto_tree_add_item(att_tree, classicstun_att_xor_ipv4, tvb, offset+4, 4, FALSE); + proto_tree_add_item(att_tree, classicstun_att_xor_ipv4, tvb, offset+4, 4, ENC_BIG_ENDIAN); /* Show the address 'in the clear'. XOR (host order) transid with (host order) xor-address. @@ -521,7 +521,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 2: if (att_length < 20) break; - proto_tree_add_item(att_tree, classicstun_att_xor_ipv6, tvb, offset+4, 16, FALSE); + proto_tree_add_item(att_tree, classicstun_att_xor_ipv6, tvb, offset+4, 16, ENC_NA); break; } break; diff --git a/epan/dissectors/packet-dcc.c b/epan/dissectors/packet-dcc.c index 00359be689..476c609e5b 100644 --- a/epan/dissectors/packet-dcc.c +++ b/epan/dissectors/packet-dcc.c @@ -358,13 +358,13 @@ dissect_dcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(dcc_optree, hf_dcc_trace, tvb, offset, 4, ENC_BIG_ENDIAN); dcc_tracetree = proto_item_add_subtree(ti, ett_dcc_trace); - proto_tree_add_item(dcc_tracetree, hf_dcc_trace_admin, tvb, offset, 4, FALSE); - proto_tree_add_item(dcc_tracetree, hf_dcc_trace_anon, tvb, offset, 4, FALSE); - proto_tree_add_item(dcc_tracetree, hf_dcc_trace_client, tvb, offset, 4, FALSE); - proto_tree_add_item(dcc_tracetree, hf_dcc_trace_rlim, tvb, offset, 4, FALSE); - proto_tree_add_item(dcc_tracetree, hf_dcc_trace_query, tvb, offset, 4, FALSE); - proto_tree_add_item(dcc_tracetree, hf_dcc_trace_ridc, tvb, offset, 4, FALSE); - proto_tree_add_item(dcc_tracetree, hf_dcc_trace_flood, tvb, offset, 4, FALSE); + proto_tree_add_item(dcc_tracetree, hf_dcc_trace_admin, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(dcc_tracetree, hf_dcc_trace_anon, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(dcc_tracetree, hf_dcc_trace_client, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(dcc_tracetree, hf_dcc_trace_rlim, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(dcc_tracetree, hf_dcc_trace_query, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(dcc_tracetree, hf_dcc_trace_ridc, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(dcc_tracetree, hf_dcc_trace_flood, tvb, offset, 4, ENC_BIG_ENDIAN); } else if ( aop == DCC_AOP_FLOD ) { diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c index 8955425569..ac2f7b2b05 100644 --- a/epan/dissectors/packet-dcerpc-epm.c +++ b/epan/dissectors/packet-dcerpc-epm.c @@ -422,7 +422,7 @@ epm_dissect_tower_data (tvbuff_t *tvb, int offset, break; case PROTO_ID_IP: /* this one is always big endian */ - proto_tree_add_item(tr, hf_epm_proto_ip, tvb, offset, 4, FALSE); + proto_tree_add_item(tr, hf_epm_proto_ip, tvb, offset, 4, ENC_BIG_ENDIAN); proto_item_append_text(tr, "IP:%s", tvb_ip_to_str(tvb, offset)); break; diff --git a/epan/dissectors/packet-ddtp.c b/epan/dissectors/packet-ddtp.c index 40b0d8c080..e3ddc51bfa 100644 --- a/epan/dissectors/packet-ddtp.c +++ b/epan/dissectors/packet-ddtp.c @@ -128,7 +128,7 @@ dissect_ddtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ddtp_tree, hf_ddtp_opcode, tvb, 16, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ddtp_tree, hf_ddtp_ipaddr, tvb, 20, 4, - FALSE); + ENC_BIG_ENDIAN); } break; case DDTP_UPDATE_REPLY : diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index 48f486b556..e86fd10874 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -1629,9 +1629,9 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, * +-----+-+-+-+ */ proto_tree_add_item(subtree, hf_clientfqdn_reserved, tvb, off, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_clientfqdn_n, tvb, off, 1, FALSE); - proto_tree_add_item(subtree, hf_clientfqdn_o, tvb, off, 1, FALSE); - proto_tree_add_item(subtree, hf_clientfqdn_s, tvb, off, 1, FALSE); + proto_tree_add_item(subtree, hf_clientfqdn_n, tvb, off, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_clientfqdn_o, tvb, off, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_clientfqdn_s, tvb, off, 1, ENC_BIG_ENDIAN); dhcpv6_domain(subtree, tvb, off+1, optlen-1); } @@ -1880,10 +1880,10 @@ dissect_dhcpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree) { proto_tree_add_item(bp_tree, hf_dhcpv6_msgtype, tvb, off, 1, ENC_BIG_ENDIAN); proto_tree_add_item(bp_tree, hf_dhcpv6_hopcount, tvb, off + 1, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(bp_tree, hf_dhcpv6_linkaddr, tvb, off + 2, 16, FALSE); + proto_tree_add_item(bp_tree, hf_dhcpv6_linkaddr, tvb, off + 2, 16, ENC_NA); tvb_get_ipv6(tvb, off + 2, &in6); col_append_fstr(pinfo->cinfo, COL_INFO, "L: %s ", ip6_to_str(&in6)); - proto_tree_add_item(bp_tree, hf_dhcpv6_peeraddr, tvb, off + 18, 16, FALSE); + proto_tree_add_item(bp_tree, hf_dhcpv6_peeraddr, tvb, off + 18, 16, ENC_NA); } off += 34; } else { diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 7fadc8da82..fe7f592a16 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -421,18 +421,18 @@ dissect_diameter_avp(diam_ctx_t* c, tvbuff_t* tvb, int offset) pi = proto_tree_add_item(avp_tree,hf_diameter_avp_flags,tvb,offset,1,ENC_BIG_ENDIAN); { proto_tree* flags_tree = proto_item_add_subtree(pi,ett_diameter_avp_flags); - proto_tree_add_item(flags_tree,hf_diameter_avp_flags_vendor_specific,tvb,offset,1,FALSE); - proto_tree_add_item(flags_tree,hf_diameter_avp_flags_mandatory,tvb,offset,1,FALSE); - proto_tree_add_item(flags_tree,hf_diameter_avp_flags_protected,tvb,offset,1,FALSE); - pi = proto_tree_add_item(flags_tree,hf_diameter_avp_flags_reserved3,tvb,offset,1,FALSE); + proto_tree_add_item(flags_tree,hf_diameter_avp_flags_vendor_specific,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree,hf_diameter_avp_flags_mandatory,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree,hf_diameter_avp_flags_protected,tvb,offset,1,ENC_BIG_ENDIAN); + pi = proto_tree_add_item(flags_tree,hf_diameter_avp_flags_reserved3,tvb,offset,1,ENC_BIG_ENDIAN); if(flags_bits & 0x10) proto_item_set_expert_flags(pi, PI_MALFORMED, PI_WARN); - pi = proto_tree_add_item(flags_tree,hf_diameter_avp_flags_reserved4,tvb,offset,1,FALSE); + pi = proto_tree_add_item(flags_tree,hf_diameter_avp_flags_reserved4,tvb,offset,1,ENC_BIG_ENDIAN); if(flags_bits & 0x08) proto_item_set_expert_flags(pi, PI_MALFORMED, PI_WARN); - pi = proto_tree_add_item(flags_tree,hf_diameter_avp_flags_reserved5,tvb,offset,1,FALSE); + pi = proto_tree_add_item(flags_tree,hf_diameter_avp_flags_reserved5,tvb,offset,1,ENC_BIG_ENDIAN); if(flags_bits & 0x04) proto_item_set_expert_flags(pi, PI_MALFORMED, PI_WARN); - proto_tree_add_item(flags_tree,hf_diameter_avp_flags_reserved6,tvb,offset,1,FALSE); + proto_tree_add_item(flags_tree,hf_diameter_avp_flags_reserved6,tvb,offset,1,ENC_BIG_ENDIAN); if(flags_bits & 0x02) proto_item_set_expert_flags(pi, PI_MALFORMED, PI_WARN); - proto_tree_add_item(flags_tree,hf_diameter_avp_flags_reserved7,tvb,offset,1,FALSE); + proto_tree_add_item(flags_tree,hf_diameter_avp_flags_reserved7,tvb,offset,1,ENC_BIG_ENDIAN); if(flags_bits & 0x01) proto_item_set_expert_flags(pi, PI_MALFORMED, PI_WARN); } offset += 1; @@ -832,17 +832,17 @@ dissect_diameter_common(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) pi = proto_tree_add_item(diam_tree,hf_diameter_flags,tvb,4,1,ENC_BIG_ENDIAN); { proto_tree* pt = proto_item_add_subtree(pi,ett_diameter_flags); - proto_tree_add_item(pt,hf_diameter_flags_request,tvb,4,1,FALSE); - proto_tree_add_item(pt,hf_diameter_flags_proxyable,tvb,4,1,FALSE); - proto_tree_add_item(pt,hf_diameter_flags_error,tvb,4,1,FALSE); - proto_tree_add_item(pt,hf_diameter_flags_T,tvb,4,1,FALSE); - proto_tree_add_item(pt,hf_diameter_flags_reserved4,tvb,4,1,FALSE); + proto_tree_add_item(pt,hf_diameter_flags_request,tvb,4,1,ENC_BIG_ENDIAN); + proto_tree_add_item(pt,hf_diameter_flags_proxyable,tvb,4,1,ENC_BIG_ENDIAN); + proto_tree_add_item(pt,hf_diameter_flags_error,tvb,4,1,ENC_BIG_ENDIAN); + proto_tree_add_item(pt,hf_diameter_flags_T,tvb,4,1,ENC_BIG_ENDIAN); + proto_tree_add_item(pt,hf_diameter_flags_reserved4,tvb,4,1,ENC_BIG_ENDIAN); if(flags_bits & 0x08) proto_item_set_expert_flags(pi, PI_MALFORMED, PI_WARN); - pi = proto_tree_add_item(pt,hf_diameter_flags_reserved5,tvb,4,1,FALSE); + pi = proto_tree_add_item(pt,hf_diameter_flags_reserved5,tvb,4,1,ENC_BIG_ENDIAN); if(flags_bits & 0x04) proto_item_set_expert_flags(pi, PI_MALFORMED, PI_WARN); - pi = proto_tree_add_item(pt,hf_diameter_flags_reserved6,tvb,4,1,FALSE); + pi = proto_tree_add_item(pt,hf_diameter_flags_reserved6,tvb,4,1,ENC_BIG_ENDIAN); if(flags_bits & 0x02) proto_item_set_expert_flags(pi, PI_MALFORMED, PI_WARN); - pi = proto_tree_add_item(pt,hf_diameter_flags_reserved7,tvb,4,1,FALSE); + pi = proto_tree_add_item(pt,hf_diameter_flags_reserved7,tvb,4,1,ENC_BIG_ENDIAN); if(flags_bits & 0x01) proto_item_set_expert_flags(pi, PI_MALFORMED, PI_WARN); } diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index a3fcc38288..3897dc1260 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -1280,7 +1280,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, col_append_fstr(cinfo, COL_INFO, " %s", addr); proto_item_append_text(trr, ", addr %s", addr); - proto_tree_add_item(rr_tree, hf_dns_rr_addr, tvb, cur_offset, 4, FALSE); + proto_tree_add_item(rr_tree, hf_dns_rr_addr, tvb, cur_offset, 4, ENC_BIG_ENDIAN); if ((class & 0x7f) == C_IN) { tvb_memcpy(tvb, &addr_int, cur_offset, sizeof(addr_int)); @@ -1992,7 +1992,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, proto_tree_add_item(rr_tree, hf_dns_nsec3_algo, tvb, cur_offset++, 1, ENC_BIG_ENDIAN); flags_item = proto_tree_add_item(rr_tree, hf_dns_nsec3_flags, tvb, cur_offset, 1, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_item, ett_nsec3_flags); - proto_tree_add_item(flags_tree, hf_dns_nsec3_flag_optout, tvb, cur_offset, 1, FALSE); + proto_tree_add_item(flags_tree, hf_dns_nsec3_flag_optout, tvb, cur_offset, 1, ENC_BIG_ENDIAN); cur_offset++; proto_tree_add_item(rr_tree, hf_dns_nsec3_iterations, tvb, cur_offset, 2, ENC_BIG_ENDIAN); cur_offset += 2; @@ -2785,7 +2785,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, if (rr_len < 1) 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, FALSE); + 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); cur_offset += 1; rr_len -= 1; @@ -3228,19 +3228,19 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, flags, buf); field_tree = proto_item_add_subtree(tf, ett_dns_flags); proto_tree_add_item(field_tree, hf_dns_flags_response, - tvb, offset + DNS_FLAGS, 2, FALSE); + tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_dns_flags_opcode, tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN); if (is_llmnr) { if (flags & F_RESPONSE) { proto_tree_add_item(field_tree, hf_dns_flags_conflict_response, - tvb, offset + DNS_FLAGS, 2, FALSE); + tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN); } else { proto_tree_add_item(field_tree, hf_dns_flags_conflict_query, - tvb, offset + DNS_FLAGS, 2, FALSE); + tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN); } proto_tree_add_item(field_tree, hf_dns_flags_truncated, - tvb, offset + DNS_FLAGS, 2, FALSE); + tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_dns_flags_tentative, tvb, offset + DNS_FLAGS, 2, FALSE); if (flags & F_RESPONSE) { @@ -3250,24 +3250,24 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } else { if (flags & F_RESPONSE) { proto_tree_add_item(field_tree, hf_dns_flags_authoritative, - tvb, offset + DNS_FLAGS, 2, FALSE); + tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN); } proto_tree_add_item(field_tree, hf_dns_flags_truncated, - tvb, offset + DNS_FLAGS, 2, FALSE); + tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_dns_flags_recdesired, - 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_recavail, - tvb, offset + DNS_FLAGS, 2, FALSE); + tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN); } proto_tree_add_item(field_tree, hf_dns_flags_z, - 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_authenticated, - tvb, offset + DNS_FLAGS, 2, FALSE); + tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN); } proto_tree_add_item(field_tree, hf_dns_flags_checkdisable, - 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-dsi.c b/epan/dissectors/packet-dsi.c index 996b68b73b..97d3547d12 100644 --- a/epan/dissectors/packet-dsi.c +++ b/epan/dissectors/packet-dsi.c @@ -317,21 +317,21 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) ofs = offset +AFPSTATUS_FLAGOFF; ti = proto_tree_add_item(tree, hf_dsi_server_flag, tvb, ofs, 2, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(ti, ett_dsi_status_server_flag); - proto_tree_add_item(sub_tree, hf_dsi_server_flag_copyfile , tvb, ofs, 2, FALSE); - proto_tree_add_item(sub_tree, hf_dsi_server_flag_passwd , tvb, ofs, 2, FALSE); - proto_tree_add_item(sub_tree, hf_dsi_server_flag_no_save_passwd, tvb, ofs, 2, FALSE); - proto_tree_add_item(sub_tree, hf_dsi_server_flag_srv_msg , tvb, ofs, 2, FALSE); - proto_tree_add_item(sub_tree, hf_dsi_server_flag_srv_sig , tvb, ofs, 2, FALSE); - proto_tree_add_item(sub_tree, hf_dsi_server_flag_tcpip , tvb, ofs, 2, FALSE); - proto_tree_add_item(sub_tree, hf_dsi_server_flag_notify , tvb, ofs, 2, FALSE); - proto_tree_add_item(sub_tree, hf_dsi_server_flag_reconnect , tvb, ofs, 2, FALSE); - proto_tree_add_item(sub_tree, hf_dsi_server_flag_directory , tvb, ofs, 2, FALSE); - proto_tree_add_item(sub_tree, hf_dsi_server_flag_utf8_name , tvb, ofs, 2, FALSE); - proto_tree_add_item(sub_tree, hf_dsi_server_flag_uuid , tvb, ofs, 2, FALSE); - proto_tree_add_item(sub_tree, hf_dsi_server_flag_ext_sleep , tvb, ofs, 2, FALSE); - proto_tree_add_item(sub_tree, hf_dsi_server_flag_fast_copy , tvb, ofs, 2, FALSE); - - proto_tree_add_item(tree, hf_dsi_server_name, tvb, offset +AFPSTATUS_PRELEN, 1, FALSE); + proto_tree_add_item(sub_tree, hf_dsi_server_flag_copyfile , tvb, ofs, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_dsi_server_flag_passwd , tvb, ofs, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_dsi_server_flag_no_save_passwd, tvb, ofs, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_dsi_server_flag_srv_msg , tvb, ofs, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_dsi_server_flag_srv_sig , tvb, ofs, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_dsi_server_flag_tcpip , tvb, ofs, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_dsi_server_flag_notify , tvb, ofs, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_dsi_server_flag_reconnect , tvb, ofs, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_dsi_server_flag_directory , tvb, ofs, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_dsi_server_flag_utf8_name , tvb, ofs, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_dsi_server_flag_uuid , tvb, ofs, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_dsi_server_flag_ext_sleep , tvb, ofs, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_dsi_server_flag_fast_copy , tvb, ofs, 2, ENC_BIG_ENDIAN); + + proto_tree_add_item(tree, hf_dsi_server_name, tvb, offset +AFPSTATUS_PRELEN, 1, ENC_BIG_ENDIAN); flag = tvb_get_ntohs(tvb, ofs); if ((flag & AFPSRVRINFO_SRVSIGNATURE)) { @@ -366,7 +366,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_MACHOFF); if (ofs) - proto_tree_add_item(tree, hf_dsi_server_type, tvb, ofs, 1, FALSE); + proto_tree_add_item(tree, hf_dsi_server_type, tvb, ofs, 1, ENC_BIG_ENDIAN); ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_VERSOFF); if (ofs) { @@ -376,7 +376,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) sub_tree = proto_item_add_subtree(ti, ett_dsi_vers); for (i = 0; i < nbe; i++) { len = tvb_get_guint8(tvb, ofs); - proto_tree_add_item(sub_tree, hf_dsi_server_vers, tvb, ofs, 1, FALSE); + proto_tree_add_item(sub_tree, hf_dsi_server_vers, tvb, ofs, 1, ENC_BIG_ENDIAN); ofs += len + 1; } } @@ -389,7 +389,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) sub_tree = proto_item_add_subtree(ti, ett_dsi_uams); for (i = 0; i < nbe; i++) { len = tvb_get_guint8(tvb, ofs); - proto_tree_add_item(sub_tree, hf_dsi_server_uams, tvb, ofs, 1, FALSE); + proto_tree_add_item(sub_tree, hf_dsi_server_uams, tvb, ofs, 1, ENC_BIG_ENDIAN); ofs += len + 1; } } @@ -478,7 +478,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) sub_tree = proto_item_add_subtree(ti, ett_dsi_directory); for (i = 0; i < nbe; i++) { len = tvb_get_guint8(tvb, ofs); - proto_tree_add_item(sub_tree, hf_dsi_server_directory, tvb, ofs, 1, FALSE); + proto_tree_add_item(sub_tree, hf_dsi_server_directory, tvb, ofs, 1, ENC_BIG_ENDIAN); ofs += len + 1; } } diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index 44c70e5750..616638b765 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -1377,7 +1377,7 @@ dissect_conn_desc(tvbuff_t *tvb, gint offset, } else if (ip_ver == LSC_IPV6) { proto_tree_add_item(conn_desc_tree, hf_dvbci_lsc_ipv6_addr, - tvb, offset, FT_IPv6_LEN, ENC_BIG_ENDIAN); + tvb, offset, FT_IPv6_LEN, ENC_NA); offset += FT_IPv6_LEN; } else diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c index a01c7532e9..eeac4c43c3 100644 --- a/epan/dissectors/packet-dvmrp.c +++ b/epan/dissectors/packet-dvmrp.c @@ -385,7 +385,7 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset += 4; while (tvb_reported_length_remaining(tvb, offset)>=4) { proto_tree_add_item(parent_tree, hf_neighbor, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } break; @@ -395,11 +395,11 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int case DVMRP_V3_PRUNE: /* source address */ proto_tree_add_item(parent_tree, hf_saddr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* group address */ proto_tree_add_item(parent_tree, hf_maddr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* prune lifetime */ proto_tree_add_item(parent_tree, hf_life, @@ -408,39 +408,39 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int /* source netmask */ if (tvb_reported_length_remaining(tvb, offset)>=4) { proto_tree_add_item(parent_tree, hf_netmask, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } break; case DVMRP_V3_GRAFT: /* source address */ proto_tree_add_item(parent_tree, hf_saddr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* group address */ proto_tree_add_item(parent_tree, hf_maddr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* source netmask */ if (tvb_reported_length_remaining(tvb, offset)>=4) { proto_tree_add_item(parent_tree, hf_netmask, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } break; case DVMRP_V3_GRAFT_ACK: /* source address */ proto_tree_add_item(parent_tree, hf_saddr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* group address */ proto_tree_add_item(parent_tree, hf_maddr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* source netmask */ if (tvb_reported_length_remaining(tvb, offset)>=4) { proto_tree_add_item(parent_tree, hf_netmask, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } break; @@ -457,7 +457,7 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int /* local address */ proto_tree_add_item(parent_tree, hf_local, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Metric */ proto_tree_add_item(parent_tree, hf_metric, @@ -477,17 +477,17 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int tree = proto_item_add_subtree(item, ett_flags); proto_tree_add_item(tree, hf_flag_tunnel, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_flag_srcroute, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_flag_down, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_flag_disabled, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_flag_querier, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_flag_leaf, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); } offset += 1; /* Neighbor count */ @@ -499,7 +499,7 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int while ((tvb_reported_length_remaining(tvb, offset)>=4) && (neighbor_count>0)) { proto_tree_add_item(parent_tree, hf_neighbor, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; neighbor_count--; } @@ -580,7 +580,7 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset += 1; if (count) { /* must be 0 or 1 */ proto_tree_add_item(tree, hf_netmask, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); if (item) { proto_item_set_text(item, "%s: %d.%d.%d.%d", val_to_str(cmd, command, "Unknown Command:0x%02x"), @@ -634,7 +634,7 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset += 1; while (count--) { proto_tree_add_item(tree, hf_daddr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } if (item) { @@ -649,7 +649,7 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset += 1; while (count--) { proto_tree_add_item(tree, hf_maddr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_hold, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -667,7 +667,7 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset += 1; while (count--) { proto_tree_add_item(tree, hf_maddr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } if (item) { diff --git a/epan/dissectors/packet-e100.c b/epan/dissectors/packet-e100.c index 1130078ec9..348bd90c75 100644 --- a/epan/dissectors/packet-e100.c +++ b/epan/dissectors/packet-e100.c @@ -98,7 +98,7 @@ dissect_e100(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(e100_tree, hf_e100_seq, tvb, e100_seq.offset, e100_seq.len, ENC_BIG_ENDIAN); proto_tree_add_item(e100_tree, hf_e100_ip, tvb, - e100_ip.offset, e100_ip.len, FALSE); + e100_ip.offset, e100_ip.len, ENC_BIG_ENDIAN); proto_tree_add_item(e100_tree, hf_e100_mon_pkt_id, tvb, e100_mon_pkt_id.offset, e100_mon_pkt_id.len, ENC_BIG_ENDIAN); { diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index 2c7921e412..0e2e6ed388 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -715,7 +715,7 @@ static int dissect_edonkey_metatag(tvbuff_t *tvb, packet_info *pinfo _U_, edonkey_tree_add_metatag_name(metatag_tree, tvb, tag_offset-tag_name_size, tag_name_size, special_tagtype); trans_tagtype = edonkey_metatag_name_get_type(tvb, offset+3, tag_name_size, special_tagtype); if (trans_tagtype == EDONKEY_STAG_IP) { - proto_tree_add_item(metatag_tree, hf_edonkey_ip, tvb, tag_offset, 4, FALSE); + proto_tree_add_item(metatag_tree, hf_edonkey_ip, tvb, tag_offset, 4, ENC_BIG_ENDIAN); } else if (trans_tagtype == EMULE_STAG_SERVER_VERSION) { guint16 maj, min; @@ -857,7 +857,7 @@ static int dissect_edonkey_address(tvbuff_t *tvb, packet_info *pinfo _U_, /* <Address> ::= <IP> <Port> */ /* guint32 ip = tvb_get_letohl(tvb, offset); proto_tree_add_ipv4(tree, hf_edonkey_ip, tvb, offset, 4, ip); */ - proto_tree_add_item(tree, hf_edonkey_ip, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_edonkey_ip, tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_edonkey_port, tvb, offset+4, 2, ENC_LITTLE_ENDIAN); return offset+6; } @@ -881,7 +881,7 @@ static int dissect_kademlia_tcp_port(tvbuff_t *tvb, packet_info *pinfo _U_, static int dissect_kademlia_ip_address(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_kademlia_ip, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_kademlia_ip, tvb, offset, 4, ENC_LITTLE_ENDIAN); return offset + 4; } @@ -1196,7 +1196,7 @@ static int dissect_emule_sourceOBFU(tvbuff_t *tvb, packet_info *pinfo _U_, ti = proto_tree_add_item(tree, hf_emule_sourceOBFU, tvb, offset, 7 + ((settings & 0x80) ? 16 : 0), ENC_NA); sourceOBFU_tree = proto_item_add_subtree(ti, ett_emule_sourceOBFU); - proto_tree_add_item(sourceOBFU_tree, hf_edonkey_ip, tvb, offset, 4, FALSE); + proto_tree_add_item(sourceOBFU_tree, hf_edonkey_ip, tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(sourceOBFU_tree, hf_edonkey_port, tvb, offset+4, 2, ENC_LITTLE_ENDIAN); proto_tree_add_text(sourceOBFU_tree, tvb, offset+6, 1, "Obfuscation Settings: %u", settings); offset += 7; @@ -1222,7 +1222,7 @@ static int dissect_edonkey_client_id(tvbuff_t *tvb, packet_info *pinfo _U_, /* <Client ID> ::= guint32 */ /* guint32 ip = tvb_get_letohl(tvb, offset); proto_tree_add_ipv4(tree, hf_edonkey_client_id, tvb, offset, 4, ip); */ - ti = proto_tree_add_item(tree, hf_edonkey_client_id, tvb, offset, 4, FALSE); + ti = proto_tree_add_item(tree, hf_edonkey_client_id, tvb, offset, 4, ENC_BIG_ENDIAN); if (fileinfo) { guint32 ip = tvb_get_letohl(tvb, offset); guint16 port = tvb_get_letohs(tvb, offset+4); @@ -2436,7 +2436,7 @@ static int dissect_kademlia_tag(tvbuff_t *tvb, packet_info *pinfo _U_, case KADEMLIA_TAG_SOURCEIP: { int ipa = 0, ipb = 0, ipc = 0, ipd = 0; - proto_tree_add_item( subtree, hf_kademlia_tag_ipv4, tvb, offset, 4, TRUE); + proto_tree_add_item( subtree, hf_kademlia_tag_ipv4, tvb, offset, 4, ENC_LITTLE_ENDIAN); value = tvb_get_letohl( tvb, offset ); ipa = (value / (256*256*256)) % 256; ipb = (value / (256*256)) % 256; diff --git a/epan/dissectors/packet-egd.c b/epan/dissectors/packet-egd.c index eca5497e2b..c854e2fd67 100644 --- a/epan/dissectors/packet-egd.c +++ b/epan/dissectors/packet-egd.c @@ -123,7 +123,7 @@ static void dissect_egd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; proto_tree_add_item(egd_tree, hf_egd_rid, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(egd_tree, hf_egd_pid, tvb, offset, 4, FALSE); + proto_tree_add_item(egd_tree, hf_egd_pid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(egd_tree, hf_egd_exid, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c index 8be33a2204..65d0513506 100644 --- a/epan/dissectors/packet-ehs.c +++ b/epan/dissectors/packet-ehs.c @@ -519,7 +519,7 @@ static void payload_ccsds_secondary_header_dissector ( proto_tree* ehs_secondary proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_5, tvb, *offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_4, tvb, *offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_3, tvb, *offset, 1, ENC_BIG_ENDIAN ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_vcdu_sequence_error, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_vcdu_sequence_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_packet_sequence_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_0, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); @@ -534,8 +534,8 @@ static void core_ccsds_secondary_header_dissector ( proto_tree* ehs_secondary_he proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_version, tvb, *offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_5, tvb, *offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_4, tvb, *offset, 1, ENC_BIG_ENDIAN ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_parent_stream_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_vcdu_sequence_error, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_parent_stream_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_vcdu_sequence_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_packet_sequence_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_0, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); @@ -551,7 +551,7 @@ static void payload_bpdu_secondary_header_dissector ( proto_tree* ehs_secondary_ proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_5, tvb, *offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_4, tvb, *offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_3, tvb, *offset, 1, ENC_BIG_ENDIAN ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_vcdu_sequence_error, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_vcdu_sequence_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_1, tvb, *offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_0, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); @@ -591,20 +591,20 @@ static void tdm_secondary_header_dissector ( proto_tree* ehs_secondary_header_tr proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_secondary_header_length, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_extra_data_packet, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_extra_data_packet, tvb, *offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_backup_stream_id_number, tvb, *offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_end_of_data_flag, tvb, *offset, 1, ENC_BIG_ENDIAN ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_parent_frame_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_checksum_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_fixed_value_error, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_parent_frame_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_checksum_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_fixed_value_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_minor_frame_counter_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_format_id_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_bit_slip_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_sync_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_aoslos_flag, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_override_errors_flag, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_minor_frame_counter_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_format_id_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_bit_slip_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_sync_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_aoslos_flag, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_override_errors_flag, tvb, *offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_data_status, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); @@ -639,9 +639,9 @@ static void tdm_secondary_header_dissector ( proto_tree* ehs_secondary_header_tr cntmet_present = tvb_get_guint8 ( tvb, *offset ) & 0x80; obt_present = tvb_get_guint8 ( tvb, *offset ) & 0x40; mjfs_present = tvb_get_guint8 ( tvb, *offset ) & 0x20; - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_cntmet_present, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_present, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_major_frame_status_present, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_cntmet_present, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_present, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_major_frame_status_present, tvb, *offset, 1, ENC_BIG_ENDIAN ); /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_reserved, tvb, *offset, 1, ENC_BIG_ENDIAN ); */ ++(*offset); @@ -707,10 +707,10 @@ static void tdm_secondary_header_dissector ( proto_tree* ehs_secondary_header_tr proto_tree_add_text ( ehs_secondary_header_tree, tvb, *offset-7, 7, "%04d/%03d:%02d:%02d:%02d.%1d = OBT Time", year + 1900, jday, hour, minute, second, tenths ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_delta_time_flag, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_computed_flag, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_not_retrieved_flag, tvb, *offset, 1, FALSE ); - /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_reserved, tvb, *offset, 1, FALSE ); */ + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_delta_time_flag, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_computed_flag, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_not_retrieved_flag, tvb, *offset, 1, ENC_BIG_ENDIAN ); + /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_reserved, tvb, *offset, 1, ENC_BIG_ENDIAN ); */ proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_source_apid, tvb, *offset, 1, ENC_BIG_ENDIAN ); } @@ -726,9 +726,9 @@ static void tdm_secondary_header_dissector ( proto_tree* ehs_secondary_header_tr { proto_tree_add_text ( ehs_secondary_header_tree, tvb, *offset, 1, "Major Frame Status Byte# %d", j ); /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mjfs_reserved, tvb, *offset, 1, ENC_BIG_ENDIAN ); */ - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mjfs_parent_frame_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mjfs_checksum_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mjfs_fixed_value_error, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mjfs_parent_frame_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mjfs_checksum_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mjfs_fixed_value_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); } } @@ -738,14 +738,14 @@ static void tdm_secondary_header_dissector ( proto_tree* ehs_secondary_header_tr for ( j=0; j < num_minor_frames; ++j ) { proto_tree_add_text ( ehs_secondary_header_tree, tvb, *offset, 1, "Minor Frame Status Byte# %d", j ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mnfs_parent_frame_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mnfs_data_not_available, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mnfs_checksum_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mnfs_fixed_value_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mnfs_counter_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mnfs_format_id_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mnfs_bit_slip_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mnfs_sync_error, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mnfs_parent_frame_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mnfs_data_not_available, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mnfs_checksum_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mnfs_fixed_value_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mnfs_counter_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mnfs_format_id_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mnfs_bit_slip_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mnfs_sync_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); } @@ -903,7 +903,7 @@ static void udsm_data_zone_dissector ( proto_tree* ehs_tree, tvbuff_t* tvb, int* ++(*offset); /* proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_unused3, tvb, *offset, 2, ENC_BIG_ENDIAN ); */ - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_gse_pkt_id, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_gse_pkt_id, tvb, *offset, 2, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_payload_vs_core, tvb, *offset, 2, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_apid, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; @@ -1114,9 +1114,9 @@ dissect_ehs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text ( ehs_primary_header_tree, tvb, offset-7, 7, "%04d/%03d:%02d:%02d:%02d.%1d = EHS Ground Receipt Time", year + 1900, jday, hour, minute, second, tenths ); - proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_new_data_flag, tvb, offset, 1, FALSE ); + 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, FALSE ); + 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 ); ++offset; diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index 59989442f3..8f97ecfe62 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -394,10 +394,10 @@ static void dissect_eigrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { ti = proto_tree_add_item(eigrp_tree, hf_eigrp_flags, tvb, 4, 4, ENC_BIG_ENDIAN); eigrp_flags_tree = proto_item_add_subtree(ti, ett_eigrp_flags); - proto_tree_add_item(eigrp_flags_tree, hf_eigrp_flags_init, tvb, 4, 4, FALSE); - proto_tree_add_item(eigrp_flags_tree, hf_eigrp_flags_condrecv, tvb, 4, 4, FALSE); - proto_tree_add_item(eigrp_flags_tree, hf_eigrp_flags_restart, tvb, 4, 4, FALSE); - proto_tree_add_item(eigrp_flags_tree, hf_eigrp_flags_eot, tvb, 4, 4, FALSE); + proto_tree_add_item(eigrp_flags_tree, hf_eigrp_flags_init, tvb, 4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(eigrp_flags_tree, hf_eigrp_flags_condrecv, tvb, 4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(eigrp_flags_tree, hf_eigrp_flags_restart, tvb, 4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(eigrp_flags_tree, hf_eigrp_flags_eot, tvb, 4, 4, ENC_BIG_ENDIAN); /* End Decode the EIGRP Flags Field */ @@ -564,7 +564,7 @@ static void dissect_eigrp_seq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre switch (addr_len) { /* IPv4 */ case 4: - proto_tree_add_item(tree, hf_eigrp_seq_ipaddr, tvb, offset, addr_len, FALSE); + proto_tree_add_item(tree, hf_eigrp_seq_ipaddr, tvb, offset, addr_len, ENC_BIG_ENDIAN); break; /* IPX */ case 10: @@ -574,7 +574,7 @@ static void dissect_eigrp_seq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre break; /* IPv6 */ case 16: - proto_tree_add_item(tree, hf_eigrp_seq_ip6addr, tvb, offset, addr_len, FALSE); + proto_tree_add_item(tree, hf_eigrp_seq_ip6addr, tvb, offset, addr_len, ENC_NA); break; default: expert_add_info_format(pinfo, ti_addrlen, PI_MALFORMED, PI_ERROR, "Invalid address length"); @@ -616,12 +616,12 @@ static void dissect_eigrp_stub(tvbuff_t *tvb, proto_tree *tree) { ti = proto_tree_add_item(tree, hf_eigrp_stub_flags, tvb, 0, 2, ENC_BIG_ENDIAN); eigrp_stub_flags_tree = proto_item_add_subtree(ti, ett_eigrp_stub_flags); - proto_tree_add_item(eigrp_stub_flags_tree, hf_eigrp_stub_flags_connected, tvb, 0, 2, FALSE); - proto_tree_add_item(eigrp_stub_flags_tree, hf_eigrp_stub_flags_static, tvb, 0, 2, FALSE); - proto_tree_add_item(eigrp_stub_flags_tree, hf_eigrp_stub_flags_summary, tvb, 0, 2, FALSE); - proto_tree_add_item(eigrp_stub_flags_tree, hf_eigrp_stub_flags_recvonly, tvb, 0, 2, FALSE); - proto_tree_add_item(eigrp_stub_flags_tree, hf_eigrp_stub_flags_redist, tvb, 0, 2, FALSE); - proto_tree_add_item(eigrp_stub_flags_tree, hf_eigrp_stub_flags_leakmap, tvb, 0, 2, FALSE); + proto_tree_add_item(eigrp_stub_flags_tree, hf_eigrp_stub_flags_connected, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(eigrp_stub_flags_tree, hf_eigrp_stub_flags_static, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(eigrp_stub_flags_tree, hf_eigrp_stub_flags_summary, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(eigrp_stub_flags_tree, hf_eigrp_stub_flags_recvonly, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(eigrp_stub_flags_tree, hf_eigrp_stub_flags_redist, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(eigrp_stub_flags_tree, hf_eigrp_stub_flags_leakmap, tvb, 0, 2, ENC_BIG_ENDIAN); } static void dissect_eigrp_ip_int(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *ti) { @@ -632,7 +632,7 @@ static void dissect_eigrp_ip_int(tvbuff_t *tvb, packet_info *pinfo, proto_tree * tvb_memcpy(tvb, ip_addr, 0, 4); - proto_tree_add_item(tree, hf_eigrp_ip_int_nexthop, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_int_nexthop, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_eigrp_ip_int_delay, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -681,10 +681,10 @@ static void dissect_eigrp_ip_ext(tvbuff_t *tvb, packet_info *pinfo, proto_tree * eigrp_ip_ext_ti = ti; tvb_memcpy(tvb, ip_addr, 0, 4); - proto_tree_add_item(tree, hf_eigrp_ip_ext_nexthop, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_ext_nexthop, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; tvb_memcpy(tvb,ip_addr, 4, 4); - proto_tree_add_item(tree, hf_eigrp_ip_ext_origrouter, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_ext_origrouter, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_eigrp_ip_ext_as, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -701,8 +701,8 @@ static void dissect_eigrp_ip_ext(tvbuff_t *tvb, packet_info *pinfo, proto_tree * ti = proto_tree_add_item(tree, hf_eigrp_ip_ext_flags, tvb, offset, 1, ENC_BIG_ENDIAN); eigrp_ip_ext_flags_tree = proto_item_add_subtree(ti, ett_eigrp_ip_ext_flags); - proto_tree_add_item(eigrp_ip_ext_flags_tree, hf_eigrp_ip_ext_flags_ext, tvb, offset, 1, FALSE); - proto_tree_add_item(eigrp_ip_ext_flags_tree, hf_eigrp_ip_ext_flags_default, tvb, offset, 1, FALSE); + proto_tree_add_item(eigrp_ip_ext_flags_tree, hf_eigrp_ip_ext_flags_ext, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(eigrp_ip_ext_flags_tree, hf_eigrp_ip_ext_flags_default, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* End Decode the IP external route Flags Field */ @@ -876,8 +876,8 @@ static void dissect_eigrp_at_ext(tvbuff_t *tvb, proto_tree *tree, proto_item *ti ti = proto_tree_add_item(tree, hf_eigrp_at_ext_flags, tvb, offset, 1, ENC_BIG_ENDIAN); eigrp_at_ext_flags_tree = proto_item_add_subtree(ti, ett_eigrp_at_ext_flags); - proto_tree_add_item(eigrp_at_ext_flags_tree, hf_eigrp_at_ext_flags_ext, tvb, offset, 1, FALSE); - proto_tree_add_item(eigrp_at_ext_flags_tree, hf_eigrp_at_ext_flags_default, tvb, offset, 1, FALSE); + proto_tree_add_item(eigrp_at_ext_flags_tree, hf_eigrp_at_ext_flags_ext, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(eigrp_at_ext_flags_tree, hf_eigrp_at_ext_flags_default, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* End Decode the AppleTalk external route Flags Field */ @@ -910,7 +910,7 @@ static void dissect_eigrp_ip6_int(tvbuff_t *tvb, packet_info *pinfo, proto_tree struct e_in6_addr addr; proto_item *ti_prefixlen, *ti_dst; - proto_tree_add_item(tree, hf_eigrp_ip6_int_nexthop, tvb, offset, 16, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_int_nexthop, tvb, offset, 16, ENC_NA); offset += 16; proto_tree_add_item(tree, hf_eigrp_ip6_int_delay, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -964,9 +964,9 @@ static void dissect_eigrp_ip6_ext(tvbuff_t *tvb, packet_info *pinfo, proto_tree eigrp_ip6_ext_ti = ti; - proto_tree_add_item(tree, hf_eigrp_ip6_ext_nexthop, tvb, offset, 16, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_ext_nexthop, tvb, offset, 16, ENC_NA); offset += 16; - proto_tree_add_item(tree, hf_eigrp_ip6_ext_origrouter, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_ext_origrouter, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_eigrp_ip6_ext_as, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -983,8 +983,8 @@ static void dissect_eigrp_ip6_ext(tvbuff_t *tvb, packet_info *pinfo, proto_tree ti = proto_tree_add_item(tree, hf_eigrp_ip6_ext_flags, tvb, offset, 1, ENC_BIG_ENDIAN); eigrp_ip6_ext_flags_tree = proto_item_add_subtree(ti, ett_eigrp_ip6_ext_flags); - proto_tree_add_item(eigrp_ip6_ext_flags_tree, hf_eigrp_ip6_ext_flags_ext, tvb, offset, 1, FALSE); - proto_tree_add_item(eigrp_ip6_ext_flags_tree, hf_eigrp_ip6_ext_flags_default, tvb, offset, 1, FALSE); + proto_tree_add_item(eigrp_ip6_ext_flags_tree, hf_eigrp_ip6_ext_flags_ext, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(eigrp_ip6_ext_flags_tree, hf_eigrp_ip6_ext_flags_default, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* End Decode the IPv6 external route Flags Field */ diff --git a/epan/dissectors/packet-enrp.c b/epan/dissectors/packet-enrp.c index f8a034838d..3b6b2f8c6e 100644 --- a/epan/dissectors/packet-enrp.c +++ b/epan/dissectors/packet-enrp.c @@ -267,7 +267,7 @@ dissect_ipv4_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot static void dissect_ipv6_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - proto_tree_add_item(parameter_tree, hf_parameter_ipv6_address, parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_parameter_ipv6_address, parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH, ENC_NA); proto_item_append_text(parameter_item, " (%s)", tvb_ip6_to_str(parameter_tvb, IPV6_ADDRESS_OFFSET)); } diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index bade12a042..2e859b2254 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -1021,8 +1021,8 @@ dissect_epl_soa(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, guint8 if (epl_tree) { - proto_tree_add_item(epl_tree, hf_epl_soa_ea, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_tree, hf_epl_soa_er, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_tree, hf_epl_soa_ea, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_tree, hf_epl_soa_er, tvb, offset, 1, ENC_LITTLE_ENDIAN); } offset += 2; @@ -1187,8 +1187,8 @@ dissect_epl_asnd_ires(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, g proto_item *ti_feat; proto_tree *epl_feat_tree; - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_en, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_ec, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_en, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_ec, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_pr, tvb, offset, 1, ENC_LITTLE_ENDIAN); @@ -1316,8 +1316,8 @@ dissect_epl_asnd_sres(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, g if (epl_tree) { - proto_tree_add_item(epl_tree, hf_epl_asnd_statusresponse_en, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_tree, hf_epl_asnd_statusresponse_ec, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_statusresponse_en, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_tree, hf_epl_asnd_statusresponse_ec, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; proto_tree_add_item(epl_tree, hf_epl_asnd_statusresponse_pr, tvb, offset, 1, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 4c502780fa..54dd9c30a1 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -292,15 +292,15 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, if (addr_item) addr_tree = proto_item_add_subtree(addr_item, ett_addr); proto_tree_add_ether(addr_tree, hf_eth_addr, tvb, 0, 6, dst_addr); - proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 0, 3, FALSE); - proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 0, 3, FALSE); + proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 0, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 0, 3, ENC_BIG_ENDIAN); addr_item = proto_tree_add_ether(fh_tree, hf_eth_src, tvb, 6, 6, src_addr); if (addr_item) addr_tree = proto_item_add_subtree(addr_item, ett_addr); proto_tree_add_ether(addr_tree, hf_eth_addr, tvb, 6, 6, src_addr); - proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 6, 3, FALSE); - proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 6, 3, FALSE); + proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 6, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 6, 3, ENC_BIG_ENDIAN); ti = proto_tree_add_item(fh_tree, hf_eth_invalid_lentype, tvb, 12, 2, ENC_BIG_ENDIAN); expert_add_info_format(pinfo, ti, PI_PROTOCOL, PI_WARN, @@ -337,16 +337,16 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, addr_tree = proto_item_add_subtree(addr_item, ett_addr); } proto_tree_add_ether(addr_tree, hf_eth_addr, tvb, 0, 6, dst_addr); - proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 0, 3, FALSE); - proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 0, 3, FALSE); + proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 0, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 0, 3, ENC_BIG_ENDIAN); addr_item=proto_tree_add_ether(fh_tree, hf_eth_src, tvb, 6, 6, src_addr); if(addr_item){ addr_tree = proto_item_add_subtree(addr_item, ett_addr); } proto_tree_add_ether(addr_tree, hf_eth_addr, tvb, 6, 6, src_addr); - proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 6, 3, FALSE); - proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 6, 3, FALSE); + proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 6, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 6, 3, ENC_BIG_ENDIAN); dissect_802_3(ehdr->type, is_802_2, tvb, ETH_HEADER_SIZE, pinfo, parent_tree, fh_tree, hf_eth_len, hf_eth_trailer, fcs_len); @@ -378,8 +378,8 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, addr_tree = proto_item_add_subtree(addr_item, ett_addr); } proto_tree_add_ether(addr_tree, hf_eth_addr, tvb, 0, 6, dst_addr); - proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 0, 3, FALSE); - proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 0, 3, FALSE); + proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 0, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 0, 3, ENC_BIG_ENDIAN); addr_item=proto_tree_add_ether(fh_tree, hf_eth_src, tvb, 6, 6, src_addr); if(addr_item){ @@ -390,8 +390,8 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, } } proto_tree_add_ether(addr_tree, hf_eth_addr, tvb, 6, 6, src_addr); - proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 6, 3, FALSE); - proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 6, 3, FALSE); + proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 6, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 6, 3, ENC_BIG_ENDIAN); ethertype(ehdr->type, tvb, ETH_HEADER_SIZE, pinfo, parent_tree, fh_tree, hf_eth_type, hf_eth_trailer, fcs_len); diff --git a/epan/dissectors/packet-evrc.c b/epan/dissectors/packet-evrc.c index 2966a26655..f89bcdfc3b 100644 --- a/epan/dissectors/packet-evrc.c +++ b/epan/dissectors/packet-evrc.c @@ -263,7 +263,7 @@ dissect_evrc_aux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, evrc_varia toc_tree = proto_item_add_subtree(item, ett_toc); - proto_tree_add_item(toc_tree, hf_evrc_legacy_toc_fe_ind, tvb, offset, 1, FALSE); + proto_tree_add_item(toc_tree, hf_evrc_legacy_toc_fe_ind, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(toc_tree, hf_evrc_legacy_toc_reduc_rate, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(toc_tree, hf_evrc_legacy_toc_frame_type, tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c index 7c14f93771..f9ca387b05 100644 --- a/epan/dissectors/packet-fcdns.c +++ b/epan/dissectors/packet-fcdns.c @@ -482,7 +482,7 @@ dissect_fcdns_ganxt (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) } if (tvb_offset_exists (tvb, 572)) { proto_tree_add_item (req_tree, hf_fcdns_rply_ipnode, tvb, - offset+540, 16, 0); + offset+540, 16, ENC_NA); } if (tvb_offset_exists (tvb, 576)) { dissect_cos_flags(req_tree, tvb, offset+556, hf_fcdns_reply_cos); @@ -492,7 +492,7 @@ dissect_fcdns_ganxt (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) } if (tvb_offset_exists (tvb, 624)) { proto_tree_add_item (req_tree, hf_fcdns_rply_ipport, tvb, - offset+592, 16, 0); + offset+592, 16, ENC_NA); } if (tvb_offset_exists (tvb, 632)) { proto_tree_add_string (req_tree, hf_fcdns_rply_fpname, tvb, @@ -698,7 +698,7 @@ dissect_fcdns_gipppn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) } else { proto_tree_add_item (req_tree, hf_fcdns_rply_ipport, tvb, offset, - 16, 0); + 16, ENC_NA); } } } @@ -740,7 +740,7 @@ dissect_fcdns_gipnn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) } else { proto_tree_add_item (req_tree, hf_fcdns_rply_ipnode, tvb, offset, - 16, 0); + 16, ENC_NA); } } } @@ -917,7 +917,7 @@ dissect_fcdns_gidipp (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) if (req_tree) { if (isreq) { proto_tree_add_item (req_tree, hf_fcdns_req_ip, tvb, offset, - 16, 0); + 16, ENC_NA); } else { do { @@ -1060,7 +1060,7 @@ dissect_fcdns_rippid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) offset+1, 3, tvb_fc_to_str (tvb, offset+1)); proto_tree_add_item (req_tree, hf_fcdns_req_ip, tvb, - offset+4, 16, 0); + offset+4, 16, ENC_NA); } } @@ -1110,7 +1110,7 @@ dissect_fcdns_ripnn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) if (req_tree && isreq) { proto_tree_add_string (req_tree, hf_fcdns_req_nname, tvb, offset, 8, tvb_fcwwn_to_str (tvb, offset)); - proto_tree_add_item (req_tree, hf_fcdns_req_ip, tvb, offset+8, 16, 0); + proto_tree_add_item (req_tree, hf_fcdns_req_ip, tvb, offset+8, 16, ENC_NA); } } @@ -1243,11 +1243,11 @@ dissect_fcdns_swils_entries (tvbuff_t *tvb, proto_tree *tree, int offset) } proto_tree_add_item (tree, hf_fcdns_rply_ipa, tvb, offset, 8, ENC_NA); proto_tree_add_item (tree, hf_fcdns_rply_ipnode, tvb, offset+8, 16, - 0); + ENC_NA); dissect_cos_flags(tree, tvb, offset+24, hf_fcdns_reply_cos); dissect_fc4type(tree, tvb, offset+28, hf_fcdns_rply_gft); proto_tree_add_item (tree, hf_fcdns_rply_ipport, tvb, offset+60, - 16, 0); + 16, ENC_NA); proto_tree_add_string (tree, hf_fcdns_rply_fpname, tvb, offset+76, 8, tvb_fcwwn_to_str (tvb, offset+76)); proto_tree_add_string (tree, hf_fcdns_rply_hrdaddr, tvb, offset+85, @@ -1330,7 +1330,7 @@ dissect_fcdns_geip (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) if (isreq) { if (req_tree) { - proto_tree_add_item (req_tree, hf_fcdns_req_ip, tvb, offset, 16, 0); + proto_tree_add_item (req_tree, hf_fcdns_req_ip, tvb, offset, 16, ENC_NA); } } else { @@ -1411,7 +1411,7 @@ dissect_fcdns_geipp (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) if (isreq) { if (req_tree) { - proto_tree_add_item (req_tree, hf_fcdns_portip, tvb, offset, 4, 0); + proto_tree_add_item (req_tree, hf_fcdns_portip, tvb, offset, 4, ENC_BIG_ENDIAN); } } else { diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index cf8108fd6b..945bc96aee 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -1259,9 +1259,9 @@ dissect_fcels_farp (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_string (farp_tree, hf_fcels_respnname, tvb, offset+32, 8, tvb_fcwwn_to_str (tvb, offset+32)); proto_tree_add_item (farp_tree, hf_fcels_reqipaddr, tvb, offset+40, - 16, FALSE); + 16, ENC_NA); proto_tree_add_item (farp_tree, hf_fcels_respipaddr, tvb, offset+56, - 16, FALSE); + 16, ENC_NA); } } @@ -1908,7 +1908,7 @@ dissect_fcels_rnid (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item (rnid_tree, hf_fcels_tcpport, tvb, offset+54, 2, ENC_BIG_ENDIAN); proto_tree_add_item (rnid_tree, hf_fcels_ip, tvb, offset+56, - 16, FALSE); + 16, ENC_NA); proto_tree_add_item (rnid_tree, hf_fcels_vendorsp, tvb, offset+74, 2, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c index 419b730d66..516e883295 100644 --- a/epan/dissectors/packet-fcfcs.c +++ b/epan/dissectors/packet-fcfcs.c @@ -402,7 +402,7 @@ dissect_fcfcs_gapnl (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_string (tree, hf_fcs_portname, tvb, offset, 8, tvb_fcwwn_to_str (tvb, offset)); proto_tree_add_item (tree, hf_fcs_portflags, tvb, offset+10, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcs_porttype, tvb, offset+11, 1, ENC_BIG_ENDIAN); offset += 12; diff --git a/epan/dissectors/packet-fcgi.c b/epan/dissectors/packet-fcgi.c index 24c63b585f..227ae641d2 100644 --- a/epan/dissectors/packet-fcgi.c +++ b/epan/dissectors/packet-fcgi.c @@ -154,7 +154,7 @@ dissect_begin_request(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16 offset += 2; proto_tree_add_item(br_tree, hf_fcgi_begin_request_flags, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(br_tree, hf_fcgi_begin_request_keep_conn, tvb, offset, 1, FALSE); + proto_tree_add_item(br_tree, hf_fcgi_begin_request_keep_conn, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; offset += 5; diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c index 81798f6fbb..4b4db5211d 100644 --- a/epan/dissectors/packet-fcip.c +++ b/epan/dissectors/packet-fcip.c @@ -330,9 +330,9 @@ dissect_fcencap_header (tvbuff_t *tvb, proto_tree *tree, gint offset) proto_tree_add_item (tree, hf_fcip_encap_word1, tvb, offset+4, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcip_pflags_changed, tvb, offset+8, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcip_pflags_special, tvb, offset+8, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcip_pflags_c, tvb, offset+10, 1, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index 977cbcecbd..99f31fbdd3 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.c @@ -447,8 +447,8 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro fchdr->itlq->task_flags|=SCSI_DATA_WRITE; } } - proto_tree_add_item(tree, hf_fcp_rddata, tvb, offset+11, 1, 0); - proto_tree_add_item(tree, hf_fcp_wrdata, tvb, offset+11, 1, 0); + proto_tree_add_item(tree, hf_fcp_rddata, tvb, offset+11, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_fcp_wrdata, tvb, offset+11, 1, ENC_BIG_ENDIAN); tvb_len=tvb_length_remaining(tvb, offset+12); if(tvb_len>(16+add_len)) diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index b4675efee8..7c5c09b9ae 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -565,51 +565,51 @@ dissect_swils_ess_capability (tvbuff_t *tvb, proto_tree *tree, int offset, switch (srvr_type) { case FCCT_GSRVR_DNS: proto_tree_add_item (tree, hf_swils_ess_dns_zlacc, tvb, offset+3, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swils_ess_dns_obj3h, tvb, offset+3, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swils_ess_dns_obj2h, tvb, offset+3, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swils_ess_dns_obj1h, tvb, offset+3, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swils_ess_dns_obj0h, tvb, offset+3, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swils_ess_dns_vendor, tvb, offset+4, 4, ENC_BIG_ENDIAN); break; case FCCT_GSRVR_FCTLR: proto_tree_add_item (tree, hf_swils_ess_fctlr_rscn, tvb, - offset+3, 1, 0); + offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swils_ess_fctlr_vendor, tvb, offset+4, 4, ENC_BIG_ENDIAN); break; case FCCT_GSRVR_FCS: proto_tree_add_item (tree, hf_swils_ess_fcs_basic, tvb, - offset+3, 1, 0); + offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swils_ess_fcs_platform, tvb, - offset+3, 1, 0); + offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swils_ess_fcs_topology, tvb, - offset+3, 1, 0); + offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swils_ess_fcs_enhanced, tvb, - offset+3, 1, 0); + offset+3, 1, ENC_BIG_ENDIAN); break; case FCCT_GSRVR_FZS: proto_tree_add_item (tree, hf_swils_ess_fzs_enh_supp, tvb, - offset+3, 1, 0); + offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swils_ess_fzs_enh_ena, tvb, - offset+3, 1, 0); + offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swils_ess_fzs_mr, tvb, offset+3, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swils_ess_fzs_defzone, tvb, - offset+3, 1, 0); + offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swils_ess_fzs_zsdb_supp, tvb, - offset+3, 1, 0); + offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swils_ess_fzs_zsdb_ena, tvb, - offset+3, 1, 0); + offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swils_ess_fzs_adc_supp, tvb, - offset+3, 1, 0); + offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swils_ess_fzs_hardzone, tvb, - offset+3, 1, 0); + offset+3, 1, ENC_BIG_ENDIAN); break; default: break; diff --git a/epan/dissectors/packet-fefd.c b/epan/dissectors/packet-fefd.c index 868c734937..cbf8d06d18 100644 --- a/epan/dissectors/packet-fefd.c +++ b/epan/dissectors/packet-fefd.c @@ -117,8 +117,8 @@ dissect_fefd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 1; flags_ti = proto_tree_add_item(fefd_tree, hf_fefd_flags, tvb, offset, 1, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_ti, ett_fefd_flags); - proto_tree_add_item(flags_tree, hf_fefd_flags_rt, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree, hf_fefd_flags_rsy, tvb, offset, 1, FALSE); + proto_tree_add_item(flags_tree, hf_fefd_flags_rt, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_fefd_flags_rsy, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(fefd_tree, hf_fefd_checksum, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c index eb33348a34..7a439888c1 100644 --- a/epan/dissectors/packet-ff.c +++ b/epan/dissectors/packet-ff.c @@ -2329,7 +2329,7 @@ dissect_ff_msg_sm_find_tag_reply_req(tvbuff_t *tvb, gint offset, length -= 4; proto_tree_add_item(sub_tree, - hf_ff_sm_find_tag_reply_req_ip_addr, tvb, offset, 16, FALSE); + hf_ff_sm_find_tag_reply_req_ip_addr, tvb, offset, 16, ENC_NA); offset += 16; length -= 16; @@ -2848,7 +2848,7 @@ dissect_ff_msg_sm_id_rsp(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_id_rsp_operational_ip_addr, tvb, offset, 16, FALSE); + hf_ff_sm_id_rsp_operational_ip_addr, tvb, offset, 16, ENC_NA); offset += 16; length -= 16; @@ -3304,7 +3304,7 @@ dissect_ff_msg_sm_set_assign_info_req(tvbuff_t *tvb, gint offset, proto_tree_add_item(sub_tree, hf_ff_sm_set_assign_info_req_operational_ip_addr, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_NA); offset += 16; length -= 16; @@ -4018,7 +4018,7 @@ dissect_ff_msg_sm_dev_annunc_req(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_dev_annunc_req_operational_ip_addr, tvb, offset, 16, FALSE); + hf_ff_sm_dev_annunc_req_operational_ip_addr, tvb, offset, 16, ENC_NA); offset += 16; length -= 16; @@ -9456,25 +9456,25 @@ dissect_ff_msg_lr_get_info_rsp( proto_tree_add_item(sub_tree, hf_ff_lr_get_info_rsp_diagnostic_msg_if_a_send_addr, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_NA); offset += 16; length -= 16; proto_tree_add_item(sub_tree, hf_ff_lr_get_info_rsp_diagnostic_msg_if_a_recv_addr, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_NA); offset += 16; length -= 16; proto_tree_add_item(sub_tree, hf_ff_lr_get_info_rsp_diagnostic_msg_if_b_send_addr, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_NA); offset += 16; length -= 16; proto_tree_add_item(sub_tree, hf_ff_lr_get_info_rsp_diagnostic_msg_if_b_recv_addr, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_NA); offset += 16; length -= 16; @@ -9711,25 +9711,25 @@ dissect_ff_msg_lr_put_info_req( proto_tree_add_item(sub_tree, hf_ff_lr_put_info_req_diagnostic_msg_if_a_send_addr, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_NA); offset += 16; length -= 16; proto_tree_add_item(sub_tree, hf_ff_lr_put_info_req_diagnostic_msg_if_a_recv_addr, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_NA); offset += 16; length -= 16; proto_tree_add_item(sub_tree, hf_ff_lr_put_info_req_diagnostic_msg_if_b_send_addr, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_NA); offset += 16; length -= 16; proto_tree_add_item(sub_tree, hf_ff_lr_put_info_req_diagnostic_msg_if_b_recv_addr, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_NA); offset += 16; length -= 16; @@ -9902,25 +9902,25 @@ dissect_ff_msg_lr_put_info_rsp( proto_tree_add_item(sub_tree, hf_ff_lr_put_info_rsp_diagnostic_msg_if_a_send_addr, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_NA); offset += 16; length -= 16; proto_tree_add_item(sub_tree, hf_ff_lr_put_info_rsp_diagnostic_msg_if_a_recv_addr, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_NA); offset += 16; length -= 16; proto_tree_add_item(sub_tree, hf_ff_lr_put_info_rsp_diagnostic_msg_if_b_send_addr, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_NA); offset += 16; length -= 16; proto_tree_add_item(sub_tree, hf_ff_lr_put_info_rsp_diagnostic_msg_if_b_recv_addr, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_NA); offset += 16; length -= 16; diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c index 47231ea9a4..94b679966a 100644 --- a/epan/dissectors/packet-gdsdb.c +++ b/epan/dissectors/packet-gdsdb.c @@ -439,7 +439,7 @@ gdsdb_connect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_connect_filename, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); length = tvb_get_ntohl(tvb, offset); offset += length + 6; proto_tree_add_item(tree, hf_gdsdb_connect_count, tvb, @@ -447,7 +447,7 @@ gdsdb_connect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) count = tvb_get_ntohl(tvb, offset); offset += 4; proto_tree_add_item(tree, hf_gdsdb_connect_userid, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); length = tvb_get_ntohl(tvb, offset); offset += length + 5; for(i=0;i<count;i++){ @@ -546,7 +546,7 @@ gdsdb_attach(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_attach_filename, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); length = tvb_get_ntohl(tvb, offset); offset += length + 6; proto_tree_add_uint_format_value(tree, @@ -571,7 +571,7 @@ gdsdb_compile(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_compile_blr, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); } return tvb_length(tvb); @@ -662,7 +662,7 @@ gdsdb_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) offset, 8, ENC_BIG_ENDIAN); offset += 8; proto_tree_add_item(tree, hf_gdsdb_response_data, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); length = tvb_get_ntohl(tvb, offset); offset += length + 4; proto_tree_add_item(tree, hf_gdsdb_response_status, tvb, @@ -723,7 +723,7 @@ gdsdb_open_blob2(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) if (tree) { offset = 4; proto_tree_add_item(tree, hf_gdsdb_openblob2_bpb, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); length = tvb_get_ntohl(tvb, offset); offset += length + 6; proto_tree_add_item(tree, hf_gdsdb_openblob_transaction, tvb, @@ -827,7 +827,7 @@ gdsdb_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) offset += 4; if(opcode == op_service_info) { proto_tree_add_item(tree, hf_gdsdb_info_items, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); length = tvb_get_ntohl(tvb, offset); offset += length + 6; } diff --git a/epan/dissectors/packet-glbp.c b/epan/dissectors/packet-glbp.c index 6448165202..5a919caf4c 100644 --- a/epan/dissectors/packet-glbp.c +++ b/epan/dissectors/packet-glbp.c @@ -208,7 +208,7 @@ dissect_glbp_hello(tvbuff_t *tvb, int offset, expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR, "Wrong IPv6 address length: %u", addrlen); return offset + addrlen; } - proto_tree_add_item(tlv_tree, hf_glbp_hello_virtualipv6, tvb, offset, addrlen, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_glbp_hello_virtualipv6, tvb, offset, addrlen, ENC_NA); break; default: proto_tree_add_item(tlv_tree, hf_glbp_hello_virtualunk, tvb, offset, addrlen, ENC_NA); diff --git a/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c index 119fc5227c..04d4dc6e15 100644 --- a/epan/dissectors/packet-gnutella.c +++ b/epan/dissectors/packet-gnutella.c @@ -99,7 +99,7 @@ static void dissect_gnutella_pong(tvbuff_t *tvb, guint offset, proto_tree *tree) tvb, offset + GNUTELLA_PONG_IP_OFFSET, GNUTELLA_IP_LENGTH, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_gnutella_pong_files, @@ -175,7 +175,7 @@ static void dissect_gnutella_queryhit(tvbuff_t *tvb, guint offset, proto_tree *t tvb, offset + GNUTELLA_QUERYHIT_IP_OFFSET, GNUTELLA_IP_LENGTH, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_gnutella_queryhit_speed, @@ -310,7 +310,7 @@ static void dissect_gnutella_push(tvbuff_t *tvb, guint offset, proto_tree *tree) tvb, offset + GNUTELLA_PUSH_IP_OFFSET, GNUTELLA_IP_LENGTH, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_gnutella_push_port, diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index daffd7c1e3..f71dc20e60 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.c @@ -248,7 +248,7 @@ dissect_gre_3gpp2_attribs(tvbuff_t *tvb, int offset, proto_tree *tree) case ID_3GPP2_SDI_FLAG: { value = tvb_get_guint8(tvb,offset); - proto_tree_add_item(attr_tree, hf_gre_3ggp2_sdi, tvb, offset, attrib_length, FALSE); + proto_tree_add_item(attr_tree, hf_gre_3ggp2_sdi, tvb, offset, attrib_length, ENC_BIG_ENDIAN); proto_item_append_text(attr_item," - %s", (value & 0x80) ? "Packet suitable for 1x SDB or HRPD DOS transmission" : "Reserved"); @@ -264,10 +264,10 @@ dissect_gre_3gpp2_attribs(tvbuff_t *tvb, int offset, proto_tree *tree) case ID_3GPP2_FLOW_CTRL: { value = tvb_get_guint8(tvb,offset); - proto_tree_add_item(attr_tree, hf_gre_3ggp2_fci, tvb, offset, attrib_length, FALSE); + proto_tree_add_item(attr_tree, hf_gre_3ggp2_fci, tvb, offset, attrib_length, ENC_BIG_ENDIAN); proto_item_append_text(attr_item," - %s", (value & 0x80) ? "XON" : "XOFF"); - proto_tree_add_item(attr_tree, hf_gre_3ggp2_di, tvb, offset, attrib_length, FALSE); + proto_tree_add_item(attr_tree, hf_gre_3ggp2_di, tvb, offset, attrib_length, ENC_BIG_ENDIAN); proto_item_append_text(attr_item,"/%s", (value & 0x40) ? "INDEFINITE" : "TEMPORARY"); } @@ -290,9 +290,9 @@ dissect_gre_wccp2_redirect_header(tvbuff_t *tvb, int offset, proto_tree *tree) ti = proto_tree_add_item(tree, hf_gre_wccp_redirect_header, tvb, offset, 4, ENC_NA); rh_tree = proto_item_add_subtree(ti, ett_gre_wccp2_redirect_header); - proto_tree_add_item(rh_tree, hf_gre_wccp_dynamic_service, tvb, offset, 1, FALSE); + proto_tree_add_item(rh_tree, hf_gre_wccp_dynamic_service, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(rh_tree, hf_gre_wccp_alternative_bucket_used, tvb, offset, 1, FALSE); + proto_tree_add_item(rh_tree, hf_gre_wccp_alternative_bucket_used, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rh_tree, hf_gre_wccp_service_id, tvb, offset +1, 1, ENC_BIG_ENDIAN); @@ -359,21 +359,21 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) it_flags = proto_tree_add_item(gre_tree, hf_gre_flags_and_version, tvb, offset, 2, ENC_BIG_ENDIAN); fv_tree = proto_item_add_subtree(it_flags, ett_gre_flags); - proto_tree_add_item(fv_tree, hf_gre_flags_checksum, tvb, offset, 2, FALSE); + proto_tree_add_item(fv_tree, hf_gre_flags_checksum, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(fv_tree, hf_gre_flags_routing, tvb, offset, 2, FALSE); + proto_tree_add_item(fv_tree, hf_gre_flags_routing, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(fv_tree, hf_gre_flags_key, tvb, offset, 2, FALSE); + proto_tree_add_item(fv_tree, hf_gre_flags_key, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(fv_tree, hf_gre_flags_sequence_number, tvb, offset, 2, FALSE); + proto_tree_add_item(fv_tree, hf_gre_flags_sequence_number, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(fv_tree, hf_gre_flags_strict_source_route, tvb, offset, 2, FALSE); + proto_tree_add_item(fv_tree, hf_gre_flags_strict_source_route, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(fv_tree, hf_gre_flags_recursion_control, tvb, offset, 2, ENC_BIG_ENDIAN); /* RFC2637 Section 4.1 : Enhanced GRE Header */ if (is_ppp) { - proto_tree_add_item(fv_tree, hf_gre_flags_ack, tvb, offset, 2, FALSE); + proto_tree_add_item(fv_tree, hf_gre_flags_ack, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(fv_tree, hf_gre_flags_reserved_ppp, tvb, offset, 2, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c index 2fdd1ca337..42d4161933 100644 --- a/epan/dissectors/packet-gsm_a_bssmap.c +++ b/epan/dissectors/packet-gsm_a_bssmap.c @@ -3586,7 +3586,7 @@ be_aoip_trans_lay_add(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g break; case 18: /* IPv6 */ - proto_tree_add_item(tree, hf_gsm_a_bssmap_aoip_trans_ipv6, tvb, curr_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gsm_a_bssmap_aoip_trans_ipv6, tvb, curr_offset, 16, ENC_NA); curr_offset+=16; break; default: diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c index 7f088d4a15..c039951f6a 100644 --- a/epan/dissectors/packet-gsm_a_gm.c +++ b/epan/dissectors/packet-gsm_a_gm.c @@ -3861,14 +3861,14 @@ de_sm_pdp_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offs switch (pdp_type_num) { case 0x57: - proto_tree_add_item(tree,hf_gsm_a_sm_ip6_address,tvb,curr_offset,16,ENC_BIG_ENDIAN); + proto_tree_add_item(tree,hf_gsm_a_sm_ip6_address,tvb,curr_offset,16,ENC_NA); curr_offset+=16; break; case 0x8d: proto_tree_add_item(tree,hf_gsm_a_sm_ip4_address,tvb,curr_offset,4,ENC_BIG_ENDIAN); curr_offset+=4; - proto_tree_add_item(tree,hf_gsm_a_sm_ip6_address,tvb,curr_offset,16,ENC_BIG_ENDIAN); + proto_tree_add_item(tree,hf_gsm_a_sm_ip6_address,tvb,curr_offset,16,ENC_NA); curr_offset+=16; break; @@ -4696,10 +4696,10 @@ de_sm_tflow_temp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 of case 0x20: str="IPv6 remote address type"; - proto_tree_add_item(comp_tree,hf_gsm_a_sm_ip6_address,tvb,curr_offset,16,ENC_BIG_ENDIAN); + proto_tree_add_item(comp_tree,hf_gsm_a_sm_ip6_address,tvb,curr_offset,16,ENC_NA); curr_offset+=16; curr_len-=16; - proto_tree_add_item(comp_tree,hf_gsm_a_sm_ip6_mask,tvb,curr_offset,16,ENC_BIG_ENDIAN); + proto_tree_add_item(comp_tree,hf_gsm_a_sm_ip6_mask,tvb,curr_offset,16,ENC_NA); curr_offset+=16; curr_len-=16; pf_length-=32; diff --git a/epan/dissectors/packet-gsmtap.c b/epan/dissectors/packet-gsmtap.c index cc2bb5569f..cdb566798c 100644 --- a/epan/dissectors/packet-gsmtap.c +++ b/epan/dissectors/packet-gsmtap.c @@ -278,7 +278,7 @@ dissect_sacch_l1h(tvbuff_t *tvb, proto_tree *tree) /* Power Level */ proto_tree_add_item(l1h_tree, hf_sacch_l1h_power_lev, tvb, 0, 1, ENC_BIG_ENDIAN); /* Fast Power Control */ - proto_tree_add_item(l1h_tree, hf_sacch_l1h_fpc, tvb, 0, 1, FALSE); + proto_tree_add_item(l1h_tree, hf_sacch_l1h_fpc, tvb, 0, 1, ENC_BIG_ENDIAN); /* Acutal Timing Advance */ proto_tree_add_item(l1h_tree, hf_sacch_l1h_ta, tvb, 1, 1, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index 11261c9481..a3fe47123d 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -1349,7 +1349,7 @@ dissect_gtpv2_ip_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree } else if (length==16) { - proto_tree_add_item(tree, hf_gtpv2_ip_address_ipv6, tvb, offset, length, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gtpv2_ip_address_ipv6, tvb, offset, length, ENC_NA); tvb_get_ipv6(tvb, offset, &ipv6_addr); proto_item_append_text(item, "IPv6 %s", ip6_to_str(&ipv6_addr)); } @@ -1969,7 +1969,7 @@ dissect_gtpv2_f_teid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, pr } if (flags&0x40) { - proto_tree_add_item(tree, hf_gtpv2_f_teid_ipv6, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gtpv2_f_teid_ipv6, tvb, offset, 16, ENC_NA); proto_item_append_text(item, ", IPv6 %s", tvb_ip6_to_str(tvb, offset)); offset= offset+16; } @@ -2036,7 +2036,7 @@ dissect_gtpv2_s103pdf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto break; case 16: /* IPv6 */ - proto_tree_add_item(tree, hf_gtpv2_hsgw_addr_ipv6, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gtpv2_hsgw_addr_ipv6, tvb, offset, 1, ENC_NA); offset+=16; break; default: @@ -2093,7 +2093,7 @@ dissect_gtpv2_s1udf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_i break; case 16: /* IPv6 */ - proto_tree_add_item(tree, hf_gtpv2_sgw_addr_ipv6, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gtpv2_sgw_addr_ipv6, tvb, offset, 1, ENC_NA); offset+=16; break; default: @@ -3400,7 +3400,7 @@ dissect_gtpv2_fq_csid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto break; case 1: /* Indicates that Node-ID is a global unicast IPv6 address and p = 21 */ - proto_tree_add_item(tree, hf_gtpv2_fq_csid_ipv6, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gtpv2_fq_csid_ipv6, tvb, offset, 16, ENC_NA); offset += 16; break; case 2: diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index 6884676b0c..0e2ffc1711 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -268,8 +268,8 @@ dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 0x04: /* Assign new temporary network configuration */ if (packet_plsize >= 48) { proto_tree_add_item(gvcp_tree, hf_gvcp_ether, tvb, 10, 6, FALSE); - proto_tree_add_item(gvcp_tree, hf_gvcp_ip, tvb, 28, 4, FALSE); - proto_tree_add_item(gvcp_tree, hf_gvcp_netmask, tvb, 44, 4, FALSE); + proto_tree_add_item(gvcp_tree, hf_gvcp_ip, tvb, 28, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(gvcp_tree, hf_gvcp_netmask, tvb, 44, 4, ENC_BIG_ENDIAN); } break; case 0x80: /* Register Read Request */ diff --git a/epan/dissectors/packet-h263p.c b/epan/dissectors/packet-h263p.c index 04af1a00c7..bd93efa49b 100644 --- a/epan/dissectors/packet-h263p.c +++ b/epan/dissectors/packet-h263p.c @@ -93,8 +93,8 @@ dissect_h263P( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) data16 = tvb_get_ntohs(tvb,offset); 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, FALSE ); - proto_tree_add_item( h263P_tree, hf_h263P_vbit, tvb, offset, 2, FALSE ); + 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_pebit, tvb, offset, 2, ENC_BIG_ENDIAN ); offset = offset +2; diff --git a/epan/dissectors/packet-hclnfsd.c b/epan/dissectors/packet-hclnfsd.c index 7ec1650746..15be4b4409 100644 --- a/epan/dissectors/packet-hclnfsd.c +++ b/epan/dissectors/packet-hclnfsd.c @@ -173,7 +173,7 @@ dissect_hclnfsd_authorize_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_ proto_item *ident_item = NULL; proto_tree *ident_tree = NULL; - proto_tree_add_item(tree, hf_hclnfsd_server_ip, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_hclnfsd_server_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; request_type = tvb_get_ntohl(tvb, offset); @@ -291,7 +291,7 @@ dissect_hclnfsd_grp_to_number_reply(tvbuff_t *tvb, int offset, packet_info *pinf static int dissect_hclnfsd_return_host_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_hclnfsd_host_ip, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_hclnfsd_host_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; diff --git a/epan/dissectors/packet-hip.c b/epan/dissectors/packet-hip.c index 5cdfa967d4..7099a8d8a3 100644 --- a/epan/dissectors/packet-hip.c +++ b/epan/dissectors/packet-hip.c @@ -616,13 +616,13 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len locator_type = tvb_get_guint8(tvb, newoffset + 1); if (locator_type == 0) { ti_loc = proto_tree_add_item(t, hf_hip_tlv_locator_address, - tvb, newoffset + 8, 16, FALSE); + tvb, newoffset + 8, 16, ENC_NA); } else if (locator_type == 1) { ti_loc = proto_tree_add_item(t, hf_hip_tlv_locator_address, - tvb, newoffset + 12, 16, FALSE); + tvb, newoffset + 12, 16, ENC_NA); } else if (locator_type == 2) { ti_loc = proto_tree_add_item(t, hf_hip_tlv_locator_address, - tvb, newoffset + 20, 16, FALSE); + tvb, newoffset + 20, 16, ENC_NA); } else { /* unknown or malformed locator type jumping over it */ ti_loc = NULL; @@ -659,7 +659,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len /* Locator types 1 and 0 RFC 5206 section 4.2.*/ /* Locator */ proto_tree_add_item(ti_loc, hf_hip_tlv_locator_address, - tvb, newoffset, 16, FALSE); + tvb, newoffset, 16, ENC_NA); newoffset += 16; tlv_len -= 24; } else if (locator_type == 1) { @@ -670,7 +670,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len newoffset += 4; /* Locator */ proto_tree_add_item(ti_loc, hf_hip_tlv_locator_address, - tvb, newoffset, 16, FALSE); + tvb, newoffset, 16, ENC_NA); newoffset += 16; tlv_len -= 28; } else if (locator_type == 2) { @@ -703,7 +703,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len newoffset += 4; /* Locator */ proto_tree_add_item(ti_loc, hf_hip_tlv_locator_address, - tvb, newoffset, 16, FALSE); + tvb, newoffset, 16, ENC_NA); newoffset += 16; tlv_len -= 36; } @@ -1083,13 +1083,13 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len case PARAM_FROM: t = proto_item_add_subtree(ti, ett_hip_tlv_data); /* Address */ - proto_tree_add_item(t, hf_hip_tlv_from_address, tvb, newoffset, 16, FALSE); + proto_tree_add_item(t, hf_hip_tlv_from_address, tvb, newoffset, 16, ENC_NA); break; case PARAM_VIA_RVS: t = proto_item_add_subtree(ti, ett_hip_tlv_data); /* RVS Addresses */ while (tlv_len > 0) { - proto_tree_add_item(t, hf_hip_tlv_rvs_address, tvb, newoffset, 16, FALSE); + proto_tree_add_item(t, hf_hip_tlv_rvs_address, tvb, newoffset, 16, ENC_NA); tlv_len -= 16; newoffset += 16; } @@ -1106,7 +1106,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len proto_tree_add_item(t, hf_hip_tlv_relay_from_reserved, tvb, newoffset, 1, ENC_BIG_ENDIAN); newoffset += 1; /* Address */ - proto_tree_add_item(t, hf_hip_tlv_relay_to_address, tvb, newoffset, 16, FALSE); + proto_tree_add_item(t, hf_hip_tlv_relay_to_address, tvb, newoffset, 16, ENC_NA); break; case PARAM_RELAY_TO: t = proto_item_add_subtree(ti, ett_hip_tlv_data); @@ -1120,7 +1120,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len proto_tree_add_item(t, hf_hip_tlv_relay_to_reserved, tvb, newoffset, 1, ENC_BIG_ENDIAN); newoffset += 1; /* Address */ - proto_tree_add_item(t, hf_hip_tlv_relay_to_address, tvb, newoffset, 16, FALSE); + proto_tree_add_item(t, hf_hip_tlv_relay_to_address, tvb, newoffset, 16, ENC_NA); break; case PARAM_REG_FROM: t = proto_item_add_subtree(ti, ett_hip_tlv_data); @@ -1134,7 +1134,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len proto_tree_add_item(t, hf_hip_tlv_reg_from_reserved, tvb, newoffset, 1, ENC_BIG_ENDIAN); newoffset += 1; /* Address */ - proto_tree_add_item(t, hf_hip_tlv_reg_from_address, tvb, newoffset, 16, FALSE); + proto_tree_add_item(t, hf_hip_tlv_reg_from_address, tvb, newoffset, 16, ENC_NA); break; default: break; diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c index 7049e581ac..f95a03efc5 100644 --- a/epan/dissectors/packet-hsrp.c +++ b/epan/dissectors/packet-hsrp.c @@ -410,7 +410,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (tvb_strneql(tvb, offset, "cisco", strlen("cisco"))) == 0 ? "" : "Non-", auth_buf); offset += 8; - proto_tree_add_item(hsrp_tree, hf_hsrp_virt_ip_addr, tvb, offset, 4, FALSE); + proto_tree_add_item(hsrp_tree, hf_hsrp_virt_ip_addr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else if (opcode == 3) { proto_tree_add_item(hsrp_tree, hf_hsrp_adv_type, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -509,10 +509,10 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset+=4; if (ipver == 4) { /* Fetch Virtual IP as IPv4 */ - proto_tree_add_item(group_state_tlv, hf_hsrp2_virt_ip_addr, tvb, offset, 4, FALSE); + proto_tree_add_item(group_state_tlv, hf_hsrp2_virt_ip_addr, tvb, offset, 4, ENC_BIG_ENDIAN); } else if (ipver == 6) { /* Fetch Virtual IP as IPv6 */ - proto_tree_add_item(group_state_tlv, hf_hsrp2_virt_ip_addr_v6, tvb, offset, 16, FALSE); + proto_tree_add_item(group_state_tlv, hf_hsrp2_virt_ip_addr_v6, tvb, offset, 16, ENC_NA); } else { /* Unknown protocol */ next_tvb = tvb_new_subset_remaining(tvb, offset); @@ -582,7 +582,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; proto_tree_add_item(md5_auth_tlv, hf_hsrp2_md5_flags, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; - proto_tree_add_item(md5_auth_tlv, hf_hsrp2_md5_ip_address, tvb, offset, 4, FALSE); + proto_tree_add_item(md5_auth_tlv, hf_hsrp2_md5_ip_address, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; proto_tree_add_item(md5_auth_tlv, hf_hsrp2_md5_key_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; diff --git a/epan/dissectors/packet-hyperscsi.c b/epan/dissectors/packet-hyperscsi.c index ccd9ee62fc..b7f6294465 100644 --- a/epan/dissectors/packet-hyperscsi.c +++ b/epan/dissectors/packet-hyperscsi.c @@ -124,7 +124,7 @@ dissect_hyperscsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(hs_hdr_tree, hf_hs_res, tvb, 0, 1, hs_res); proto_tree_add_uint(hs_hdr_tree, hf_hs_tagno, tvb, 0, 2, hs_tagno); - proto_tree_add_item(hs_hdr_tree, hf_hs_lastfrag, tvb, 1, 1, FALSE); + proto_tree_add_item(hs_hdr_tree, hf_hs_lastfrag, tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(hs_hdr_tree, hf_hs_fragno, tvb, 1, 2, hs_fragno); } diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index d38daf2484..e8b42d1cdd 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -1240,21 +1240,21 @@ static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset, codec_tree = proto_item_add_subtree (ie_item, ett_iax2_codecs); - proto_tree_add_item(codec_tree, hf_iax2_cap_g723_1, tvb, offset + 2, ies_len, FALSE ); - proto_tree_add_item(codec_tree, hf_iax2_cap_gsm, tvb, offset + 2, ies_len, FALSE ); - proto_tree_add_item(codec_tree, hf_iax2_cap_ulaw, tvb, offset + 2, ies_len, FALSE ); - proto_tree_add_item(codec_tree, hf_iax2_cap_alaw, tvb, offset + 2, ies_len, FALSE ); - proto_tree_add_item(codec_tree, hf_iax2_cap_g726, tvb, offset + 2, ies_len, FALSE ); - proto_tree_add_item(codec_tree, hf_iax2_cap_adpcm, tvb, offset + 2, ies_len, FALSE ); - proto_tree_add_item(codec_tree, hf_iax2_cap_slinear, tvb, offset + 2, ies_len, FALSE ); + proto_tree_add_item(codec_tree, hf_iax2_cap_g723_1, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN ); + proto_tree_add_item(codec_tree, hf_iax2_cap_gsm, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN ); + proto_tree_add_item(codec_tree, hf_iax2_cap_ulaw, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN ); + proto_tree_add_item(codec_tree, hf_iax2_cap_alaw, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN ); + 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_g729a, tvb, offset + 2, ies_len, FALSE ); - proto_tree_add_item(codec_tree, hf_iax2_cap_speex, tvb, offset + 2, ies_len, FALSE ); - proto_tree_add_item(codec_tree, hf_iax2_cap_ilbc, tvb, offset + 2, ies_len, FALSE ); - proto_tree_add_item(codec_tree, hf_iax2_cap_jpeg, tvb, offset + 2, ies_len, FALSE ); - proto_tree_add_item(codec_tree, hf_iax2_cap_png, tvb, offset + 2, ies_len, FALSE ); - proto_tree_add_item(codec_tree, hf_iax2_cap_h261, tvb, offset + 2, ies_len, FALSE ); - proto_tree_add_item(codec_tree, hf_iax2_cap_h263, tvb, offset + 2, ies_len, FALSE ); + 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 ); + proto_tree_add_item(codec_tree, hf_iax2_cap_jpeg, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN ); + proto_tree_add_item(codec_tree, hf_iax2_cap_png, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN ); + proto_tree_add_item(codec_tree, hf_iax2_cap_h261, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN ); + proto_tree_add_item(codec_tree, hf_iax2_cap_h263, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN ); break; } @@ -1545,7 +1545,7 @@ dissect_fullpacket (tvbuff_t * tvb, guint32 offset, proto_tree_add_item (iax2_tree, hf_iax2_dcallno, tvb, offset, 2, ENC_BIG_ENDIAN ); - proto_tree_add_item(iax2_tree, hf_iax2_retransmission, tvb, offset, 2, FALSE ); + proto_tree_add_item(iax2_tree, hf_iax2_retransmission, tvb, offset, 2, ENC_BIG_ENDIAN ); if( iax_call ) { proto_item *item = @@ -1641,7 +1641,7 @@ dissect_fullpacket (tvbuff_t * tvb, guint32 offset, if( packet_type_tree ) { proto_item *item; proto_tree_add_item (packet_type_tree, hf_iax2_video_csub, tvb, offset+9, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (packet_type_tree, hf_iax2_marker, tvb, offset+9, 1, FALSE); + proto_tree_add_item (packet_type_tree, hf_iax2_marker, tvb, offset+9, 1, ENC_BIG_ENDIAN); item = proto_tree_add_uint (packet_type_tree, hf_iax2_video_codec, tvb, offset+9, 1, codec); PROTO_ITEM_SET_GENERATED(item); } diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index 1b1d3eccb7..ba7b248641 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -383,7 +383,7 @@ dissect_mip_extensions(tvbuff_t *tvb, int offset, proto_tree *tree) numCOAs = (length - 6) / 4; for (i=0; i<numCOAs; i++) { proto_tree_add_item(mip_tree, hf_icmp_mip_coa, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset+=4; } break; @@ -1012,7 +1012,7 @@ dissect_icmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ICMP_REDIRECT: - proto_tree_add_item(icmp_tree, hf_icmp_redir_gw, tvb, 4, 4, FALSE); + proto_tree_add_item(icmp_tree, hf_icmp_redir_gw, tvb, 4, 4, ENC_BIG_ENDIAN); break; } diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 698426fa74..04adadd24d 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -1379,7 +1379,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 4; /* Prefix */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_prefix, tvb, opt_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_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; @@ -1445,7 +1445,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 6; while(opt_offset < (offset + opt_len) ) { - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_ipv6_address, tvb, opt_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_ipv6_address, tvb, opt_offset, 16, ENC_NA); proto_item_append_text(ti, " %s", tvb_ip6_to_str(tvb, opt_offset)); opt_offset += 16; } @@ -1649,7 +1649,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 4; /* IPv6 Address */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_ipa_ipv6_address, tvb, opt_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_ipa_ipv6_address, 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; @@ -1673,7 +1673,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 4; /* Prefix */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_nrpi_prefix, tvb, opt_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_nrpi_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; @@ -1705,7 +1705,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 1; if(status == 2){ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_naack_supplied_ncoa, tvb, opt_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_naack_supplied_ncoa, tvb, opt_offset, 16, ENC_NA); opt_offset += 16; }else{ proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, opt_len - 4, ENC_NA); @@ -1736,7 +1736,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 4; /* Global Address */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_map_global_address, tvb, opt_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_map_global_address, tvb, opt_offset, 16, ENC_NA); opt_offset += 16; break; } @@ -1789,7 +1789,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 8; break; case 24: - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_prefix, tvb, opt_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_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; @@ -1825,7 +1825,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 4; while(opt_offset < (offset + opt_len) ) { - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_rdnss, tvb, opt_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_rdnss, tvb, opt_offset, 16, ENC_NA); proto_item_append_text(ti, " %s", tvb_ip6_to_str(tvb, opt_offset)); opt_offset += 16; @@ -2076,7 +2076,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 8; break; case 24: - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_6co_context_prefix, tvb, opt_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_6co_context_prefix, tvb, opt_offset, 16, ENC_NA); proto_item_append_text(ti, " %s/%d", tvb_ip6_to_str(tvb, opt_offset), context_len); opt_offset += 16; break; @@ -2100,7 +2100,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 4; /* 6LBR Address */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_abro_6lbr_address, tvb, opt_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_abro_6lbr_address, tvb, opt_offset, 16, ENC_NA); proto_item_append_text(ti, " : Version %d, 6LBR : %s", version, tvb_ip6_to_str(tvb, opt_offset)); opt_offset += 16; @@ -2224,7 +2224,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 8; break; case 22: - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_route_prefix, tvb, opt_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_route_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; @@ -2343,7 +2343,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree /* Option contains parent */ if(opt_len > 4) { - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_transit_parent, tvb, opt_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_transit_parent, tvb, opt_offset, 16, ENC_NA); proto_item_append_text(ti, " %s", tvb_ip6_to_str(tvb, opt_offset)); opt_offset += 16; } @@ -2367,7 +2367,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 1; /* DODAG ID */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_solicited_dodagid, tvb, opt_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_solicited_dodagid, tvb, opt_offset, 16, ENC_NA); opt_offset += 16; /* Version Number */ @@ -2422,7 +2422,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 4; /* Prefix */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_prefix, tvb, opt_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_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; @@ -2591,7 +2591,7 @@ dissect_rpl_control(tvbuff_t *tvb, int rpl_offset, packet_info *pinfo _U_, proto rpl_offset += 1; /* DODAGID */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_rpl_dio_dagid, tvb, rpl_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_rpl_dio_dagid, tvb, rpl_offset, 16, ENC_NA); rpl_offset += 16; /* RPL Options */ @@ -2627,7 +2627,7 @@ dissect_rpl_control(tvbuff_t *tvb, int rpl_offset, packet_info *pinfo _U_, proto /* DODAGID */ if(flags & RPL_DAO_FLAG_D) { - proto_tree_add_item(icmp6_tree, hf_icmpv6_rpl_dao_dodagid, tvb, rpl_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_rpl_dao_dodagid, tvb, rpl_offset, 16, ENC_NA); rpl_offset += 16; } /* Options */ @@ -2662,7 +2662,7 @@ dissect_rpl_control(tvbuff_t *tvb, int rpl_offset, packet_info *pinfo _U_, proto /* DODAGID */ if(flags & RPL_DAOACK_FLAG_D) { - proto_tree_add_item(icmp6_tree, hf_icmpv6_rpl_daoack_dodagid, tvb, rpl_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_rpl_daoack_dodagid, tvb, rpl_offset, 16, ENC_NA); rpl_offset += 16; } @@ -2688,7 +2688,7 @@ dissect_rpl_control(tvbuff_t *tvb, int rpl_offset, packet_info *pinfo _U_, proto rpl_offset += 2; /* DODAGID */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_rpl_cc_dodagid, tvb, rpl_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_rpl_cc_dodagid, tvb, rpl_offset, 16, ENC_NA); rpl_offset += 16; /* Destination Counter */ @@ -2741,7 +2741,7 @@ dissect_nodeinfo(tvbuff_t *tvb, int ni_offset, packet_info *pinfo _U_, proto_tre if(icmp6_type == ICMP6_NI_QUERY){ switch(icmp6_code){ case ICMP6_NI_SUBJ_IPV6: { - proto_tree_add_item(tree, hf_icmpv6_ni_query_subject_ipv6, tvb, ni_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_icmpv6_ni_query_subject_ipv6, tvb, ni_offset, 16, ENC_NA); ni_offset += 16; break; } @@ -2791,7 +2791,7 @@ dissect_nodeinfo(tvbuff_t *tvb, int ni_offset, packet_info *pinfo _U_, proto_tre proto_tree_add_item(tree, hf_icmpv6_ni_reply_node_ttl, tvb, ni_offset, 4, ENC_BIG_ENDIAN); ni_offset += 4; /* Node Addresses */ - proto_tree_add_item(tree, hf_icmpv6_ni_reply_node_address, tvb, ni_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_icmpv6_ni_reply_node_address, tvb, ni_offset, 16, ENC_NA); ni_offset += 16; } break; @@ -2891,7 +2891,7 @@ dissect_rrenum(tvbuff_t *tvb, int rr_offset, packet_info *pinfo _U_, proto_tree rr_offset += 2; /* Match Prefix */ - proto_tree_add_item(mp_tree, hf_icmpv6_rr_pco_mp_matchprefix, tvb, rr_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(mp_tree, hf_icmpv6_rr_pco_mp_matchprefix, tvb, rr_offset, 16, ENC_NA); rr_offset += 16; /* Add Info (Prefix, Length...) to Match Prefix Part label */ @@ -2961,7 +2961,7 @@ dissect_rrenum(tvbuff_t *tvb, int rr_offset, packet_info *pinfo _U_, proto_tree rr_offset += 4; /* UsePrefix */ - proto_tree_add_item(up_tree, hf_icmpv6_rr_pco_up_useprefix, tvb, rr_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(up_tree, hf_icmpv6_rr_pco_up_useprefix, tvb, rr_offset, 16, ENC_NA); rr_offset += 16; /* Add Info (Prefix, Length...) to Use Prefix Part label */ @@ -3000,7 +3000,7 @@ dissect_rrenum(tvbuff_t *tvb, int rr_offset, packet_info *pinfo _U_, proto_tree rr_offset +=4; /* MatchedPrefix */ - proto_tree_add_item(rm_tree, hf_icmpv6_rr_rm_matchedprefix, tvb, rr_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(rm_tree, hf_icmpv6_rr_rm_matchedprefix, tvb, rr_offset, 16, ENC_NA); rr_offset +=16; /* Add Info (Prefix, Length...) to Use Resultat Message label */ @@ -3052,13 +3052,13 @@ dissect_mldrv2( tvbuff_t *tvb, guint32 offset, packet_info *pinfo _U_, proto_tre mldr_offset += 2; /* Multicast Address */ - proto_tree_add_item(mar_tree, hf_icmpv6_mldr_mar_multicast_address, tvb, mldr_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(mar_tree, hf_icmpv6_mldr_mar_multicast_address, tvb, mldr_offset, 16, ENC_NA); tvb_get_ipv6(tvb, mldr_offset, &multicast_address); mldr_offset += 16; /* Source Address */ for (i=1; i <= nb_sources; i++){ - proto_tree_add_item(mar_tree, hf_icmpv6_mldr_mar_source_address, tvb, mldr_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(mar_tree, hf_icmpv6_mldr_mar_source_address, tvb, mldr_offset, 16, ENC_NA); mldr_offset += 16; } @@ -3300,7 +3300,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; /* Multicast Address */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_mld_multicast_address, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_mld_multicast_address, tvb, offset, 16, ENC_NA); offset += 16; /* Flag */ @@ -3326,7 +3326,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Source Address */ for (i=1; i <= nb_sources; i++){ - proto_tree_add_item(icmp6_tree, hf_icmpv6_mld_source_address, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_mld_source_address, tvb, offset, 16, ENC_NA); offset += 16; } @@ -3340,7 +3340,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; /* Multicast Address */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_mld_multicast_address, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_mld_multicast_address, tvb, offset, 16, ENC_NA); offset += 16; } break; @@ -3397,7 +3397,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 4; /* Target Address */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_nd_ns_target_address, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_nd_ns_target_address, tvb, offset, 16, ENC_NA); col_append_fstr(pinfo->cinfo, COL_INFO, " for %s", tvb_ip6_to_str(tvb, offset)); offset += 16; @@ -3422,7 +3422,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 4; /* Target Address */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_nd_na_target_address, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_nd_na_target_address, tvb, offset, 16, ENC_NA); if (na_flags & ND_NA_FLAG_R) { @@ -3454,11 +3454,11 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 4; /* Target Address */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_nd_rd_target_address, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_nd_rd_target_address, tvb, offset, 16, ENC_NA); offset += 16; /* Destination Address */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_nd_rd_destination_address, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_nd_rd_destination_address, tvb, offset, 16, ENC_NA); offset += 16; /* Show options */ @@ -3517,7 +3517,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Show all Home Agent Addresses */ while((int)length > offset) { - proto_tree_add_item(icmp6_tree, hf_icmpv6_mip6_home_agent_address, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_mip6_home_agent_address, tvb, offset, 16, ENC_NA); offset += 16; } break; diff --git a/epan/dissectors/packet-ieee1722.c b/epan/dissectors/packet-ieee1722.c index 3346f18819..a46fbe0844 100644 --- a/epan/dissectors/packet-ieee1722.c +++ b/epan/dissectors/packet-ieee1722.c @@ -140,21 +140,21 @@ static void dissect_1722(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * CD field is 1 bit * Subtype field is 7 bits */ - proto_tree_add_item(ieee1722_tree, hf_1722_cdfield, tvb, IEEE_1722_CD_OFFSET, 1, FALSE); + proto_tree_add_item(ieee1722_tree, hf_1722_cdfield, tvb, IEEE_1722_CD_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_subtype, tvb, IEEE_1722_CD_OFFSET, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(ieee1722_tree, hf_1722_svfield, tvb, IEEE_1722_VERSION_OFFSET, 1, FALSE); + proto_tree_add_item(ieee1722_tree, hf_1722_svfield, tvb, IEEE_1722_VERSION_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_verfield, tvb, IEEE_1722_VERSION_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_mrfield, tvb, IEEE_1722_VERSION_OFFSET, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(ieee1722_tree, hf_1722_gvfield, tvb, IEEE_1722_VERSION_OFFSET, 1, FALSE); - proto_tree_add_item(ieee1722_tree, hf_1722_tvfield, tvb, IEEE_1722_VERSION_OFFSET, 1, FALSE); + proto_tree_add_item(ieee1722_tree, hf_1722_gvfield, tvb, IEEE_1722_VERSION_OFFSET, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ieee1722_tree, hf_1722_tvfield, tvb, IEEE_1722_VERSION_OFFSET, 1, ENC_BIG_ENDIAN); /* Add the rest of the packet fields */ proto_tree_add_item(ieee1722_tree, hf_1722_seqnum, tvb, IEEE_1722_SEQ_NUM_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_tufield, tvb, - IEEE_1722_TU_FIELD_OFFSET, 1, FALSE); + IEEE_1722_TU_FIELD_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_stream_id, tvb, IEEE_1722_STREAM_ID_OFFSET, 8, ENC_BIG_ENDIAN); @@ -189,7 +189,7 @@ static void dissect_1722(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ieee1722_tree, hf_1722_qpc, tvb, IEEE_1722_FN_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_sph, tvb, - IEEE_1722_FN_OFFSET, 1, FALSE); + IEEE_1722_FN_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_dbc, tvb, IEEE_1722_DBC_OFFSET, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index dc1538ec3f..c3f4fdf888 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -7022,7 +7022,7 @@ dissect_wsie_ie(proto_tree * tree, tvbuff_t * tvb, int offset, guint32 tag_len _ local_offset += 1; } if (pst_contents & WAVE_IPV6ADDR) { - proto_tree_add_item(cap_tree, hf_ieee80211_pst_ipv6addr, tvb, local_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_pst_ipv6addr, tvb, local_offset, 16, ENC_NA); local_offset += 16; proto_tree_add_item(cap_tree, hf_ieee80211_pst_serviceport, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; @@ -8110,9 +8110,9 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off } else if (version == 6) { - proto_tree_add_item(tree, hf_ieee80211_tclas_ipv6_src, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ieee80211_tclas_ipv6_src, tvb, offset, 16, ENC_NA); offset += 16; - proto_tree_add_item(tree, hf_ieee80211_tclas_ipv6_dst, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ieee80211_tclas_ipv6_dst, tvb, offset, 16, ENC_NA); offset += 16; proto_tree_add_item(tree, hf_ieee80211_tclas_src_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; diff --git a/epan/dissectors/packet-igap.c b/epan/dissectors/packet-igap.c index bf0662c6d2..f354420c70 100644 --- a/epan/dissectors/packet-igap.c +++ b/epan/dissectors/packet-igap.c @@ -165,7 +165,7 @@ dissect_igap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int off igmp_checksum(tree, tvb, hf_checksum, hf_checksum_bad, pinfo, 0); offset += 2; - proto_tree_add_item(tree, hf_maddr, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_maddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_uint(tree, hf_version, tvb, offset, 1, diff --git a/epan/dissectors/packet-image-png.c b/epan/dissectors/packet-image-png.c index b060d7298c..ad61f44b47 100644 --- a/epan/dissectors/packet-image-png.c +++ b/epan/dissectors/packet-image-png.c @@ -268,9 +268,9 @@ dissect_png(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) it=proto_tree_add_item(chunk_tree, hf_png_chunk_type, tvb, offset, 4, FALSE); - proto_tree_add_item(chunk_tree, hf_png_chunk_flag_anc, tvb, offset, 4, FALSE); - proto_tree_add_item(chunk_tree, hf_png_chunk_flag_priv, tvb, offset, 4, FALSE); - proto_tree_add_item(chunk_tree, hf_png_chunk_flag_stc, tvb, offset, 4, FALSE); + proto_tree_add_item(chunk_tree, hf_png_chunk_flag_anc, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(chunk_tree, hf_png_chunk_flag_priv, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(chunk_tree, hf_png_chunk_flag_stc, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; if (len >= 1000000000) diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index d64bee17dd..a1a6dbaa6d 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -1749,7 +1749,7 @@ skip_lrh: proto_tree_add_item(global_route_header_tree, hf_infiniband_next_header, tvb, offset, 1, ENC_BIG_ENDIAN); offset +=1; proto_tree_add_item(global_route_header_tree, hf_infiniband_hop_limit, tvb, offset, 1, ENC_BIG_ENDIAN); offset +=1; - proto_tree_add_item(global_route_header_tree, hf_infiniband_source_gid, tvb, offset, 16, FALSE); + proto_tree_add_item(global_route_header_tree, hf_infiniband_source_gid, tvb, offset, 16, ENC_NA); tvb_get_ipv6(tvb, offset, &SRCgid); @@ -1759,7 +1759,7 @@ skip_lrh: offset += 16; - proto_tree_add_item(global_route_header_tree, hf_infiniband_destination_gid, tvb, offset, 16, FALSE); + proto_tree_add_item(global_route_header_tree, hf_infiniband_destination_gid, tvb, offset, 16, ENC_NA); tvb_get_ipv6(tvb, offset, &DSTgid); @@ -1788,15 +1788,15 @@ skip_lrh: col_append_str(pinfo->cinfo, COL_INFO, val_to_str((guint32)opCode, OpCodeMap, "Unknown OpCode")); offset +=1; - proto_tree_add_item(base_transport_header_tree, hf_infiniband_solicited_event, tvb, offset, 1, FALSE); - proto_tree_add_item(base_transport_header_tree, hf_infiniband_migreq, tvb, offset, 1, FALSE); + proto_tree_add_item(base_transport_header_tree, hf_infiniband_solicited_event, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(base_transport_header_tree, hf_infiniband_migreq, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(base_transport_header_tree, hf_infiniband_pad_count, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(base_transport_header_tree, hf_infiniband_transport_header_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset +=1; proto_tree_add_item(base_transport_header_tree, hf_infiniband_partition_key, tvb, offset, 2, ENC_BIG_ENDIAN); offset +=2; proto_tree_add_item(base_transport_header_tree, hf_infiniband_reserved8, tvb, offset, 1, ENC_BIG_ENDIAN); offset +=1; proto_tree_add_item(base_transport_header_tree, hf_infiniband_destination_qp, tvb, offset, 3, ENC_BIG_ENDIAN); pinfo->destport = tvb_get_ntoh24(tvb, offset); offset +=3; - proto_tree_add_item(base_transport_header_tree, hf_infiniband_acknowledge_request, tvb, offset, 1, FALSE); + proto_tree_add_item(base_transport_header_tree, hf_infiniband_acknowledge_request, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(base_transport_header_tree, hf_infiniband_reserved7, tvb, offset, 1, ENC_BIG_ENDIAN); offset +=1; proto_tree_add_item(base_transport_header_tree, hf_infiniband_packet_sequence_number, tvb, offset, 3, ENC_BIG_ENDIAN); offset +=3; @@ -2740,12 +2740,12 @@ static gboolean parse_EoIB(proto_tree *tree, tvbuff_t *tvb, gint offset, packet_ proto_tree_add_item(header_subtree, hf_infiniband_ver, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(header_subtree, hf_infiniband_tcp_chk, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(header_subtree, hf_infiniband_ip_chk, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(header_subtree, hf_infiniband_fcs, tvb, offset, 2, FALSE); + proto_tree_add_item(header_subtree, hf_infiniband_fcs, tvb, offset, 2, ENC_BIG_ENDIAN); ms = tvb_get_bits8(tvb, (offset + 1)*8 + 2, 1); seg_offset = tvb_get_bits8(tvb, (offset + 1)*8 + 3, 5); - proto_tree_add_item(header_subtree, hf_infiniband_ms, tvb, offset, 2, FALSE); + proto_tree_add_item(header_subtree, hf_infiniband_ms, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(header_subtree, hf_infiniband_seg_off, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(header_subtree, hf_infiniband_seg_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -3049,9 +3049,9 @@ static void parse_COM_MGT(proto_tree *parentTree, packet_info *pinfo, tvbuff_t * local_lid = tvb_get_ntohs(tvb, local_offset); local_offset += 2; proto_tree_add_item(CM_header_tree, hf_cm_req_primary_remote_lid, tvb, local_offset, 2, ENC_BIG_ENDIAN); remote_lid = tvb_get_ntohs(tvb, local_offset); local_offset += 2; - proto_tree_add_item(CM_header_tree, hf_cm_req_primary_local_gid, tvb, local_offset, 16, FALSE); + proto_tree_add_item(CM_header_tree, hf_cm_req_primary_local_gid, tvb, local_offset, 16, ENC_NA); tvb_get_ipv6(tvb, local_offset, (struct e_in6_addr*)local_gid); local_offset += 16; - proto_tree_add_item(CM_header_tree, hf_cm_req_primary_remote_gid, tvb, local_offset, 16, FALSE); + proto_tree_add_item(CM_header_tree, hf_cm_req_primary_remote_gid, tvb, local_offset, 16, ENC_NA); tvb_get_ipv6(tvb, local_offset, (struct e_in6_addr*)remote_gid); local_offset += 16; proto_tree_add_item(CM_header_tree, hf_cm_req_primary_flow_label, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; local_offset += 1; /* skip reserved */ @@ -3682,22 +3682,22 @@ static void parse_NoticeDataDetails(proto_tree* parentTree, tvbuff_t* tvb, gint case 64: proto_item_set_text(DataDetails_header_item, "%s", "Trap 64 DataDetails"); local_offset +=6; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR, tvb, local_offset, 16, FALSE); local_offset+=16; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR, tvb, local_offset, 16, ENC_NA); local_offset+=16; break; case 65: proto_item_set_text(DataDetails_header_item, "%s", "Trap 65 DataDetails"); local_offset +=6; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR, tvb, local_offset, 16, FALSE); local_offset+=16; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR, tvb, local_offset, 16, ENC_NA); local_offset+=16; break; case 66: proto_item_set_text(DataDetails_header_item, "%s", "Trap 66 DataDetails"); local_offset +=6; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR, tvb, local_offset, 16, FALSE); local_offset+=16; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR, tvb, local_offset, 16, ENC_NA); local_offset+=16; break; case 67: proto_item_set_text(DataDetails_header_item, "%s", "Trap 67 DataDetails"); local_offset +=6; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR, tvb, local_offset, 16, FALSE); local_offset+=16; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR, tvb, local_offset, 16, ENC_NA); local_offset+=16; break; case 68: proto_item_set_text(DataDetails_header_item, "%s", "Trap 68 DataDetails"); @@ -3776,8 +3776,8 @@ static void parse_NoticeDataDetails(proto_tree* parentTree, tvbuff_t* tvb, gint proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP1, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; local_offset +=1; proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP2, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR1, tvb, local_offset, 16, FALSE); local_offset+=16; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR2, tvb, local_offset, 16, FALSE); local_offset+=16; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR1, tvb, local_offset, 16, ENC_NA); local_offset+=16; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR2, tvb, local_offset, 16, ENC_NA); local_offset+=16; break; case 258: proto_item_set_text(DataDetails_header_item, "%s", "Trap 258 DataDetails"); @@ -3789,12 +3789,12 @@ static void parse_NoticeDataDetails(proto_tree* parentTree, tvbuff_t* tvb, gint proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP1, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; local_offset +=1; proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP2, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR1, tvb, local_offset, 16, FALSE); local_offset+=16; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR2, tvb, local_offset, 16, FALSE); local_offset+=16; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR1, tvb, local_offset, 16, ENC_NA); local_offset+=16; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR2, tvb, local_offset, 16, ENC_NA); local_offset+=16; break; case 259: proto_item_set_text(DataDetails_header_item, "%s", "Trap 259 DataDetails"); - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DataValid, tvb, local_offset, 2, FALSE); local_offset+=2; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DataValid, tvb, local_offset, 2, ENC_NA); local_offset+=2; proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR1, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR2, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_PKEY, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; @@ -3802,9 +3802,9 @@ static void parse_NoticeDataDetails(proto_tree* parentTree, tvbuff_t* tvb, gint proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP1, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; local_offset +=1; proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP2, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR1, tvb, local_offset, 16, FALSE); local_offset+=16; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR2, tvb, local_offset, 16, FALSE); local_offset+=16; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_SWLIDADDR, tvb, local_offset, 2, FALSE); local_offset+=2; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR1, tvb, local_offset, 16, ENC_NA); local_offset+=16; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR2, tvb, local_offset, 16, ENC_NA); local_offset+=16; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_SWLIDADDR, tvb, local_offset, 2, ENC_NA); local_offset+=2; proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_PORTNO, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; break; default: @@ -3845,7 +3845,7 @@ static void parse_NoticesAndTraps(proto_tree* parentTree, tvbuff_t* tvb, gint *o proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_DataDetails, tvb, local_offset, 54, ENC_NA); local_offset+=54; /* Only Defined For GMPs not SMPs which is not part of this dissector phase - *proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_IssuerGID, tvb, local_offset, 16, FALSE); local_offset+=16; + *proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_IssuerGID, tvb, local_offset, 16, ENC_NA); local_offset+=16; *proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_ClassTrapSpecificData, tvb, local_offset, 1, ENC_NA); local_offset+=1; */ } @@ -4541,7 +4541,7 @@ static void parse_RID(proto_tree* SA_header_tree, tvbuff_t* tvb, gint *offset, M break; case 0x00F3: /* InformInfoRecord */ - proto_tree_add_item(SA_header_tree, hf_infiniband_InformInfoRecord_SubscriberGID, tvb, local_offset, 16, FALSE); local_offset+=16; + proto_tree_add_item(SA_header_tree, hf_infiniband_InformInfoRecord_SubscriberGID, tvb, local_offset, 16, ENC_NA); local_offset+=16; proto_tree_add_item(SA_header_tree, hf_infiniband_InformInfoRecord_Enum, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; local_offset+=6; /* Reserved bits */ break; @@ -4553,14 +4553,14 @@ static void parse_RID(proto_tree* SA_header_tree, tvbuff_t* tvb, gint *offset, M case 0x0031: /* ServiceRecord */ proto_tree_add_item(SA_header_tree, hf_infiniband_ServiceRecord_ServiceID, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset+=8; - proto_tree_add_item(SA_header_tree, hf_infiniband_ServiceRecord_ServiceGID, tvb, local_offset, 16, FALSE); local_offset+=16; + proto_tree_add_item(SA_header_tree, hf_infiniband_ServiceRecord_ServiceGID, tvb, local_offset, 16, ENC_NA); local_offset+=16; proto_tree_add_item(SA_header_tree, hf_infiniband_ServiceRecord_ServiceP_Key, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; local_offset+=2; break; case 0x0038: /* MCMemberRecord */ - proto_tree_add_item(SA_header_tree, hf_infiniband_MCMemberRecord_MGID, tvb, local_offset, 16, FALSE); local_offset+=16; - proto_tree_add_item(SA_header_tree, hf_infiniband_MCMemberRecord_PortGID, tvb, local_offset, 16, FALSE); local_offset+=16; + proto_tree_add_item(SA_header_tree, hf_infiniband_MCMemberRecord_MGID, tvb, local_offset, 16, ENC_NA); local_offset+=16; + proto_tree_add_item(SA_header_tree, hf_infiniband_MCMemberRecord_PortGID, tvb, local_offset, 16, ENC_NA); local_offset+=16; break; case 0x0030: /* GuidInfoRecord */ @@ -4593,7 +4593,7 @@ static void parse_InformInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset proto_item_set_text(InformInfo_header_item, "%s", "InformInfo"); InformInfo_header_tree = proto_item_add_subtree(InformInfo_header_item, ett_informinfo); - proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_GID, tvb, local_offset, 16, FALSE); local_offset+=16; + proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_GID, tvb, local_offset, 16, ENC_NA); local_offset+=16; proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_LIDRangeBegin, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_LIDRangeEnd, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; local_offset+=2; /* Reserved Bits */ @@ -4687,8 +4687,8 @@ static void parse_PathRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *offset PathRecord_header_tree = proto_item_add_subtree(PathRecord_header_item, ett_pathrecord); local_offset += 8; /* Reserved Bits */ - proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_DGID, tvb, local_offset, 16, FALSE); local_offset+=16; - proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_SGID, tvb, local_offset, 16, FALSE); local_offset+=16; + proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_DGID, tvb, local_offset, 16, ENC_NA); local_offset+=16; + proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_SGID, tvb, local_offset, 16, ENC_NA); local_offset+=16; proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_DLID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_SLID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_RawTraffic, tvb, local_offset, 1, ENC_BIG_ENDIAN); @@ -4826,12 +4826,12 @@ static void parse_MultiPathRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *o for(i = 0; i < SDGIDCount; i++) { - SDGID = proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_SDGID, tvb, local_offset, 16, FALSE); local_offset+=16; + SDGID = proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_SDGID, tvb, local_offset, 16, ENC_NA); local_offset+=16; proto_item_set_text(SDGID, "(%s%u)","SGID", i); } for(i = 0; i < DGIDCount; i++) { - SDGID = proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_SDGID, tvb, local_offset, 16, FALSE); local_offset+=16; + SDGID = proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_SDGID, tvb, local_offset, 16, ENC_NA); local_offset+=16; proto_item_set_text(SDGID, "(%s%u)","DGID", i); } } diff --git a/epan/dissectors/packet-infiniband_sdp.c b/epan/dissectors/packet-infiniband_sdp.c index 4c6ebd8332..fd9367291d 100644 --- a/epan/dissectors/packet-infiniband_sdp.c +++ b/epan/dissectors/packet-infiniband_sdp.c @@ -271,8 +271,8 @@ manual_override: proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_localrcvsz, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_localport, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; local_offset += 2; /* skip reserved */ - proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_src_ip, tvb, local_offset, 16, FALSE); local_offset += 16; - proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_dst_ip, tvb, local_offset, 16, FALSE); local_offset += 16; + proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_src_ip, tvb, local_offset, 16, ENC_NA); local_offset += 16; + proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_dst_ip, tvb, local_offset, 16, ENC_NA); local_offset += 16; local_offset += 2; /* skip reserved */ proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_extmaxadverts, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; break; diff --git a/epan/dissectors/packet-ipmi-chassis.c b/epan/dissectors/packet-ipmi-chassis.c index 1137e25b73..280c7d821e 100644 --- a/epan/dissectors/packet-ipmi-chassis.c +++ b/epan/dissectors/packet-ipmi-chassis.c @@ -590,7 +590,7 @@ rq08(tvbuff_t *tvb, proto_tree *tree) "Boot option parameter selector: %s (0x%02x)", desc, pno); s_tree = proto_item_add_subtree(ti, ett_ipmi_chs_08_byte1); - proto_tree_add_item(s_tree, hf_ipmi_chs_08_valid, tvb, 0, 1, TRUE); + proto_tree_add_item(s_tree, hf_ipmi_chs_08_valid, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_uint_format(s_tree, hf_ipmi_chs_08_selector, tvb, 0, 1, pno, "%sBoot option parameter selector: %s (0x%02x)", ipmi_dcd8(pno, 0x7f), desc, pno); @@ -672,7 +672,7 @@ rs09(tvbuff_t *tvb, proto_tree *tree) "Boot option parameter selector: %s (0x%02x)", desc, pno); s_tree = proto_item_add_subtree(ti, ett_ipmi_chs_09_rs_byte2); - proto_tree_add_item(s_tree, hf_ipmi_chs_09_rs_valid, tvb, 1, 1, TRUE); + proto_tree_add_item(s_tree, hf_ipmi_chs_09_rs_valid, tvb, 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_uint_format(s_tree, hf_ipmi_chs_09_rs_param_select, tvb, 1, 1, pno, "%sBoot option parameter selector: %s (0x%02x)", ipmi_dcd8(pno, 0x7f), desc, pno); diff --git a/epan/dissectors/packet-ipmi-picmg.c b/epan/dissectors/packet-ipmi-picmg.c index 35db7492e1..b7b39d6086 100644 --- a/epan/dissectors/packet-ipmi-picmg.c +++ b/epan/dissectors/packet-ipmi-picmg.c @@ -1227,7 +1227,7 @@ rs21(tvbuff_t *tvb, proto_tree *tree) addrtype = tvb_get_guint8(tvb, 8) & 0x7f; if (addrtype == 0x01) { /* IP address and RMCP port are in network byte order! */ - proto_tree_add_item(tree, hf_ipmi_picmg_21_ipaddr, tvb, 9, 4, FALSE); + proto_tree_add_item(tree, hf_ipmi_picmg_21_ipaddr, tvb, 9, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_ipmi_picmg_21_rmcpport, tvb, 13, 2, ENC_BIG_ENDIAN); }; } diff --git a/epan/dissectors/packet-ipmi-se.c b/epan/dissectors/packet-ipmi-se.c index e7f0737631..e364e49c74 100644 --- a/epan/dissectors/packet-ipmi-se.c +++ b/epan/dissectors/packet-ipmi-se.c @@ -1805,7 +1805,7 @@ parse_platform_event(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ipmi_se_evt_sensor_num, tvb, 2, 1, TRUE); 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, TRUE); + proto_tree_add_item(s_tree, hf_ipmi_se_evt_dir, tvb, 3, 1, ENC_LITTLE_ENDIAN); proto_tree_add_uint_format(s_tree, hf_ipmi_se_evt_type, tvb, 3, 1, evtype, "%sEvent/Reading type: %s (0x%02x)", ipmi_dcd8(evtype, 0x7f), eti->desc, evtype); @@ -1922,21 +1922,21 @@ cfgparam_00(tvbuff_t *tvb, proto_tree *tree) static void cfgparam_01(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_cp01_alert_startup, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_cp01_startup, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_cp01_event_msg, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_cp01_pef, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_cp01_alert_startup, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_cp01_startup, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_cp01_event_msg, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_cp01_pef, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void cfgparam_02(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_cp02_diag_intr, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_cp02_oem_action, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_cp02_pwr_cycle, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_cp02_reset, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_cp02_pwr_down, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_cp02_alert, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_cp02_diag_intr, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_cp02_oem_action, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_cp02_pwr_cycle, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_cp02_reset, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_cp02_pwr_down, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_cp02_alert, tvb, 0, 1, ENC_LITTLE_ENDIAN); } @@ -2321,7 +2321,7 @@ rq13(tvbuff_t *tvb, proto_tree *tree) ti = proto_tree_add_uint_format(tree, hf_ipmi_se_13_byte1, tvb, 0, 1, pno, "Parameter selector: %s (0x%02x)", desc, pno); s_tree = proto_item_add_subtree(ti, ett_ipmi_se_13_byte1); - proto_tree_add_item(s_tree, hf_ipmi_se_13_getrev, tvb, 0, 1, TRUE); + proto_tree_add_item(s_tree, hf_ipmi_se_13_getrev, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_uint_format(s_tree, hf_ipmi_se_13_param, tvb, 0, 1, pno, "%sParameter selector: %s (0x%02x)", ipmi_dcd8(pno, 0x7f), desc, pno); diff --git a/epan/dissectors/packet-ipmi-session.c b/epan/dissectors/packet-ipmi-session.c index 8ad23c7d43..58c1fddc84 100644 --- a/epan/dissectors/packet-ipmi-session.c +++ b/epan/dissectors/packet-ipmi-session.c @@ -195,8 +195,8 @@ dissect_ipmi_session(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) payloadtype_enc ? "" : "not ", payloadtype_auth ? "" : "not "); s_tree = proto_item_add_subtree(ti, ett_ipmi_session_payloadtype); - proto_tree_add_item(s_tree, hf_ipmi_session_payloadtype_enc, tvb, offset, 1, TRUE); - proto_tree_add_item(s_tree, hf_ipmi_session_payloadtype_auth, tvb, offset, 1, TRUE); + proto_tree_add_item(s_tree, hf_ipmi_session_payloadtype_enc, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(s_tree, hf_ipmi_session_payloadtype_auth, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(s_tree, hf_ipmi_session_payloadtype, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; diff --git a/epan/dissectors/packet-ipmi-transport.c b/epan/dissectors/packet-ipmi-transport.c index 4de53b9c7f..cc6b512d2e 100644 --- a/epan/dissectors/packet-ipmi-transport.c +++ b/epan/dissectors/packet-ipmi-transport.c @@ -745,7 +745,7 @@ lan_serial_02(tvbuff_t *tvb, proto_tree *tree) static void lan_03(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_lan03_ip, tvb, 0, 4, FALSE); + proto_tree_add_item(tree, hf_ipmi_trn_lan03_ip, tvb, 0, 4, ENC_BIG_ENDIAN); } static void @@ -766,7 +766,7 @@ lan_05(tvbuff_t *tvb, proto_tree *tree) static void lan_06(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_lan06_subnet, tvb, 0, 4, FALSE); + proto_tree_add_item(tree, hf_ipmi_trn_lan06_subnet, tvb, 0, 4, ENC_BIG_ENDIAN); } static void @@ -809,7 +809,7 @@ lan_11(tvbuff_t *tvb, proto_tree *tree) static void lan_12(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_lan12_def_gw_ip, tvb, 0, 4, FALSE); + proto_tree_add_item(tree, hf_ipmi_trn_lan12_def_gw_ip, tvb, 0, 4, ENC_BIG_ENDIAN); } static void @@ -821,7 +821,7 @@ lan_13(tvbuff_t *tvb, proto_tree *tree) static void lan_14(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_lan14_bkp_gw_ip, tvb, 0, 4, FALSE); + proto_tree_add_item(tree, hf_ipmi_trn_lan14_bkp_gw_ip, tvb, 0, 4, ENC_BIG_ENDIAN); } static void @@ -871,7 +871,7 @@ lan_19(tvbuff_t *tvb, proto_tree *tree) if (v == 0) { proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_trn_lan19_byte3, byte3, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_trn_lan19_ip, tvb, 3, 4, FALSE); + proto_tree_add_item(tree, hf_ipmi_trn_lan19_ip, tvb, 3, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_lan19_mac, tvb, 7, 6, FALSE); return; } @@ -1418,7 +1418,7 @@ serial_23(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_serial23_byte1, byte1, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_trn_serial23_ipaddr, tvb, 1, 4, FALSE); + proto_tree_add_item(tree, hf_ipmi_trn_serial23_ipaddr, tvb, 1, 4, ENC_BIG_ENDIAN); } static void @@ -1573,7 +1573,7 @@ static void serial_39(tvbuff_t *tvb, proto_tree *tree) { proto_tree_add_item(tree, hf_ipmi_trn_serial39_acct_sel, tvb, 0, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_ipmi_trn_serial39_ipaddr, tvb, 1, 4, FALSE); + proto_tree_add_item(tree, hf_ipmi_trn_serial39_ipaddr, tvb, 1, 4, ENC_BIG_ENDIAN); } static void @@ -1635,8 +1635,8 @@ serial_44(tvbuff_t *tvb, proto_tree *tree) static void serial_45(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial45_src_ipaddr, tvb, 0, 4, FALSE); - proto_tree_add_item(tree, hf_ipmi_trn_serial45_dst_ipaddr, tvb, 4, 4, FALSE); + proto_tree_add_item(tree, hf_ipmi_trn_serial45_src_ipaddr, tvb, 0, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_serial45_dst_ipaddr, tvb, 4, 4, ENC_BIG_ENDIAN); } static void @@ -1654,7 +1654,7 @@ serial_47(tvbuff_t *tvb, proto_tree *tree) static void serial_48(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial48_ipaddr, tvb, 0, 4, FALSE); + proto_tree_add_item(tree, hf_ipmi_trn_serial48_ipaddr, tvb, 0, 4, ENC_BIG_ENDIAN); } static void @@ -1983,8 +1983,8 @@ rq16(tvbuff_t *tvb, proto_tree *tree) ett_ipmi_trn_16_byte1, byte1, TRUE, 0); proto_tree_add_item(tree, hf_ipmi_trn_16_src_port, tvb, 1, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_16_dst_port, tvb, 3, 2, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_ipmi_trn_16_src_addr, tvb, 5, 4, FALSE); - proto_tree_add_item(tree, hf_ipmi_trn_16_dst_addr, tvb, 9, 4, FALSE); + proto_tree_add_item(tree, hf_ipmi_trn_16_src_addr, tvb, 5, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_16_dst_addr, tvb, 9, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_16_bytes, tvb, 13, 2, ENC_LITTLE_ENDIAN); } diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index d178de764d..84570660b5 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -618,7 +618,7 @@ dissect_routing6(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info *pinfo proto_tree_add_item(rthdr_tree, hf_ipv6_routing_hdr_addr, tvb, offset + offsetof(struct ip6_rthdr0, ip6r0_addr) + n * sizeof(struct e_in6_addr), - sizeof(struct e_in6_addr), FALSE); + sizeof(struct e_in6_addr), ENC_NA); if (seg_left) SET_ADDRESS(&pinfo->dst, AT_IPv6, 16, tvb_get_ptr(tvb, offset + offsetof(struct ip6_rthdr0, ip6r0_addr) @@ -627,7 +627,7 @@ dissect_routing6(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info *pinfo } if (rt.ip6r_type == IPv6_RT_HEADER_MobileIP) { proto_tree_add_item(rthdr_tree, hf_ipv6_mipv6_home_address, tvb, - offset + 8, 16, FALSE); + offset + 8, 16, ENC_NA); SET_ADDRESS(&pinfo->dst, AT_IPv6, 16, tvb_get_ptr(tvb, offset + 8, 16)); } if (rt.ip6r_type == IPv6_RT_HEADER_RPL) { @@ -742,7 +742,7 @@ dissect_frag6(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, offset + offsetof(struct ip6_frag, ip6f_offlg), 2, ENC_BIG_ENDIAN); proto_tree_add_item(rthdr_tree, hf_ipv6_frag_more, tvb, - offset + offsetof(struct ip6_frag, ip6f_offlg), 2, FALSE); + offset + offsetof(struct ip6_frag, ip6f_offlg), 2, ENC_BIG_ENDIAN); proto_tree_add_item(rthdr_tree, hf_ipv6_frag_id, tvb, offset + offsetof(struct ip6_frag, ip6f_ident), 4, ENC_BIG_ENDIAN); @@ -1149,7 +1149,7 @@ dissect_shim6_opt_loclist(proto_tree * opt_tree, tvbuff_t * tvb, gint *offset) subtree = proto_item_add_subtree(it, ett_ipv6_shim6_locators); for (count=0; count < optlen; count++) { - proto_tree_add_item(subtree, hf_ipv6_shim6_locator, tvb, p, 16, FALSE); + proto_tree_add_item(subtree, hf_ipv6_shim6_locator, tvb, p, 16, ENC_NA); p += 16; } *offset = p; @@ -1278,9 +1278,9 @@ dissect_shimopts(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info *pinfo case SHIM6_OPT_ULIDPAIR: proto_tree_add_text(opt_tree, tvb, p, 4, "Reserved"); p += 4; - proto_tree_add_item(opt_tree, hf_ipv6_shim6_sulid, tvb, p, 16, FALSE); + proto_tree_add_item(opt_tree, hf_ipv6_shim6_sulid, tvb, p, 16, ENC_NA); p += 16; - proto_tree_add_item(opt_tree, hf_ipv6_shim6_rulid, tvb, p, 16, FALSE); + proto_tree_add_item(opt_tree, hf_ipv6_shim6_rulid, tvb, p, 16, ENC_NA); p += 16; break; case SHIM6_OPT_FII: @@ -1340,9 +1340,9 @@ dissect_shim6_probes(proto_tree * shim_tree, tvbuff_t * tvb, gint offset, it = proto_tree_add_text(probes_tree, tvb, offset, 40, "Probe %u", count+1); probe_tree = proto_item_add_subtree(it, ett_probe); - proto_tree_add_item(probe_tree, hf_ipv6_shim6_psrc, tvb, offset, 16, FALSE); + proto_tree_add_item(probe_tree, hf_ipv6_shim6_psrc, tvb, offset, 16, ENC_NA); offset += 16; - proto_tree_add_item(probe_tree, hf_ipv6_shim6_pdst, tvb, offset, 16, FALSE); + proto_tree_add_item(probe_tree, hf_ipv6_shim6_pdst, tvb, offset, 16, ENC_NA); offset += 16; proto_tree_add_item(probe_tree, hf_ipv6_shim6_pnonce, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -1537,7 +1537,7 @@ dissect_shim6(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info * pinfo) /* P Field */ proto_tree_add_item(shim_tree, hf_ipv6_shim6_p, tvb, - offset + offsetof(struct ip6_shim, ip6s_p), 1, FALSE); + offset + offsetof(struct ip6_shim, ip6s_p), 1, ENC_BIG_ENDIAN); /* skip the first 2 bytes (nxt hdr, hdr ext len, p+7bits) */ p = offset + 3; @@ -1669,10 +1669,10 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset + offsetof(struct ip6_hdr, ip6_flow), 4, ENC_BIG_ENDIAN); proto_tree_add_item(ipv6_tc_tree, hf_ipv6_traffic_class_ect, tvb, - offset + offsetof(struct ip6_hdr, ip6_flow), 4, FALSE); + offset + offsetof(struct ip6_hdr, ip6_flow), 4, ENC_BIG_ENDIAN); proto_tree_add_item(ipv6_tc_tree, hf_ipv6_traffic_class_ce, tvb, - offset + offsetof(struct ip6_hdr, ip6_flow), 4, FALSE); + offset + offsetof(struct ip6_hdr, ip6_flow), 4, ENC_BIG_ENDIAN); proto_tree_add_item(ipv6_tree, hf_ipv6_flow, tvb, offset + offsetof(struct ip6_hdr, ip6_flow), 4, ENC_BIG_ENDIAN); @@ -1691,7 +1691,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Add the different items for the source address */ proto_tree_add_item(ipv6_tree, hf_ipv6_src, tvb, - offset + offsetof(struct ip6_hdr, ip6_src), 16, FALSE); + offset + offsetof(struct ip6_hdr, ip6_src), 16, ENC_NA); ti = proto_tree_add_ipv6(ipv6_tree, hf_ipv6_addr, tvb, offset + offsetof(struct ip6_hdr, ip6_src), 16, (guint8 *)&ipv6.ip6_src); @@ -1714,13 +1714,13 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Extract embedded (IPv6 and MAC) address information */ if (tvb_get_ntohs(tvb, offset + IP6H_SRC) == 0x2002) { /* RFC 3056 section 2 */ ti = proto_tree_add_item(ipv6_tree, hf_ipv6_src_6to4_gateway_ipv4, tvb, - offset + IP6H_SRC + 2, 4, FALSE); + offset + IP6H_SRC + 2, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(ti); ti = proto_tree_add_item(ipv6_tree, hf_ipv6_src_6to4_sla_id, tvb, offset + IP6H_SRC + 6, 2, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(ti); ti = proto_tree_add_item(ipv6_tree, hf_ipv6_6to4_gateway_ipv4, tvb, - offset + IP6H_SRC + 2, 4, FALSE); + offset + IP6H_SRC + 2, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(ti); PROTO_ITEM_SET_HIDDEN(ti); ti = proto_tree_add_item(ipv6_tree, hf_ipv6_6to4_sla_id, tvb, @@ -1732,7 +1732,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 client_v4 = tvb_get_ipv4(tvb, offset + IP6H_SRC + 12) ^ 0xffffffff; ti = proto_tree_add_item(ipv6_tree, hf_ipv6_src_teredo_server_ipv4, tvb, - offset + IP6H_SRC + 4, 4, FALSE); + offset + IP6H_SRC + 4, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(ti); ti = proto_tree_add_uint(ipv6_tree, hf_ipv6_src_teredo_port, tvb, offset + IP6H_SRC + 10, 2, mapped_port); @@ -1741,7 +1741,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset + IP6H_SRC + 12, 4, client_v4); PROTO_ITEM_SET_GENERATED(ti); ti = proto_tree_add_item(ipv6_tree, hf_ipv6_teredo_server_ipv4, tvb, - offset + IP6H_SRC + 4, 4, FALSE); + offset + IP6H_SRC + 4, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(ti); PROTO_ITEM_SET_HIDDEN(ti); ti = proto_tree_add_uint(ipv6_tree, hf_ipv6_teredo_port, tvb, @@ -1768,17 +1768,17 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PROTO_ITEM_SET_HIDDEN(ti); } else if ((tvb_get_ntohl(tvb, offset + IP6H_SRC + 8) & 0xfcffffff) == 0x00005efe) { /* RFC 5214 section 6.1 */ ti = proto_tree_add_item(ipv6_tree, hf_ipv6_src_isatap_ipv4, tvb, - offset + IP6H_SRC + 12, 4, FALSE); + offset + IP6H_SRC + 12, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(ti); ti = proto_tree_add_item(ipv6_tree, hf_ipv6_isatap_ipv4, tvb, - offset + IP6H_SRC + 12, 4, FALSE); + offset + IP6H_SRC + 12, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(ti); PROTO_ITEM_SET_HIDDEN(ti); } /* Add different items for the destination address */ proto_tree_add_item(ipv6_tree, hf_ipv6_dst, tvb, - offset + offsetof(struct ip6_hdr, ip6_dst), 16, FALSE); + offset + offsetof(struct ip6_hdr, ip6_dst), 16, ENC_NA); ti = proto_tree_add_ipv6(ipv6_tree, hf_ipv6_addr, tvb, offset + offsetof(struct ip6_hdr, ip6_dst), 16, (guint8 *)&ipv6.ip6_dst); @@ -1801,13 +1801,13 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Extract embedded (IPv6 and MAC) address information */ if (tvb_get_ntohs(tvb, offset + IP6H_DST) == 0x2002) { /* RFC 3056 section 2 */ ti = proto_tree_add_item(ipv6_tree, hf_ipv6_dst_6to4_gateway_ipv4, tvb, - offset + IP6H_DST + 2, 4, FALSE); + offset + IP6H_DST + 2, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(ti); ti = proto_tree_add_item(ipv6_tree, hf_ipv6_dst_6to4_sla_id, tvb, offset + IP6H_DST + 6, 2, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(ti); ti = proto_tree_add_item(ipv6_tree, hf_ipv6_6to4_gateway_ipv4, tvb, - offset + IP6H_DST + 2, 4, FALSE); + offset + IP6H_DST + 2, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(ti); PROTO_ITEM_SET_HIDDEN(ti); ti = proto_tree_add_item(ipv6_tree, hf_ipv6_6to4_sla_id, tvb, @@ -1819,7 +1819,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 client_v4 = tvb_get_ipv4(tvb, offset + IP6H_DST + 12) ^ 0xffffffff; ti = proto_tree_add_item(ipv6_tree, hf_ipv6_dst_teredo_server_ipv4, tvb, - offset + IP6H_DST + 4, 4, FALSE); + offset + IP6H_DST + 4, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(ti); ti = proto_tree_add_uint(ipv6_tree, hf_ipv6_dst_teredo_port, tvb, offset + IP6H_DST + 10, 2, mapped_port); @@ -1828,7 +1828,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset + IP6H_DST + 12, 4, client_v4); PROTO_ITEM_SET_GENERATED(ti); ti = proto_tree_add_item(ipv6_tree, hf_ipv6_teredo_server_ipv4, tvb, - offset + IP6H_DST + 4, 4, FALSE); + offset + IP6H_DST + 4, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(ti); PROTO_ITEM_SET_HIDDEN(ti); ti = proto_tree_add_uint(ipv6_tree, hf_ipv6_teredo_port, tvb, @@ -1855,10 +1855,10 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PROTO_ITEM_SET_HIDDEN(ti); } else if ((tvb_get_ntohl(tvb, offset + IP6H_DST + 8) & 0xfcffffff) == 0x00005efe) { /* RFC 5214 section 6.1 */ ti = proto_tree_add_item(ipv6_tree, hf_ipv6_dst_isatap_ipv4, tvb, - offset + IP6H_DST + 12, 4, FALSE); + offset + IP6H_DST + 12, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(ti); ti = proto_tree_add_item(ipv6_tree, hf_ipv6_isatap_ipv4, tvb, - offset + IP6H_DST + 12, 4, FALSE); + offset + IP6H_DST + 12, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(ti); PROTO_ITEM_SET_HIDDEN(ti); } diff --git a/epan/dissectors/packet-ipvs-syncd.c b/epan/dissectors/packet-ipvs-syncd.c index 0c9c813f3b..be0a114120 100644 --- a/epan/dissectors/packet-ipvs-syncd.c +++ b/epan/dissectors/packet-ipvs-syncd.c @@ -142,13 +142,13 @@ dissect_ipvs_syncd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) proto_tree_add_item(ctree, hf_dport, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(ctree, hf_caddr, tvb, offset, 4, FALSE); + proto_tree_add_item(ctree, hf_caddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(ctree, hf_vaddr, tvb, offset, 4, FALSE); + proto_tree_add_item(ctree, hf_vaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(ctree, hf_daddr, tvb, offset, 4, FALSE); + proto_tree_add_item(ctree, hf_daddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; flags = tvb_get_ntohs(tvb, offset); diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 27d098e902..3c99793fce 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -2763,18 +2763,18 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ftree = proto_item_add_subtree(fti, ett_isakmp_flags); if (isakmp_version == 1) { - proto_tree_add_item(ftree, hf_isakmp_flag_e, tvb, offset, 1, FALSE); + proto_tree_add_item(ftree, hf_isakmp_flag_e, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(ftree, hf_isakmp_flag_c, tvb, offset, 1, FALSE); + proto_tree_add_item(ftree, hf_isakmp_flag_c, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(ftree, hf_isakmp_flag_a, tvb, offset, 1, FALSE); + proto_tree_add_item(ftree, hf_isakmp_flag_a, tvb, offset, 1, ENC_BIG_ENDIAN); } else if (isakmp_version == 2) { - proto_tree_add_item(ftree, hf_isakmp_flag_i, tvb, offset, 1, FALSE); + proto_tree_add_item(ftree, hf_isakmp_flag_i, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(ftree, hf_isakmp_flag_v, tvb, offset, 1, FALSE); + proto_tree_add_item(ftree, hf_isakmp_flag_v, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(ftree, hf_isakmp_flag_r, tvb, offset, 1, FALSE); + proto_tree_add_item(ftree, hf_isakmp_flag_r, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; @@ -2863,7 +2863,7 @@ dissect_payload_header(tvbuff_t *tvb, int offset, int length, proto_tree_add_item(ntree, hf_isakmp_nextpayload, tvb, offset, 1, FALSE); if (isakmp_version == 2) { - proto_tree_add_item(ntree, hf_isakmp_criticalpayload, tvb, offset+1, 1, FALSE); + proto_tree_add_item(ntree, hf_isakmp_criticalpayload, tvb, offset+1, 1, ENC_BIG_ENDIAN); } proto_tree_add_item(ntree, hf_isakmp_payloadlen, tvb, offset + 2, 2, ENC_BIG_ENDIAN); @@ -2899,9 +2899,9 @@ dissect_sa(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_v sti = proto_tree_add_item(tree, hf_isakmp_sa_situation, tvb, offset, 4, ENC_NA); stree = proto_item_add_subtree(sti, ett_isakmp_sa); - proto_tree_add_item(stree, hf_isakmp_sa_situation_identity_only, tvb, offset, 4, FALSE); - proto_tree_add_item(stree, hf_isakmp_sa_situation_secrecy, tvb, offset, 4, FALSE); - proto_tree_add_item(stree, hf_isakmp_sa_situation_integrity, tvb, offset, 4, FALSE); + proto_tree_add_item(stree, hf_isakmp_sa_situation_identity_only, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(stree, hf_isakmp_sa_situation_secrecy, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(stree, hf_isakmp_sa_situation_integrity, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -3008,7 +3008,7 @@ dissect_rohc_supported(tvbuff_t *tvb, proto_tree *rohc_tree, int offset ) rohc_item = proto_tree_add_item(rohc_tree, hf_isakmp_notify_data_rohc_attr, tvb, offset, 2+len+optlen, ENC_NA); proto_item_append_text(rohc_item," (t=%d,l=%d) %s",rohc, optlen, val_to_str(rohc, rohc_attr_type, "Unknown Attribute Type (%02d)") ); sub_rohc_tree = proto_item_add_subtree(rohc_item, ett_isakmp_rohc_attr); - proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_format, tvb, offset, 2, FALSE); + proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_format, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_uint(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_type, tvb, offset, 2, rohc); offset += 2; @@ -3153,7 +3153,7 @@ dissect_transform_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_tree, transform_attr_type_item = proto_tree_add_item(transform_attr_type_tree, hf_isakmp_tf_attr, tvb, offset, 2+len+optlen, ENC_NA); proto_item_append_text(transform_attr_type_item, " (t=%d,l=%d) %s",transform_attr_type, optlen, val_to_str(transform_attr_type, transform_isakmp_attr_type, "Unknown Attribute Type (%02d)") ); sub_transform_attr_type_tree = proto_item_add_subtree(transform_attr_type_item, ett_isakmp_tf_attr); - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_format, tvb, offset, 2, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_format, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_uint(sub_transform_attr_type_tree, hf_isakmp_tf_attr_type_v1, tvb, offset, 2, transform_attr_type); offset += 2; @@ -3252,7 +3252,7 @@ dissect_transform_ike_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_t transform_attr_type_item = proto_tree_add_item(transform_attr_type_tree, hf_isakmp_ike_attr, tvb, offset, 2+len+optlen, ENC_NA); proto_item_append_text(transform_attr_type_item," (t=%d,l=%d) %s",transform_attr_type, optlen, val_to_str(transform_attr_type,transform_ike_attr_type,"Unknown Attribute Type (%02d)") ); sub_transform_attr_type_tree = proto_item_add_subtree(transform_attr_type_item, ett_isakmp_tf_ike_attr); - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_format, tvb, offset, 2, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_format, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_uint(sub_transform_attr_type_tree, hf_isakmp_ike_attr_type, tvb, offset, 2, transform_attr_type); offset += 2; @@ -3366,7 +3366,7 @@ dissect_transform_ike2_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_ transform_attr_type_item = proto_tree_add_item(transform_attr_type_tree, hf_isakmp_ike2_attr, tvb, offset, 2+len+optlen, ENC_NA); proto_item_append_text(transform_attr_type_item," (t=%d,l=%d) %s",transform_attr_type, optlen, val_to_str(transform_attr_type,transform_ike2_attr_type,"Unknown Attribute Type (%02d)") ); sub_transform_attr_type_tree = proto_item_add_subtree(transform_attr_type_item, ett_isakmp_tf_ike2_attr); - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike2_attr_format, tvb, offset, 2, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike2_attr_format, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_uint(sub_transform_attr_type_tree, hf_isakmp_ike2_attr_type, tvb, offset, 2, transform_attr_type); offset += 2; @@ -3583,7 +3583,7 @@ dissect_id(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_v idtree = proto_item_add_subtree(idit, ett_isakmp_id); switch (id_type) { case IKE_ID_IPV4_ADDR: - proto_tree_add_item(idtree, hf_isakmp_id_data_ipv4_addr, tvb, offset, 4, FALSE); + proto_tree_add_item(idtree, hf_isakmp_id_data_ipv4_addr, tvb, offset, 4, ENC_BIG_ENDIAN); proto_item_append_text(idit, "%s", tvb_ip_to_str(tvb, offset)); break; case IKE_ID_FQDN: @@ -3595,27 +3595,27 @@ dissect_id(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_v proto_item_append_text(idit, "%s", tvb_get_ephemeral_string(tvb, offset,length)); break; case IKE_ID_IPV4_ADDR_SUBNET: - proto_tree_add_item(idtree, hf_isakmp_id_data_ipv4_addr, tvb, offset, 4, FALSE); - proto_tree_add_item(idtree, hf_isakmp_id_data_ipv4_subnet, tvb, offset+4, 4, FALSE); + proto_tree_add_item(idtree, hf_isakmp_id_data_ipv4_addr, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(idtree, hf_isakmp_id_data_ipv4_subnet, tvb, offset+4, 4, ENC_BIG_ENDIAN); proto_item_append_text(idit, "%s/%s", tvb_ip_to_str(tvb, offset), tvb_ip_to_str(tvb, offset+4)); break; case IKE_ID_IPV4_ADDR_RANGE: - proto_tree_add_item(idtree, hf_isakmp_id_data_ipv4_range_start, tvb, offset, 4, FALSE); - proto_tree_add_item(idtree, hf_isakmp_id_data_ipv4_range_end, tvb, offset+4, 4, FALSE); + proto_tree_add_item(idtree, hf_isakmp_id_data_ipv4_range_start, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(idtree, hf_isakmp_id_data_ipv4_range_end, tvb, offset+4, 4, ENC_BIG_ENDIAN); proto_item_append_text(idit, "%s/%s", tvb_ip_to_str(tvb, offset), tvb_ip_to_str(tvb, offset+4)); break; case IKE_ID_IPV6_ADDR: - proto_tree_add_item(idtree, hf_isakmp_id_data_ipv6_addr, tvb, offset, 16, FALSE); + proto_tree_add_item(idtree, hf_isakmp_id_data_ipv6_addr, tvb, offset, 16, ENC_NA); proto_item_append_text(idit, "%s", tvb_ip6_to_str(tvb, offset)); break; case IKE_ID_IPV6_ADDR_SUBNET: - proto_tree_add_item(idtree, hf_isakmp_id_data_ipv6_addr, tvb, offset, 16, FALSE); - proto_tree_add_item(idtree, hf_isakmp_id_data_ipv6_subnet, tvb, offset+16, 16, FALSE); + proto_tree_add_item(idtree, hf_isakmp_id_data_ipv6_addr, tvb, offset, 16, ENC_NA); + proto_tree_add_item(idtree, hf_isakmp_id_data_ipv6_subnet, tvb, offset+16, 16, ENC_NA); proto_item_append_text(idit, "%s/%s", tvb_ip6_to_str(tvb, offset), tvb_ip6_to_str(tvb, offset+16)); break; case IKE_ID_IPV6_ADDR_RANGE: - proto_tree_add_item(idtree, hf_isakmp_id_data_ipv6_range_start, tvb, offset, 16, FALSE); - proto_tree_add_item(idtree, hf_isakmp_id_data_ipv6_range_end, tvb, offset+16, 16, FALSE); + proto_tree_add_item(idtree, hf_isakmp_id_data_ipv6_range_start, tvb, offset, 16, ENC_NA); + proto_tree_add_item(idtree, hf_isakmp_id_data_ipv6_range_end, tvb, offset+16, 16, ENC_NA); proto_item_append_text(idit, "%s/%s", tvb_ip6_to_str(tvb, offset), tvb_ip6_to_str(tvb, offset+16)); break; case IKE_ID_KEY_ID: @@ -3837,7 +3837,7 @@ dissect_notif(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakm proto_tree_add_item(tree, hf_isakmp_notify_data_dpd_are_you_there_ack, tvb, offset, length, ENC_BIG_ENDIAN); break; case 40501: /* UNITY Load Balance */ - proto_tree_add_item(tree, hf_isakmp_notify_data_unity_load_balance, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_unity_load_balance, tvb, offset, length, ENC_BIG_ENDIAN); break; default: /* No Default Action */ @@ -3856,10 +3856,10 @@ dissect_notif(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakm proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_gw_ident_len, tvb, offset+1, 1, ENC_BIG_ENDIAN); switch(tvb_get_guint8(tvb, offset)){ /* Ident Type ? */ case 1: - proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_new_resp_gw_ident_ipv4, tvb, offset+2, 4, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_new_resp_gw_ident_ipv4, tvb, offset+2, 4, ENC_BIG_ENDIAN); break; case 2: - proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_new_resp_gw_ident_ipv6, tvb, offset+2, 16, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_new_resp_gw_ident_ipv6, tvb, offset+2, 16, ENC_NA); break; case 3: proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_new_resp_gw_ident_fqdn, tvb, offset+2, tvb_get_guint8(tvb,offset+1), FALSE); @@ -3880,10 +3880,10 @@ dissect_notif(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakm proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_gw_ident_len, tvb, offset+1, 1, ENC_BIG_ENDIAN); switch(tvb_get_guint8(tvb, offset)){ /* Ident Type ? */ case 1: - proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_org_resp_gw_ident_ipv4, tvb, offset+2, 4, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_org_resp_gw_ident_ipv4, tvb, offset+2, 4, ENC_BIG_ENDIAN); break; case 2: - proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_org_resp_gw_ident_ipv6, tvb, offset+2, 16, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_org_resp_gw_ident_ipv6, tvb, offset+2, 16, ENC_NA); break; default : proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_org_resp_gw_ident, tvb, offset+2, tvb_get_guint8(tvb,offset+1), ENC_NA); @@ -4057,7 +4057,7 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs sub_cfg_attr_type_tree = proto_item_add_subtree(cfg_attr_type_item, ett_isakmp_cfg_attr); proto_tree_add_uint(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_type_v2, tvb, offset, 2, cfg_attr_type); } - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_format, tvb, offset, 2, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_format, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if (len) { @@ -4078,14 +4078,14 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs { while (offset_end-offset > 0) { - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip4_address, tvb, offset, 4, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip4_address, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } } break; case INTERNAL_IP4_NETMASK: /* 2 */ - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip4_netmask, tvb, offset, 4, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip4_netmask, tvb, offset, 4, ENC_BIG_ENDIAN); break; case INTERNAL_IP4_DNS: /* 3 */ offset_end = offset + optlen; @@ -4094,7 +4094,7 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs { while (offset_end-offset > 0) { - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip4_dns, tvb, offset, 4, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip4_dns, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } @@ -4107,7 +4107,7 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs { while (offset_end-offset > 0) { - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip4_nbns, tvb, offset, 4, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip4_nbns, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } @@ -4123,7 +4123,7 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs { while (offset_end-offset > 0) { - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip4_dhcp, tvb, offset, 4, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip4_dhcp, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } @@ -4140,14 +4140,14 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs { while (offset_end-offset > 0) { - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_address, tvb, offset, 16, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_address, tvb, offset, 16, ENC_BIG_ENDIAN); offset += 16; } } break; case INTERNAL_IP6_NETMASK: /* 9 Only in IKEv1 */ - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_netmask, tvb, offset, 18, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_netmask, tvb, offset, 18, ENC_NA); break; case INTERNAL_IP6_DNS: /* 10 */ offset_end = offset + optlen; @@ -4156,7 +4156,7 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs { while (offset_end-offset > 0) { - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_dns, tvb, offset, 16, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_dns, tvb, offset, 16, ENC_NA); offset += 16; } @@ -4169,7 +4169,7 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs { while (offset_end-offset > 0) { - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_nbns, tvb, offset, 16, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_nbns, tvb, offset, 16, ENC_NA); offset += 16; } @@ -4182,7 +4182,7 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs { while (offset_end-offset > 0) { - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_dhcp, tvb, offset, 16, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_dhcp, tvb, offset, 16, ENC_NA); offset += 16; } @@ -4195,8 +4195,8 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs { while (offset_end-offset > 0) { - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip4_subnet_ip, tvb, offset, 4, FALSE); - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip4_subnet_netmask, tvb, offset, 4, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip4_subnet_ip, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip4_subnet_netmask, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 8; } @@ -4222,7 +4222,7 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs { while (offset_end-offset > 0) { - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_subnet_ip, tvb, offset, 16, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_subnet_ip, tvb, offset, 16, ENC_NA); offset += 16; proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_subnet_prefix, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -4243,7 +4243,7 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs { while (offset_end-offset > 0) { - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_prefix_ip, tvb, offset, 16, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_prefix_ip, tvb, offset, 16, ENC_NA); offset += 16; proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_prefix_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -4360,11 +4360,11 @@ dissect_nat_original_address(tvbuff_t *tvb, int offset, int length, proto_tree * switch (id_type) { case IKE_ID_IPV4_ADDR: - proto_tree_add_item(tree, hf_isakmp_nat_original_address_ipv4, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_isakmp_nat_original_address_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN); break; case IKE_ID_IPV6_ADDR: - proto_tree_add_item(tree, hf_isakmp_nat_original_address_ipv6, tvb, offset, 16, FALSE); + proto_tree_add_item(tree, hf_isakmp_nat_original_address_ipv6, tvb, offset, 16, ENC_NA); break; default: @@ -4416,10 +4416,10 @@ dissect_ts(tvbuff_t *tvb, int offset, int length, proto_tree *tree) offset += 2; length -= 2; - proto_tree_add_item(tree, hf_isakmp_ts_start_addr_ipv4, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_start_addr_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; - proto_tree_add_item(tree, hf_isakmp_ts_end_addr_ipv4, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_end_addr_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; break; @@ -4445,11 +4445,11 @@ dissect_ts(tvbuff_t *tvb, int offset, int length, proto_tree *tree) offset += 2; length -= 2; - proto_tree_add_item(tree, hf_isakmp_ts_start_addr_ipv6, tvb, offset, 16, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_start_addr_ipv6, tvb, offset, 16, ENC_NA); offset += 16; length -= 16; - proto_tree_add_item(tree, hf_isakmp_ts_end_addr_ipv6, tvb, offset, 16, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_end_addr_ipv6, tvb, offset, 16, ENC_NA); offset += 16; length -= 16; break; diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c index cf79bc5697..5ae141d0d9 100644 --- a/epan/dissectors/packet-isl.c +++ b/epan/dissectors/packet-isl.c @@ -241,7 +241,7 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len) tvb_get_ntohs(tvb, 20) >> 1); if (tree) { proto_tree_add_item(fh_tree, hf_isl_vlan_id, payload_tvb, 6, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(fh_tree, hf_isl_bpdu, payload_tvb, 6, 2, FALSE); + proto_tree_add_item(fh_tree, hf_isl_bpdu, payload_tvb, 6, 2, ENC_BIG_ENDIAN); proto_tree_add_item(fh_tree, hf_isl_index, payload_tvb, 8, 2, ENC_BIG_ENDIAN); } @@ -311,11 +311,11 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len) case TYPE_TR: if (tree) { proto_tree_add_item(fh_tree, hf_isl_src_vlan_id, payload_tvb, 10, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(fh_tree, hf_isl_explorer, payload_tvb, 10, 2, FALSE); + proto_tree_add_item(fh_tree, hf_isl_explorer, payload_tvb, 10, 2, ENC_BIG_ENDIAN); proto_tree_add_item(fh_tree, hf_isl_dst_route_descriptor, payload_tvb, 12, 2, ENC_BIG_ENDIAN); proto_tree_add_item(fh_tree, hf_isl_src_route_descriptor, payload_tvb, 14, 2, ENC_BIG_ENDIAN); /* This doesn't appear to be present in at least one capture I've seen. */ - proto_tree_add_item(fh_tree, hf_isl_fcs_not_incl, payload_tvb, 16, 1, FALSE); + proto_tree_add_item(fh_tree, hf_isl_fcs_not_incl, payload_tvb, 16, 1, ENC_BIG_ENDIAN); proto_tree_add_item(fh_tree, hf_isl_esize, payload_tvb, 16, 1, ENC_BIG_ENDIAN); } next_tvb = tvb_new_subset_remaining(payload_tvb, 17); diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index c5b8d5c8ee..3e1d80d296 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -265,7 +265,7 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp proto_tree_add_item(edp_tree, hf_ismp_edp_version, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(edp_tree, hf_ismp_edp_module_ip, tvb, offset, 4, FALSE); + proto_tree_add_item(edp_tree, hf_ismp_edp_module_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(edp_tree, hf_ismp_edp_module_mac, tvb, offset, 6, FALSE); offset += 6; @@ -273,7 +273,7 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp offset += 4; proto_tree_add_item(edp_tree, hf_ismp_edp_chassis_mac, tvb, offset, 6, FALSE); offset += 6; - proto_tree_add_item(edp_tree, hf_ismp_edp_chassis_ip, tvb, offset, 4, FALSE); + proto_tree_add_item(edp_tree, hf_ismp_edp_chassis_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; device_type = tvb_get_ntohs(tvb, offset); proto_tree_add_item(edp_tree, hf_ismp_edp_device_type, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -293,45 +293,45 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp switch (device_type) { case EDP_DEVICE_TYPE_SFS17: case EDP_DEVICE_TYPE_SFS18: - proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_uplink_flood, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_uplink_port, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_uplink_core, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_uplink_switch, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_isolated, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_redun, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_conmsg, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_calltap, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_tagflood, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_unused2, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_resolve, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_flood, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_lsp, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_sfssup, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_unused1, tvb, offset, 4, FALSE); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_uplink_flood, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_uplink_port, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_uplink_core, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_uplink_switch, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_isolated, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_redun, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_conmsg, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_calltap, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_tagflood, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_unused2, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_resolve, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_flood, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_lsp, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_sfssup, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_sfs_option_unused1, tvb, offset, 4, ENC_BIG_ENDIAN); break; case EDP_DEVICE_TYPE_ROUTER: - proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_level1, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_trans, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_route, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_igmp_snoop, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_gmrp, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_gvrp, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_8021q, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_dvmrp, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_ospf, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_bgp, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_rip, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_igmp, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_ssr, tvb, offset, 4, FALSE); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_level1, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_trans, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_route, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_igmp_snoop, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_gmrp, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_gvrp, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_8021q, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_dvmrp, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_ospf, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_bgp, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_rip, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_igmp, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_rtr_option_ssr, tvb, offset, 4, ENC_BIG_ENDIAN); break; case EDP_DEVICE_TYPE_BRIDGE: - proto_tree_add_item(edp_options_tree, hf_ismp_edp_switch_option_level1, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_switch_option_trans, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_switch_option_route, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_switch_option_igmp, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_switch_option_gmrp, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_switch_option_gvrp, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_switch_option_8021q, tvb, offset, 4, FALSE); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_switch_option_level1, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_switch_option_trans, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_switch_option_route, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_switch_option_igmp, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_switch_option_gmrp, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_switch_option_gvrp, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_switch_option_8021q, tvb, offset, 4, ENC_BIG_ENDIAN); break; case EDP_DEVICE_TYPE_VLANMAN: break; @@ -341,9 +341,9 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp case EDP_DEVICE_TYPE_WIN98: case EDP_DEVICE_TYPE_UNIXSERVER: case EDP_DEVICE_TYPE_UNIXCLIENT: - proto_tree_add_item(edp_options_tree, hf_ismp_edp_end_station_option_ad, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_end_station_option_dns, tvb, offset, 4, FALSE); - proto_tree_add_item(edp_options_tree, hf_ismp_edp_end_station_option_dhcp, tvb, offset, 4, FALSE); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_end_station_option_ad, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_end_station_option_dns, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(edp_options_tree, hf_ismp_edp_end_station_option_dhcp, tvb, offset, 4, ENC_BIG_ENDIAN); break; case EDP_DEVICE_TYPE_ACCESSPOINT: default: diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 1f52f1eab5..a8838779e1 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -2505,7 +2505,7 @@ dissect_ansi_isup_cause_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree /*CCITT*/ proto_tree_add_item(parameter_tree, hf_isup_cause_location, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(parameter_tree, hf_ansi_isup_coding_standard, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, FALSE); + proto_tree_add_item(parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; length--; if (length == 0) @@ -2526,7 +2526,7 @@ dissect_ansi_isup_cause_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree /*ANSI*/ proto_tree_add_item(parameter_tree, hf_isup_cause_location, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(parameter_tree, hf_ansi_isup_coding_standard, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, FALSE); + proto_tree_add_item(parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; length--; if (length == 0) @@ -2547,7 +2547,7 @@ dissect_ansi_isup_cause_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree return; default: proto_tree_add_item(parameter_tree, hf_ansi_isup_coding_standard, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, FALSE); + proto_tree_add_item(parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); break; } proto_item_set_text(parameter_item, "Cause indicators(%u byte%s length)", length , plurality(length, "", "s")); @@ -2806,14 +2806,14 @@ dissect_nsap(tvbuff_t *parameter_tvb,gint offset,gint len, proto_tree *parameter proto_tree_add_text(parameter_tree, parameter_tvb, offset + 2 , 17, "DSP = %s", tvb_bytes_to_str(parameter_tvb, offset + 2, 17)); proto_tree_add_item(parameter_tree, hf_nsap_ipv6_addr, parameter_tvb, offset + 2, - 16, FALSE); + 16, ENC_NA); } else { /* IPv4 addr */ /* XXX - this is really only for ICP 1 */ proto_tree_add_text(parameter_tree, parameter_tvb, offset + 2, 17, "DSP = %s", tvb_bytes_to_str(parameter_tvb, offset + 2, 17)); - proto_tree_add_item(parameter_tree, hf_nsap_ipv4_addr, parameter_tvb, offset + 2, 4, FALSE); + proto_tree_add_item(parameter_tree, hf_nsap_ipv4_addr, parameter_tvb, offset + 2, 4, ENC_BIG_ENDIAN); } break; @@ -3344,7 +3344,7 @@ dissect_bat_ase_Encapsulated_Application_Information(tvbuff_t *parameter_tvb, pa /* length indicator may be 11 bits long */ offset = offset + 1; - proto_tree_add_item( bat_ase_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, FALSE ); + proto_tree_add_item( bat_ase_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); tempdata = tvb_get_guint8(parameter_tvb, offset); if ( tempdata & 0x80 ) { length_indicator = tempdata & 0x7f; @@ -3373,10 +3373,10 @@ dissect_bat_ase_Encapsulated_Application_Information(tvbuff_t *parameter_tvb, pa offset - length_ind_len + 1, length_ind_len, length_indicator ); offset = offset + 1; - proto_tree_add_item( bat_ase_element_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, FALSE ); - proto_tree_add_item( bat_ase_element_tree, hf_Send_notification_ind_for_pass_on_not_possible, parameter_tvb, offset, 1, FALSE ); + proto_tree_add_item( bat_ase_element_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item( bat_ase_element_tree, hf_Send_notification_ind_for_pass_on_not_possible, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item( bat_ase_element_tree, hf_Instruction_ind_for_pass_on_not_possible, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); - proto_tree_add_item( bat_ase_element_tree, hf_Send_notification_ind_for_general_action, parameter_tvb, offset, 1, FALSE ); + proto_tree_add_item( bat_ase_element_tree, hf_Send_notification_ind_for_general_action, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item( bat_ase_element_tree, hf_Instruction_ind_for_general_action, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); offset = offset + 1; } @@ -3633,7 +3633,7 @@ dissect_isup_application_transport_parameter(tvbuff_t *parameter_tvb, packet_inf if ( (aci16 & H_8BIT_MASK) == 0x80) { /* Octet 1 */ aci16 = aci16 & 0x7f; - proto_tree_add_item( parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, FALSE ); + proto_tree_add_item( parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_uint(parameter_tree, hf_isup_app_cont_ident , parameter_tvb, offset, 1, aci16); offset = offset + 1; } @@ -3646,23 +3646,23 @@ dissect_isup_application_transport_parameter(tvbuff_t *parameter_tvb, packet_inf /* Octet 2 */ proto_tree_add_text(parameter_tree, parameter_tvb, offset, -1, "Application transport instruction indicators: "); - proto_tree_add_item( parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, FALSE ); - proto_tree_add_item( parameter_tree, hf_isup_app_Send_notification_ind, parameter_tvb, offset, 1, FALSE ); - proto_tree_add_item( parameter_tree, hf_isup_app_Release_call_ind, parameter_tvb, offset, 1, FALSE ); + proto_tree_add_item( parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item( parameter_tree, hf_isup_app_Send_notification_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item( parameter_tree, hf_isup_app_Release_call_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); offset = offset + 1; /* Octet 3*/ proto_tree_add_text(parameter_tree, parameter_tvb, offset, 1, "APM segmentation indicator:"); si_and_apm_seg_ind = tvb_get_guint8(parameter_tvb, offset); - proto_tree_add_item( parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, FALSE ); - proto_tree_add_item( parameter_tree, hf_isup_apm_si_ind, parameter_tvb, offset, 1, FALSE ); + proto_tree_add_item( parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item( parameter_tree, hf_isup_apm_si_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item( parameter_tree, hf_isup_apm_segmentation_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); offset = offset + 1; /* Octet 3a */ if ( (si_and_apm_seg_ind & H_8BIT_MASK) == 0x00) { apm_Segmentation_local_ref = tvb_get_guint8(parameter_tvb, offset); - proto_tree_add_item( parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, FALSE ); + proto_tree_add_item( parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item( parameter_tree, hf_isup_apm_slr, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); offset = offset + 1; } @@ -3674,10 +3674,10 @@ dissect_isup_application_transport_parameter(tvbuff_t *parameter_tvb, packet_inf offset++; if ( octet != 0){ /* 4b */ - proto_tree_add_item( parameter_tree, hf_isup_odd_even_indicator, parameter_tvb, offset, 1, FALSE ); + proto_tree_add_item( parameter_tree, hf_isup_odd_even_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); /* nature of address indicator */ offset++; - proto_tree_add_item( parameter_tree, hf_isup_inn_indicator, parameter_tvb, offset, 1, FALSE ); + proto_tree_add_item( parameter_tree, hf_isup_inn_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item( parameter_tree, hf_isup_numbering_plan_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; /* Address digits */ @@ -3690,10 +3690,10 @@ dissect_isup_application_transport_parameter(tvbuff_t *parameter_tvb, packet_inf offset++; if ( octet != 0){ /* 4b */ - proto_tree_add_item( parameter_tree, hf_isup_odd_even_indicator, parameter_tvb, offset, 1, FALSE ); + proto_tree_add_item( parameter_tree, hf_isup_odd_even_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); /* nature of address indicator */ offset++; - proto_tree_add_item( parameter_tree, hf_isup_inn_indicator, parameter_tvb, offset, 1, FALSE ); + proto_tree_add_item( parameter_tree, hf_isup_inn_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item( parameter_tree, hf_isup_numbering_plan_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; /* Address digits */ diff --git a/epan/dissectors/packet-itdm.c b/epan/dissectors/packet-itdm.c index dd3722a693..a74d1a1b84 100644 --- a/epan/dissectors/packet-itdm.c +++ b/epan/dissectors/packet-itdm.c @@ -229,15 +229,15 @@ dissect_itdm_125usec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(itdm_tree, hf_itdm_seqnum, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(itdm_tree, hf_itdm_sop_eop, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(itdm_tree, hf_itdm_last_pack, tvb, offset, 1, FALSE); + proto_tree_add_item(itdm_tree, hf_itdm_last_pack, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(itdm_tree, hf_itdm_pktlen, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(itdm_tree, hf_itdm_chksum, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(itdm_tree, hf_itdm_uid, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; - proto_tree_add_item(itdm_tree, hf_itdm_ack, tvb, offset, 1, FALSE); - proto_tree_add_item(itdm_tree, hf_itdm_act, tvb, offset, 1, FALSE); + proto_tree_add_item(itdm_tree, hf_itdm_ack, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(itdm_tree, hf_itdm_act, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(itdm_tree, hf_itdm_chcmd, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(itdm_tree, hf_itdm_chid, tvb, offset, 3, ENC_BIG_ENDIAN); @@ -325,7 +325,7 @@ dissect_itdm_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(itdm_ctl_tree, hf_itdm_seqnum, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(itdm_ctl_tree, hf_itdm_sop_eop, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(itdm_ctl_tree, hf_itdm_last_pack, tvb, offset, 1, FALSE); + proto_tree_add_item(itdm_ctl_tree, hf_itdm_last_pack, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(itdm_ctl_tree, hf_itdm_pktlen, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(itdm_ctl_tree, hf_itdm_chksum, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-iwarp-ddp-rdmap.c b/epan/dissectors/packet-iwarp-ddp-rdmap.c index b07c77c860..95539da872 100644 --- a/epan/dissectors/packet-iwarp-ddp-rdmap.c +++ b/epan/dissectors/packet-iwarp-ddp-rdmap.c @@ -520,9 +520,9 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ett_iwarp_ddp); proto_tree_add_item(ddp_ctrl_field_tree, hf_iwarp_ddp_t_flag, tvb, - offset, DDP_CONTROL_FIELD_LEN, FALSE); + offset, DDP_CONTROL_FIELD_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(ddp_ctrl_field_tree, hf_iwarp_ddp_l_flag, tvb, - offset, DDP_CONTROL_FIELD_LEN, FALSE); + offset, DDP_CONTROL_FIELD_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(ddp_ctrl_field_tree, hf_iwarp_ddp_rsvd, tvb, offset, DDP_CONTROL_FIELD_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(ddp_ctrl_field_tree, hf_iwarp_ddp_dv, tvb, offset, diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c index 694f0369b2..2a87e7871e 100644 --- a/epan/dissectors/packet-iwarp-mpa.c +++ b/epan/dissectors/packet-iwarp-mpa.c @@ -504,11 +504,11 @@ dissect_mpa_req_rep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += MPA_REQ_REP_KEY_LEN; proto_tree_add_item(mpa_header_tree, hf_mpa_flag_m, tvb, - offset, MPA_REQ_REP_FLAG_LEN, FALSE); + offset, MPA_REQ_REP_FLAG_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(mpa_header_tree, hf_mpa_flag_c, tvb, - offset, MPA_REQ_REP_FLAG_LEN, FALSE); + offset, MPA_REQ_REP_FLAG_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(mpa_header_tree, hf_mpa_flag_r, tvb, - offset, MPA_REQ_REP_FLAG_LEN, FALSE); + offset, MPA_REQ_REP_FLAG_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(mpa_header_tree, hf_mpa_flag_res, tvb, offset, MPA_REQ_REP_FLAG_LEN, ENC_BIG_ENDIAN); offset += MPA_REQ_REP_FLAG_LEN; diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index cdb23e0a06..21235b49db 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -1389,7 +1389,7 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree guint16 name_len = tvb_get_ntohs(tvb, tree_offset); names_table[2 + each_name] = tvb_get_ephemeral_string(tvb, tree_offset + sizeof(name_len), name_len); - proto_tree_add_item(jxta_msg_tree, hf_jxta_message_names_name, tvb, tree_offset, sizeof(name_len), FALSE); + proto_tree_add_item(jxta_msg_tree, hf_jxta_message_names_name, tvb, tree_offset, sizeof(name_len), ENC_BIG_ENDIAN); tree_offset += sizeof(name_len) + name_len; } @@ -1630,13 +1630,13 @@ static int dissect_jxta_message_element_1(tvbuff_t * tvb, packet_info * pinfo, p name_len = tvb_get_ntohs(tvb, tree_offset); proto_item_append_text(jxta_elem_tree_item, " \"%s\"", tvb_format_text(tvb, tree_offset + sizeof(guint16), name_len)); - proto_tree_add_item(jxta_elem_tree, hf_jxta_element_name, tvb, tree_offset, sizeof(guint16), FALSE); + proto_tree_add_item(jxta_elem_tree, hf_jxta_element_name, tvb, tree_offset, sizeof(guint16), ENC_BIG_ENDIAN); tree_offset += sizeof(guint16) + name_len; /* process type */ if ((flags & JXTAMSG1_ELMFLAG_TYPE) != 0) { guint16 type_len = tvb_get_ntohs(tvb, tree_offset); - proto_tree_add_item(jxta_elem_tree, hf_jxta_element_type, tvb, tree_offset, sizeof(guint16), FALSE); + proto_tree_add_item(jxta_elem_tree, hf_jxta_element_type, tvb, tree_offset, sizeof(guint16), ENC_BIG_ENDIAN); tree_offset += sizeof(guint16); mediatype = tvb_get_ephemeral_string(tvb, tree_offset, type_len); @@ -1647,7 +1647,7 @@ static int dissect_jxta_message_element_1(tvbuff_t * tvb, packet_info * pinfo, p /* process encoding */ if ((flags & JXTAMSG1_ELMFLAG_ENCODING) != 0) { guint16 encoding_len = tvb_get_ntohs(tvb, tree_offset); - proto_tree_add_item(jxta_elem_tree, hf_jxta_element_encoding, tvb, tree_offset, sizeof(guint16), FALSE); + proto_tree_add_item(jxta_elem_tree, hf_jxta_element_encoding, tvb, tree_offset, sizeof(guint16), ENC_BIG_ENDIAN); tree_offset += sizeof(guint16) + encoding_len; } @@ -1905,7 +1905,7 @@ static int dissect_jxta_message_element_2(tvbuff_t * tvb, packet_info * pinfo, p /* literal name */ guint16 name_len = tvb_get_ntohs(tvb, tree_offset); proto_item_append_text(jxta_elem_tree_item, " \"%s\"", tvb_format_text(tvb, tree_offset + sizeof(guint16), name_len)); - proto_tree_add_item(jxta_elem_tree, hf_jxta_element_name, tvb, tree_offset, sizeof(guint16), FALSE); + proto_tree_add_item(jxta_elem_tree, hf_jxta_element_name, tvb, tree_offset, sizeof(guint16), ENC_BIG_ENDIAN); tree_offset += sizeof(guint16) + name_len; } diff --git a/epan/dissectors/packet-kdp.c b/epan/dissectors/packet-kdp.c index ca9e1fcb5a..2941974de3 100644 --- a/epan/dissectors/packet-kdp.c +++ b/epan/dissectors/packet-kdp.c @@ -123,12 +123,12 @@ static void dissect_kdp(tvbuff_t *tvb, ti = proto_tree_add_item(kdp_tree, hf_kdp_flags, tvb, 2, 1, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(ti, ett_kdp_flags); - proto_tree_add_item(flags_tree, hf_kdp_drop_flag, tvb, 2, 1, FALSE); - proto_tree_add_item(flags_tree, hf_kdp_syn_flag, tvb, 2, 1, FALSE); - proto_tree_add_item(flags_tree, hf_kdp_ack_flag, tvb, 2, 1, FALSE); - proto_tree_add_item(flags_tree, hf_kdp_rst_flag, tvb, 2, 1, FALSE); - proto_tree_add_item(flags_tree, hf_kdp_bcst_flag, tvb, 2, 1, FALSE); - proto_tree_add_item(flags_tree, hf_kdp_dup_flag, tvb, 2, 1, FALSE); + proto_tree_add_item(flags_tree, hf_kdp_drop_flag, tvb, 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_kdp_syn_flag, tvb, 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_kdp_ack_flag, tvb, 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_kdp_rst_flag, tvb, 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_kdp_bcst_flag, tvb, 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_kdp_dup_flag, tvb, 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(kdp_tree, hf_kdp_errors, tvb, 3, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index d0edc358dc..fb4b520ca9 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -1819,7 +1819,7 @@ static int dissect_krb5_address(proto_tree *tree, tvbuff_t *tvb, int offset, asn address_str[0]='\0'; switch(addr_type){ case KRB5_ADDR_IPv4: - it=proto_tree_add_item(tree, hf_krb_address_ip, tvb, offset, 4, FALSE); + it=proto_tree_add_item(tree, hf_krb_address_ip, tvb, offset, 4, ENC_BIG_ENDIAN); g_snprintf(address_str,ADDRESS_STR_BUFSIZ,"%d.%d.%d.%d",tvb_get_guint8(tvb, offset),tvb_get_guint8(tvb, offset+1),tvb_get_guint8(tvb, offset+2),tvb_get_guint8(tvb, offset+3)); break; case KRB5_ADDR_NETBIOS: @@ -1834,7 +1834,7 @@ static int dissect_krb5_address(proto_tree *tree, tvbuff_t *tvb, int offset, asn } break; case KRB5_ADDR_IPv6: - it=proto_tree_add_item(tree, hf_krb_address_ipv6, tvb, offset, INET6_ADDRLEN, FALSE); + it=proto_tree_add_item(tree, hf_krb_address_ipv6, tvb, offset, INET6_ADDRLEN, ENC_NA); g_snprintf(address_str, ADDRESS_STR_BUFSIZ, "%s", tvb_ip6_to_str(tvb, offset)); break; default: @@ -3351,13 +3351,13 @@ dissect_krb5_rfc1964_checksum(asn1_ctx_t *actx _U_, proto_tree *tree, tvbuff_t * /* flags */ - proto_tree_add_item(tree, hf_krb_gssapi_c_flag_dce_style, tvb, offset, 4, TRUE); - proto_tree_add_item(tree, hf_krb_gssapi_c_flag_integ, tvb, offset, 4, TRUE); - proto_tree_add_item(tree, hf_krb_gssapi_c_flag_conf, tvb, offset, 4, TRUE); - proto_tree_add_item(tree, hf_krb_gssapi_c_flag_sequence, tvb, offset, 4, TRUE); - proto_tree_add_item(tree, hf_krb_gssapi_c_flag_replay, tvb, offset, 4, TRUE); - proto_tree_add_item(tree, hf_krb_gssapi_c_flag_mutual, tvb, offset, 4, TRUE); - proto_tree_add_item(tree, hf_krb_gssapi_c_flag_deleg, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_krb_gssapi_c_flag_dce_style, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_krb_gssapi_c_flag_integ, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_krb_gssapi_c_flag_conf, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_krb_gssapi_c_flag_sequence, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_krb_gssapi_c_flag_replay, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_krb_gssapi_c_flag_mutual, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_krb_gssapi_c_flag_deleg, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* the next fields are optional so we have to check that we have diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 828430ac97..bbb3b99658 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -1395,7 +1395,7 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, l2_specific = proto_item_add_subtree(ti, ett_l2tp_l2_spec); proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_s, tvb, idx + l2tpv3_cookie, - 1, FALSE); + 1, ENC_BIG_ENDIAN); proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_sequence, tvb, idx + l2tpv3_cookie + 1, 3, ENC_BIG_ENDIAN); } @@ -1408,10 +1408,10 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, l2_specific = proto_item_add_subtree(ti, ett_l2tp_l2_spec); proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_v, tvb, - idx + l2tpv3_cookie,1, FALSE); + idx + l2tpv3_cookie,1, ENC_BIG_ENDIAN); proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_s, tvb, - idx + l2tpv3_cookie,1, FALSE); + idx + l2tpv3_cookie,1, ENC_BIG_ENDIAN); proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_flow_id, tvb, idx + l2tpv3_cookie,1, ENC_BIG_ENDIAN); @@ -1428,20 +1428,20 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, l2_specific = proto_item_add_subtree(ti, ett_l2tp_l2_spec); proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_s, tvb, idx + l2tpv3_cookie, - 1, FALSE); + 1, ENC_BIG_ENDIAN); proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_t, tvb, idx + l2tpv3_cookie, - 1, FALSE); + 1, ENC_BIG_ENDIAN); /* * As per RFC 4454, the T bit specifies whether * we're transporting an OAM cell or an AAL5 frame. */ oam_cell = tvb_get_guint8(tvb, idx + l2tpv3_cookie) & 0x08; proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_g, tvb, idx + l2tpv3_cookie, - 1, FALSE); + 1, ENC_BIG_ENDIAN); proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_c, tvb, idx + l2tpv3_cookie, - 1, FALSE); + 1, ENC_BIG_ENDIAN); proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_u, tvb, idx + l2tpv3_cookie, - 1, FALSE); + 1, ENC_BIG_ENDIAN); proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_sequence, tvb, idx + l2tpv3_cookie + 1, 3, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index 809ecc8300..dd658e9d08 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -1053,7 +1053,7 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) ti = proto_tree_add_text(val_tree, tvb, offset, 8+vc_len, "FEC Element %u", ix); fec_tree = proto_item_add_subtree(ti, ett_ldp_fec); proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_wc, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_controlword, tvb, offset+1, 1, FALSE); + proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_controlword, tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_vctype, tvb, offset+1, 2, ENC_BIG_ENDIAN); proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_infolength, tvb, offset+3,1,ENC_BIG_ENDIAN); proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_groupid,tvb, offset +4, 4, ENC_BIG_ENDIAN); @@ -1103,7 +1103,7 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) ti = proto_tree_add_text(val_tree, tvb, offset, 8+vc_len, "FEC Element %u", ix); fec_tree = proto_item_add_subtree(ti, ett_ldp_fec); proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_wc, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_controlword, tvb, offset+1, 1, FALSE); + proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_controlword, tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_vctype, tvb, offset+1, 2, ENC_BIG_ENDIAN); proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_infolength, tvb, offset+3,1,ENC_BIG_ENDIAN); rem -= 4; @@ -1405,8 +1405,8 @@ dissect_tlv_status(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) ti=proto_tree_add_text(tree, tvb, offset, rem, "Status"); val_tree=proto_item_add_subtree(ti, ett_ldp_tlv_val); - proto_tree_add_item(val_tree, hf_ldp_tlv_status_ebit, tvb, offset, 1, FALSE); - proto_tree_add_item(val_tree, hf_ldp_tlv_status_fbit, tvb, offset, 1, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_status_ebit, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(val_tree, hf_ldp_tlv_status_fbit, tvb, offset, 1, ENC_BIG_ENDIAN); data=tvb_get_ntohl(tvb, offset)&0x3FFFFFFF; proto_tree_add_uint_format(val_tree, hf_ldp_tlv_status_data, tvb, offset, 4, @@ -1434,7 +1434,7 @@ dissect_tlv_returned_pdu(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) proto_tree_add_item(val_tree, hf_ldp_tlv_returned_version, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(val_tree, hf_ldp_tlv_returned_pdu_len, tvb, offset+2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(val_tree, hf_ldp_tlv_returned_lsr, tvb, offset+4, 4, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_returned_lsr, tvb, offset+4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(val_tree, hf_ldp_tlv_returned_ls_id, tvb, offset+8, 2, ENC_BIG_ENDIAN); offset += 10; rem -= 10; @@ -1462,7 +1462,7 @@ dissect_tlv_returned_message(tvbuff_t *tvb, guint offset, proto_tree *tree, int ti=proto_tree_add_text(tree, tvb, offset, rem, "Returned Message"); val_tree=proto_item_add_subtree(ti, ett_ldp_tlv_val); - proto_tree_add_item(val_tree, hf_ldp_tlv_returned_msg_ubit, tvb, offset, 1, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_returned_msg_ubit, tvb, offset, 1, ENC_BIG_ENDIAN); type=tvb_get_ntohs(tvb, offset)&0x7FFF; /*chk for vendor-private*/ @@ -1515,8 +1515,8 @@ dissect_tlv_common_hello_parms(tvbuff_t *tvb, guint offset, proto_tree *tree) val_tree=tree; #endif proto_tree_add_item(val_tree, hf_ldp_tlv_val_hold, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(val_tree, hf_ldp_tlv_val_target, tvb, offset + 2, 2, FALSE); - proto_tree_add_item(val_tree, hf_ldp_tlv_val_request, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_val_target, tvb, offset + 2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(val_tree, hf_ldp_tlv_val_request, tvb, offset + 2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(val_tree, hf_ldp_tlv_val_res, tvb, offset + 2, 2, ENC_BIG_ENDIAN); } @@ -1564,10 +1564,10 @@ dissect_tlv_common_session_parms(tvbuff_t *tvb, guint offset, proto_tree *tree, proto_tree_add_item(val_tree, hf_ldp_tlv_sess_ka, tvb,offset + 2, 2, ENC_BIG_ENDIAN); /*A bit*/ - proto_tree_add_item(val_tree, hf_ldp_tlv_sess_advbit,tvb, offset + 4, 1, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_sess_advbit,tvb, offset + 4, 1, ENC_BIG_ENDIAN); /*D bit*/ - proto_tree_add_item(val_tree, hf_ldp_tlv_sess_ldetbit,tvb, offset + 4, 1, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_sess_ldetbit,tvb, offset + 4, 1, ENC_BIG_ENDIAN); /*Path Vector Limit*/ proto_tree_add_item(val_tree, hf_ldp_tlv_sess_pvlim,tvb, offset + 5, 1, ENC_BIG_ENDIAN); @@ -1576,7 +1576,7 @@ dissect_tlv_common_session_parms(tvbuff_t *tvb, guint offset, proto_tree *tree, proto_tree_add_item(val_tree, hf_ldp_tlv_sess_mxpdu,tvb, offset + 6, 2, ENC_BIG_ENDIAN); /*Rx LSR*/ - proto_tree_add_item(val_tree, hf_ldp_tlv_sess_rxlsr,tvb, offset + 8, 4, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_sess_rxlsr,tvb, offset + 8, 4, ENC_BIG_ENDIAN); /*Rx LS*/ proto_tree_add_item(val_tree, hf_ldp_tlv_sess_rxls,tvb, offset + 12, 2, ENC_BIG_ENDIAN); @@ -1609,7 +1609,7 @@ dissect_tlv_atm_session_parms(tvbuff_t *tvb, guint offset, proto_tree *tree, int tvb, offset, 1, numlr, "Number of Label Range components: %u", numlr); - proto_tree_add_item(val_tree, hf_ldp_tlv_sess_atm_dir,tvb, offset, 1, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_sess_atm_dir,tvb, offset, 1, ENC_BIG_ENDIAN); /*move into range components*/ offset += 4; @@ -1684,7 +1684,7 @@ dissect_tlv_frame_relay_session_parms(tvbuff_t *tvb, guint offset,proto_tree *tr numlr); proto_tree_add_item(val_tree, hf_ldp_tlv_sess_fr_dir, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); /*move into range components*/ offset += 4; @@ -1749,12 +1749,12 @@ dissect_tlv_ft_session(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) flags = tvb_get_ntohs(tvb, offset); proto_item_append_text(ti, " (%s%s)", (flags & 0x8000) ? "R, " : "", val_to_str(flags & 0xF, tlv_ft_flags, "Invalid")); - proto_tree_add_item(flags_tree, hf_ldp_tlv_ft_sess_flag_r, tvb, offset, 2, FALSE); + proto_tree_add_item(flags_tree, hf_ldp_tlv_ft_sess_flag_r, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(flags_tree, hf_ldp_tlv_ft_sess_flag_res, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(flags_tree, hf_ldp_tlv_ft_sess_flag_s, tvb, offset, 2, FALSE); - proto_tree_add_item(flags_tree, hf_ldp_tlv_ft_sess_flag_a, tvb, offset, 2, FALSE); - proto_tree_add_item(flags_tree, hf_ldp_tlv_ft_sess_flag_c, tvb, offset, 2, FALSE); - proto_tree_add_item(flags_tree, hf_ldp_tlv_ft_sess_flag_l, tvb, offset, 2, FALSE); + proto_tree_add_item(flags_tree, hf_ldp_tlv_ft_sess_flag_s, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_ldp_tlv_ft_sess_flag_a, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_ldp_tlv_ft_sess_flag_c, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_ldp_tlv_ft_sess_flag_l, tvb, offset, 2, ENC_BIG_ENDIAN); /* Reserved */ proto_tree_add_item(val_tree, hf_ldp_tlv_ft_sess_res, tvb, offset + 2, 2, ENC_BIG_ENDIAN); @@ -1790,7 +1790,7 @@ dissect_tlv_lspid(tvbuff_t *tvb, guint offset,proto_tree *tree, int rem) tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(val_tree, hf_ldp_tlv_lspid_ldpid, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); } static void @@ -1815,7 +1815,7 @@ dissect_tlv_er_hop_ipv4(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; proto_tree_add_item(val_tree, hf_ldp_tlv_er_hop_prefix4, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); } } @@ -1841,7 +1841,7 @@ dissect_tlv_er_hop_ipv6(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; proto_tree_add_item(val_tree, hf_ldp_tlv_er_hop_prefix6, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_NA); } } @@ -1890,7 +1890,7 @@ dissect_tlv_er_hop_lspid(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(val_tree, hf_ldp_tlv_er_hop_ldpid, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); } } @@ -1914,12 +1914,12 @@ dissect_tlv_traffic(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) if(val_tree != NULL) { /* flags */ proto_tree_add_item(val_tree, hf_ldp_tlv_flags_reserv, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(val_tree, hf_ldp_tlv_flags_weight, tvb, offset, 1, FALSE); - proto_tree_add_item(val_tree, hf_ldp_tlv_flags_ebs, tvb, offset, 1, FALSE); - proto_tree_add_item(val_tree, hf_ldp_tlv_flags_cbs, tvb, offset, 1, FALSE); - proto_tree_add_item(val_tree, hf_ldp_tlv_flags_cdr, tvb, offset, 1, FALSE); - proto_tree_add_item(val_tree, hf_ldp_tlv_flags_pbs, tvb, offset, 1, FALSE); - proto_tree_add_item(val_tree, hf_ldp_tlv_flags_pdr, tvb, offset, 1, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_flags_weight, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(val_tree, hf_ldp_tlv_flags_ebs, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(val_tree, hf_ldp_tlv_flags_cbs, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(val_tree, hf_ldp_tlv_flags_cdr, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(val_tree, hf_ldp_tlv_flags_pbs, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(val_tree, hf_ldp_tlv_flags_pdr, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; /* frequency */ @@ -2258,7 +2258,7 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) "Error processing IPv4 Transport Address TLV: length is %d, should be 4", length); else { - proto_tree_add_item(tlv_tree, hf_ldp_tlv_ipv4_taddr, tvb, offset + 4, 4, FALSE); + proto_tree_add_item(tlv_tree, hf_ldp_tlv_ipv4_taddr, tvb, offset + 4, 4, ENC_BIG_ENDIAN); } break; @@ -2278,7 +2278,7 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) "Error processing IPv6 Transport Address TLV: length is %d, should be 16", length); else { - proto_tree_add_item(tlv_tree, hf_ldp_tlv_ipv6_taddr, tvb, offset + 4, 16, FALSE); + proto_tree_add_item(tlv_tree, hf_ldp_tlv_ipv6_taddr, tvb, offset + 4, 16, ENC_NA); } break; @@ -2558,7 +2558,7 @@ dissect_msg(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree) msg_tree = proto_item_add_subtree(ti, ett_ldp_message); - proto_tree_add_item(msg_tree, hf_ldp_msg_ubit, tvb, offset, 1, FALSE); + proto_tree_add_item(msg_tree, hf_ldp_msg_ubit, tvb, offset, 1, ENC_BIG_ENDIAN); switch (type) { case LDP_VENDOR_PRIVATE_START: @@ -2637,7 +2637,7 @@ dissect_ldp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_set_reported_length(tvb, length); if (tree) { - proto_tree_add_item(pdu_tree, hf_ldp_lsr, tvb, offset+4, 4, FALSE); + proto_tree_add_item(pdu_tree, hf_ldp_lsr, tvb, offset+4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(pdu_tree, hf_ldp_ls_id, tvb, offset+8, 2, ENC_BIG_ENDIAN); } offset += 10; diff --git a/epan/dissectors/packet-lisp-data.c b/epan/dissectors/packet-lisp-data.c index da1249090f..d1eff75bee 100644 --- a/epan/dissectors/packet-lisp-data.c +++ b/epan/dissectors/packet-lisp-data.c @@ -114,15 +114,15 @@ dissect_lisp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) lisp_data_flags_tree = proto_item_add_subtree(tif, ett_lisp_data_flags); proto_tree_add_item(lisp_data_flags_tree, - hf_lisp_data_flags_nonce, tvb, offset, 1, FALSE); + hf_lisp_data_flags_nonce, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(lisp_data_flags_tree, - hf_lisp_data_flags_lsb, tvb, offset, 1, FALSE); + hf_lisp_data_flags_lsb, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(lisp_data_flags_tree, - hf_lisp_data_flags_enr, tvb, offset, 1, FALSE); + hf_lisp_data_flags_enr, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(lisp_data_flags_tree, - hf_lisp_data_flags_mv, tvb, offset, 1, FALSE); + hf_lisp_data_flags_mv, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(lisp_data_flags_tree, - hf_lisp_data_flags_iid, tvb, offset, 1, FALSE); + hf_lisp_data_flags_iid, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(lisp_data_flags_tree, hf_lisp_data_flags_res, tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c index 39fa769fa8..29ada9a480 100644 --- a/epan/dissectors/packet-lisp.c +++ b/epan/dissectors/packet-lisp.c @@ -360,12 +360,12 @@ dissect_lisp_map_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tre /* Flags (6 bits)*/ flags = tvb_get_guint8(tvb, offset); mrep = flags & (MAP_REQ_FLAG_M >> 16); - proto_tree_add_item(lisp_tree, hf_lisp_mreq_flags_auth, tvb, offset, 3, FALSE); - proto_tree_add_item(lisp_tree, hf_lisp_mreq_flags_mrp, tvb, offset, 3, FALSE); - proto_tree_add_item(lisp_tree, hf_lisp_mreq_flags_probe, tvb, offset, 3, FALSE); - proto_tree_add_item(lisp_tree, hf_lisp_mreq_flags_smr, tvb, offset, 3, FALSE); - proto_tree_add_item(lisp_tree, hf_lisp_mreq_flags_pitr, tvb, offset, 3, FALSE); - proto_tree_add_item(lisp_tree, hf_lisp_mreq_flags_smri, tvb, offset, 3, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_mreq_flags_auth, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(lisp_tree, hf_lisp_mreq_flags_mrp, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(lisp_tree, hf_lisp_mreq_flags_probe, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(lisp_tree, hf_lisp_mreq_flags_smr, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(lisp_tree, hf_lisp_mreq_flags_pitr, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(lisp_tree, hf_lisp_mreq_flags_smri, tvb, offset, 3, ENC_BIG_ENDIAN); /* Reserved bits (9 bits) */ proto_tree_add_item(lisp_tree, hf_lisp_mreq_res, tvb, offset, 3, ENC_BIG_ENDIAN); @@ -574,8 +574,8 @@ dissect_lisp_map_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree) tvbuff_t *next_tvb; /* Flags (2 bits) */ - proto_tree_add_item(lisp_tree, hf_lisp_mrep_flags_probe, tvb, offset, 3, FALSE); - proto_tree_add_item(lisp_tree, hf_lisp_mrep_flags_enlr, tvb, offset, 3, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_mrep_flags_probe, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(lisp_tree, hf_lisp_mrep_flags_enlr, tvb, offset, 3, ENC_BIG_ENDIAN); /* Reserved bits (18 bits) */ proto_tree_add_item(lisp_tree, hf_lisp_mrep_res, tvb, offset, 3, ENC_BIG_ENDIAN); @@ -648,13 +648,13 @@ dissect_lisp_map_register(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tr guint16 authlen = 0; /* Flags (1 bit) */ - proto_tree_add_item(lisp_tree, hf_lisp_mreg_flags_pmr, tvb, offset, 3, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_mreg_flags_pmr, tvb, offset, 3, ENC_BIG_ENDIAN); /* Reserved bits (18 bits) */ proto_tree_add_item(lisp_tree, hf_lisp_mreg_res, tvb, offset, 3, ENC_BIG_ENDIAN); /* Flags (1 bit) */ - proto_tree_add_item(lisp_tree, hf_lisp_mreg_flags_wmn, tvb, offset, 3, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_mreg_flags_wmn, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; /* Record count (8 bits) */ diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index d9e3c4257b..e202ef987b 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -1206,10 +1206,10 @@ dissect_lldp_management_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre { /* XXX - Should we throw an exception if stringLen doesn't match our address length? */ case 1: /* IPv4 */ - proto_tree_add_item(system_mgm_addr, hf_mgn_addr_ipv4, tvb, tempOffset, 4, FALSE); + proto_tree_add_item(system_mgm_addr, hf_mgn_addr_ipv4, tvb, tempOffset, 4, ENC_BIG_ENDIAN); break; case 2: /* IPv6 */ - proto_tree_add_item(system_mgm_addr, hf_mgn_addr_ipv6, tvb, tempOffset, 16, FALSE); + proto_tree_add_item(system_mgm_addr, hf_mgn_addr_ipv6, tvb, tempOffset, 16, ENC_NA); break; default: proto_tree_add_item(system_mgm_addr, hf_mgn_addr_hex, tvb, tempOffset, (stringLen-1), ENC_NA); diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index 71d08e3c20..5498503a77 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.c @@ -515,7 +515,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree) /* subtype */ proto_tree_add_item(ext_tree, hf_mip_dhaext_stype, tvb, offset, 1, ENC_BIG_ENDIAN); /* Home Agent */ - proto_tree_add_item(ext_tree, hf_mip_dhaext_addr, tvb, offset + 1, 4, FALSE); + proto_tree_add_item(ext_tree, hf_mip_dhaext_addr, tvb, offset + 1, 4, ENC_BIG_ENDIAN); break; case MSG_STR_EXT: /* sub-type */ @@ -705,15 +705,15 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; /* home address */ - proto_tree_add_item(mip_tree, hf_mip_homeaddr, tvb, offset, 4, FALSE); + proto_tree_add_item(mip_tree, hf_mip_homeaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* home agent address */ - proto_tree_add_item(mip_tree, hf_mip_haaddr, tvb, offset, 4, FALSE); + proto_tree_add_item(mip_tree, hf_mip_haaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Care of Address */ - proto_tree_add_item(mip_tree, hf_mip_coa, tvb, offset, 4, FALSE); + proto_tree_add_item(mip_tree, hf_mip_coa, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Identifier - assumed to be an NTP time here */ @@ -747,11 +747,11 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; /* Home address */ - proto_tree_add_item(mip_tree, hf_mip_homeaddr, tvb, offset, 4, FALSE); + proto_tree_add_item(mip_tree, hf_mip_homeaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Home Agent Address */ - proto_tree_add_item(mip_tree, hf_mip_haaddr, tvb, offset, 4, FALSE); + proto_tree_add_item(mip_tree, hf_mip_haaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Identifier - assumed to be an NTP time here */ @@ -819,15 +819,15 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; /* home address */ - proto_tree_add_item(mip_tree, hf_mip_homeaddr, tvb, offset, 4, FALSE); + proto_tree_add_item(mip_tree, hf_mip_homeaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* home domain address */ - proto_tree_add_item(mip_tree, hf_mip_hda, tvb, offset, 4, FALSE); + proto_tree_add_item(mip_tree, hf_mip_hda, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* foreign domain address */ - proto_tree_add_item(mip_tree, hf_mip_fda, tvb, offset, 4, FALSE); + proto_tree_add_item(mip_tree, hf_mip_fda, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* revocation identifier */ @@ -862,7 +862,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; /* home address */ - proto_tree_add_item(mip_tree, hf_mip_homeaddr, tvb, offset, 4, FALSE); + proto_tree_add_item(mip_tree, hf_mip_homeaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* revocation identifier */ diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index 6692b0476f..181515ea51 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -1001,23 +1001,23 @@ dissect_mip6_bu(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) MIP6_BU_SEQNR_OFF, MIP6_BU_SEQNR_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_mip6_bu_a_flag, tvb, - MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE); + MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_mip6_bu_h_flag, tvb, - MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE); + MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_mip6_bu_l_flag, tvb, - MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE); + MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_mip6_bu_k_flag, tvb, - MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE); + MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_mip6_bu_m_flag, tvb, - MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE); + MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_mip6_nemo_bu_r_flag, tvb, - MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE); + MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_pmip6_bu_p_flag, tvb, - MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE); + MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_mip6_bu_f_flag, tvb, - MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE); + MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_pmip6_bu_t_flag, tvb, - MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE); + MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, ENC_BIG_ENDIAN); if ((tvb_get_guint8(tvb, MIP6_BU_FLAGS_OFF) & 0x0004 ) == 0x0004) proto_nemo = 1; @@ -1050,13 +1050,13 @@ dissect_mip6_ba(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) proto_tree_add_item(data_tree, hf_mip6_ba_status, tvb, MIP6_BA_STATUS_OFF, MIP6_BA_STATUS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_mip6_ba_k_flag, tvb, - MIP6_BA_FLAGS_OFF, MIP6_BA_FLAGS_LEN, FALSE); + MIP6_BA_FLAGS_OFF, MIP6_BA_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_mip6_nemo_ba_r_flag, tvb, - MIP6_BA_FLAGS_OFF, MIP6_BA_FLAGS_LEN, FALSE); + MIP6_BA_FLAGS_OFF, MIP6_BA_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_pmip6_ba_p_flag, tvb, - MIP6_BA_FLAGS_OFF, MIP6_BA_FLAGS_LEN, FALSE); + MIP6_BA_FLAGS_OFF, MIP6_BA_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_pmip6_ba_t_flag, tvb, - MIP6_BA_FLAGS_OFF, MIP6_BA_FLAGS_LEN, FALSE); + MIP6_BA_FLAGS_OFF, MIP6_BA_FLAGS_LEN, ENC_BIG_ENDIAN); if ((tvb_get_guint8(tvb, MIP6_BA_FLAGS_OFF) & 0x0040 ) == 0x0040) proto_nemo = 1; @@ -1090,7 +1090,7 @@ dissect_mip6_be(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) proto_tree_add_item(data_tree, hf_mip6_be_status, tvb, MIP6_BE_STATUS_OFF, MIP6_BE_STATUS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_mip6_be_haddr, tvb, - MIP6_BE_HOA_OFF, MIP6_BE_HOA_LEN, FALSE); + MIP6_BE_HOA_OFF, MIP6_BE_HOA_LEN, ENC_NA); } return MIP6_DATA_OFF + MIP6_BE_LEN; @@ -1110,9 +1110,9 @@ dissect_mip6_hb(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) data_tree = proto_item_add_subtree(ti, ett_mip6); proto_tree_add_item(data_tree, hf_mip6_hb_u_flag, tvb, - MIP6_HB_FLAGS_OFF, MIP6_HB_FLAGS_LEN, FALSE); + MIP6_HB_FLAGS_OFF, MIP6_HB_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_mip6_hb_r_flag, tvb, - MIP6_HB_FLAGS_OFF, MIP6_HB_FLAGS_LEN, FALSE); + MIP6_HB_FLAGS_OFF, MIP6_HB_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_mip6_hb_seqnr, tvb, MIP6_HB_SEQNR_OFF, MIP6_HB_SEQNR_LEN, ENC_BIG_ENDIAN); @@ -1157,13 +1157,13 @@ dissect_fmip6_fbu(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) FMIP6_FBU_SEQNR_OFF, FMIP6_FBU_SEQNR_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_fmip6_fbu_a_flag, tvb, - FMIP6_FBU_FLAGS_OFF, FMIP6_FBU_FLAGS_LEN, FALSE); + FMIP6_FBU_FLAGS_OFF, FMIP6_FBU_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_fmip6_fbu_h_flag, tvb, - FMIP6_FBU_FLAGS_OFF, FMIP6_FBU_FLAGS_LEN, FALSE); + FMIP6_FBU_FLAGS_OFF, FMIP6_FBU_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_fmip6_fbu_l_flag, tvb, - FMIP6_FBU_FLAGS_OFF, FMIP6_FBU_FLAGS_LEN, FALSE); + FMIP6_FBU_FLAGS_OFF, FMIP6_FBU_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_fmip6_fbu_k_flag, tvb, - FMIP6_FBU_FLAGS_OFF, FMIP6_FBU_FLAGS_LEN, FALSE); + FMIP6_FBU_FLAGS_OFF, FMIP6_FBU_FLAGS_LEN, ENC_BIG_ENDIAN); lifetime = tvb_get_ntohs(tvb, FMIP6_FBU_LIFETIME_OFF); proto_tree_add_uint_format(data_tree, hf_fmip6_fbu_lifetime, tvb, @@ -1193,7 +1193,7 @@ dissect_fmip6_fback(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) proto_tree_add_item(data_tree, hf_fmip6_fback_status, tvb, FMIP6_FBACK_STATUS_OFF, FMIP6_FBACK_STATUS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_fmip6_fback_k_flag, tvb, - FMIP6_FBACK_FLAGS_OFF, FMIP6_FBACK_FLAGS_LEN, FALSE); + FMIP6_FBACK_FLAGS_OFF, FMIP6_FBACK_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_fmip6_fback_seqnr, tvb, FMIP6_FBACK_SEQNR_OFF, FMIP6_FBACK_SEQNR_LEN, ENC_BIG_ENDIAN); lifetime = tvb_get_ntohs(tvb, FMIP6_FBACK_LIFETIME_OFF); @@ -1259,13 +1259,13 @@ dissect_pmip6_bri(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) PMIP6_BRI_SEQNR_OFF, PMIP6_BRI_SEQNR_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_pmip6_bri_ip_flag, tvb, - PMIP6_BRI_FLAGS_OFF, PMIP6_BRI_FLAGS_LEN, FALSE); + PMIP6_BRI_FLAGS_OFF, PMIP6_BRI_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_pmip6_bri_ia_flag, tvb, - PMIP6_BRI_FLAGS_OFF, PMIP6_BRI_FLAGS_LEN, FALSE); + PMIP6_BRI_FLAGS_OFF, PMIP6_BRI_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_pmip6_bri_ig_flag, tvb, - PMIP6_BRI_FLAGS_OFF, PMIP6_BRI_FLAGS_LEN, FALSE); + PMIP6_BRI_FLAGS_OFF, PMIP6_BRI_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_pmip6_bri_res, tvb, PMIP6_BRI_RES_OFF, PMIP6_BRI_RES_LEN, ENC_BIG_ENDIAN); @@ -1291,10 +1291,10 @@ dissect_pmip6_bri(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) PMIP6_BRI_SEQNR_OFF, PMIP6_BRI_SEQNR_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_pmip6_bri_ap_flag, tvb, - PMIP6_BRI_FLAGS_OFF, PMIP6_BRI_FLAGS_LEN, FALSE); + PMIP6_BRI_FLAGS_OFF, PMIP6_BRI_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_pmip6_bri_ag_flag, tvb, - PMIP6_BRI_FLAGS_OFF, PMIP6_BRI_FLAGS_LEN, FALSE); + PMIP6_BRI_FLAGS_OFF, PMIP6_BRI_FLAGS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_pmip6_bri_res, tvb, PMIP6_BRI_RES_OFF, PMIP6_BRI_RES_LEN, ENC_BIG_ENDIAN); @@ -1350,7 +1350,7 @@ dissect_mip6_nemo_opt_mnp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, offset + MIP6_NEMO_MNP_PL_OFF, 1, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_mip6_nemo_mnp_mnp, tvb, - offset + MIP6_NEMO_MNP_MNP_OFF, MIP6_NEMO_MNP_MNP_LEN, FALSE); + offset + MIP6_NEMO_MNP_MNP_OFF, MIP6_NEMO_MNP_MNP_LEN, ENC_NA); } static void @@ -1580,10 +1580,10 @@ dissect_pmip6_opt_ipv4ha(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, len = MIP6_IPV4HA_PREFIXL_LEN; proto_tree_add_item(field_tree, hf_mip6_ipv4ha_preflen, tvb, p, len, ENC_BIG_ENDIAN); - proto_tree_add_item(field_tree, hf_mip6_ipv4ha_p_flag, tvb, p, len+1, FALSE); + proto_tree_add_item(field_tree, hf_mip6_ipv4ha_p_flag, tvb, p, len+1, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_mip6_ipv4ha_ha, tvb, - offset + MIP6_IPV4HA_HA_OFF, MIP6_IPV4HA_HA_LEN, FALSE); + offset + MIP6_IPV4HA_HA_OFF, MIP6_IPV4HA_HA_LEN, ENC_BIG_ENDIAN); } @@ -1605,7 +1605,7 @@ dissect_pmip6_opt_ipv4aa(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, offset + MIP6_IPV4AA_PREFIXL_OFF, MIP6_IPV4AA_PREFIXL_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_mip6_ipv4ha_ha, tvb, - offset + MIP6_IPV4AA_HA_OFF, MIP6_IPV4AA_HA_LEN, FALSE); + offset + MIP6_IPV4AA_HA_OFF, MIP6_IPV4AA_HA_LEN, ENC_BIG_ENDIAN); } @@ -1634,7 +1634,7 @@ dissect_pmip6_opt_ipv4hareq(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offse offset + MIP6_IPV4HAREQ_PREFIXL_OFF, MIP6_IPV4HAREQ_PREFIXL_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_mip6_ipv4ha_ha, tvb, - offset + MIP6_IPV4HAREQ_HA_OFF, MIP6_IPV4HAREQ_HA_LEN, FALSE); + offset + MIP6_IPV4HAREQ_HA_OFF, MIP6_IPV4HAREQ_HA_LEN, ENC_BIG_ENDIAN); } @@ -1656,7 +1656,7 @@ dissect_pmip6_opt_ipv4harep(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offse offset + MIP6_IPV4HAREP_PREFIXL_OFF, MIP6_IPV4HAREP_PREFIXL_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_mip6_ipv4ha_ha, tvb, - offset + MIP6_IPV4HAREP_HA_OFF, MIP6_IPV4HAREP_HA_LEN, FALSE); + offset + MIP6_IPV4HAREP_HA_OFF, MIP6_IPV4HAREP_HA_LEN, ENC_BIG_ENDIAN); } @@ -1672,7 +1672,7 @@ dissect_pmip6_opt_ipv4dra(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, field_tree = proto_item_add_subtree(tf, *optp->subtree_index); proto_tree_add_item(field_tree, hf_mip6_ipv4dra_dra, tvb, - offset + MIP6_IPV4DRA_DRA_OFF, MIP6_IPV4DRA_DRA_LEN, FALSE); + offset + MIP6_IPV4DRA_DRA_OFF, MIP6_IPV4DRA_DRA_LEN, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index 27b74ead5c..701002e14b 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -347,7 +347,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem switch (type) { case TLV_FEC_STACK_LDP_IPv4: proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_ldp_ipv4, - tvb, offset + 4, 4, FALSE); + tvb, offset + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_ldp_ipv4_mask, tvb, offset + 8, 1, ENC_BIG_ENDIAN); if (length == 8) @@ -355,7 +355,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem break; case TLV_FEC_STACK_LDP_IPv6: proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_ldp_ipv6, - tvb, offset + 4, 16, FALSE); + tvb, offset + 4, 16, ENC_NA); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_ldp_ipv6_mask, tvb, offset + 20, 1, ENC_BIG_ENDIAN); if (length == 20) @@ -368,7 +368,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem return; } proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ipv4_ipv4_endpoint, - tvb, offset + 4, 4, FALSE); + tvb, offset + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ip_mbz1, tvb, offset + 8, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ip_tunnel_id, @@ -380,7 +380,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem tvb, offset + 12, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ipv4_ipv4_sender, - tvb, offset + 16, 4, FALSE); + tvb, offset + 16, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ip_mbz2, tvb, offset + 20, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ip_lsp_id, @@ -393,7 +393,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem return; } proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ipv6_ipv6_endpoint, - tvb, offset + 4, 16, FALSE); + tvb, offset + 4, 16, ENC_NA); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ip_mbz1, tvb, offset + 20, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ip_tunnel_id, @@ -406,7 +406,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem tvb, offset + 24, 16, ENC_NA); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ipv6_ipv6_sender, - tvb, offset + 40, 16, FALSE); + tvb, offset + 40, 16, ENC_NA); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ip_mbz2, tvb, offset + 56, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ip_lsp_id, @@ -414,7 +414,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem break; case TLV_FEC_STACK_L2_CID_OLD: proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_l2cid_remote, - tvb, offset + 4, 4, FALSE); + tvb, offset + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_l2cid_vcid, tvb, offset + 8, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_l2cid_encap, @@ -429,9 +429,9 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem return; } proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_l2cid_sender, - tvb, offset + 4, 4, FALSE); + tvb, offset + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_l2cid_remote, - tvb, offset + 8, 4, FALSE); + tvb, offset + 8, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_l2cid_vcid, tvb, offset + 12, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_l2cid_encap, @@ -453,9 +453,9 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem break; case TLV_FEC_STACK_BGP_LAB_v4: proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_bgp_nh, - tvb, offset + 4, 4, FALSE); + tvb, offset + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_bgp_ipv4, - tvb, offset + 8, 4, FALSE); + tvb, offset + 8, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_bgp_len, tvb, offset + 12, 1, ENC_BIG_ENDIAN); if (length == 12) @@ -463,7 +463,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem break; case TLV_FEC_STACK_GEN_IPv4: proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_gen_ipv4, - tvb, offset + 4, 4, FALSE); + tvb, offset + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_gen_ipv4_mask, tvb, offset + 8, 1, ENC_BIG_ENDIAN); if (length == 8) @@ -471,7 +471,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem break; case TLV_FEC_STACK_GEN_IPv6: proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_gen_ipv6, - tvb, offset + 4, 16, FALSE); + tvb, offset + 4, 16, ENC_NA); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_gen_ipv6_mask, tvb, offset + 20, 1, ENC_BIG_ENDIAN); if (length == 20) @@ -553,30 +553,30 @@ dissect_mpls_echo_tlv_ds_map(tvbuff_t *tvb, guint offset, proto_tree *tree, int proto_tree_add_item(tlv_ds_map_tree, hf_mpls_echo_tlv_ds_map_flag_res, tvb, offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_ds_map_tree, hf_mpls_echo_tlv_ds_map_flag_i, tvb, - offset + 3, 1, FALSE); + offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_ds_map_tree, hf_mpls_echo_tlv_ds_map_flag_n, tvb, - offset + 3, 1, FALSE); + offset + 3, 1, ENC_BIG_ENDIAN); addr_type = tvb_get_guint8(tvb, offset + 2); switch(addr_type){ case TLV_ADDR_IPv4: proto_tree_add_item(tree, hf_mpls_echo_tlv_ds_map_ds_ip, tvb, - offset + 4, 4, FALSE); + offset + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_mpls_echo_tlv_ds_map_int_ip, tvb, - offset + 8, 4, FALSE); + offset + 8, 4, ENC_BIG_ENDIAN); break; case TLV_ADDR_UNNUM_IPv4: case TLV_ADDR_UNNUM_IPv6: proto_tree_add_item(tree, hf_mpls_echo_tlv_ds_map_ds_ip, tvb, - offset + 4, 4, FALSE); + offset + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_mpls_echo_tlv_ds_map_if_index, tvb, offset + 8, 4, ENC_BIG_ENDIAN); break; case TLV_ADDR_IPv6: proto_tree_add_item(tree, hf_mpls_echo_tlv_ds_map_ds_ipv6, tvb, - offset + 4, 16, FALSE); + offset + 4, 16, ENC_NA); proto_tree_add_item(tree, hf_mpls_echo_tlv_ds_map_int_ipv6, tvb, - offset + 20, 16, FALSE); + offset + 20, 16, ENC_NA); rem -= 24; offset += 24; break; @@ -618,7 +618,7 @@ dissect_mpls_echo_tlv_ds_map(tvbuff_t *tvb, guint offset, proto_tree *tree, int "Multipath Information"); tlv_ds_map_tree = proto_item_add_subtree(ti, ett_mpls_echo_tlv_ds_map); proto_tree_add_item(tlv_ds_map_tree, hf_mpls_echo_tlv_ds_map_mp_ip, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); break; case TLV_DS_MAP_HASH_IP_RANGE: if(mplen != 8){ @@ -630,9 +630,9 @@ dissect_mpls_echo_tlv_ds_map(tvbuff_t *tvb, guint offset, proto_tree *tree, int "Multipath Information"); tlv_ds_map_tree = proto_item_add_subtree(ti, ett_mpls_echo_tlv_ds_map); proto_tree_add_item(tlv_ds_map_tree, hf_mpls_echo_tlv_ds_map_mp_ip_low, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_ds_map_tree, hf_mpls_echo_tlv_ds_map_mp_ip_high, tvb, - offset + 4, 4, FALSE); + offset + 4, 4, ENC_BIG_ENDIAN); break; case TLV_DS_MAP_HASH_NO_MP: case TLV_DS_MAP_HASH_NO_LABEL: @@ -651,7 +651,7 @@ dissect_mpls_echo_tlv_ds_map(tvbuff_t *tvb, guint offset, proto_tree *tree, int "Multipath Information"); tlv_ds_map_tree = proto_item_add_subtree(ti, ett_mpls_echo_tlv_ds_map); proto_tree_add_item(tlv_ds_map_tree, hf_mpls_echo_tlv_ds_map_mp_ip, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); if(mplen > 4) proto_tree_add_item(tlv_ds_map_tree, hf_mpls_echo_tlv_ds_map_mp_mask, tvb, offset + 4, mplen - 4, ENC_NA); @@ -722,10 +722,10 @@ dissect_mpls_echo_tlv_ilso(tvbuff_t *tvb, guint offset, proto_tree *tree, int re proto_tree_add_text(tree, tvb, offset, 4, "Incorrect address type for TLV ?"); } proto_tree_add_item(tree, hf_mpls_echo_tlv_ilso_ipv4_addr, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); if (type == TLV_ADDR_IPv4) { proto_tree_add_item(tree, hf_mpls_echo_tlv_ilso_ipv4_int_addr, tvb, - offset + 4, 4, FALSE); + offset + 4, 4, ENC_BIG_ENDIAN); } else { proto_tree_add_item(tree, hf_mpls_echo_tlv_ilso_int_index, tvb, offset + 4, 4, ENC_BIG_ENDIAN); @@ -738,10 +738,10 @@ dissect_mpls_echo_tlv_ilso(tvbuff_t *tvb, guint offset, proto_tree *tree, int re } proto_tree_add_item(tree, hf_mpls_echo_tlv_ilso_ipv6_addr, tvb, - offset, 16, FALSE); + offset, 16, ENC_NA); if (type == TLV_ADDR_IPv6) { proto_tree_add_item(tree, hf_mpls_echo_tlv_ilso_ipv6_int_addr, tvb, - offset + 16, 16, FALSE); + offset + 16, 16, ENC_NA); offset += 32; rem -= 32; } else { @@ -898,7 +898,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem, gb break; } proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_rto_ipv4, - tvb, offset + 4, 4, FALSE); + tvb, offset + 4, 4, ENC_BIG_ENDIAN); break; case TLV_RTO_IPv6: if(length != 16) { @@ -908,7 +908,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem, gb break; } proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_rto_ipv6, - tvb, offset + 4, 16, FALSE); + tvb, offset + 4, 16, ENC_NA); break; case TLV_VENDOR_PRIVATE_START: if (length < 4) { /* SMI Enterprise code */ @@ -1024,7 +1024,7 @@ dissect_mpls_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(mpls_echo_gflags, hf_mpls_echo_flag_sbz, tvb, offset + 2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(mpls_echo_gflags, - hf_mpls_echo_flag_v, tvb, offset + 2, 2, FALSE); + hf_mpls_echo_flag_v, tvb, offset + 2, 2, ENC_BIG_ENDIAN); } else { proto_tree_add_item(mpls_echo_tree, hf_mpls_echo_mbz, tvb, offset + 2, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c index 67ec55081c..087c3bd94d 100644 --- a/epan/dissectors/packet-msdp.c +++ b/epan/dissectors/packet-msdp.c @@ -213,7 +213,7 @@ dissect_msdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case MSDP_SA_REQ: proto_tree_add_item(msdp_tree, hf_msdp_sa_req_res, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(msdp_tree, hf_msdp_sa_req_group, tvb, offset + 1, 4, FALSE); + proto_tree_add_item(msdp_tree, hf_msdp_sa_req_group, tvb, offset + 1, 4, ENC_BIG_ENDIAN); offset += 5; break; case MSDP_NOTIFICATION: @@ -255,7 +255,7 @@ static void dissect_msdp_sa(tvbuff_t *tvb, packet_info *pinfo, *offset += length; return; } - proto_tree_add_item(tree, hf_msdp_sa_rp_addr, tvb, *offset, 4, FALSE); + proto_tree_add_item(tree, hf_msdp_sa_rp_addr, tvb, *offset, 4, ENC_BIG_ENDIAN); *offset += 4; length -= 4; @@ -282,10 +282,10 @@ static void dissect_msdp_sa(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(entry_tree, hf_msdp_sa_sprefix_len, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset += 1; length -= 1; - proto_tree_add_item(entry_tree, hf_msdp_sa_group_addr, tvb, *offset, 4, FALSE); + proto_tree_add_item(entry_tree, hf_msdp_sa_group_addr, tvb, *offset, 4, ENC_BIG_ENDIAN); *offset += 4; length -= 4; - proto_tree_add_item(entry_tree, hf_msdp_sa_src_addr, tvb, *offset, 4, FALSE); + proto_tree_add_item(entry_tree, hf_msdp_sa_src_addr, tvb, *offset, 4, ENC_BIG_ENDIAN); *offset += 4; length -= 4; } diff --git a/epan/dissectors/packet-msnlb.c b/epan/dissectors/packet-msnlb.c index 4be17a0afb..85e3e9a028 100644 --- a/epan/dissectors/packet-msnlb.c +++ b/epan/dissectors/packet-msnlb.c @@ -73,10 +73,10 @@ dissect_msnlb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(msnlb_tree, hf_msnlb_hpn, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(msnlb_tree, hf_msnlb_cls_virt_ip, tvb, offset, 4, FALSE); + proto_tree_add_item(msnlb_tree, hf_msnlb_cls_virt_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(msnlb_tree, hf_msnlb_host_ip, tvb, offset, 4, FALSE); + proto_tree_add_item(msnlb_tree, hf_msnlb_host_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, ENC_NA); diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c index 003e9a72c8..7eddd24335 100644 --- a/epan/dissectors/packet-msproxy.c +++ b/epan/dissectors/packet-msproxy.c @@ -412,7 +412,7 @@ static void dissect_bind(tvbuff_t *tvb, int offset, if ( tree) proto_tree_add_item( tree, hf_msproxy_bindaddr, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 4; if ( tree) @@ -499,7 +499,7 @@ static void dissect_request_connect(tvbuff_t *tvb, int offset, if ( tree) proto_tree_add_item( tree, hf_msproxy_dstaddr, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); conv_info->dst_addr = tvb_get_ipv4( tvb, offset); @@ -535,7 +535,7 @@ static void dissect_bind_info_ack(tvbuff_t *tvb, int offset, proto_tree *tree) { offset += 2; proto_tree_add_item( tree, hf_msproxy_dstaddr, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 12; proto_tree_add_item( tree, hf_msproxy_server_int_port, tvb, @@ -547,7 +547,7 @@ static void dissect_bind_info_ack(tvbuff_t *tvb, int offset, proto_tree *tree) { offset += 2; proto_tree_add_item( tree, hf_msproxy_server_ext_addr, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 78; display_application_name( tvb, offset, tree); @@ -613,7 +613,7 @@ static void dissect_udp_bind(tvbuff_t *tvb, int offset, if ( tree) proto_tree_add_item( tree, hf_msproxy_dstaddr, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 96; @@ -748,7 +748,7 @@ static void dissect_hello_ack(tvbuff_t *tvb, int offset, proto_tree *tree) { offset += 2; proto_tree_add_item( tree, hf_msproxy_serveraddr, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 4; } } @@ -784,7 +784,7 @@ static void dissect_udpassociate_ack(tvbuff_t *tvb, int offset, offset += 2; proto_tree_add_item( tree, hf_msproxy_server_ext_addr, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 96; display_application_name( tvb, offset, tree); @@ -838,7 +838,7 @@ static void dissect_connect_ack( tvbuff_t *tvb, int offset, packet_info *pinfo, if ( tree){ proto_tree_add_item( tree, hf_msproxy_server_int_addr, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 14; proto_tree_add_item( tree, hf_msproxy_server_ext_port, tvb, @@ -846,7 +846,7 @@ static void dissect_connect_ack( tvbuff_t *tvb, int offset, packet_info *pinfo, offset += 2; proto_tree_add_item( tree, hf_msproxy_server_ext_addr, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 80; display_application_name( tvb, offset, tree); @@ -877,7 +877,7 @@ static void dissect_tcp_bind_ack( tvbuff_t *tvb, int offset, proto_tree *tree) { offset += 2; proto_tree_add_item( tree, hf_msproxy_server_ext_addr, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 88; @@ -909,7 +909,7 @@ static void dissect_bind_info( tvbuff_t *tvb, int offset, packet_info *pinfo, conv_info->dst_addr = tvb_get_ipv4( tvb, offset); if ( tree) proto_tree_add_item( tree, hf_msproxy_dstaddr, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 12; conv_info->server_int_port = tvb_get_ntohs( tvb, offset); @@ -924,7 +924,7 @@ static void dissect_bind_info( tvbuff_t *tvb, int offset, packet_info *pinfo, offset += 2; proto_tree_add_item( tree, hf_msproxy_server_ext_addr, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 78; display_application_name( tvb, offset, tree); @@ -958,7 +958,7 @@ static void dissect_resolve(tvbuff_t *tvb, int offset, proto_tree *tree) { offset += addr_offset; proto_tree_add_item( tree, hf_msproxy_resolvaddr, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); } } diff --git a/epan/dissectors/packet-mux27010.c b/epan/dissectors/packet-mux27010.c index 22b7f04d33..e1ee41d28d 100644 --- a/epan/dissectors/packet-mux27010.c +++ b/epan/dissectors/packet-mux27010.c @@ -442,8 +442,8 @@ getFrameAddress(tvbuff_t *tvb, proto_tree *field_tree_addr){ g_snprintf(colSourceText,sizeof(colSourceText),"%s %s", colSourceText, dlci_char); /*Add items to subtree to display the details*/ - proto_tree_add_item(field_tree_addr, hf_mux27010_eaaddressflag, tvb, offset, 1, FALSE); - proto_tree_add_item(field_tree_addr, hf_mux27010_craddressflag, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree_addr, hf_mux27010_eaaddressflag, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree_addr, hf_mux27010_craddressflag, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree_addr, hf_mux27010_dlciaddressflag, tvb, offset, 1, ENC_BIG_ENDIAN); /*Get info if frame is command or response*/ @@ -585,7 +585,7 @@ getFrameLength(tvbuff_t *tvb, proto_tree *field_tree){ length_info = length_info >> 1; /*Shift because of EA bit*/ /*Add the E/A bit and the length value to the subtree*/ - proto_tree_add_item(field_tree, hf_mux27010_ealengthflag, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_ealengthflag, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_uint_format(field_tree, hf_mux27010_lengthframesize, tvb, offset, 1, length_info, "Info length: %i", length_info); } /*If E/A = 0 the length of the info field is >127*/ @@ -605,7 +605,7 @@ getFrameLength(tvbuff_t *tvb, proto_tree *field_tree){ offset--; /*Add info to subtree*/ - proto_tree_add_item(field_tree, hf_mux27010_ealengthflag, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_ealengthflag, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_uint_format(field_tree, hf_mux27010_lengthframesize_ea, tvb, offset, 2, length_info, "Info length: %i", length_info); offset++; } @@ -643,8 +643,8 @@ getControlChannelFrameType(tvbuff_t *tvb, proto_tree *field_tree_ctr){ controlchannel_type_command = controlchannel_type_command & MUX27010_COMMAND_CONTROLCHANNEL_FRAMETYPE_FLAG; /*Add info to subtree*/ - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneleaframetype, tvb, offset, 1, FALSE); - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchannelcrframetype, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneleaframetype, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchannelcrframetype, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchannelframetypecommand, tvb, offset, 1, ENC_BIG_ENDIAN); /*Check the control channel frame types and add the name to the subtree and strcat the name to the info column*/ @@ -718,7 +718,7 @@ getControlChannelLength(tvbuff_t *tvb, proto_tree *field_tree_ctr) { controlchannel_length_value = controlchannel_length_value >> 1; /*Shift because of EA bit*/ /*Add data to subtree*/ - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchannelealength, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchannelealength, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchannellengthfield, tvb, offset, 1, ENC_BIG_ENDIAN); /*Increment the offset by the number of info octets*/ @@ -764,11 +764,11 @@ getControlChannelValues(tvbuff_t *tvb, proto_tree *field_tree_ctr){ proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluemscdlci, tvb, offset, 1, ENC_BIG_ENDIAN); /*Add bits of Flow Control*/ - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluemscv24fc, tvb, offset+1, 1, FALSE); - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluemscv24rtc, tvb, offset+1, 1, FALSE); - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluemscv24rtr, tvb, offset+1, 1, FALSE); - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluemscv24ring, tvb, offset+1, 1, FALSE); - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluemscv24dcd, tvb, offset+1, 1, FALSE); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluemscv24fc, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluemscv24rtc, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluemscv24rtr, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluemscv24ring, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluemscv24dcd, tvb, offset+1, 1, ENC_BIG_ENDIAN); /**/ if (controlchannel_length_value == 3) { diff --git a/epan/dissectors/packet-nb_rtpmux.c b/epan/dissectors/packet-nb_rtpmux.c index 1d7003a359..959c371c34 100644 --- a/epan/dissectors/packet-nb_rtpmux.c +++ b/epan/dissectors/packet-nb_rtpmux.c @@ -110,7 +110,7 @@ dissect_nb_rtpmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* XXX - what if the T bit is set? */ proto_tree_add_item(nb_rtpmux_tree, - hf_nb_rtpmux_compressed, tvb, offset, 1, FALSE); + hf_nb_rtpmux_compressed, tvb, offset, 1, ENC_BIG_ENDIAN); tbit = tvb_get_guint8(tvb,offset)>>7; if(tbit == 1){ /* 6.4.2.4 Transport Format for multiplexing with RTP header compression */ @@ -118,7 +118,7 @@ dissect_nb_rtpmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(nb_rtpmux_tree, hf_nb_rtpmux_dstport, tvb, offset, 2, dstport ); proto_tree_add_item(nb_rtpmux_tree, hf_nb_rtpmux_length, tvb, offset+2, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(nb_rtpmux_tree, hf_nb_r_bit, tvb, offset, 1, FALSE); + proto_tree_add_item(nb_rtpmux_tree, hf_nb_r_bit, tvb, offset, 1, ENC_BIG_ENDIAN); srcport = (tvb_get_ntohs(tvb, offset+3) & 0x7fff) << 1; proto_tree_add_uint(nb_rtpmux_tree, hf_nb_rtpmux_srcport, tvb, offset+3, 2, srcport ); cmp_rtp_item = proto_tree_add_text( nb_rtpmux_tree, tvb, offset+5, 3, "Compressed RTP header" ); @@ -136,7 +136,7 @@ dissect_nb_rtpmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(nb_rtpmux_tree, hf_nb_rtpmux_dstport, tvb, offset, 2, dstport ); proto_tree_add_item(nb_rtpmux_tree, hf_nb_rtpmux_length, tvb, offset+2, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(nb_rtpmux_tree, hf_nb_r_bit, tvb, offset, 1, FALSE); + proto_tree_add_item(nb_rtpmux_tree, hf_nb_r_bit, tvb, offset, 1, ENC_BIG_ENDIAN); srcport = (tvb_get_ntohs(tvb, offset+3) & 0x7fff) << 1; proto_tree_add_uint(nb_rtpmux_tree, hf_nb_rtpmux_srcport, tvb, offset+3, 2, srcport ); diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c index e04a6c19bd..942626ea76 100644 --- a/epan/dissectors/packet-nbns.c +++ b/epan/dissectors/packet-nbns.c @@ -483,23 +483,23 @@ nbns_add_nbns_flags(column_info *cinfo, proto_tree *nbns_tree, tvbuff_t *tvb, in tvb, offset, 2, flags, "Flags: 0x%04x (%s)", flags, buf); field_tree = proto_item_add_subtree(tf, ett_nbns_flags); proto_tree_add_item(field_tree, hf_nbns_flags_response, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_nbns_flags_opcode, tvb, offset, 2, ENC_BIG_ENDIAN); if (flags & F_RESPONSE) { proto_tree_add_item(field_tree, hf_nbns_flags_authoritative, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); } proto_tree_add_item(field_tree, hf_nbns_flags_truncated, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_nbns_flags_recdesired, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); if (flags & F_RESPONSE) { proto_tree_add_item(field_tree, hf_nbns_flags_recavail, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); } proto_tree_add_item(field_tree, hf_nbns_flags_broadcast, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); if (flags & F_RESPONSE && !is_wack) { proto_tree_add_item(field_tree, hf_nbns_flags_rcode, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c index 25bf38e639..e60894bd97 100644 --- a/epan/dissectors/packet-ncp-sss.c +++ b/epan/dissectors/packet-ncp-sss.c @@ -304,100 +304,100 @@ process_flags(proto_tree *sss_tree, tvbuff_t *tvb, guint32 foffset) switch(bvalue) { case 0x00000001: - proto_tree_add_item(flags_tree, hfbit1, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit1, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00000002: - proto_tree_add_item(flags_tree, hfbit2, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit2, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00000004: - proto_tree_add_item(flags_tree, hfbit3, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit3, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00000008: - proto_tree_add_item(flags_tree, hfbit4, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit4, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00000010: - proto_tree_add_item(flags_tree, hfbit5, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit5, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00000020: - proto_tree_add_item(flags_tree, hfbit6, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit6, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00000040: - proto_tree_add_item(flags_tree, hfbit7, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit7, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00000080: - proto_tree_add_item(flags_tree, hfbit8, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit8, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00000100: - proto_tree_add_item(flags_tree, hfbit9, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit9, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00000200: - proto_tree_add_item(flags_tree, hfbit10, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit10, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00000400: - proto_tree_add_item(flags_tree, hfbit11, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit11, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00000800: - proto_tree_add_item(flags_tree, hfbit12, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit12, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00001000: - proto_tree_add_item(flags_tree, hfbit13, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit13, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00002000: - proto_tree_add_item(flags_tree, hfbit14, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit14, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00004000: - proto_tree_add_item(flags_tree, hfbit15, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit15, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00008000: - proto_tree_add_item(flags_tree, hfbit16, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit16, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00010000: - proto_tree_add_item(flags_tree, hfbit17, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit17, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00020000: - proto_tree_add_item(flags_tree, hfbit18, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit18, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00040000: - proto_tree_add_item(flags_tree, hfbit19, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit19, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00080000: - proto_tree_add_item(flags_tree, hfbit20, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit20, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00100000: - proto_tree_add_item(flags_tree, hfbit21, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit21, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00200000: - proto_tree_add_item(flags_tree, hfbit22, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit22, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00400000: - proto_tree_add_item(flags_tree, hfbit23, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit23, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x00800000: - proto_tree_add_item(flags_tree, hfbit24, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit24, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x01000000: - proto_tree_add_item(flags_tree, hfbit25, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit25, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x02000000: - proto_tree_add_item(flags_tree, hfbit26, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit26, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x04000000: - proto_tree_add_item(flags_tree, hfbit27, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit27, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x08000000: - proto_tree_add_item(flags_tree, hfbit28, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit28, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x10000000: - proto_tree_add_item(flags_tree, hfbit29, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit29, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x20000000: - proto_tree_add_item(flags_tree, hfbit30, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit30, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x40000000: - proto_tree_add_item(flags_tree, hfbit31, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit31, tvb, foffset, 4, ENC_BIG_ENDIAN); break; case 0x80000000: - proto_tree_add_item(flags_tree, hfbit32, tvb, foffset, 4, FALSE); + proto_tree_add_item(flags_tree, hfbit32, tvb, foffset, 4, ENC_BIG_ENDIAN); break; default: break; diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index 2e48e7a8d5..5b94865f72 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -543,35 +543,35 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, flags_tree = proto_item_add_subtree(ti, ett_ncp_system_flags); proto_tree_add_item(flags_tree, hf_ncp_system_flags_abt, - tvb, commhdr + 2, 1, FALSE); + tvb, commhdr + 2, 1, ENC_BIG_ENDIAN); if (flags & ABT) { proto_item_append_text(ti, " ABT"); } flags&=(~( ABT )); proto_tree_add_item(flags_tree, hf_ncp_system_flags_bsy, - tvb, commhdr + 2, 1, FALSE); + tvb, commhdr + 2, 1, ENC_BIG_ENDIAN); if (flags & BSY) { proto_item_append_text(ti, " BSY"); } flags&=(~( BSY )); proto_tree_add_item(flags_tree, hf_ncp_system_flags_eob, - tvb, commhdr + 2, 1, FALSE); + tvb, commhdr + 2, 1, ENC_BIG_ENDIAN); if (flags & EOB) { proto_item_append_text(ti, " EOB"); } flags&=(~( EOB )); proto_tree_add_item(flags_tree, hf_ncp_system_flags_lst, - tvb, commhdr + 2, 1, FALSE); + tvb, commhdr + 2, 1, ENC_BIG_ENDIAN); if (flags & LST) { proto_item_append_text(ti, " LST"); } flags&=(~( LST )); proto_tree_add_item(flags_tree, hf_ncp_system_flags_sys, - tvb, commhdr + 2, 1, FALSE); + tvb, commhdr + 2, 1, ENC_BIG_ENDIAN); if (flags & SYS) { proto_item_append_text(ti, " SYS"); } diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index d8ddb55049..5b0aa56629 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -1894,7 +1894,7 @@ static int dissect_ndmp_v4_tcp_addr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { /* IP addr */ - proto_tree_add_item(tree, hf_ndmp_addr_ip, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_addr_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; /* TCP port */ @@ -1935,7 +1935,7 @@ dissect_ndmp_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* this became an array in version 4 and beyond */ if(get_ndmp_protocol_version()<NDMP_PROTOCOL_V4){ /* IP addr */ - proto_tree_add_item(tree, hf_ndmp_addr_ip, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_addr_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; /* TCP port */ diff --git a/epan/dissectors/packet-ndp.c b/epan/dissectors/packet-ndp.c index 5e34be56e4..b6180c4b43 100644 --- a/epan/dissectors/packet-ndp.c +++ b/epan/dissectors/packet-ndp.c @@ -308,7 +308,7 @@ dissect_ndp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ndp_tree = proto_item_add_subtree(ti, ett_ndp); proto_tree_add_item(ndp_tree, hf_ndp_ip_address, tvb, - NDP_IP_ADDRESS, 4, FALSE); + NDP_IP_ADDRESS, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ndp_tree, hf_ndp_segment_identifier, tvb, diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 9ac80e1610..1187c4a1c4 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -2351,7 +2351,7 @@ print_address(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) break; case 0x00000001: proto_tree_add_item(ndps_tree, hf_ndps_port, tvb, foffset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(ndps_tree, hf_ndps_ip, tvb, foffset+2, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_ip, tvb, foffset+2, 4, ENC_BIG_ENDIAN); break; default: break; @@ -2657,7 +2657,7 @@ server_entry(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset += 4; break; case 3: /* Boolean */ - proto_tree_add_item(btree, hf_info_boolean, tvb, foffset, 4, FALSE); + proto_tree_add_item(btree, hf_info_boolean, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 4: /* String */ diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 1c16040f3f..e5ea2e31eb 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -4576,7 +4576,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 80): /* FRAGMENTED */ case ((VENDOR_NTOP << 16) | 80): /* FRAGMENTED */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_fragmented, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 81): /* FINGERPRINT */ case ((VENDOR_NTOP << 16) | 81): /* FINGERPRINT */ @@ -4688,7 +4688,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 114): /* UNTUNNELED_IPV4_SRC_ADDR */ case ((VENDOR_NTOP << 16) | 114): /* UNTUNNELED_IPV4_SRC_ADDR */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_untunneled_ipv4_src_addr, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 115): /* UNTUNNELED_L4_SRC_PORT */ case ((VENDOR_NTOP << 16) | 115): /* UNTUNNELED_L4_SRC_PORT */ @@ -4698,7 +4698,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 116): /* UNTUNNELED_IPV4_DST_ADDR */ case ((VENDOR_NTOP << 16) | 116): /* UNTUNNELED_IPV4_DST_ADDR */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_untunneled_ipv4_dst_addr, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 117): /* UNTUNNELED_L4_DST_PORT */ case ((VENDOR_NTOP << 16) | 117): /* UNTUNNELED_L4_DST_PORT */ @@ -4764,7 +4764,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 139): /* SIP_RTP_SRC_IP */ case ((VENDOR_NTOP << 16) | 139): /* SIP_RTP_SRC_IP */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_sip_rtp_src_ip, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 140): /* SIP_RTP_SRC_PORT */ case ((VENDOR_NTOP << 16) | 140): /* SIP_RTP_SRC_PORT */ @@ -4774,7 +4774,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 141): /* SIP_RTP_DST_IP */ case ((VENDOR_NTOP << 16) | 141): /* SIP_RTP_DST_IP */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_sip_rtp_dst_ip, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 142): /* SIP_RTP_DST_PORT */ case ((VENDOR_NTOP << 16) | 142): /* SIP_RTP_DST_PORT */ @@ -4924,7 +4924,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, /* START Plixer International */ case ((VENDOR_PLIXER << 16) | 100): /* client_ip_v4 */ ti = proto_tree_add_item(pdutree, hf_pie_plixer_client_ip_v4, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case ((VENDOR_PLIXER << 16) | 101): /* client_hostname */ gen_str = tvb_format_text(tvb, offset, length); @@ -4943,7 +4943,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_PLIXER << 16) | 104): /* server_ip_v4 */ ti = proto_tree_add_item(pdutree, hf_pie_plixer_server_ip_v4, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case ((VENDOR_PLIXER << 16) | 105): /* recipient_address */ gen_str = tvb_format_text(tvb, offset, length); diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index 7af791207a..416d14a570 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -530,7 +530,7 @@ void dissect_cie_list(tvbuff_t *tvb, case AFNUM_INET: if (cli_addr_len == 4) - proto_tree_add_item(cie_tree, hf_nhrp_client_nbma_addr, tvb, offset, 4, FALSE); + proto_tree_add_item(cie_tree, hf_nhrp_client_nbma_addr, tvb, offset, 4, ENC_BIG_ENDIAN); else { proto_tree_add_text(cie_tree, tvb, offset, cli_addr_len, "Client NBMA Address: %s", @@ -676,7 +676,7 @@ void dissect_nhrp_mand(tvbuff_t *tvb, case AFNUM_INET: if (shl == 4) - proto_tree_add_item(nhrp_tree, hf_nhrp_src_nbma_addr, tvb, offset, 4, FALSE); + proto_tree_add_item(nhrp_tree, hf_nhrp_src_nbma_addr, tvb, offset, 4, ENC_BIG_ENDIAN); else { proto_tree_add_text(nhrp_tree, tvb, offset, shl, "Source NBMA Address: %s", @@ -702,7 +702,7 @@ void dissect_nhrp_mand(tvbuff_t *tvb, } if (*srcLen == 4) { - proto_tree_add_item(nhrp_tree, hf_nhrp_src_prot_addr, tvb, offset, 4, FALSE); + proto_tree_add_item(nhrp_tree, hf_nhrp_src_prot_addr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else if (*srcLen) { @@ -713,7 +713,7 @@ void dissect_nhrp_mand(tvbuff_t *tvb, } if (dstLen == 4) { - proto_tree_add_item(nhrp_tree, hf_nhrp_dst_prot_addr, tvb, offset, 4, FALSE); + proto_tree_add_item(nhrp_tree, hf_nhrp_dst_prot_addr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else if (dstLen) { @@ -878,11 +878,11 @@ void dissect_nhrp_ext(tvbuff_t *tvb, devcap_tree = proto_item_add_subtree(devcap_item, ett_nhrp_devcap_ext); cap_item = proto_tree_add_item(devcap_tree, hf_nhrp_devcap_ext_srccap, tvb, offset, 4, ENC_BIG_ENDIAN); cap_tree = proto_item_add_subtree(cap_item, ett_nhrp_devcap_ext_srccap); - proto_tree_add_item(cap_tree, hf_nhrp_devcap_ext_srccap_V, tvb, offset, 4, FALSE); + proto_tree_add_item(cap_tree, hf_nhrp_devcap_ext_srccap_V, tvb, offset, 4, ENC_BIG_ENDIAN); cap_item = proto_tree_add_item(devcap_tree, hf_nhrp_devcap_ext_dstcap, tvb, offset + 4, 4, ENC_BIG_ENDIAN); cap_tree = proto_item_add_subtree(cap_item, ett_nhrp_devcap_ext_dstcap); - proto_tree_add_item(cap_tree, hf_nhrp_devcap_ext_dstcap_V, tvb, offset + 4, 4, FALSE); + proto_tree_add_item(cap_tree, hf_nhrp_devcap_ext_dstcap_V, tvb, offset + 4, 4, ENC_BIG_ENDIAN); goto skip_switch; } @@ -915,7 +915,7 @@ void dissect_nhrp_ext(tvbuff_t *tvb, proto_tree_add_item(auth_tree, hf_nhrp_auth_ext_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(auth_tree, hf_nhrp_auth_ext_spi, tvb, offset + 2, 2, ENC_BIG_ENDIAN); if (srcLen == 4) - proto_tree_add_item(auth_tree, hf_nhrp_auth_ext_src_addr, tvb, offset + 4, 4, FALSE); + proto_tree_add_item(auth_tree, hf_nhrp_auth_ext_src_addr, tvb, offset + 4, 4, ENC_BIG_ENDIAN); else if (srcLen) { proto_tree_add_text(auth_tree, tvb, offset + 4, srcLen, "Source Address: %s", diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c index 37496f18f0..10228a7d31 100644 --- a/epan/dissectors/packet-nlsp.c +++ b/epan/dissectors/packet-nlsp.c @@ -1072,7 +1072,7 @@ nlsp_dissect_nlsp_lsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, 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, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_nlsp_lsp_router_type, tvb, offset, 1, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c index 8543cebadb..e1d46452c8 100644 --- a/epan/dissectors/packet-olsr.c +++ b/epan/dissectors/packet-olsr.c @@ -186,10 +186,10 @@ static int dissect_olsr_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_t return message_end; } if (pinfo->src.type == AT_IPv4) { - proto_tree_add_item(olsr_tree, hf_olsr_neighbor_addr, tvb, offset, 4, FALSE); + proto_tree_add_item(olsr_tree, hf_olsr_neighbor_addr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else if (pinfo->src.type == AT_IPv6) { - proto_tree_add_item(olsr_tree, hf_olsr_neighbor6_addr, tvb, offset, 16, FALSE); + proto_tree_add_item(olsr_tree, hf_olsr_neighbor6_addr, tvb, offset, 16, ENC_NA); offset += 16; } else { break; /* unknown address type should be handled in dissect_olsr, just be sure */ @@ -227,7 +227,7 @@ static int dissect_olsrorg_lq_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * address_tree = proto_item_add_subtree(address_group, ett_olsr_message_neigh); - proto_tree_add_item(address_tree, hf_olsr_neighbor_addr, tvb, offset, 4, FALSE); + proto_tree_add_item(address_tree, hf_olsr_neighbor_addr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else if (pinfo->src.type == AT_IPv6) { if (message_end - offset < 20) { @@ -243,7 +243,7 @@ static int dissect_olsrorg_lq_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * address_tree = proto_item_add_subtree(address_group, ett_olsr_message_neigh); - proto_tree_add_item(address_tree, hf_olsr_neighbor6_addr, tvb, offset, 16, FALSE); + proto_tree_add_item(address_tree, hf_olsr_neighbor6_addr, tvb, offset, 16, ENC_NA); offset += 16; } else { break; /* unknown address type should be handled in dissect_olsr, just be sure */ @@ -273,10 +273,10 @@ static int dissect_nrlolsr_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ols saneEnd = message_end - ((message_end - offset) % (pinfo->src.len + 2)); while (field2Ptr < saneEnd) { if (pinfo->src.type == AT_IPv4) { - proto_tree_add_item(olsr_tree, hf_olsr_neighbor_addr, tvb, offset, 4, FALSE); + proto_tree_add_item(olsr_tree, hf_olsr_neighbor_addr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else if (pinfo->src.type == AT_IPv6) { - proto_tree_add_item(olsr_tree, hf_olsr_neighbor6_addr, tvb, offset, 16, FALSE); + proto_tree_add_item(olsr_tree, hf_olsr_neighbor6_addr, tvb, offset, 16, ENC_NA); offset += 16; } else { break; /* unknown address type should be handled in dissect_olsr, just be sure */ @@ -352,10 +352,10 @@ static int handle_olsr_hello_rfc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * return link_message_end; } if (pinfo->src.type == AT_IPv4) { - proto_tree_add_item(olsr_tree, hf_olsr_neighbor_addr, tvb, offset, 4, FALSE); + proto_tree_add_item(olsr_tree, hf_olsr_neighbor_addr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else if (pinfo->src.type == AT_IPv6) { - proto_tree_add_item(olsr_tree, hf_olsr_neighbor6_addr, tvb, offset, 16, FALSE); + proto_tree_add_item(olsr_tree, hf_olsr_neighbor6_addr, tvb, offset, 16, ENC_NA); offset += 16; } else { break; /* unknown address type should be handled in dissect_olsr, just be sure */ @@ -388,7 +388,7 @@ static int handle_olsr_hello_olsrorg(tvbuff_t *tvb, packet_info *pinfo, proto_tr address_tree = proto_item_add_subtree(address_group, ett_olsr_message_neigh); - proto_tree_add_item(address_tree, hf_olsr_neighbor_addr, tvb, offset, 4, FALSE); + proto_tree_add_item(address_tree, hf_olsr_neighbor_addr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else if (pinfo->src.type == AT_IPv6) { lq = tvb_get_guint8(tvb, offset + 16); @@ -399,7 +399,7 @@ static int handle_olsr_hello_olsrorg(tvbuff_t *tvb, packet_info *pinfo, proto_tr address_tree = proto_item_add_subtree(address_group, ett_olsr_message_neigh); - proto_tree_add_item(address_tree, hf_olsr_neighbor6_addr, tvb, offset, 16, FALSE); + proto_tree_add_item(address_tree, hf_olsr_neighbor6_addr, tvb, offset, 16, ENC_NA); offset += 16; } else { break; /* unknown address type should be handled in dissect_olsr, just be sure */ @@ -421,10 +421,10 @@ static int dissect_olsr_mid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_ return message_end; } if (pinfo->src.type == AT_IPv4) { - proto_tree_add_item(olsr_tree, hf_olsr_interface_addr, tvb, offset, 4, FALSE); + proto_tree_add_item(olsr_tree, hf_olsr_interface_addr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else if (pinfo->src.type == AT_IPv6) { - proto_tree_add_item(olsr_tree, hf_olsr_interface6_addr, tvb, offset, 16, FALSE); + proto_tree_add_item(olsr_tree, hf_olsr_interface6_addr, tvb, offset, 16, ENC_NA); offset += 16; } else { break; /* unknown address type should be handled in dissect_olsr, just be sure */ @@ -443,14 +443,14 @@ static int dissect_olsr_hna(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_ } if (pinfo->src.type == AT_IPv4) { - proto_tree_add_item(olsr_tree, hf_olsr_network_addr, tvb, offset, 4, FALSE); + proto_tree_add_item(olsr_tree, hf_olsr_network_addr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(olsr_tree, hf_olsr_netmask, tvb, offset, 4, FALSE); + proto_tree_add_item(olsr_tree, hf_olsr_netmask, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else if (pinfo->src.type == AT_IPv6) { - proto_tree_add_item(olsr_tree, hf_olsr_network6_addr, tvb, offset, 4, FALSE); + proto_tree_add_item(olsr_tree, hf_olsr_network6_addr, tvb, offset, 4, ENC_NA); offset += 16; - proto_tree_add_item(olsr_tree, hf_olsr_netmask6, tvb, offset, 4, FALSE); + proto_tree_add_item(olsr_tree, hf_olsr_netmask6, tvb, offset, 4, ENC_NA); offset += 16; } else { break; /* unknown address type should be handled in dissect_olsr, just be sure */ @@ -511,9 +511,9 @@ static int dissect_olsrorg_nameservice(tvbuff_t *tvb, packet_info *pinfo, proto_ proto_tree_add_uint(olsr_ns_tree, hf_olsrorg_ns_length, tvb, offset + 2, 2, length); if (pinfo->src.type == AT_IPv4) { - proto_tree_add_item(olsr_ns_tree, hf_olsrorg_ns_ip, tvb, offset + 4, 4, FALSE); + proto_tree_add_item(olsr_ns_tree, hf_olsrorg_ns_ip, tvb, offset + 4, 4, ENC_BIG_ENDIAN); } else if (pinfo->src.type == AT_IPv6) { - proto_tree_add_item(olsr_ns_tree, hf_olsrorg_ns_ip6, tvb, offset + 4, 16, FALSE); + proto_tree_add_item(olsr_ns_tree, hf_olsrorg_ns_ip6, tvb, offset + 4, 16, ENC_NA); } else { break; /* unknown address type should be handled in dissect_olsr, just be sure */ } @@ -625,10 +625,10 @@ static int dissect_olsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /*-----------------Dissecting: Origin Addr, TTL, Hop Count, and Message Seq Number*/ if (pinfo->src.type == AT_IPv4) { - proto_tree_add_item(message_tree, hf_olsr_origin_addr, tvb, offset, 4, FALSE); + proto_tree_add_item(message_tree, hf_olsr_origin_addr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else if (pinfo->src.type == AT_IPv6) { - proto_tree_add_item(message_tree, hf_olsr_origin6_addr, tvb, offset, 16, FALSE); + proto_tree_add_item(message_tree, hf_olsr_origin6_addr, tvb, offset, 16, ENC_NA); offset += 16; } else { break; /* unknown address type should be handled before this loop, just be sure */ diff --git a/epan/dissectors/packet-omron-fins.c b/epan/dissectors/packet-omron-fins.c index 754138a296..0a5e667079 100644 --- a/epan/dissectors/packet-omron-fins.c +++ b/epan/dissectors/packet-omron-fins.c @@ -1626,7 +1626,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { ti = proto_tree_add_text(command_tree, tvb, offset, 8, "Block Record"); omron_block_record_tree = proto_item_add_subtree(ti, ett_omron_block_record); - proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_node_num_status, tvb, offset, 1, FALSE); + proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_node_num_status, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_node_num_num_nodes, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_cio_area, tvb, (offset+1), 2, ENC_BIG_ENDIAN); proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_kind_of_dm, tvb, (offset+3), 1, ENC_BIG_ENDIAN); @@ -1659,7 +1659,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { ti = proto_tree_add_text(command_tree, tvb, offset, 8, "Block Record"); omron_block_record_tree = proto_item_add_subtree(ti, ett_omron_block_record); - proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_node_num_status, tvb, offset, 1, FALSE); + proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_node_num_status, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_node_num_num_nodes, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_cio_area, tvb, (offset+1), 2, ENC_BIG_ENDIAN); proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_kind_of_dm, tvb, (offset+3), 1, ENC_BIG_ENDIAN); @@ -2049,18 +2049,18 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { ti = proto_tree_add_text(netw_nodes_sts_tree, tvb, offset, 1, "Node Number %d", node_num); field_tree = proto_item_add_subtree(ti, ett_omron_netw_node_sts); - proto_tree_add_item(field_tree, hf_omron_netw_node_sts_low_3, tvb, offset, 1, FALSE); - proto_tree_add_item(field_tree, hf_omron_netw_node_sts_low_2, tvb, offset, 1, FALSE); - proto_tree_add_item(field_tree, hf_omron_netw_node_sts_low_1, tvb, offset, 1, FALSE); - proto_tree_add_item(field_tree, hf_omron_netw_node_sts_low_0, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree, hf_omron_netw_node_sts_low_3, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree, hf_omron_netw_node_sts_low_2, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree, hf_omron_netw_node_sts_low_1, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree, hf_omron_netw_node_sts_low_0, tvb, offset, 1, ENC_BIG_ENDIAN); node_num = node_num + 1; ti = proto_tree_add_text(netw_nodes_sts_tree, tvb, offset, 1, "Node Number %d", node_num); field_tree = proto_item_add_subtree(ti, ett_omron_netw_node_sts); - proto_tree_add_item(field_tree, hf_omron_netw_node_sts_high_3, tvb, offset, 1, FALSE); - proto_tree_add_item(field_tree, hf_omron_netw_node_sts_high_2, tvb, offset, 1, FALSE); - proto_tree_add_item(field_tree, hf_omron_netw_node_sts_high_1, tvb, offset, 1, FALSE); - proto_tree_add_item(field_tree, hf_omron_netw_node_sts_high_0, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree, hf_omron_netw_node_sts_high_3, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree, hf_omron_netw_node_sts_high_2, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree, hf_omron_netw_node_sts_high_1, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree, hf_omron_netw_node_sts_high_0, tvb, offset, 1, ENC_BIG_ENDIAN); node_num = node_num + 1; offset = offset + 1; @@ -2128,8 +2128,8 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* add status flag tree */ ti = proto_tree_add_item(command_tree, hf_omron_status_flags, tvb, (offset+2), 1, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); - proto_tree_add_item(omron_status_tree, hf_omron_status_flags_slave_master, tvb, (offset+2), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_flags_data_link, tvb, (offset+2), 1, FALSE); + proto_tree_add_item(omron_status_tree, hf_omron_status_flags_slave_master, tvb, (offset+2), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_flags_data_link, tvb, (offset+2), 1, ENC_BIG_ENDIAN); /* command_tree for master node */ proto_tree_add_item(command_tree, hf_omron_master_node_number, tvb, (offset+3), 1, ENC_BIG_ENDIAN); @@ -2142,138 +2142,138 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Status block 1 */ ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+0), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_0, tvb, (offset+0), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_1, tvb, (offset+0), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_2, tvb, (offset+0), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_3, tvb, (offset+0), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_4, tvb, (offset+0), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_5, tvb, (offset+0), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_6, tvb, (offset+0), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_7, tvb, (offset+0), 1, FALSE); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_0, tvb, (offset+0), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_1, tvb, (offset+0), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_2, tvb, (offset+0), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_3, tvb, (offset+0), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_4, tvb, (offset+0), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_5, tvb, (offset+0), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_6, tvb, (offset+0), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_7, tvb, (offset+0), 1, ENC_BIG_ENDIAN); ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+0), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_0, tvb, (offset+1), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_1, tvb, (offset+1), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_2, tvb, (offset+1), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_3, tvb, (offset+1), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_4, tvb, (offset+1), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_5, tvb, (offset+1), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_6, tvb, (offset+1), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_7, tvb, (offset+1), 1, FALSE); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_0, tvb, (offset+1), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_1, tvb, (offset+1), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_2, tvb, (offset+1), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_3, tvb, (offset+1), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_4, tvb, (offset+1), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_5, tvb, (offset+1), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_6, tvb, (offset+1), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_7, tvb, (offset+1), 1, ENC_BIG_ENDIAN); ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+0), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_0, tvb, (offset+2), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_1, tvb, (offset+2), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_2, tvb, (offset+2), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_3, tvb, (offset+2), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_4, tvb, (offset+2), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_5, tvb, (offset+2), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_6, tvb, (offset+2), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_7, tvb, (offset+2), 1, FALSE); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_0, tvb, (offset+2), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_1, tvb, (offset+2), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_2, tvb, (offset+2), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_3, tvb, (offset+2), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_4, tvb, (offset+2), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_5, tvb, (offset+2), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_6, tvb, (offset+2), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_7, tvb, (offset+2), 1, ENC_BIG_ENDIAN); /* status block 2 */ ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+3), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_0, tvb, (offset+3), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_1, tvb, (offset+3), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_2, tvb, (offset+3), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_3, tvb, (offset+3), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_4, tvb, (offset+3), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_5, tvb, (offset+3), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_6, tvb, (offset+3), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_7, tvb, (offset+3), 1, FALSE); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_0, tvb, (offset+3), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_1, tvb, (offset+3), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_2, tvb, (offset+3), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_3, tvb, (offset+3), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_4, tvb, (offset+3), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_5, tvb, (offset+3), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_6, tvb, (offset+3), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_7, tvb, (offset+3), 1, ENC_BIG_ENDIAN); ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+3), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_0, tvb, (offset+4), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_1, tvb, (offset+4), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_2, tvb, (offset+4), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_3, tvb, (offset+4), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_4, tvb, (offset+4), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_5, tvb, (offset+4), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_6, tvb, (offset+4), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_7, tvb, (offset+4), 1, FALSE); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_0, tvb, (offset+4), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_1, tvb, (offset+4), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_2, tvb, (offset+4), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_3, tvb, (offset+4), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_4, tvb, (offset+4), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_5, tvb, (offset+4), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_6, tvb, (offset+4), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_7, tvb, (offset+4), 1, ENC_BIG_ENDIAN); ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+3), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_0, tvb, (offset+5), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_1, tvb, (offset+5), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_2, tvb, (offset+5), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_3, tvb, (offset+5), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_4, tvb, (offset+5), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_5, tvb, (offset+5), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_6, tvb, (offset+5), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_7, tvb, (offset+5), 1, FALSE); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_0, tvb, (offset+5), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_1, tvb, (offset+5), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_2, tvb, (offset+5), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_3, tvb, (offset+5), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_4, tvb, (offset+5), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_5, tvb, (offset+5), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_6, tvb, (offset+5), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_7, tvb, (offset+5), 1, ENC_BIG_ENDIAN); /* status block 3 */ ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+6), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_0, tvb, (offset+6), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_1, tvb, (offset+6), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_2, tvb, (offset+6), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_3, tvb, (offset+6), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_4, tvb, (offset+6), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_5, tvb, (offset+6), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_6, tvb, (offset+6), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_7, tvb, (offset+6), 1, FALSE); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_0, tvb, (offset+6), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_1, tvb, (offset+6), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_2, tvb, (offset+6), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_3, tvb, (offset+6), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_4, tvb, (offset+6), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_5, tvb, (offset+6), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_6, tvb, (offset+6), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_7, tvb, (offset+6), 1, ENC_BIG_ENDIAN); ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+6), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_0, tvb, (offset+7), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_1, tvb, (offset+7), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_2, tvb, (offset+7), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_3, tvb, (offset+7), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_4, tvb, (offset+7), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_5, tvb, (offset+7), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_6, tvb, (offset+7), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_7, tvb, (offset+7), 1, FALSE); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_0, tvb, (offset+7), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_1, tvb, (offset+7), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_2, tvb, (offset+7), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_3, tvb, (offset+7), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_4, tvb, (offset+7), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_5, tvb, (offset+7), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_6, tvb, (offset+7), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_7, tvb, (offset+7), 1, ENC_BIG_ENDIAN); ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+6), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_0, tvb, (offset+8), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_1, tvb, (offset+8), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_2, tvb, (offset+8), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_3, tvb, (offset+8), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_4, tvb, (offset+8), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_5, tvb, (offset+8), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_6, tvb, (offset+8), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_7, tvb, (offset+8), 1, FALSE); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_0, tvb, (offset+8), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_1, tvb, (offset+8), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_2, tvb, (offset+8), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_3, tvb, (offset+8), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_4, tvb, (offset+8), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_5, tvb, (offset+8), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_6, tvb, (offset+8), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_7, tvb, (offset+8), 1, ENC_BIG_ENDIAN); /* status block 4 */ ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+9), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_0, tvb, (offset+9), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_1, tvb, (offset+9), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_2, tvb, (offset+9), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_3, tvb, (offset+9), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_4, tvb, (offset+9), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_5, tvb, (offset+9), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_6, tvb, (offset+9), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_node_7, tvb, (offset+9), 1, FALSE); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_0, tvb, (offset+9), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_1, tvb, (offset+9), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_2, tvb, (offset+9), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_3, tvb, (offset+9), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_4, tvb, (offset+9), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_5, tvb, (offset+9), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_6, tvb, (offset+9), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_node_7, tvb, (offset+9), 1, ENC_BIG_ENDIAN); ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+9), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_0, tvb, (offset+10), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_1, tvb, (offset+10), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_2, tvb, (offset+10), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_3, tvb, (offset+10), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_4, tvb, (offset+10), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_5, tvb, (offset+10), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_6, tvb, (offset+10), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_7, tvb, (offset+10), 1, FALSE); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_0, tvb, (offset+10), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_1, tvb, (offset+10), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_2, tvb, (offset+10), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_3, tvb, (offset+10), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_4, tvb, (offset+10), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_5, tvb, (offset+10), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_6, tvb, (offset+10), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_7, tvb, (offset+10), 1, ENC_BIG_ENDIAN); ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+9), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_0, tvb, (offset+11), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_1, tvb, (offset+11), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_2, tvb, (offset+11), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_3, tvb, (offset+11), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_4, tvb, (offset+11), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_5, tvb, (offset+11), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_6, tvb, (offset+11), 1, FALSE); - proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_7, tvb, (offset+11), 1, FALSE); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_0, tvb, (offset+11), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_1, tvb, (offset+11), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_2, tvb, (offset+11), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_3, tvb, (offset+11), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_4, tvb, (offset+11), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_5, tvb, (offset+11), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_6, tvb, (offset+11), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_7, tvb, (offset+11), 1, ENC_BIG_ENDIAN); offset = offset + 12; } diff --git a/epan/dissectors/packet-packetbb.c b/epan/dissectors/packet-packetbb.c index 5f0735d95e..c64ff3a9c4 100644 --- a/epan/dissectors/packet-packetbb.c +++ b/epan/dissectors/packet-packetbb.c @@ -222,12 +222,12 @@ static int dissect_pbb_tlvblock(tvbuff_t *tvb, proto_tree *tree, guint offset, tlvFlags_item = proto_tree_add_item(tlv_tree, hf_packetbb_tlv_flags, tvb, offset, 1, ENC_BIG_ENDIAN); tlv_flags_tree = proto_item_add_subtree(tlvFlags_item, ett_packetbb_tlv_flags); - proto_tree_add_item(tlv_flags_tree, hf_packetbb_tlv_flags_hastypext, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_flags_tree, hf_packetbb_tlv_flags_hassingleindex, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_flags_tree, hf_packetbb_tlv_flags_hasmultiindex, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_flags_tree, hf_packetbb_tlv_flags_hasvalue, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_flags_tree, hf_packetbb_tlv_flags_hasextlen, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_flags_tree, hf_packetbb_tlv_flags_hasmultivalue, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_flags_tree, hf_packetbb_tlv_flags_hastypext, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_flags_tree, hf_packetbb_tlv_flags_hassingleindex, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_flags_tree, hf_packetbb_tlv_flags_hasmultiindex, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_flags_tree, hf_packetbb_tlv_flags_hasvalue, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_flags_tree, hf_packetbb_tlv_flags_hasextlen, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_flags_tree, hf_packetbb_tlv_flags_hasmultivalue, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if ((tlvFlags & TLV_HAS_TYPEEXT) != 0) { @@ -435,11 +435,11 @@ static int dissect_pbb_addressblock(tvbuff_t *tvb, proto_tree *tree, guint offse addrFlags_item = proto_tree_add_item(addr_tree, hf_packetbb_addr_flags, tvb, block_index+1, 1, ENC_BIG_ENDIAN); addrFlags_tree = proto_item_add_subtree(addrFlags_item, ett_packetbb_addr_flags); - proto_tree_add_item(addrFlags_tree, hf_packetbb_addr_flags_hashead, tvb, block_index+1, 1, FALSE); - proto_tree_add_item(addrFlags_tree, hf_packetbb_addr_flags_hasfulltail, tvb, block_index+1, 1, FALSE); - proto_tree_add_item(addrFlags_tree, hf_packetbb_addr_flags_haszerotail, tvb, block_index+1, 1, FALSE); - proto_tree_add_item(addrFlags_tree, hf_packetbb_addr_flags_hassingleprelen, tvb, block_index+1, 1, FALSE); - proto_tree_add_item(addrFlags_tree, hf_packetbb_addr_flags_hasmultiprelen, tvb, block_index+1, 1, FALSE); + proto_tree_add_item(addrFlags_tree, hf_packetbb_addr_flags_hashead, tvb, block_index+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(addrFlags_tree, hf_packetbb_addr_flags_hasfulltail, tvb, block_index+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(addrFlags_tree, hf_packetbb_addr_flags_haszerotail, tvb, block_index+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(addrFlags_tree, hf_packetbb_addr_flags_hassingleprelen, tvb, block_index+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(addrFlags_tree, hf_packetbb_addr_flags_hasmultiprelen, tvb, block_index+1, 1, ENC_BIG_ENDIAN); if ((address_flags & ADDR_HASHEAD) != 0) { /* add head */ diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index 75f86fc5c1..bdb3fa2a19 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -919,12 +919,12 @@ static int dissect_pdcp_ir_packet(proto_tree *tree, /* Source address */ source = tvb_get_ipv4(tvb, offset); - proto_tree_add_item(static_ipv4_tree, hf_pdcp_lte_rohc_ip_src, tvb, offset, 4, FALSE); + proto_tree_add_item(static_ipv4_tree, hf_pdcp_lte_rohc_ip_src, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Dest address */ dest = tvb_get_ipv4(tvb, offset); - proto_tree_add_item(static_ipv4_tree, hf_pdcp_lte_rohc_ip_dst, tvb, offset, 4, FALSE); + proto_tree_add_item(static_ipv4_tree, hf_pdcp_lte_rohc_ip_dst, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Set proper length for subtree */ diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c index 7f7d40b2f9..852fe351e5 100644 --- a/epan/dissectors/packet-pflog.c +++ b/epan/dissectors/packet-pflog.c @@ -249,10 +249,10 @@ dissect_pflog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case BSD_AF_INET6_BSD: - proto_tree_add_item(pflog_tree, hf_pflog_saddr_ipv6, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(pflog_tree, hf_pflog_saddr_ipv6, tvb, offset, 16, ENC_NA); offset += 16; - proto_tree_add_item(pflog_tree, hf_pflog_daddr_ipv6, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(pflog_tree, hf_pflog_daddr_ipv6, tvb, offset, 16, ENC_NA); offset += 16; break; diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c index 97bccfbbda..2d0ec43d44 100644 --- a/epan/dissectors/packet-pktc.c +++ b/epan/dissectors/packet-pktc.c @@ -352,7 +352,7 @@ dissect_pktc_ap_request(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset=dissect_pktc_list_of_ciphersuites(pinfo, tree, tvb, offset, doi); /* re-establish flag */ - proto_tree_add_item(tree, hf_pktc_reestablish_flag, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pktc_reestablish_flag, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; /* sha-1 hmac */ @@ -389,11 +389,11 @@ dissect_pktc_ap_reply(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o offset+=4; /* re-establish flag */ - proto_tree_add_item(tree, hf_pktc_reestablish_flag, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pktc_reestablish_flag, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; /* ack required flag */ - proto_tree_add_item(tree, hf_pktc_ack_required_flag, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pktc_ack_required_flag, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; /* sha-1 hmac */ @@ -454,7 +454,7 @@ dissect_pktc_rekey(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs offset+=4; /* re-establish flag */ - proto_tree_add_item(tree, hf_pktc_reestablish_flag, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pktc_reestablish_flag, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; /* sha-1 hmac */ diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c index 9f549f195a..09f9ed2daa 100644 --- a/epan/dissectors/packet-pnrp.c +++ b/epan/dissectors/packet-pnrp.c @@ -896,7 +896,7 @@ static void dissect_ipv6_endpoint_structure(tvbuff_t *tvb, gint offset, gint len static void dissect_ipv6_address(tvbuff_t *tvb, gint offset, gint length, proto_tree *tree) { while (0 <= tvb_reported_length_remaining(tvb, offset+16) && 16 <=length) { - proto_tree_add_item(tree, hf_pnrp_message_ipv6, tvb, offset, 16, FALSE); + proto_tree_add_item(tree, hf_pnrp_message_ipv6, tvb, offset, 16, ENC_NA); offset += 16; length -= 16; } diff --git a/epan/dissectors/packet-ppi-sensor.c b/epan/dissectors/packet-ppi-sensor.c index b5446fb3c4..d9129fc30c 100644 --- a/epan/dissectors/packet-ppi-sensor.c +++ b/epan/dissectors/packet-ppi-sensor.c @@ -254,17 +254,17 @@ dissect_ppi_sensor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { pt = proto_tree_add_uint(ppi_sensor_tree, hf_ppi_sensor_present, tvb, offset + 4, 4, present); present_tree = proto_item_add_subtree(pt, ett_ppi_sensor_present); /* this represents the present bitmask field */ - proto_tree_add_item(present_tree, hf_ppi_sensor_present_sensortype, tvb, 4, 4, TRUE); - proto_tree_add_item(present_tree, hf_ppi_sensor_present_scalefactor, tvb, 4, 4, TRUE); - proto_tree_add_item(present_tree, hf_ppi_sensor_present_val_x, tvb, 4, 4, TRUE); - proto_tree_add_item(present_tree, hf_ppi_sensor_present_val_y, tvb, 4, 4, TRUE); - proto_tree_add_item(present_tree, hf_ppi_sensor_present_val_z, tvb, 4, 4, TRUE); - proto_tree_add_item(present_tree, hf_ppi_sensor_present_val_t, tvb, 4, 4, TRUE); - proto_tree_add_item(present_tree, hf_ppi_sensor_present_val_e, tvb, 4, 4, TRUE); - proto_tree_add_item(present_tree, hf_ppi_sensor_present_descstr, tvb, 4, 4, TRUE); - proto_tree_add_item(present_tree, hf_ppi_sensor_present_appspecific_num, tvb, 4, 4, TRUE); - proto_tree_add_item(present_tree, hf_ppi_sensor_present_appspecific_data, tvb, 4, 4, TRUE); - proto_tree_add_item(present_tree, hf_ppi_sensor_present_ext, tvb, 4, 4, TRUE); + proto_tree_add_item(present_tree, hf_ppi_sensor_present_sensortype, tvb, 4, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(present_tree, hf_ppi_sensor_present_scalefactor, tvb, 4, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(present_tree, hf_ppi_sensor_present_val_x, tvb, 4, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(present_tree, hf_ppi_sensor_present_val_y, tvb, 4, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(present_tree, hf_ppi_sensor_present_val_z, tvb, 4, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(present_tree, hf_ppi_sensor_present_val_t, tvb, 4, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(present_tree, hf_ppi_sensor_present_val_e, tvb, 4, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(present_tree, hf_ppi_sensor_present_descstr, tvb, 4, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(present_tree, hf_ppi_sensor_present_appspecific_num, tvb, 4, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(present_tree, hf_ppi_sensor_present_appspecific_data, tvb, 4, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(present_tree, hf_ppi_sensor_present_ext, tvb, 4, 4, ENC_LITTLE_ENDIAN); } offset += PPI_GEOBASE_MIN_HEADER_LEN; length_remaining -= PPI_GEOBASE_MIN_HEADER_LEN; diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c index 580a28be09..d122c2ec89 100644 --- a/epan/dissectors/packet-ppi.c +++ b/epan/dissectors/packet-ppi.c @@ -775,7 +775,7 @@ dissect_ppi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); ppi_flags_tree = proto_item_add_subtree(ti, ett_ppi_flags); proto_tree_add_item(ppi_flags_tree, hf_ppi_head_flag_alignment, - tvb, offset + 1, 1, TRUE); + tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(ppi_flags_tree, hf_ppi_head_flag_reserved, tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index eae7616742..22a10a4d36 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -3998,7 +3998,7 @@ dissect_iphc_crtp_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) while (offset < length) { proto_tree_add_item(cs_tree, hf, tvb, offset, cid_size, FALSE); offset += cid_size; - proto_tree_add_item(cs_tree, hf_iphc_crtp_cs_invalid, tvb, offset, 1, FALSE); + proto_tree_add_item(cs_tree, hf_iphc_crtp_cs_invalid, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(cs_tree, hf_iphc_crtp_seq, tvb, offset, 1, ENC_BIG_ENDIAN); ++offset; proto_tree_add_item(cs_tree, hf_iphc_crtp_gen, tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index 8595e25f41..cbeb8e1844 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -530,7 +530,7 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr proto_tree_add_item(pppoe_tree, hf_pppoed_tag_cdr_units, tvb, tagstart+4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(pppoe_tree, hf_pppoed_tag_metrics_r, tvb, - tagstart+4, 2, FALSE); + tagstart+4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(pppoe_tree, hf_pppoed_tag_metrics_rlq, tvb, tagstart+6, 1, ENC_BIG_ENDIAN); proto_tree_add_item(pppoe_tree, hf_pppoed_tag_metrics_resource, tvb, diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c index 35b596ffdd..b0db3a2e51 100644 --- a/epan/dissectors/packet-ptp.c +++ b/epan/dissectors/packet-ptp.c @@ -1752,7 +1752,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_ptp_sdr_estimatedmasterdrift, tvb, PTP_SDR_ESTIMATEDMASTERDRIFT_OFFSET, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_sdr_utcreasonable, tvb, PTP_SDR_UTCREASONABLE_OFFSET, 1, FALSE); + hf_ptp_sdr_utcreasonable, tvb, PTP_SDR_UTCREASONABLE_OFFSET, 1, ENC_BIG_ENDIAN); break; } case PTP_FOLLOWUP_MESSAGE:{ @@ -1879,19 +1879,19 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_DEFAULT_DATA_SET_CLOCKVARIANCE_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_clockfollowupcapable, tvb, - PTP_MM_DEFAULT_DATA_SET_CLOCKFOLLOWUPCAPABLE_OFFSET, 1, FALSE); + PTP_MM_DEFAULT_DATA_SET_CLOCKFOLLOWUPCAPABLE_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_preferred, tvb, - PTP_MM_DEFAULT_DATA_SET_PREFERRED_OFFSET, 1, FALSE); + PTP_MM_DEFAULT_DATA_SET_PREFERRED_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_initializable, tvb, - PTP_MM_DEFAULT_DATA_SET_INITIALIZABLE_OFFSET, 1, FALSE); + PTP_MM_DEFAULT_DATA_SET_INITIALIZABLE_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_externaltiming, tvb, - PTP_MM_DEFAULT_DATA_SET_EXTERNALTIMING_OFFSET, 1, FALSE); + PTP_MM_DEFAULT_DATA_SET_EXTERNALTIMING_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_isboundaryclock, tvb, - PTP_MM_DEFAULT_DATA_SET_ISBOUNDARYCLOCK_OFFSET, 1, FALSE); + PTP_MM_DEFAULT_DATA_SET_ISBOUNDARYCLOCK_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_syncinterval, tvb, PTP_MM_DEFAULT_DATA_SET_SYNCINTERVAL_OFFSET, 1, ENC_BIG_ENDIAN); @@ -1917,7 +1917,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_UPDATE_DEFAULT_DATA_SET_CLOCKVARIANCE_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_update_default_data_set_preferred, tvb, - PTP_MM_UPDATE_DEFAULT_DATA_SET_PREFERRED_OFFSET, 1, FALSE); + PTP_MM_UPDATE_DEFAULT_DATA_SET_PREFERRED_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_update_default_data_set_syncinterval, tvb, PTP_MM_UPDATE_DEFAULT_DATA_SET_SYNCINTERVAL_OFFSET, 1, ENC_BIG_ENDIAN); @@ -1991,16 +1991,16 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_parentfollowupcapable, tvb, - PTP_MM_PARENT_DATA_SET_PARENTFOLLOWUPCAPABLE_OFFSET, 1, FALSE); + PTP_MM_PARENT_DATA_SET_PARENTFOLLOWUPCAPABLE_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_parentexternaltiming, tvb, - PTP_MM_PARENT_DATA_SET_PARENTEXTERNALTIMING_OFFSET, 1, FALSE); + PTP_MM_PARENT_DATA_SET_PARENTEXTERNALTIMING_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_parentvariance, tvb, PTP_MM_PARENT_DATA_SET_PARENTVARIANCE_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_parentstats, tvb, - PTP_MM_PARENT_DATA_SET_PARENTSTATS_OFFSET, 1, FALSE); + PTP_MM_PARENT_DATA_SET_PARENTSTATS_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_observedvariance, tvb, PTP_MM_PARENT_DATA_SET_OBSERVEDVARIANCE_OFFSET, 2, ENC_BIG_ENDIAN); @@ -2009,7 +2009,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_PARENT_DATA_SET_OBSERVEDDRIFT_OFFSET, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_utcreasonable, tvb, - PTP_MM_PARENT_DATA_SET_UTCREASONABLE_OFFSET, 1, FALSE); + PTP_MM_PARENT_DATA_SET_UTCREASONABLE_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_grandmastercommunicationtechnology, @@ -2032,10 +2032,10 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_PARENT_DATA_SET_GRANDMASTERVARIANCE_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_grandmasterpreferred, tvb, - PTP_MM_PARENT_DATA_SET_GRANDMASTERPREFERRED_OFFSET, 1, FALSE); + PTP_MM_PARENT_DATA_SET_GRANDMASTERPREFERRED_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_grandmasterisboundaryclock, tvb, - PTP_MM_PARENT_DATA_SET_GRANDMASTERISBOUNDARYCLOCK_OFFSET, 1, FALSE); + PTP_MM_PARENT_DATA_SET_GRANDMASTERISBOUNDARYCLOCK_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_grandmastersequencenumber, tvb, PTP_MM_PARENT_DATA_SET_GRANDMASTERSEQUENCENUMBER_OFFSET, 2, ENC_BIG_ENDIAN); @@ -2065,7 +2065,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_PORT_DATA_SET_PORTIDFIELD_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_port_data_set_burstenabled, tvb, - PTP_MM_PORT_DATA_SET_BURSTENABLED_OFFSET, 1, FALSE); + PTP_MM_PORT_DATA_SET_BURSTENABLED_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_port_data_set_subdomainaddressoctets, tvb, PTP_MM_PORT_DATA_SET_SUBDOMAINADDRESSOCTETS_OFFSET, 1, ENC_BIG_ENDIAN); @@ -2113,10 +2113,10 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_GLOBAL_TIME_DATA_SET_CURRENTUTCOFFSET_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_global_time_data_set_leap59, tvb, - PTP_MM_GLOBAL_TIME_DATA_SET_LEAP59_OFFSET, 1, FALSE); + PTP_MM_GLOBAL_TIME_DATA_SET_LEAP59_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_global_time_data_set_leap61, tvb, - PTP_MM_GLOBAL_TIME_DATA_SET_LEAP61_OFFSET, 1, FALSE); + PTP_MM_GLOBAL_TIME_DATA_SET_LEAP61_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_global_time_data_set_epochnumber, tvb, PTP_MM_GLOBAL_TIME_DATA_SET_EPOCHNUMBER_OFFSET, 2, ENC_BIG_ENDIAN); @@ -2128,10 +2128,10 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_update_global_time_properties_leap59, tvb, - PTP_MM_UPDATE_GLOBAL_TIME_PROPERTIES_LEAP59_OFFSET, 1, FALSE); + PTP_MM_UPDATE_GLOBAL_TIME_PROPERTIES_LEAP59_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_update_global_time_properties_leap61, tvb, - PTP_MM_UPDATE_GLOBAL_TIME_PROPERTIES_LEAP61_OFFSET, 1, FALSE); + PTP_MM_UPDATE_GLOBAL_TIME_PROPERTIES_LEAP61_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_get_foreign_data_set_recordkey, tvb, PTP_MM_UPDATE_GLOBAL_TIME_PROPERTIES_EPOCHNUMBER_OFFSET, 2, ENC_BIG_ENDIAN); @@ -2339,12 +2339,12 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (ptpv2_oE == TRUE) { proto_tree_add_item(ptp_transportspecific_tree, - hf_ptp_v2_transportspecific_802as_conform, tvb, PTP_V2_TRANSPORT_SPECIFIC_MESSAGE_ID_OFFSET, 1, FALSE); + hf_ptp_v2_transportspecific_802as_conform, tvb, PTP_V2_TRANSPORT_SPECIFIC_MESSAGE_ID_OFFSET, 1, ENC_BIG_ENDIAN); } else { proto_tree_add_item(ptp_transportspecific_tree, - hf_ptp_v2_transportspecific_v1_compatibility, tvb, PTP_V2_TRANSPORT_SPECIFIC_MESSAGE_ID_OFFSET, 1, FALSE); + hf_ptp_v2_transportspecific_v1_compatibility, tvb, PTP_V2_TRANSPORT_SPECIFIC_MESSAGE_ID_OFFSET, 1, ENC_BIG_ENDIAN); } proto_tree_add_item(ptp_tree, @@ -2366,40 +2366,40 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ptp_flags_tree = proto_item_add_subtree(flags_ti, ett_ptp_v2_flags); proto_tree_add_item(ptp_flags_tree, - hf_ptp_v2_flags_security, tvb, PTP_V2_FLAGS_OFFSET, 2, FALSE); + hf_ptp_v2_flags_security, tvb, PTP_V2_FLAGS_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_flags_tree, - hf_ptp_v2_flags_specific2, tvb, PTP_V2_FLAGS_OFFSET, 2, FALSE); + hf_ptp_v2_flags_specific2, tvb, PTP_V2_FLAGS_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_flags_tree, - hf_ptp_v2_flags_specific1, tvb, PTP_V2_FLAGS_OFFSET, 2, FALSE); + hf_ptp_v2_flags_specific1, tvb, PTP_V2_FLAGS_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_flags_tree, - hf_ptp_v2_flags_unicast, tvb, PTP_V2_FLAGS_OFFSET, 2, FALSE); + hf_ptp_v2_flags_unicast, tvb, PTP_V2_FLAGS_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_flags_tree, - hf_ptp_v2_flags_twostep, tvb, PTP_V2_FLAGS_OFFSET, 2, FALSE); + hf_ptp_v2_flags_twostep, tvb, PTP_V2_FLAGS_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_flags_tree, - hf_ptp_v2_flags_alternatemaster, tvb, PTP_V2_FLAGS_OFFSET, 2, FALSE); + hf_ptp_v2_flags_alternatemaster, tvb, PTP_V2_FLAGS_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_flags_tree, - hf_ptp_v2_flags_frequencytraceable, tvb, PTP_V2_FLAGS_OFFSET, 2, FALSE); + hf_ptp_v2_flags_frequencytraceable, tvb, PTP_V2_FLAGS_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_flags_tree, - hf_ptp_v2_flags_timetraceable, tvb, PTP_V2_FLAGS_OFFSET, 2, FALSE); + hf_ptp_v2_flags_timetraceable, tvb, PTP_V2_FLAGS_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_flags_tree, - hf_ptp_v2_flags_ptptimescale, tvb, PTP_V2_FLAGS_OFFSET, 2, FALSE); + hf_ptp_v2_flags_ptptimescale, tvb, PTP_V2_FLAGS_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_flags_tree, - hf_ptp_v2_flags_utcoffsetvalid, tvb, PTP_V2_FLAGS_OFFSET, 2, FALSE); + hf_ptp_v2_flags_utcoffsetvalid, tvb, PTP_V2_FLAGS_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_flags_tree, - hf_ptp_v2_flags_li59, tvb, PTP_V2_FLAGS_OFFSET, 2, FALSE); + hf_ptp_v2_flags_li59, tvb, PTP_V2_FLAGS_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_flags_tree, - hf_ptp_v2_flags_li61, tvb, PTP_V2_FLAGS_OFFSET, 2, FALSE); + hf_ptp_v2_flags_li61, tvb, PTP_V2_FLAGS_OFFSET, 2, ENC_BIG_ENDIAN); temp = PTP_V2_CORRECTIONNS_OFFSET; @@ -2851,14 +2851,14 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, PTP_AS_SIG_TLV_MESSAGEINTERVALREQUEST_OFFSET + PTP_AS_SIG_TLV_FLAGS_OFFSET, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(sig_tlv_flags_tree, hf_ptp_as_sig_tlv_flags_comp_prop_delay, tvb, PTP_AS_SIG_TLV_MESSAGEINTERVALREQUEST_OFFSET + PTP_AS_SIG_TLV_FLAGS_OFFSET, 1, - FALSE); + ENC_BIG_ENDIAN); } else { @@ -2950,22 +2950,22 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ptp_clockType_tree = proto_item_add_subtree(clockType_ti, ett_ptp_v2_clockType); /* ClockType Subtree */ proto_tree_add_item(ptp_clockType_tree, hf_ptp_v2_mm_clockType_ordinaryClock, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_clockType_tree, hf_ptp_v2_mm_clockType_boundaryClock, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_clockType_tree, hf_ptp_v2_mm_clockType_p2p_transparentClock, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_clockType_tree, hf_ptp_v2_mm_clockType_e2e_transparentClock, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_clockType_tree, hf_ptp_v2_mm_clockType_managementNode, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_clockType_tree, hf_ptp_v2_mm_clockType_reserved, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); Offset +=2; dissect_ptp_v2_text (tvb, &Offset, ptp_managementData_tree, @@ -3121,10 +3121,10 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_DEFAULT_DATA_SET: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_TSC, tvb, - PTP_V2_MM_TLV_DATAFIELD_OFFSET, 1, FALSE); + PTP_V2_MM_TLV_DATAFIELD_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_dds_SO, tvb, - PTP_V2_MM_TLV_DATAFIELD_OFFSET, 1, FALSE); + PTP_V2_MM_TLV_DATAFIELD_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, PTP_V2_MM_RESERVED1, 1, ENC_NA); @@ -3179,7 +3179,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=10; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_parentStats, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, @@ -3224,17 +3224,17 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=2; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_LI_61, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_LI_59, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_UTCV, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_PTP, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_TTRA, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_FTRA, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_timesource, tvb, @@ -3316,7 +3316,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_SLAVE_ONLY: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_SO, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, Offset+1, 1, ENC_NA); break; @@ -3396,11 +3396,11 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=2; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_LI_61, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_LI_59, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_UTCV, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, @@ -3410,9 +3410,9 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_TRACEABILITY_PROPERTIES: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_TTRA, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_FTRA, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, @@ -3423,7 +3423,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_TIMESCALE_PROPERTIES: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_PTP, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_timesource, tvb, @@ -3434,7 +3434,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_UNICAST_NEGOTIATION_ENABLE: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_ucEN, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, @@ -3456,7 +3456,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_PATH_TRACE_ENABLE: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_ptEN, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, @@ -3501,7 +3501,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_atEN, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; break; @@ -3537,7 +3537,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_ALTERNATE_MASTER: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_transmitAlternateMulticastSync, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_numberOfAlternateMasters, tvb, @@ -3608,7 +3608,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=2; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_faultyFlag, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_logMinPdelayReqInterval, tvb, diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index b503332889..6f54fd2313 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -1443,7 +1443,7 @@ dissect_q931_change_status_ie(tvbuff_t *tvb, int offset, int len _U_, proto_tree return; octet = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_q931_extension_ind, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_q931_extension_ind, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_text(tree, tvb, offset, 1, "%s", decode_enumerated_bitfield_shifted(octet, 0x40, 8, VALS(q931_status_preference_vals), "Preference: %s")); proto_tree_add_text(tree, tvb, offset, 1, "%s", @@ -1547,11 +1547,11 @@ dissect_q931_channel_identification_ie(tvbuff_t *tvb, int offset, int len, return; octet = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_q931_extension_ind, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_q931_channel_interface_explicit, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_q931_channel_interface_type, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_q931_channel_exclusive, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_q931_channel_dchan, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_q931_extension_ind, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q931_channel_interface_explicit, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q931_channel_interface_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q931_channel_exclusive, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q931_channel_dchan, tvb, offset, 1, ENC_BIG_ENDIAN); if (octet & Q931_NOT_BASIC_CHANNEL) { proto_tree_add_item(tree, hf_q931_channel_selection_pri, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -1588,7 +1588,7 @@ dissect_q931_channel_identification_ie(tvbuff_t *tvb, int offset, int len, return; octet = tvb_get_guint8(tvb, offset); coding_standard = octet & 0x60; - proto_tree_add_item(tree, hf_q931_extension_ind, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_q931_extension_ind, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(tree, hf_q931_coding_standard, tvb, offset, 1, octet); if (coding_standard != Q931_ITU_STANDARDIZED_CODING) { /* @@ -1601,7 +1601,7 @@ dissect_q931_channel_identification_ie(tvbuff_t *tvb, int offset, int len, tvb_bytes_to_str(tvb, offset, len)); return; } - proto_tree_add_item(tree, hf_q931_channel_map, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_q931_channel_map, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_q931_channel_element_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1623,7 +1623,7 @@ dissect_q931_channel_identification_ie(tvbuff_t *tvb, int offset, int len, break; octet2 = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_q931_extension_ind, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_q931_extension_ind, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree,hf_q931_channel_number,tvb,offset,1,ENC_BIG_ENDIAN); offset += 1; @@ -2411,7 +2411,7 @@ dissect_q931_high_layer_compat_ie(tvbuff_t *tvb, int offset, int len, coding_standard = octet & 0x60; pres_method = octet & 0x03; - proto_tree_add_item(tree, hf_q931_extension_ind, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_q931_extension_ind, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(tree, hf_q931_coding_standard, tvb, offset, 1, octet); proto_tree_add_uint(tree, hf_q931_interpretation, tvb, offset, 1, octet); proto_tree_add_uint(tree, hf_q931_pres_meth_prot_prof, tvb, offset, 1, octet); @@ -2434,7 +2434,7 @@ dissect_q931_high_layer_compat_ie(tvbuff_t *tvb, int offset, int len, octet = tvb_get_guint8(tvb, offset); characteristics = octet & 0x7F; - proto_tree_add_item(tree, hf_q931_extension_ind, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_q931_extension_ind, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(tree, hf_q931_high_layer_characteristics, tvb, offset, 1, octet); offset += 1; @@ -2446,11 +2446,11 @@ dissect_q931_high_layer_compat_ie(tvbuff_t *tvb, int offset, int len, octet = tvb_get_guint8(tvb, offset); if ((characteristics == Q931_AUDIOVISUAL) || (characteristics == 0x61) || (characteristics == 0x62) || (characteristics == 0x68)) { - proto_tree_add_item(tree, hf_q931_extension_ind, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_q931_extension_ind, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(tree, hf_q931_extended_audiovisual_characteristics, tvb, offset, 1, octet); } else if ((characteristics == Q931_MANAGEMENT) || (characteristics == Q931_MAINTENANCE)) { - proto_tree_add_item(tree, hf_q931_extension_ind, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_q931_extension_ind, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(tree, hf_q931_extended_high_layer_characteristics, tvb, offset, 1, octet); } } diff --git a/epan/dissectors/packet-radiotap.c b/epan/dissectors/packet-radiotap.c index 6800d20aea..f83fcb725a 100644 --- a/epan/dissectors/packet-radiotap.c +++ b/epan/dissectors/packet-radiotap.c @@ -1571,28 +1571,28 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_tree_add_item(flags_tree, hf_radiotap_flags_cfp, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(flags_tree, hf_radiotap_flags_preamble, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(flags_tree, hf_radiotap_flags_wep, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(flags_tree, hf_radiotap_flags_frag, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(flags_tree, hf_radiotap_flags_fcs, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(flags_tree, hf_radiotap_flags_datapad, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(flags_tree, hf_radiotap_flags_badfcs, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(flags_tree, hf_radiotap_flags_shortgi, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); } break; } diff --git a/epan/dissectors/packet-radius_packetcable.c b/epan/dissectors/packet-radius_packetcable.c index d4e61e1b5b..098df6fc9d 100644 --- a/epan/dissectors/packet-radius_packetcable.c +++ b/epan/dissectors/packet-radius_packetcable.c @@ -377,9 +377,9 @@ static const gchar* dissect_packetcable_time_electr_surv_ind(proto_tree* tree, t return "None"; proto_tree_add_item(tree, hf_packetcable_electronic_surveillance_indication_df_cdc_address, - tvb, 0, 4, FALSE); + tvb, 0, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_packetcable_electronic_surveillance_indication_df_ccc_address, - tvb, 4, 4, FALSE); + tvb, 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_packetcable_electronic_surveillance_indication_cdc_port, tvb, 8, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_packetcable_electronic_surveillance_indication_ccc_port, diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c index bc78d56924..af2b8abde9 100644 --- a/epan/dissectors/packet-reload.c +++ b/epan/dissectors/packet-reload.c @@ -1423,7 +1423,7 @@ dissect_ipaddressport(int anchor, tvbuff_t *tvb, proto_tree *tree, guint16 offse ti_ipv4 = proto_tree_add_item(ipaddressport_tree, hf_reload_ipv4addrport, tvb, offset, 6, ENC_NA); proto_item_append_text(ti_ipv4, ": %s:%d", tvb_ip_to_str(tvb, offset),tvb_get_ntohs(tvb,offset+4)); ipv4_tree = proto_item_add_subtree(ti_ipv4, ett_reload_ipv4addrport); - proto_tree_add_item(ipv4_tree, hf_reload_ipv4addr, tvb, offset, 4, FALSE); + proto_tree_add_item(ipv4_tree, hf_reload_ipv4addr, tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ipv4_tree, hf_reload_port, tvb, offset + 4, 2, ENC_BIG_ENDIAN); } break; @@ -1435,7 +1435,7 @@ dissect_ipaddressport(int anchor, tvbuff_t *tvb, proto_tree *tree, guint16 offse ti_ipv6 = proto_tree_add_item(ipaddressport_tree, hf_reload_ipv6addrport, tvb, offset, 6, ENC_NA); proto_item_append_text(ti_ipv6, ": %s:%d", tvb_ip6_to_str(tvb, offset),tvb_get_ntohs(tvb,offset+16)); ipv6_tree = proto_item_add_subtree(ti_ipv6, ett_reload_ipv6addrport); - proto_tree_add_item(ipv6_tree, hf_reload_ipv6addr, tvb, offset, 16, FALSE); + proto_tree_add_item(ipv6_tree, hf_reload_ipv6addr, tvb, offset, 16, ENC_NA); proto_tree_add_item(ipv6_tree, hf_reload_port, tvb, offset + 16, 2, ENC_BIG_ENDIAN); } break; @@ -1662,7 +1662,7 @@ dissect_attachreqans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint1 local_offset += dissect_opaque_string(tvb, pinfo,attachreqans_tree, hf_reload_role,offset+local_offset, 1, -1); local_offset += dissect_icecandidates(tvb, pinfo, attachreqans_tree, offset + local_offset, 2+icecandidates_length); - proto_tree_add_item(attachreqans_tree, hf_reload_sendupdate, tvb, offset+local_offset, 1, FALSE); + proto_tree_add_item(attachreqans_tree, hf_reload_sendupdate, tvb, offset+local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; return local_offset; @@ -1802,7 +1802,7 @@ static int dissect_datavalue(int anchor, tvbuff_t *tvb, packet_info *pinfo, prot ti_datavalue = proto_tree_add_item(tree, hf, tvb, offset,1+4+value_length, FALSE); datavalue_tree = proto_item_add_subtree(ti_datavalue,ett_reload_datavalue); - proto_tree_add_item(datavalue_tree, hf_reload_datavalue_exists, tvb, offset, 1, FALSE); + proto_tree_add_item(datavalue_tree, hf_reload_datavalue_exists, tvb, offset, 1, ENC_BIG_ENDIAN); if (kind != NULL) { switch(kind->id) { @@ -1882,7 +1882,7 @@ static int dissect_datavalue(int anchor, tvbuff_t *tvb, packet_info *pinfo, prot ti_datavalue = proto_tree_add_item(tree, hf, tvb, offset,1+4+1+1+hash_length, FALSE); datavalue_tree = proto_item_add_subtree(ti_datavalue,ett_reload_datavalue); - proto_tree_add_item(datavalue_tree, hf_reload_datavalue_exists, tvb, offset, 1, FALSE); + proto_tree_add_item(datavalue_tree, hf_reload_datavalue_exists, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(datavalue_tree, hf_reload_metadata_value_length, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item(datavalue_tree, hf_reload_hash_algorithm, tvb, offset+1+4, 1, ENC_BIG_ENDIAN); dissect_opaque(tvb, pinfo, datavalue_tree, hf_reload_metadata_hash_value, offset +1+4+1, 1, length-1-4-1); @@ -3429,7 +3429,7 @@ extern gint dissect_reload_messagecontents(tvbuff_t *tvb, packet_info *pinfo, pr message_type_str = "RouteQueryReq"; ti_routequeryreq = proto_tree_add_item(message_body_tree, hf_reload_routequeryreq, tvb, offset, message_body_length, ENC_NA); routequeryreq_tree = proto_item_add_subtree(ti_routequeryreq, ett_reload_routequeryreq); - proto_tree_add_item(routequeryreq_tree, hf_reload_sendupdate, tvb, offset, 1, FALSE); + proto_tree_add_item(routequeryreq_tree, hf_reload_sendupdate, tvb, offset, 1, ENC_BIG_ENDIAN); destination_length = dissect_destination(hf_reload_routequeryreq_destination,tvb, pinfo, routequeryreq_tree, offset + 1, message_body_length - 1 - 2); dissect_opaque(tvb, pinfo, routequeryreq_tree, hf_reload_overlay_specific, offset + 1 + destination_length, 2, (message_body_length - 1 - destination_length)); } @@ -3827,7 +3827,7 @@ extern gint dissect_reload_messagecontents(tvbuff_t *tvb, packet_info *pinfo, pr extension_tree = proto_item_add_subtree(ti_extension, ett_reload_message_extension); type = tvb_get_ntohs(tvb, offset+ extension_offset); proto_tree_add_item(extension_tree, hf_reload_message_extension_type, tvb, offset+ extension_offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(extension_tree, hf_reload_message_extension_critical, tvb, offset+ extension_offset + 2, 1, FALSE); + proto_tree_add_item(extension_tree, hf_reload_message_extension_critical, tvb, offset+ extension_offset + 2, 1, ENC_BIG_ENDIAN); switch(type) { case MESSAGEEXTENSIONTYPE_SELF_TUNING_DATA: diff --git a/epan/dissectors/packet-rgmp.c b/epan/dissectors/packet-rgmp.c index 0a550a4899..5fad192a4c 100644 --- a/epan/dissectors/packet-rgmp.c +++ b/epan/dissectors/packet-rgmp.c @@ -95,7 +95,7 @@ dissect_rgmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int off igmp_checksum(tree, tvb, hf_checksum, hf_checksum_bad, pinfo, 0); offset += 2; - proto_tree_add_item(tree, hf_maddr, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_maddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; diff --git a/epan/dissectors/packet-rip.c b/epan/dissectors/packet-rip.c index bf955af527..ed3d64f949 100644 --- a/epan/dissectors/packet-rip.c +++ b/epan/dissectors/packet-rip.c @@ -198,9 +198,9 @@ dissect_unspec_rip_vektor(tvbuff_t *tvb, int offset, guint8 version, proto_tree_add_item(rip_vektor_tree, hf_rip_route_tag, tvb, offset+2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(rip_vektor_tree, hf_rip_netmask, tvb, offset+8, 4, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(rip_vektor_tree, hf_rip_next_hop, tvb, offset+12, 4, - FALSE); + ENC_BIG_ENDIAN); } proto_tree_add_uint(rip_vektor_tree, hf_rip_metric, tvb, offset+16, 4, metric); @@ -226,13 +226,13 @@ dissect_ip_rip_vektor(tvbuff_t *tvb, int offset, guint8 version, ENC_BIG_ENDIAN); } - proto_tree_add_item(rip_vektor_tree, hf_rip_ip, tvb, offset+4, 4, FALSE); + proto_tree_add_item(rip_vektor_tree, hf_rip_ip, tvb, offset+4, 4, ENC_BIG_ENDIAN); if (version == RIPv2) { proto_tree_add_item(rip_vektor_tree, hf_rip_netmask, tvb, offset+8, 4, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(rip_vektor_tree, hf_rip_next_hop, tvb, offset+12, 4, - FALSE); + ENC_BIG_ENDIAN); } proto_tree_add_uint(rip_vektor_tree, hf_rip_metric, tvb, offset+16, 4, metric); diff --git a/epan/dissectors/packet-ripng.c b/epan/dissectors/packet-ripng.c index e276f73171..5fdd77a479 100644 --- a/epan/dissectors/packet-ripng.c +++ b/epan/dissectors/packet-ripng.c @@ -96,7 +96,7 @@ dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { rte_tree = proto_item_add_subtree(rte_ti, ett_ripng_rte); /* IPv6 Prefix */ - proto_tree_add_item(rte_tree, hf_ripng_rte_ipv6_prefix, tvb, offset, 16, FALSE); + proto_tree_add_item(rte_tree, hf_ripng_rte_ipv6_prefix, tvb, offset, 16, ENC_NA); proto_item_append_text(rte_ti, ": IPv6 Prefix: %s", tvb_ip6_to_str(tvb, offset)); offset += 16; diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c index 9ca8cd77fb..788516ddbd 100644 --- a/epan/dissectors/packet-rmp.c +++ b/epan/dissectors/packet-rmp.c @@ -139,7 +139,7 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; len = tvb_get_guint8(tvb, 30); proto_tree_add_item(rmp_tree, - hf_rmp_filename, tvb, 30, 1, FALSE); + hf_rmp_filename, tvb, 30, 1, ENC_BIG_ENDIAN); if(tvb_offset_exists(tvb, len+31)) call_dissector(data_handle, tvb_new_subset_remaining(tvb, len+31), @@ -157,7 +157,7 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_rmp_version, tvb, 8, 2, ENC_BIG_ENDIAN); len = tvb_get_guint8(tvb, 10); proto_tree_add_item(rmp_tree, - hf_rmp_filename, tvb, 10, 1, FALSE); + hf_rmp_filename, tvb, 10, 1, ENC_BIG_ENDIAN); if(tvb_offset_exists(tvb, len+11)) call_dissector(data_handle, tvb_new_subset_remaining(tvb, len+11), diff --git a/epan/dissectors/packet-rsip.c b/epan/dissectors/packet-rsip.c index 48a606d29c..2cbe9e6bc6 100644 --- a/epan/dissectors/packet-rsip.c +++ b/epan/dissectors/packet-rsip.c @@ -301,7 +301,7 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff) if (paramlen - 1 > 0) { proto_tree_add_item(v_tree, hf_rsip_parameter_address_ipv4, tvb, - off + 4, paramlen - 1, FALSE); + off + 4, paramlen - 1, ENC_BIG_ENDIAN); proto_item_append_text(pti, ": %s", tvb_ip_to_str(tvb, off + 4)); } else @@ -312,7 +312,7 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff) if (paramlen - 1 > 0) { proto_tree_add_item(v_tree, hf_rsip_parameter_address_ipv4_netmask, - tvb, off + 4, paramlen - 1, FALSE); + tvb, off + 4, paramlen - 1, ENC_BIG_ENDIAN); proto_item_append_text(pti, "(netmask): %s", tvb_ip_to_str(tvb, off + 4)); } else @@ -324,7 +324,7 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff) tvb_get_ipv6(tvb, off + 4, &in6); proto_tree_add_item(v_tree, hf_rsip_parameter_address_ipv6, tvb, - off + 4, paramlen - 1, FALSE); + off + 4, paramlen - 1, ENC_NA); proto_item_append_text(pti, ": %s", ip6_to_str(&in6)); } else diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 67d38bd8cb..161f0733b7 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -1223,7 +1223,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree item_len = tvb_get_guint8( tvb, offset ); /* Item len of 1 because its an FT_UINT_STRING... */ proto_tree_add_item(PoC1_tree, hf_rtcp_app_poc1_sip_uri, - tvb, offset, 1, FALSE ); + tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; col_append_fstr(pinfo->cinfo, COL_INFO, " CNAME=\"%s\"", @@ -1332,7 +1332,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree /* Reason phrase */ item_len = tvb_get_guint8( tvb, offset ); if ( item_len != 0 ) - proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_reason1_phrase, tvb, offset, 1, FALSE ); + proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_reason1_phrase, tvb, offset, 1, ENC_BIG_ENDIAN ); offset += (item_len+1); packet_len -= (item_len+1); @@ -1485,7 +1485,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_conn_session_type, tvb, offset + 2, 1, ENC_BIG_ENDIAN ); /* Additional indications */ - proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_conn_add_ind_mao, tvb, offset + 3, 1, FALSE ); + proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_conn_add_ind_mao, tvb, offset + 3, 1, ENC_BIG_ENDIAN ); offset += 4; packet_len -= 4; @@ -1536,8 +1536,8 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree proto_item* mux_item = proto_tree_add_item(tree, hf_rtcp_app_mux, tvb, offset, packet_len, ENC_NA); proto_tree* mux_tree = proto_item_add_subtree( mux_item, ett_mux ); - proto_tree_add_item( mux_tree, hf_rtcp_app_mux_mux, tvb, offset, 1, FALSE ); - proto_tree_add_item( mux_tree, hf_rtcp_app_mux_cp, tvb, offset, 1, FALSE ); + proto_tree_add_item( mux_tree, hf_rtcp_app_mux_mux, tvb, offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item( mux_tree, hf_rtcp_app_mux_cp, tvb, offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item( mux_tree, hf_rtcp_app_mux_selection, tvb, offset, 1, ENC_BIG_ENDIAN ); local_port = tvb_get_ntohs( tvb, offset+2 ); proto_tree_add_uint( mux_tree, hf_rtcp_app_mux_localmuxport, tvb, offset+2, 2, local_port*2 ); diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c index a454687bd0..5975c65734 100644 --- a/epan/dissectors/packet-rtnet.c +++ b/epan/dissectors/packet-rtnet.c @@ -352,7 +352,7 @@ dissect_rtnet_tdma_station_list(tvbuff_t *tvb, guint offset, proto_tree *tree) for( i = 0; i < nr_stations; i++ ) { proto_tree_add_item(tree, hf_tdma_v1_msg_station_list_ip, tvb, - offset, 4, FALSE ); + offset, 4, ENC_BIG_ENDIAN ); offset += 4; @@ -631,7 +631,7 @@ dissect_rtmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { item = proto_tree_add_item(rtmac_tree, hf_rtmac_header_flags, tvb, offset, 1, ENC_BIG_ENDIAN); ti = proto_item_add_subtree(item, ett_rtmac_flags); proto_tree_add_item(ti, hf_rtmac_header_flags_res, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(ti, hf_rtmac_header_flags_tunnel, tvb, offset, 1, FALSE); + proto_tree_add_item(ti, hf_rtmac_header_flags_tunnel, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; } @@ -720,10 +720,10 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { break; case RTCFG_ADDRESS_TYPE_IP: - proto_tree_add_item( rtcfg_tree, hf_rtcfg_client_ip_address, tvb, offset, 4, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_client_ip_address, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; - proto_tree_add_item( rtcfg_tree, hf_rtcfg_server_ip_address, tvb, offset, 4, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_server_ip_address, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; break; @@ -755,7 +755,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { break; case RTCFG_ADDRESS_TYPE_IP: - proto_tree_add_item( rtcfg_tree, hf_rtcfg_client_ip_address, tvb, offset, 4, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_client_ip_address, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; break; } @@ -786,7 +786,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { break; case RTCFG_ADDRESS_TYPE_IP: - proto_tree_add_item( rtcfg_tree, hf_rtcfg_client_ip_address, tvb, offset, 4, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_client_ip_address, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; break; } @@ -866,7 +866,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { break; case RTCFG_ADDRESS_TYPE_IP: - proto_tree_add_item( rtcfg_tree, hf_rtcfg_client_ip_address, tvb, offset, 4, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_client_ip_address, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; break; } diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 71196ee70d..8803984722 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -1089,7 +1089,7 @@ dissect_rtp_rfc2198(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) /* Add a subtree for this header and add items */ ti = proto_tree_add_text(rfc2198_tree, tvb, offset, (hdr_follow)?4:1, "Header %u", cnt); rfc2198_hdr_tree = proto_item_add_subtree(ti, ett_rtp_rfc2198_hdr); - proto_tree_add_item(rfc2198_hdr_tree, hf_rtp_rfc2198_follow, tvb, offset, 1, FALSE ); + proto_tree_add_item(rfc2198_hdr_tree, hf_rtp_rfc2198_follow, tvb, offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_uint_format(rfc2198_hdr_tree, hf_rtp_payload_type, tvb, offset, 1, octet1, "Payload type: %s (%u)", payload_type_str ? payload_type_str : val_to_str_ext(hdr_new->pt, &rtp_payload_type_vals_ext, "Unknown"), diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c index 5b6393a34b..8d13efd2d7 100644 --- a/epan/dissectors/packet-sasp.c +++ b/epan/dissectors/packet-sasp.c @@ -530,7 +530,7 @@ static void dissect_reg_req(tvbuff_t *tvb,proto_tree *pay_load,guint32 offset) offset+=2; /* Reg Req LB Flag */ - proto_tree_add_item(reg_req_data,hf_reg_req_lbflag,tvb,offset,1,FALSE); + proto_tree_add_item(reg_req_data,hf_reg_req_lbflag,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; gmd_cnt=tvb_get_ntohs(tvb, offset); @@ -596,7 +596,7 @@ static void dissect_dereg_req(tvbuff_t *tvb,proto_tree *pay_load,guint32 offset) offset+=2; /* LB Flag */ - proto_tree_add_item(dereg_req_data,hf_dereg_req_lbflag,tvb,offset,1,FALSE); + proto_tree_add_item(dereg_req_data,hf_dereg_req_lbflag,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; /* Reason */ @@ -707,7 +707,7 @@ static void dissect_setmemstate_req(tvbuff_t *tvb,proto_tree *pay_load,guint32 o offset+=2; /*LB Flag*/ - proto_tree_add_item(setmemstate_req_data,hf_setmemstate_req_lbflag,tvb,offset,1,FALSE); + proto_tree_add_item(setmemstate_req_data,hf_setmemstate_req_lbflag,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; /*Group Data Count*/ @@ -780,7 +780,7 @@ static guint32 dissect_memdatacomp(tvbuff_t *tvb, proto_tree *pay_load,guint32 o offset+=2; /*Ip*/ - proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_ip, tvb, offset,16, FALSE); + proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_ip, tvb, offset,16, ENC_NA); offset+=16; diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c index 7625c5bb0f..d058516687 100644 --- a/epan/dissectors/packet-sbus.c +++ b/epan/dissectors/packet-sbus.c @@ -1618,13 +1618,13 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sbusdata_tree = proto_item_add_subtree(dt, ett_sbus_data); proto_tree_add_item(sbusdata_tree, hf_sbus_flags_accu, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(sbusdata_tree, hf_sbus_flags_error, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(sbusdata_tree, hf_sbus_flags_negative, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(sbusdata_tree, hf_sbus_flags_zero, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset +=1; break; @@ -1695,15 +1695,15 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sbusdata_tree = proto_item_add_subtree(dt, ett_sbus_data); proto_tree_add_item(sbusdata_tree, hf_sbus_sysinfo0_1, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(sbusdata_tree, hf_sbus_sysinfo0_2, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(sbusdata_tree, hf_sbus_sysinfo0_3, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(sbusdata_tree, hf_sbus_sysinfo0_4, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(sbusdata_tree, hf_sbus_sysinfo0_5, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } else { /*do not dissect all system info telegrams as there is no need*/ diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c index aebc2e1216..71887793a7 100644 --- a/epan/dissectors/packet-scsi-mmc.c +++ b/epan/dissectors/packet-scsi-mmc.c @@ -418,7 +418,7 @@ dissect_mmc4_getconfiguration (tvbuff_t *tvb, packet_info *pinfo _U_, proto_item_append_text(it, "%s", val_to_str(profile, scsi_getconf_current_profile_val, "Unknown 0x%04x")); cur_profile=tvb_get_guint8(tvb_v, offset_v+2); - proto_tree_add_item (tr, hf_scsi_mmc_feature_profile_current, tvb_v, offset_v+2, 1, 0); + proto_tree_add_item (tr, hf_scsi_mmc_feature_profile_current, tvb_v, offset_v+2, 1, ENC_BIG_ENDIAN); if(cur_profile&0x01){ proto_item_append_text(it, " [CURRENT PROFILE]"); } @@ -431,14 +431,14 @@ dissect_mmc4_getconfiguration (tvbuff_t *tvb, packet_info *pinfo _U_, /* no data for this one */ break; case 0x001e: /* cd read */ - proto_tree_add_item (tree, hf_scsi_mmc_feature_cdread_dap, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_cdread_c2flag, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_cdread_cdtext, tvb_v, offset_v, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_feature_cdread_dap, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_feature_cdread_c2flag, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_feature_cdread_cdtext, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); break; case 0x0021: /* incremental streaming writeable */ proto_tree_add_item (tree, hf_scsi_mmc_feature_dts, tvb_v, offset_v, 2, ENC_BIG_ENDIAN); offset_v+=2; - proto_tree_add_item (tree, hf_scsi_mmc_feature_isw_buf, tvb_v, offset_v, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_feature_isw_buf, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); offset_v+=1; num_linksize=tvb_get_guint8(tvb_v, offset_v); proto_tree_add_item (tree, hf_scsi_mmc_feature_isw_num_linksize, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); @@ -449,36 +449,36 @@ dissect_mmc4_getconfiguration (tvbuff_t *tvb, packet_info *pinfo _U_, } break; case 0x002a: /* dvd-rw */ - proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdrw_write, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdrw_quickstart, tvb_v, offset_v, 2, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdrw_closeonly, tvb_v, offset_v, 2, 0); + proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdrw_write, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdrw_quickstart, tvb_v, offset_v, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdrw_closeonly, tvb_v, offset_v, 2, ENC_BIG_ENDIAN); break; case 0x002b: /* dvd-r */ - proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdr_write, tvb_v, offset_v, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdr_write, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); break; case 0x002d: /* track at once */ - proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_buf, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_rwraw, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_rwpack, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_testwrite, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_cdrw, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_rwsubcode, tvb_v, offset_v, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_buf, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_rwraw, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_rwpack, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_testwrite, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_cdrw, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_rwsubcode, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_feature_dts, tvb_v, offset_v+2, 2, ENC_BIG_ENDIAN); break; case 0x002e: /* session at once */ - proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_buf, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_sao, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_rawms, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_raw, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_testwrite, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_cdrw, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_rw, tvb_v, offset_v, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_buf, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_sao, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_rawms, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_raw, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_testwrite, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_cdrw, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_rw, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_mcsl, tvb_v, offset_v+1, 3, ENC_BIG_ENDIAN); break; case 0x002f: /* dvd-r/-rw*/ - proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdr_buf, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdr_testwrite, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdr_dvdrw, tvb_v, offset_v, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdr_buf, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdr_testwrite, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdr_dvdrw, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); break; case 0x0108: /* logical unit serial number */ proto_tree_add_item (tree, hf_scsi_mmc_feature_lun_sn, tvb_v, offset_v, additional_length, 0); @@ -536,7 +536,7 @@ dissect_mmc4_readtocpmaatip (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * switch(format){ case 0x00: case 0x01: - proto_tree_add_item (tree, hf_scsi_mmc_readtoc_time, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_readtoc_time, tvb, offset, 1, ENC_BIG_ENDIAN); /* save time so we can pick it up in the response */ if(tvb_get_guint8(tvb, offset)&0x02){ cdata->itlq->flags|=0x0100; @@ -643,7 +643,7 @@ dissect_mmc4_readdiscinformation (tvbuff_t *tvb, packet_info *pinfo _U_, proto_t } if(tree && (!isreq)) { proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb, 0, 2, ENC_BIG_ENDIAN); - proto_tree_add_item (tree, hf_scsi_mmc_disc_info_erasable, tvb, 2, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_disc_info_erasable, tvb, 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_disc_info_state_of_last_session, tvb, 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_disc_info_disk_status, tvb, 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_first_track, tvb, offset+3, 1, ENC_BIG_ENDIAN); @@ -653,11 +653,11 @@ dissect_mmc4_readdiscinformation (tvbuff_t *tvb, packet_info *pinfo _U_, proto_t proto_tree_add_uint (tree, hf_scsi_mmc_disc_info_first_track_in_last_session, tvb, 5, 1, (tvb_get_guint8(tvb, offset+10)<<8)|tvb_get_guint8(tvb, offset+5)); /* last track in last session offset+6 and offset+11 */ proto_tree_add_uint (tree, hf_scsi_mmc_disc_info_last_track_in_last_session, tvb, 6, 1, (tvb_get_guint8(tvb, offset+11)<<8)|tvb_get_guint8(tvb, offset+6)); - proto_tree_add_item (tree, hf_scsi_mmc_disc_info_did_v, tvb, offset+7, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_disc_info_dbc_v, tvb, offset+7, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_disc_info_uru, tvb, offset+7, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_disc_info_dac_v, tvb, offset+7, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_disc_info_dbit, tvb, offset+7, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_disc_info_did_v, tvb, offset+7, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_disc_info_dbc_v, tvb, offset+7, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_disc_info_uru, tvb, offset+7, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_disc_info_dac_v, tvb, offset+7, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_disc_info_dbit, tvb, offset+7, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_disc_info_bgfs, tvb, offset+7, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_disc_info_disc_type, tvb, offset+8, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_disc_info_disc_identification, tvb, offset+12, 4, ENC_BIG_ENDIAN); @@ -723,7 +723,7 @@ dissect_mmc4_readdiscstructure (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre proto_tree_add_item (tree, hf_scsi_mmc_disc_num_layers, tvb, offset+2, 1, ENC_BIG_ENDIAN); /* track path */ - proto_tree_add_item (tree, hf_scsi_mmc_disc_track_path, tvb, offset+2, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_disc_track_path, tvb, offset+2, 1, ENC_BIG_ENDIAN); /* disc structure */ proto_tree_add_item (tree, hf_scsi_mmc_disc_structure_layer, tvb, offset+2, 1, ENC_BIG_ENDIAN); @@ -744,18 +744,18 @@ dissect_mmc4_readdiscstructure (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre } /* extended format info */ - proto_tree_add_item (tree, hf_scsi_mmc_disc_extended_format_info, tvb, offset+16, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_disc_extended_format_info, tvb, offset+16, 1, ENC_BIG_ENDIAN); /* disk application code */ proto_tree_add_item (tree, hf_scsi_mmc_disc_application_code, tvb, offset+17, 1, ENC_BIG_ENDIAN); /* extended information blocks */ - proto_tree_add_item (tree, hf_scsi_mmc_adip_eib5, tvb, offset+18, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_adip_eib4, tvb, offset+18, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_adip_eib3, tvb, offset+18, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_adip_eib2, tvb, offset+18, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_adip_eib1, tvb, offset+18, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_adip_eib0, tvb, offset+18, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_adip_eib5, tvb, offset+18, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_adip_eib4, tvb, offset+18, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_adip_eib3, tvb, offset+18, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_adip_eib2, tvb, offset+18, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_adip_eib1, tvb, offset+18, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_adip_eib0, tvb, offset+18, 1, ENC_BIG_ENDIAN); /* disk manufacturer id */ proto_tree_add_item (tree, hf_scsi_mmc_adip_device_manuf_id, tvb, offset+19, 8, 0); @@ -818,8 +818,8 @@ dissect_mmc4_synchronizecache (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree { if (tree && isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_mmc_synccache_immed, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_synccache_reladr, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_synccache_immed, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_synccache_reladr, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_num_blocks, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, @@ -954,16 +954,16 @@ dissect_mmc4_readtrackinformation (tvbuff_t *tvb, packet_info *pinfo _U_, proto_ proto_tree_add_uint (tree, hf_scsi_mmc_track, tvb, 2, 1, (tvb_get_guint8(tvb, offset+32)<<8)|tvb_get_guint8(tvb, offset+2)); /* session offset+3 and offset+33 */ proto_tree_add_uint (tree, hf_scsi_mmc_session, tvb, 3, 1, (tvb_get_guint8(tvb, offset+33)<<8)|tvb_get_guint8(tvb, offset+3)); - proto_tree_add_item (tree, hf_scsi_mmc_rti_damage, tvb, 5, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_rti_copy, tvb, 5, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_rti_damage, tvb, 5, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_rti_copy, tvb, 5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_rti_track_mode, tvb, 5, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (tree, hf_scsi_mmc_rti_rt, tvb, 6, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_rti_blank, tvb, 6, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_rti_packet, tvb, 6, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_rti_fp, tvb, 6, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_rti_rt, tvb, 6, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_rti_blank, tvb, 6, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_rti_packet, tvb, 6, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_rti_fp, tvb, 6, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_rti_data_mode, tvb, 6, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (tree, hf_scsi_mmc_rti_lra_v, tvb, 7, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_rti_nwa_v, tvb, 7, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_rti_lra_v, tvb, 7, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_rti_nwa_v, tvb, 7, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_track_start_address, tvb, offset+8, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_next_writable_address, tvb, offset+12, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_free_blocks, tvb, offset+16, 4, ENC_BIG_ENDIAN); @@ -1032,7 +1032,7 @@ dissect_mmc4_close_track (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre { if (tree && isreq && iscdb) { /* immediate */ - proto_tree_add_item (tree, hf_scsi_mmc_closetrack_immed, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_closetrack_immed, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* close function */ @@ -1063,7 +1063,7 @@ dissect_mmc4_readbuffercapacity (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr { if (tree && isreq && iscdb) { cdata->itlq->flags=0; - proto_tree_add_item (tree, hf_scsi_mmc_rbc_block, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_rbc_block, tvb, offset, 1, ENC_BIG_ENDIAN); if(tvb_get_guint8(tvb, offset)&0x01){ cdata->itlq->flags=1; } @@ -1140,9 +1140,9 @@ dissect_mmc4_setstreaming (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr switch(cdata->itlq->flags){ case 0x00: /* performance descriptor */ proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_wrc, tvb, offset+0, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_rdd, tvb, offset+0, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_exact, tvb, offset+0, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_ra, tvb, offset+0, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_rdd, tvb, offset+0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_exact, tvb, offset+0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_ra, tvb, offset+0, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_start_lba, tvb, offset+4, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_end_lba, tvb, offset+8, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_read_size, tvb, offset+12, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c index 47444329d2..329ffb1c05 100644 --- a/epan/dissectors/packet-scsi-osd.c +++ b/epan/dissectors/packet-scsi-osd.c @@ -403,12 +403,12 @@ dissect_osd_option(tvbuff_t *tvb, int offset, proto_tree *parent_tree) tree = proto_item_add_subtree(it, ett_osd_option); } - proto_tree_add_item(tree, hf_scsi_osd_option_dpo, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_scsi_osd_option_dpo, tvb, offset, 1, ENC_BIG_ENDIAN); if(option&0x10){ proto_item_append_text(tree, " DPO"); } - proto_tree_add_item(tree, hf_scsi_osd_option_fua, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_scsi_osd_option_fua, tvb, offset, 1, ENC_BIG_ENDIAN); if(option&0x08){ proto_item_append_text(tree, " FUA"); } @@ -662,47 +662,47 @@ dissect_osd_permissions(tvbuff_t *tvb, int offset, proto_tree *parent_tree) tree = proto_item_add_subtree(it, ett_osd_permission_bitmask); } - proto_tree_add_item(tree, hf_scsi_osd_permissions_read, tvb, offset, 2, 0); + proto_tree_add_item(tree, hf_scsi_osd_permissions_read, tvb, offset, 2, ENC_BIG_ENDIAN); if(permissions&0x8000){ proto_item_append_text(tree, " READ"); } - proto_tree_add_item(tree, hf_scsi_osd_permissions_write, tvb, offset, 2, 0); + proto_tree_add_item(tree, hf_scsi_osd_permissions_write, tvb, offset, 2, ENC_BIG_ENDIAN); if(permissions&0x4000){ proto_item_append_text(tree, " WRITE"); } - proto_tree_add_item(tree, hf_scsi_osd_permissions_get_attr, tvb, offset, 2, 0); + proto_tree_add_item(tree, hf_scsi_osd_permissions_get_attr, tvb, offset, 2, ENC_BIG_ENDIAN); if(permissions&0x2000){ proto_item_append_text(tree, " GET_ATTR"); } - proto_tree_add_item(tree, hf_scsi_osd_permissions_set_attr, tvb, offset, 2, 0); + proto_tree_add_item(tree, hf_scsi_osd_permissions_set_attr, tvb, offset, 2, ENC_BIG_ENDIAN); if(permissions&0x1000){ proto_item_append_text(tree, " SET_ATTR"); } - proto_tree_add_item(tree, hf_scsi_osd_permissions_create, tvb, offset, 2, 0); + proto_tree_add_item(tree, hf_scsi_osd_permissions_create, tvb, offset, 2, ENC_BIG_ENDIAN); if(permissions&0x0800){ proto_item_append_text(tree, " CREATE"); } - proto_tree_add_item(tree, hf_scsi_osd_permissions_remove, tvb, offset, 2, 0); + proto_tree_add_item(tree, hf_scsi_osd_permissions_remove, tvb, offset, 2, ENC_BIG_ENDIAN); if(permissions&0x0400){ proto_item_append_text(tree, " REMOVE"); } - proto_tree_add_item(tree, hf_scsi_osd_permissions_obj_mgmt, tvb, offset, 2, 0); + proto_tree_add_item(tree, hf_scsi_osd_permissions_obj_mgmt, tvb, offset, 2, ENC_BIG_ENDIAN); if(permissions&0x0200){ proto_item_append_text(tree, " OBJ_MGMT"); } - proto_tree_add_item(tree, hf_scsi_osd_permissions_append, tvb, offset, 2, 0); + proto_tree_add_item(tree, hf_scsi_osd_permissions_append, tvb, offset, 2, ENC_BIG_ENDIAN); if(permissions&0x0100){ proto_item_append_text(tree, " APPEND"); } - proto_tree_add_item(tree, hf_scsi_osd_permissions_dev_mgmt, tvb, offset, 2, 0); + proto_tree_add_item(tree, hf_scsi_osd_permissions_dev_mgmt, tvb, offset, 2, ENC_BIG_ENDIAN); if(permissions&0x0080){ proto_item_append_text(tree, " DEV_MGMT"); } - proto_tree_add_item(tree, hf_scsi_osd_permissions_global, tvb, offset, 2, 0); + proto_tree_add_item(tree, hf_scsi_osd_permissions_global, tvb, offset, 2, ENC_BIG_ENDIAN); if(permissions&0x0040){ proto_item_append_text(tree, " GLOBAL"); } - proto_tree_add_item(tree, hf_scsi_osd_permissions_pol_sec, tvb, offset, 2, 0); + proto_tree_add_item(tree, hf_scsi_osd_permissions_pol_sec, tvb, offset, 2, ENC_BIG_ENDIAN); if(permissions&0x0020){ proto_item_append_text(tree, " POL/SEC"); } @@ -1140,8 +1140,8 @@ dissect_osd_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset+=3; /* LSTCHG and ROOT flags */ - proto_tree_add_item(tree, hf_scsi_osd_list_flags_lstchg, tvb, offset, 1, 0); - proto_tree_add_item(tree, hf_scsi_osd_list_flags_root, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_scsi_osd_list_flags_lstchg, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_osd_list_flags_root, tvb, offset, 1, ENC_BIG_ENDIAN); is_root=tvb_get_guint8(tvb, offset)&0x01; offset++; @@ -1485,7 +1485,7 @@ static const true_false_string collection_fcr_tfs = { static void dissect_osd_collection_fcr(tvbuff_t *tvb, int offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_osd_collection_fcr, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_scsi_osd_collection_fcr, tvb, offset, 1, ENC_BIG_ENDIAN); } static void diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 08f5e4a045..9d2999c5dc 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -461,350 +461,350 @@ static const value_string scsi_log_pc_val[] = { static void log_parameter_2e_0001(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_rw, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_rw, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : write warning flag */ static void log_parameter_2e_0002(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_ww, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_ww, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : hard error flag */ static void log_parameter_2e_0003(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_he, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_he, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : media flag */ static void log_parameter_2e_0004(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_media, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_media, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : read failure flag */ static void log_parameter_2e_0005(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_rf, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_rf, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : write failure flag */ static void log_parameter_2e_0006(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_wf, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_wf, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : media life flag */ static void log_parameter_2e_0007(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_ml, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_ml, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : not data grade flag */ static void log_parameter_2e_0008(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_ndg, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_ndg, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : write protect flag */ static void log_parameter_2e_0009(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_wp, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_wp, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : no removal flag */ static void log_parameter_2e_000a(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_nr, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_nr, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : cleaning media flag */ static void log_parameter_2e_000b(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_cm, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_cm, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : unsupported format flag */ static void log_parameter_2e_000c(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_uf, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_uf, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : removable mechanical cartridge failure flag */ static void log_parameter_2e_000d(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_rmcf, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_rmcf, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : unrecoverable mechanical cartridge failure flag */ static void log_parameter_2e_000e(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_umcf, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_umcf, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : memory chip in cartridge failure flag */ static void log_parameter_2e_000f(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_mcicf, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_mcicf, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : forced eject flag */ static void log_parameter_2e_0010(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_fe, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_fe, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : read only format flag */ static void log_parameter_2e_0011(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_rof, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_rof, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : tape directory corrupted on load flag */ static void log_parameter_2e_0012(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_tdcol, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_tdcol, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : nearing media life flag */ static void log_parameter_2e_0013(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_nml, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_nml, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : clean now flag */ static void log_parameter_2e_0014(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_cn, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_cn, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : clean periodic flag */ static void log_parameter_2e_0015(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_cp, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_cp, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : expired cleaning media flag */ static void log_parameter_2e_0016(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_ecm, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_ecm, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : invalid cleaning tape flag */ static void log_parameter_2e_0017(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_ict, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_ict, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : retention requested flag */ static void log_parameter_2e_0018(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_rr, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_rr, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : dual port interface error flag */ static void log_parameter_2e_0019(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_dpie, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_dpie, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : cooling fan failure flag */ static void log_parameter_2e_001a(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_cff, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_cff, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : power supply failure flag */ static void log_parameter_2e_001b(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_psf, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_psf, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : power consumption flag */ static void log_parameter_2e_001c(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_pc, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_pc, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : drive maintenance flag */ static void log_parameter_2e_001d(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_dm, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_dm, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : hardware a flag */ static void log_parameter_2e_001e(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_hwa, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_hwa, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : hardware b flag */ static void log_parameter_2e_001f(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_hwb, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_hwb, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : interface flag */ static void log_parameter_2e_0020(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_if, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_if, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : eject media flag */ static void log_parameter_2e_0021(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_em, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_em, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : download failed flag */ static void log_parameter_2e_0022(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_dwf, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_dwf, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : drive humidity flag */ static void log_parameter_2e_0023(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_drhu, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_drhu, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : drive temperature flag */ static void log_parameter_2e_0024(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_drtm, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_drtm, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : drive voltage flag */ static void log_parameter_2e_0025(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_drvo, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_drvo, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : periodic failure flag */ static void log_parameter_2e_0026(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_pefa, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_pefa, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : diagnostics required flag */ static void log_parameter_2e_0027(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_dire, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_dire, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : lost statistics flag */ static void log_parameter_2e_0032(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_lost, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_lost, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : tape directory invalid at unload flag */ static void log_parameter_2e_0033(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_tduau, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_tduau, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : tape system area write failure flag */ static void log_parameter_2e_0034(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_tsawf, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_tsawf, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : tape system area read failure flag */ static void log_parameter_2e_0035(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_tsarf, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_tsarf, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : no start of data flag */ static void log_parameter_2e_0036(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_nsod, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_nsod, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : loading failure flag */ static void log_parameter_2e_0037(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_lofa, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_lofa, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : unrecoverable unload failure flag */ static void log_parameter_2e_0038(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_uuf, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_uuf, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : automatic interface failure flag */ static void log_parameter_2e_0039(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_aif, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_aif, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : firmware failure flag */ static void log_parameter_2e_003a(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_fwf, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_fwf, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : worm medium integrity check failed flag */ static void log_parameter_2e_003b(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_wmicf, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_wmicf, tvb, 0, 1, ENC_BIG_ENDIAN); } /* TapeAlert page : worm medium overwrite attempted flag */ static void log_parameter_2e_003c(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_log_ta_wmoa, tvb, 0, 1, 0); + proto_tree_add_item(tree, hf_scsi_log_ta_wmoa, tvb, 0, 1, ENC_BIG_ENDIAN); } @@ -2741,12 +2741,12 @@ dissect_scsi_spc_modepage (tvbuff_t *tvb, packet_info *pinfo _U_, (flags & 0x2) >> 1, (flags & 0x1)); flags = tvb_get_guint8 (tvb, offset+3); proto_tree_add_item (tree, hf_scsi_modesns_qmod, tvb, offset+3, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (tree, hf_scsi_modesns_qerr, tvb, offset+3, 1, 0); + proto_tree_add_item (tree, hf_scsi_modesns_qerr, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_text (tree, tvb, offset+3, 1, "Disable Queuing: %u", flags & 0x1); flags = tvb_get_guint8 (tvb, offset+4); - proto_tree_add_item (tree, hf_scsi_modesns_rac, tvb, offset+4, 1, 0); - proto_tree_add_item (tree, hf_scsi_modesns_tas, tvb, offset+4, 1, 0); + proto_tree_add_item (tree, hf_scsi_modesns_rac, tvb, offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_modesns_tas, tvb, offset+4, 1, ENC_BIG_ENDIAN); proto_tree_add_text (tree, tvb, offset+4, 1, "SWP: %u, RAERP: %u, UAAERP: %u, EAERP: %u", (flags & 0x8) >> 3, (flags & 0x4) >> 2, @@ -4124,7 +4124,7 @@ dissect_scsi_fix_snsinfo (tvbuff_t *tvb, proto_tree *sns_tree, guint offset) hidden_item = proto_tree_add_item (sns_tree, hf_scsi_ascq, tvb, offset+13, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_item (sns_tree, hf_scsi_fru, tvb, offset+14, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (sns_tree, hf_scsi_sksv, tvb, offset+15, 1, 0); + proto_tree_add_item (sns_tree, hf_scsi_sksv, tvb, offset+15, 1, ENC_BIG_ENDIAN); proto_tree_add_text (sns_tree, tvb, offset+15, 3, "Sense Key Specific: %s", tvb_bytes_to_str (tvb, offset+15, 3)); diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index d067057a44..13b01e653b 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -962,7 +962,7 @@ static void dissect_ipv6_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item, proto_item *additional_item, gboolean dissecting_init_init_ack_chunk) { if (parameter_tree) { - proto_tree_add_item(parameter_tree, hf_ipv6_address, parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_ipv6_address, parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH, ENC_NA); proto_item_append_text(parameter_item, " (Address: %s)", tvb_ip6_to_str(parameter_tvb, IPV6_ADDRESS_OFFSET)); if (additional_item) proto_item_append_text(additional_item, "%s", tvb_ip6_to_str(parameter_tvb, IPV6_ADDRESS_OFFSET)); diff --git a/epan/dissectors/packet-sebek.c b/epan/dissectors/packet-sebek.c index dc02f81199..b21af7b7ad 100644 --- a/epan/dissectors/packet-sebek.c +++ b/epan/dissectors/packet-sebek.c @@ -249,11 +249,11 @@ dissect_sebek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (sebek_type == 2) { /*data is socket data, process accordingly*/ - proto_tree_add_item(sebek_tree, hf_sebek_socket_dst_ip, tvb, offset, 4, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_socket_dst_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(sebek_tree, hf_sebek_socket_dst_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(sebek_tree, hf_sebek_socket_src_ip, tvb, offset, 4, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_socket_src_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(sebek_tree, hf_sebek_socket_src_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index 22e65037aa..e324a10a20 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -1141,10 +1141,10 @@ dissect_sflow_5_ipv4(tvbuff_t *tvb, proto_tree *tree, gint offset) { } offset += 4; - proto_tree_add_item(tree, hf_sflow_245_ipv4_src, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ipv4_src, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_sflow_245_ipv4_dst, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ipv4_dst, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; src_port = tvb_get_ntohl(tvb, offset); @@ -1231,10 +1231,10 @@ dissect_sflow_5_ipv6(tvbuff_t *tvb, proto_tree *tree, gint offset) { } offset += 4; - proto_tree_add_item(tree, hf_sflow_245_ipv6_src, tvb, offset, 16, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ipv6_src, tvb, offset, 16, ENC_NA); offset += 16; - proto_tree_add_item(tree, hf_sflow_245_ipv6_dst, tvb, offset, 16, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ipv6_dst, tvb, offset, 16, ENC_NA); offset += 16; src_port = tvb_get_ntohl(tvb, offset); diff --git a/epan/dissectors/packet-simulcrypt.c b/epan/dissectors/packet-simulcrypt.c index acec8f7744..effd2889b0 100644 --- a/epan/dissectors/packet-simulcrypt.c +++ b/epan/dissectors/packet-simulcrypt.c @@ -852,7 +852,7 @@ dissect_ecmg_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinf proto_item_append_text(simulcrypt_item, " (%d ms)", pvaluedec); break; case SIMULCRYPT_ECMG_ACCESS_CRITERIA_TRANSFER_MODE: - proto_tree_add_item(tree, hf_simulcrypt_access_criteria_transfer_mode, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_access_criteria_transfer_mode, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_ECMG_CP_NUMBER: proto_tree_add_item(tree, hf_simulcrypt_cp_number, tvb, offset, plen, ENC_BIG_ENDIAN); @@ -964,10 +964,10 @@ dissect_eis_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo proto_tree_add_item(tree, hf_simulcrypt_eis_channel_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_SERVICE_FLAG: - proto_tree_add_item(tree, hf_simulcrypt_service_flag, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_service_flag, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_COMPONENT_FLAG: - proto_tree_add_item(tree, hf_simulcrypt_component_flag, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_component_flag, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_MAX_SCG: proto_tree_add_item(tree, hf_simulcrypt_max_scg, tvb, offset, plen, ENC_BIG_ENDIAN); @@ -1031,7 +1031,7 @@ dissect_eis_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_hundredth_second, tvb, offset+7, 1, ENC_BIG_ENDIAN); /* eighth byte */ break; case SIMULCRYPT_EIS_ACTIVATION_PENDING_FLAG: - proto_tree_add_item(tree, hf_simulcrypt_activation_pending_flag, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_activation_pending_flag, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_COMPONENT_ID: proto_tree_add_item(tree, hf_simulcrypt_component_id, tvb, offset, plen, ENC_BIG_ENDIAN); @@ -1043,7 +1043,7 @@ dissect_eis_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo proto_tree_add_item(tree, hf_simulcrypt_transport_stream_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_AC_CHANGED_FLAG: - proto_tree_add_item(tree, hf_simulcrypt_ac_changed_flag, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_ac_changed_flag, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_SCG_CURRENT_REFERENCE_ID: proto_tree_add_item(tree, hf_simulcrypt_scg_current_reference_id, tvb, offset, plen, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-slimp3.c b/epan/dissectors/packet-slimp3.c index 2266d6d9ae..9d2c4d023c 100644 --- a/epan/dissectors/packet-slimp3.c +++ b/epan/dissectors/packet-slimp3.c @@ -360,7 +360,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_display, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); /* Loop through the commands */ @@ -461,7 +461,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case SLIMP3_CONTROL: if (tree) { hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_control, - tvb, offset+1, 1, FALSE); + tvb, offset+1, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_text(slimp3_tree, tvb, offset+1, 1, "Command: %s", val_to_str(tvb_get_guint8(tvb, offset+1), @@ -478,7 +478,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case SLIMP3_HELLO: if (tree) { hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_hello, - tvb, offset+1, 1, FALSE); + tvb, offset+1, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); if (to_server) { guint8 fw_ver = 0; @@ -499,7 +499,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case SLIMP3_I2C: if (tree) { hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_i2c, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); if (to_server) { /* Hello response; client->server */ @@ -524,7 +524,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case SLIMP3_DATA_REQ: if (tree) { hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_data_request, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_text(slimp3_tree, tvb, offset+2, 2, "Requested offset: %d bytes.", @@ -550,7 +550,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ if (tree) { hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_data, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); if (old_protocol) { proto_tree_add_text(slimp3_tree, tvb, offset, -1, @@ -599,7 +599,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { guint8 fw_ver; hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_discover_request, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_text(slimp3_tree, tvb, offset+1, 1, "Device ID: %d.", tvb_get_guint8(tvb, offset+1)); @@ -618,7 +618,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case SLIMP3_DISC_RSP: if (tree) { hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_discover_response, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_text(slimp3_tree, tvb, offset+2, 4, "Server Address: %s.", @@ -646,7 +646,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ if (tree) { hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_data_ack, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_text(slimp3_tree, tvb, offset+6, 2, "Write Pointer: %d", diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index 0f0dad1e87..47e96ead26 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -996,7 +996,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree "Connection Type: %s (Char: %s)", connection_type(str), format_text(str, len)); offset += 4+len; - proto_tree_add_item(slsk_tree, hf_slsk_ip, tvb, offset, 4, FALSE); + proto_tree_add_item(slsk_tree, hf_slsk_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(slsk_tree, hf_slsk_port, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; @@ -2129,7 +2129,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree "User #%d: %s", i+1, tvb_format_text(tvb, offset+4, len)); offset += 4+len; - proto_tree_add_item(slsk_tree, hf_slsk_ip, tvb, offset, 4, FALSE); + proto_tree_add_item(slsk_tree, hf_slsk_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_uint_format(slsk_tree, hf_slsk_port, tvb, offset, 4, tvb_get_letohl(tvb, offset), "Port Number #%d: %d", i+1, tvb_get_letohl(tvb, offset)); diff --git a/epan/dissectors/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c index 48f5ad99d8..0c0e479b7f 100644 --- a/epan/dissectors/packet-smb-logon.c +++ b/epan/dissectors/packet-smb-logon.c @@ -791,7 +791,7 @@ dissect_smb_pdc_response_ads(tvbuff_t *tvb, packet_info *pinfo _U_, offset += 4; /* server ip */ - proto_tree_add_item(tree, hf_server_ip, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_server_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* unknown uint32 type */ diff --git a/epan/dissectors/packet-socketcan.c b/epan/dissectors/packet-socketcan.c index fbe6023e4f..71ffe9d1e8 100644 --- a/epan/dissectors/packet-socketcan.c +++ b/epan/dissectors/packet-socketcan.c @@ -107,9 +107,9 @@ dissect_socketcan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) can_tree = proto_item_add_subtree(ti, ett_can); proto_tree_add_item(can_tree, hf_can_ident, tvb, 0, 4, ENC_BIG_ENDIAN ); - proto_tree_add_item(can_tree, hf_can_extflag, tvb, 0, 4, FALSE ); - proto_tree_add_item(can_tree, hf_can_rtrflag, tvb, 0, 4, FALSE ); - proto_tree_add_item(can_tree, hf_can_errflag, tvb, 0, 4, FALSE ); + proto_tree_add_item(can_tree, hf_can_extflag, tvb, 0, 4, ENC_BIG_ENDIAN ); + proto_tree_add_item(can_tree, hf_can_rtrflag, tvb, 0, 4, ENC_BIG_ENDIAN ); + proto_tree_add_item(can_tree, hf_can_errflag, tvb, 0, 4, ENC_BIG_ENDIAN ); proto_tree_add_item(can_tree, hf_can_len, tvb, CAN_LEN_OFFSET, 1, ENC_BIG_ENDIAN ); next_tvb = tvb_new_subset(tvb, CAN_DATA_OFFSET, tvb_get_guint8(tvb, CAN_LEN_OFFSET), 8 ); diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index 1e98a93e22..a272f6632d 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -324,7 +324,7 @@ static int display_address(tvbuff_t *tvb, int offset, proto_tree *tree) { if ( a_type == 1){ /* IPv4 address */ proto_tree_add_item( tree, hf_socks_ip_dst, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; } else if ( a_type == 3){ /* domain name address */ @@ -334,7 +334,7 @@ static int display_address(tvbuff_t *tvb, int offset, proto_tree *tree) { } else if ( a_type == 4){ /* IPv6 address */ proto_tree_add_item( tree, hf_socks_ip6_dst, tvb, offset, - 16, FALSE); + 16, ENC_NA); offset += 16; } @@ -493,7 +493,7 @@ display_socks_v4(tvbuff_t *tvb, int offset, packet_info *pinfo, /* Do destination address */ tvb_memcpy(tvb, ipaddr, offset, 4); proto_tree_add_item( tree, hf_socks_ip_dst, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; @@ -536,7 +536,7 @@ display_socks_v4(tvbuff_t *tvb, int offset, packet_info *pinfo, offset += 2; /* Do remote address */ proto_tree_add_item( tree, hf_socks_ip_dst, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); } else if ( compare_packet( hash_info->v4_user_name_row)){ diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index eb9c6dc3fb..996fd10ae0 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -664,7 +664,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 2: if (att_length < 20) break; - proto_tree_add_item(att_tree, stun_att_ipv6, tvb, offset+4, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(att_tree, stun_att_ipv6, tvb, offset+4, 16, ENC_NA); break; } break; diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index 0b826f1331..e2da240fde 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -1465,7 +1465,7 @@ dissect_hostname_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, static void dissect_ipv6_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - proto_tree_add_item(parameter_tree, hf_sua_ipv6, parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_sua_ipv6, parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH, ENC_NA); proto_item_append_text(parameter_item, " (%s)", tvb_ip6_to_str(parameter_tvb, IPV6_ADDRESS_OFFSET)); } diff --git a/epan/dissectors/packet-symantec.c b/epan/dissectors/packet-symantec.c index 3337e947e0..cde69685fd 100644 --- a/epan/dissectors/packet-symantec.c +++ b/epan/dissectors/packet-symantec.c @@ -89,7 +89,7 @@ dissect_symantec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { proto_tree_add_item(symantec_tree, hf_symantec_if, tvb, - 0, 4, FALSE); + 0, 4, ENC_BIG_ENDIAN); proto_tree_add_uint(symantec_tree, hf_symantec_etype, tvb, 6, 2, etypev2); } @@ -107,7 +107,7 @@ dissect_symantec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { proto_tree_add_item(symantec_tree, hf_symantec_if, tvb, - 0, 4, FALSE); + 0, 4, ENC_BIG_ENDIAN); proto_tree_add_uint(symantec_tree, hf_symantec_etype, tvb, 10, 2, etypev3); } diff --git a/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c index 4008444644..0bc4390684 100644 --- a/epan/dissectors/packet-synergy.c +++ b/epan/dissectors/packet-synergy.c @@ -175,7 +175,7 @@ dissect_synergy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else if(strncmp(buffer,"CCLP",4)==0) dissect_synergy_cclp(tvb,pinfo,synergy_tree,offset+4); else if(strncmp(buffer,"CSEC",4)==0) - proto_tree_add_item(synergy_tree,hf_synergy_csec,tvb,offset+4,1,FALSE); + proto_tree_add_item(synergy_tree,hf_synergy_csec,tvb,offset+4,1,ENC_BIG_ENDIAN); else if(strncmp(buffer,"CROP",4)==0) proto_tree_add_item(synergy_tree,hf_synergy_crop,tvb,offset+4,-1,ENC_NA); else if(strncmp(buffer,"CIAK",4)==0) diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index 5a22ce069d..f78ebe4185 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -221,7 +221,7 @@ dissect_tacacs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(tacacs_tree, hf_tacacs_result1, tvb, 8, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tacacs_tree, hf_tacacs_destaddr, tvb, 12, 4, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(tacacs_tree, hf_tacacs_destport, tvb, 16, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tacacs_tree, hf_tacacs_line, tvb, 18, 2, diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 9626f6a421..8b2875f686 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -2747,7 +2747,7 @@ dissect_tcpopt_user_to(const ip_tcp_opt *optp, tvbuff_t *tvb, tf = proto_tree_add_uint_format(opt_tree, hf_tcp_option_user_to_val, tvb, offset, optlen, to, "%s: %u %s", optp->name, to, g ? "minutes" : "seconds"); field_tree = proto_item_add_subtree(tf, *optp->subtree_index); - proto_tree_add_item(field_tree, hf_tcp_option_user_to_granularity, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(field_tree, hf_tcp_option_user_to_granularity, tvb, offset + 2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_tcp_option_user_to_val, tvb, offset + 2, 2, ENC_BIG_ENDIAN); tcp_info_append_uint(pinfo, "USER_TO", to); @@ -3024,7 +3024,7 @@ dissect_tcpopt_rvbd_probe(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, ip = tvb_get_ipv4(tvb, offset + PROBE_V1_PROBER_OFFSET); proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_prober, tvb, - offset + PROBE_V1_PROBER_OFFSET, 4, FALSE); + offset + PROBE_V1_PROBER_OFFSET, 4, ENC_BIG_ENDIAN); switch (type) { @@ -3058,7 +3058,7 @@ dissect_tcpopt_rvbd_probe(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, case PROBE_RESPONSE: ip = tvb_get_ipv4(tvb, offset + PROBE_V1_PROXY_ADDR_OFFSET); proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_proxy, tvb, - offset + PROBE_V1_PROXY_ADDR_OFFSET, 4, FALSE); + offset + PROBE_V1_PROXY_ADDR_OFFSET, 4, ENC_BIG_ENDIAN); port = tvb_get_ntohs(tvb, offset + PROBE_V1_PROXY_PORT_OFFSET); proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_proxy_port, tvb, @@ -3071,11 +3071,11 @@ dissect_tcpopt_rvbd_probe(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_client, tvb, offset + PROBE_V1_SH_CLIENT_ADDR_OFFSET, 4, - FALSE); + ENC_BIG_ENDIAN); ip = tvb_get_ipv4(tvb, offset + PROBE_V1_SH_PROXY_ADDR_OFFSET); proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_proxy, tvb, - offset + PROBE_V1_SH_PROXY_ADDR_OFFSET, 4, FALSE); + offset + PROBE_V1_SH_PROXY_ADDR_OFFSET, 4, ENC_BIG_ENDIAN); port = tvb_get_ntohs(tvb, offset + PROBE_V1_SH_PROXY_PORT_OFFSET); proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_proxy_port, tvb, @@ -3116,16 +3116,16 @@ dissect_tcpopt_rvbd_probe(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, flag_tree = proto_item_add_subtree(flag_pi, ett_tcp_opt_rvbd_probe_flags); proto_tree_add_item(flag_tree, hf_tcp_option_rvbd_probe_flag_not_cfe, - tvb, offset + PROBE_V2_INFO_OFFSET, 1, FALSE); + tvb, offset + PROBE_V2_INFO_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(flag_tree, hf_tcp_option_rvbd_probe_flag_last_notify, - tvb, offset + PROBE_V2_INFO_OFFSET, 1, FALSE); + tvb, offset + PROBE_V2_INFO_OFFSET, 1, ENC_BIG_ENDIAN); if (type == PROBE_QUERY_INFO_SH) proto_tree_add_item(flag_tree, hf_tcp_option_rvbd_probe_client, tvb, offset + PROBE_V2_INFO_CLIENT_ADDR_OFFSET, - 4, FALSE); + 4, ENC_BIG_ENDIAN); else if (type == PROBE_QUERY_INFO_SID) proto_tree_add_item(flag_tree, hf_tcp_option_rvbd_probe_storeid, tvb, @@ -3149,13 +3149,13 @@ dissect_tcpopt_rvbd_probe(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, flag_tree = proto_item_add_subtree(flag_pi, ett_tcp_opt_rvbd_probe_flags); proto_tree_add_item(flag_tree, hf_tcp_option_rvbd_probe_flag_probe_cache, - tvb, offset + PROBE_V2_INFO_OFFSET, 1, FALSE); + tvb, offset + PROBE_V2_INFO_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(flag_tree, hf_tcp_option_rvbd_probe_flag_sslcert, - tvb, offset + PROBE_V2_INFO_OFFSET, 1, FALSE); + tvb, offset + PROBE_V2_INFO_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(flag_tree, hf_tcp_option_rvbd_probe_flag_server_connected, - tvb, offset + PROBE_V2_INFO_OFFSET, 1, FALSE); + tvb, offset + PROBE_V2_INFO_OFFSET, 1, ENC_BIG_ENDIAN); break; case PROBE_RST: @@ -3228,25 +3228,25 @@ dissect_tcpopt_rvbd_trpy(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, flag_tree = proto_item_add_subtree(flag_pi, ett_tcp_opt_rvbd_trpy_flags); proto_tree_add_item(flag_tree, hf_tcp_option_rvbd_trpy_flag_fw_rst_probe, - 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_inner, tvb, offset + TRPY_OPTIONS_OFFSET, 2, FALSE); proto_tree_add_item(flag_tree, hf_tcp_option_rvbd_trpy_flag_fw_rst, tvb, offset + TRPY_OPTIONS_OFFSET, 2, FALSE); proto_tree_add_item(flag_tree, hf_tcp_option_rvbd_trpy_flag_chksum, - 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_oob, - 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_mode, - tvb, offset + TRPY_OPTIONS_OFFSET, 2, FALSE); + tvb, offset + TRPY_OPTIONS_OFFSET, 2, ENC_BIG_ENDIAN); src = tvb_get_ipv4(tvb, offset + TRPY_SRC_ADDR_OFFSET); proto_tree_add_item(field_tree, hf_tcp_option_rvbd_trpy_src, - tvb, offset + TRPY_SRC_ADDR_OFFSET, 4, FALSE); + tvb, offset + TRPY_SRC_ADDR_OFFSET, 4, ENC_BIG_ENDIAN); dst = tvb_get_ipv4(tvb, offset + TRPY_DST_ADDR_OFFSET); proto_tree_add_item(field_tree, hf_tcp_option_rvbd_trpy_dst, - tvb, offset + TRPY_DST_ADDR_OFFSET, 4, FALSE); + tvb, offset + TRPY_DST_ADDR_OFFSET, 4, ENC_BIG_ENDIAN); sport = tvb_get_ntohs(tvb, offset + TRPY_SRC_PORT_OFFSET); proto_tree_add_item(field_tree, hf_tcp_option_rvbd_trpy_src_port, diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index ab90b0a0a4..640b955ca6 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -1811,11 +1811,11 @@ dissect_tds_type_info(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto_tr 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_ign_case, tvb, *offset, 4, TRUE); - proto_tree_add_item(collation_tree, hf_tds_type_info_collation_ign_accent, tvb, *offset, 4, TRUE); - proto_tree_add_item(collation_tree, hf_tds_type_info_collation_ign_kana, tvb, *offset, 4, TRUE); - proto_tree_add_item(collation_tree, hf_tds_type_info_collation_ign_width, tvb, *offset, 4, TRUE); - proto_tree_add_item(collation_tree, hf_tds_type_info_collation_binary, tvb, *offset, 4, TRUE); + 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); + proto_tree_add_item(collation_tree, hf_tds_type_info_collation_ign_width, tvb, *offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(collation_tree, hf_tds_type_info_collation_binary, tvb, *offset, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(collation_tree, hf_tds_type_info_collation_version, tvb, *offset, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(collation_tree, hf_tds_type_info_collation_sortid, tvb, *offset + 4, 1, ENC_LITTLE_ENDIAN); *offset += 5; @@ -1885,7 +1885,7 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto case TDS_DATA_TYPE_NULL: /* Null (no data associated with this type) */ break; case TDS_DATA_TYPE_BIT: /* Bit (1 byte data representation) */ - proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_boolean, tvb, *offset, 1, TRUE); + proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_boolean, tvb, *offset, 1, ENC_LITTLE_ENDIAN); *offset += 1; break; case TDS_DATA_TYPE_INT1: /* TinyInt (1 byte data representation) */ @@ -1930,7 +1930,7 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto length_item = proto_tree_add_uint(sub_tree, hf_tds_type_varbyte_length, tvb, *offset, 1, length); switch(length) { case GEN_NULL: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_null, tvb, *offset, 0, ENC_NA); break; - case 16: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_guid, tvb, *offset + 1, length, TRUE); break; + case 16: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_guid, tvb, *offset + 1, length, ENC_LITTLE_ENDIAN); break; default: expert_add_info_format(pinfo, length_item, PI_MALFORMED, PI_ERROR, "Invalid length"); } *offset += 1 + length; @@ -1940,7 +1940,7 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto length_item = proto_tree_add_uint(sub_tree, hf_tds_type_varbyte_length, tvb, *offset, 1, length); switch(length) { case GEN_NULL: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_null, tvb, *offset, 0, ENC_NA); break; - case 1: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_boolean, tvb, *offset + 1, 1, TRUE); break; + case 1: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_boolean, tvb, *offset + 1, 1, ENC_LITTLE_ENDIAN); break; default: expert_add_info_format(pinfo, length_item, PI_MALFORMED, PI_ERROR, "Invalid length"); } *offset += 1 + length; @@ -2107,9 +2107,9 @@ dissect_tds_rpc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } item = proto_tree_add_item(tree, hf_tds_rpc_options, tvb, offset, 2, ENC_LITTLE_ENDIAN); sub_tree = proto_item_add_subtree(item, ett_tds_rpc_options); - proto_tree_add_item(sub_tree, hf_tds_rpc_options_with_recomp, tvb, offset, 2, TRUE); - proto_tree_add_item(sub_tree, hf_tds_rpc_options_no_metadata, tvb, offset, 2, TRUE); - proto_tree_add_item(sub_tree, hf_tds_rpc_options_reuse_metadata, tvb, offset, 2, TRUE); + proto_tree_add_item(sub_tree, hf_tds_rpc_options_with_recomp, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(sub_tree, hf_tds_rpc_options_no_metadata, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(sub_tree, hf_tds_rpc_options_reuse_metadata, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* dissect parameters */ @@ -2134,8 +2134,8 @@ dissect_tds_rpc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } item = proto_tree_add_item(sub_tree, hf_tds_rpc_parameter_status, tvb, offset, 1, ENC_LITTLE_ENDIAN); status_sub_tree = proto_item_add_subtree(item, ett_tds_rpc_parameter_status); - proto_tree_add_item(status_sub_tree, hf_tds_rpc_parameter_status_by_ref, tvb, offset, 1, TRUE); - proto_tree_add_item(status_sub_tree, hf_tds_rpc_parameter_status_default, tvb, offset, 1, TRUE); + proto_tree_add_item(status_sub_tree, hf_tds_rpc_parameter_status_by_ref, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(status_sub_tree, hf_tds_rpc_parameter_status_default, tvb, offset, 1, ENC_LITTLE_ENDIAN); ++offset; data_type = dissect_tds_type_info(tvb, &offset, pinfo, sub_tree, &plp); dissect_tds_type_varbyte(tvb, &offset, pinfo, sub_tree, hf_tds_rpc_parameter_value, data_type, plp); @@ -2291,11 +2291,11 @@ dissect_netlib_buffer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(tds_tree, hf_tds_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); tds_item = proto_tree_add_item(tds_tree, hf_tds_status, tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); tds_status_tree = proto_item_add_subtree(tds_item, ett_tds_status); - proto_tree_add_item(tds_status_tree, hf_tds_status_eom, tvb, offset + 1, 1, FALSE); - proto_tree_add_item(tds_status_tree, hf_tds_status_ignore, tvb, offset + 1, 1, FALSE); - proto_tree_add_item(tds_status_tree, hf_tds_status_event_notif, tvb, offset + 1, 1, FALSE); - proto_tree_add_item(tds_status_tree, hf_tds_status_reset_conn, tvb, offset + 1, 1, FALSE); - proto_tree_add_item(tds_status_tree, hf_tds_status_reset_conn_skip_tran,tvb, offset + 1, 1, FALSE); + proto_tree_add_item(tds_status_tree, hf_tds_status_eom, tvb, offset + 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tds_status_tree, hf_tds_status_ignore, tvb, offset + 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tds_status_tree, hf_tds_status_event_notif, tvb, offset + 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tds_status_tree, hf_tds_status_reset_conn, tvb, offset + 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tds_status_tree, hf_tds_status_reset_conn_skip_tran,tvb, offset + 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tds_tree, hf_tds_length, tvb, offset + 2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tds_tree, hf_tds_channel, tvb, offset + 4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tds_tree, hf_tds_packet_number, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index fe39f0f52f..12a6e597dd 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.c @@ -509,7 +509,7 @@ static void ts2_parse_newplayerjoined(tvbuff_t *tvb, proto_tree *ts2_tree) offset+=4; proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 6, ENC_NA); offset+=6; - proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=30; } @@ -539,7 +539,7 @@ static void ts2_parse_switchchannel(tvbuff_t *tvb, proto_tree *ts2_tree) offset=0; proto_tree_add_item(ts2_tree, hf_ts2_channel_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; - proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, offset, 1, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=30; } @@ -589,11 +589,11 @@ static void ts2_parse_loginpart2(tvbuff_t *tvb, proto_tree *ts2_tree) offset=0; proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 0, 2, ENC_NA); offset+=2; - proto_tree_add_item(ts2_tree, hf_ts2_channel, tvb, offset, 1, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_channel, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=30; - proto_tree_add_item(ts2_tree, hf_ts2_subchannel, tvb, offset, 1, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_subchannel, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=30; - proto_tree_add_item(ts2_tree, hf_ts2_channelpassword, tvb, offset, 1, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_channelpassword, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=30; proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 4, ENC_NA); @@ -617,11 +617,11 @@ static void ts2_parse_channellist(tvbuff_t *tvb, proto_tree *ts2_tree) /* Channel flags */ item = proto_tree_add_item(ts2_tree, hf_ts2_channel_flags, tvb, offset, 1, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_ts2_channel_flags); - proto_tree_add_item(subtree, hf_ts2_channel_unregistered, tvb, offset, 1, FALSE); - proto_tree_add_item(subtree, hf_ts2_channel_moderated, tvb, offset, 1, FALSE); - proto_tree_add_item(subtree, hf_ts2_channel_password, tvb, offset, 1, FALSE); - proto_tree_add_item(subtree, hf_ts2_channel_subchannels, tvb, offset, 1, FALSE); - proto_tree_add_item(subtree, hf_ts2_channel_default, tvb, offset, 1, FALSE); + proto_tree_add_item(subtree, hf_ts2_channel_unregistered, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_ts2_channel_moderated, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_ts2_channel_password, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_ts2_channel_subchannels, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_ts2_channel_default, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 1, ENC_NA); @@ -648,11 +648,11 @@ static void ts2_parse_channellist(tvbuff_t *tvb, proto_tree *ts2_tree) static void ts2_add_statusflags(tvbuff_t *tvb, proto_tree *ts2_tree, guint32 offset) { - proto_tree_add_item(ts2_tree, hf_ts2_status_channelcommander, tvb, offset, 2, TRUE); - proto_tree_add_item(ts2_tree, hf_ts2_status_blockwhispers, tvb, offset, 2, TRUE); - proto_tree_add_item(ts2_tree, hf_ts2_status_away, tvb, offset, 2, TRUE); - proto_tree_add_item(ts2_tree, hf_ts2_status_mutemicrophone, tvb, offset, 2, TRUE); - proto_tree_add_item(ts2_tree, hf_ts2_status_mute, tvb, offset, 2, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_status_channelcommander, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ts2_tree, hf_ts2_status_blockwhispers, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ts2_tree, hf_ts2_status_away, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ts2_tree, hf_ts2_status_mutemicrophone, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ts2_tree, hf_ts2_status_mute, tvb, offset, 2, ENC_LITTLE_ENDIAN); } @@ -678,7 +678,7 @@ static void ts2_parse_playerlist(tvbuff_t *tvb, proto_tree *ts2_tree) proto_tree_add_item(ts2_tree, hf_ts2_player_status_flags, tvb, offset, 2, ENC_LITTLE_ENDIAN); ts2_add_statusflags(tvb, ts2_tree, offset); offset+=2; - proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=30; x++; } @@ -782,27 +782,27 @@ static void dissect_ts2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ts2_tree, hf_ts2_ackto, tvb, 20, 4, ENC_LITTLE_ENDIAN); break; case TS2T_LOGINREQUEST: - proto_tree_add_item(ts2_tree, hf_ts2_protocol_string, tvb, 20, 1, TRUE); - proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_protocol_string, tvb, 20, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 80, 9, ENC_NA); - proto_tree_add_item(ts2_tree, hf_ts2_registeredlogin, tvb, 90, 1, TRUE); - proto_tree_add_item(ts2_tree, hf_ts2_name, tvb, 90, 1, TRUE); - proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, 120, 1, TRUE); - proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, 150, 1, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_registeredlogin, tvb, 90, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ts2_tree, hf_ts2_name, tvb, 90, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, 120, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, 150, 1, ENC_LITTLE_ENDIAN); conversation_data->server_port=pinfo->destport; conversation_data->server_addr=pinfo->dst; break; case TS2T_LOGINREPLY: - proto_tree_add_item(ts2_tree, hf_ts2_server_name, tvb, 20, 1, TRUE); - proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_server_name, tvb, 20, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 80, 9, ENC_NA); - proto_tree_add_item(ts2_tree, hf_ts2_badlogin, tvb, 89, 3, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_badlogin, tvb, 89, 3, ENC_LITTLE_ENDIAN); proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 92, 80, ENC_NA); proto_tree_add_item(ts2_tree, hf_ts2_sessionkey, tvb, 172, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 178, 3, ENC_NA); - proto_tree_add_item(ts2_tree, hf_ts2_server_welcome_message, tvb, 180, 1, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_server_welcome_message, tvb, 180, 1, ENC_LITTLE_ENDIAN); break; } break; diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c index 0f49fb9626..4c8537b2e4 100644 --- a/epan/dissectors/packet-tnef.c +++ b/epan/dissectors/packet-tnef.c @@ -389,7 +389,7 @@ static void dissect_mapiprops(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre if(tag & 0x80000000) { /* it is a named property */ - proto_tree_add_item(tag_tree, hf_tnef_property_tag_set, tvb, offset, 16, TRUE); + proto_tree_add_item(tag_tree, hf_tnef_property_tag_set, tvb, offset, 16, ENC_LITTLE_ENDIAN); offset += 16; tag_kind = tvb_get_letohl(tvb, offset); diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c index cf9a1090ed..998ac4eab6 100644 --- a/epan/dissectors/packet-tns.c +++ b/epan/dissectors/packet-tns.c @@ -201,27 +201,27 @@ static void dissect_tns_service_options(tvbuff_t *tvb, int offset, { proto_tree_add_item(sopt_tree, hf_tns_sopt_flag_bconn, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(sopt_tree, hf_tns_sopt_flag_pc, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(sopt_tree, hf_tns_sopt_flag_hc, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(sopt_tree, hf_tns_sopt_flag_fd, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(sopt_tree, hf_tns_sopt_flag_hd, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(sopt_tree, hf_tns_sopt_flag_dc1, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(sopt_tree, hf_tns_sopt_flag_dc2, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(sopt_tree, hf_tns_sopt_flag_dio, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(sopt_tree, hf_tns_sopt_flag_ap, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(sopt_tree, hf_tns_sopt_flag_ra, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(sopt_tree, hf_tns_sopt_flag_sa, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); } @@ -229,11 +229,11 @@ static void dissect_tns_connect_flag(tvbuff_t *tvb, int offset, proto_tree *cflag_tree) { - proto_tree_add_item(cflag_tree, hf_tns_conn_flag_nareq, tvb, offset, 1, FALSE); - proto_tree_add_item(cflag_tree, hf_tns_conn_flag_nalink, tvb, offset, 1, FALSE); - proto_tree_add_item(cflag_tree, hf_tns_conn_flag_enablena, tvb, offset, 1, FALSE); - proto_tree_add_item(cflag_tree, hf_tns_conn_flag_ichg, tvb, offset, 1, FALSE); - proto_tree_add_item(cflag_tree, hf_tns_conn_flag_wantna, tvb, offset, 1, FALSE); + proto_tree_add_item(cflag_tree, hf_tns_conn_flag_nareq, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cflag_tree, hf_tns_conn_flag_nalink, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cflag_tree, hf_tns_conn_flag_enablena, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cflag_tree, hf_tns_conn_flag_ichg, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cflag_tree, hf_tns_conn_flag_wantna, tvb, offset, 1, ENC_BIG_ENDIAN); } static void dissect_tns_data(tvbuff_t *tvb, int offset, packet_info *pinfo, @@ -280,15 +280,15 @@ static void dissect_tns_data(tvbuff_t *tvb, int offset, packet_info *pinfo, ti = proto_tree_add_item(data_tree, hf_tns_data_flag, tvb, offset, 2, ENC_BIG_ENDIAN); df_tree = proto_item_add_subtree(ti, ett_tns_data_flag); - proto_tree_add_item(df_tree, hf_tns_data_flag_send, tvb, offset, 2, FALSE); - proto_tree_add_item(df_tree, hf_tns_data_flag_rc, tvb, offset, 2, FALSE); - proto_tree_add_item(df_tree, hf_tns_data_flag_c, tvb, offset, 2, FALSE); - proto_tree_add_item(df_tree, hf_tns_data_flag_reserved, tvb, offset, 2, FALSE); - proto_tree_add_item(df_tree, hf_tns_data_flag_more, tvb, offset, 2, FALSE); - proto_tree_add_item(df_tree, hf_tns_data_flag_eof, tvb, offset, 2, FALSE); - proto_tree_add_item(df_tree, hf_tns_data_flag_dic, tvb, offset, 2, FALSE); - proto_tree_add_item(df_tree, hf_tns_data_flag_rts, tvb, offset, 2, FALSE); - proto_tree_add_item(df_tree, hf_tns_data_flag_sntt, tvb, offset, 2, FALSE); + proto_tree_add_item(df_tree, hf_tns_data_flag_send, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(df_tree, hf_tns_data_flag_rc, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(df_tree, hf_tns_data_flag_c, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(df_tree, hf_tns_data_flag_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(df_tree, hf_tns_data_flag_more, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(df_tree, hf_tns_data_flag_eof, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(df_tree, hf_tns_data_flag_dic, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(df_tree, hf_tns_data_flag_rts, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(df_tree, hf_tns_data_flag_sntt, tvb, offset, 2, ENC_BIG_ENDIAN); } offset += 2; @@ -387,22 +387,22 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, ntp_tree = proto_item_add_subtree(ti, ett_tns_ntp_flag); - proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_hangon, tvb, offset, 2, FALSE); - proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_crel, tvb, offset, 2, FALSE); - proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_tduio, tvb, offset, 2, FALSE); - proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_srun, tvb, offset, 2, FALSE); - proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_dtest, tvb, offset, 2, FALSE); - proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_cbio, tvb, offset, 2, FALSE); - proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_asio, tvb, offset, 2, FALSE); - proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_pio, tvb, offset, 2, FALSE); - proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_grant, tvb, offset, 2, FALSE); - proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_handoff, tvb, offset, 2, FALSE); - proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_sigio, tvb, offset, 2, FALSE); - proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_sigpipe, tvb, offset, 2, FALSE); - proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_sigurg, tvb, offset, 2, FALSE); - proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_urgentio, tvb, offset, 2, FALSE); - proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_fdio, tvb, offset, 2, FALSE); - proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_testop, tvb, offset, 2, FALSE); + proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_hangon, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_crel, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_tduio, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_srun, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_dtest, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_cbio, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_asio, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_pio, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_grant, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_handoff, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_sigio, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_sigpipe, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_sigurg, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_urgentio, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_fdio, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_testop, tvb, offset, 2, ENC_BIG_ENDIAN); } offset += 2; diff --git a/epan/dissectors/packet-trill.c b/epan/dissectors/packet-trill.c index 9c7ffe8b9a..cfa247a498 100644 --- a/epan/dissectors/packet-trill.c +++ b/epan/dissectors/packet-trill.c @@ -115,7 +115,7 @@ dissect_trill( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) proto_tree_add_item( trill_tree, hf_trill_reserved, tvb, offset, TRILL_BIT_FIELDS_LEN, ENC_BIG_ENDIAN ) ; proto_tree_add_item( trill_tree, hf_trill_multi_dst, tvb, offset, - TRILL_BIT_FIELDS_LEN, FALSE ) ; + TRILL_BIT_FIELDS_LEN, ENC_BIG_ENDIAN ) ; proto_tree_add_item( trill_tree, hf_trill_op_len, tvb, offset, TRILL_BIT_FIELDS_LEN, ENC_BIG_ENDIAN ) ; proto_tree_add_item( trill_tree, hf_trill_hop_cnt, tvb, offset, diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c index 1de7884633..91a1b54ceb 100644 --- a/epan/dissectors/packet-turbocell.c +++ b/epan/dissectors/packet-turbocell.c @@ -167,7 +167,7 @@ static void dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre } proto_tree_add_item(turbocell_tree, hf_turbocell_unknown, tvb, 0x0E, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(turbocell_tree, hf_turbocell_ip, tvb, 0x10, 4, FALSE); + proto_tree_add_item(turbocell_tree, hf_turbocell_ip, tvb, 0x10, 4, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index fea1518e06..c27b0e071c 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -1123,7 +1123,7 @@ dissect_usb_endpoint_descriptor(packet_info *pinfo, proto_tree *parent_tree, tvb endpoint_tree=proto_item_add_subtree(endpoint_item, ett_configuration_bEndpointAddress); } endpoint=tvb_get_guint8(tvb, offset)&0x0f; - proto_tree_add_item(endpoint_tree, hf_usb_bEndpointAddress_direction, tvb, offset, 1, TRUE); + proto_tree_add_item(endpoint_tree, hf_usb_bEndpointAddress_direction, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(endpoint_item, " %s", (tvb_get_guint8(tvb, offset)&0x80)?"IN":"OUT"); proto_tree_add_item(endpoint_tree, hf_usb_bEndpointAddress_number, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(endpoint_item, " Endpoint:%d", endpoint); @@ -1303,10 +1303,10 @@ dissect_usb_configuration_descriptor(packet_info *pinfo _U_, proto_tree *parent_ flags_tree=proto_item_add_subtree(flags_item, ett_configuration_bmAttributes); } flags=tvb_get_guint8(tvb, offset); - proto_tree_add_item(flags_tree, hf_usb_configuration_legacy10buspowered, tvb, offset, 1, TRUE); - proto_tree_add_item(flags_tree, hf_usb_configuration_selfpowered, tvb, offset, 1, TRUE); + proto_tree_add_item(flags_tree, hf_usb_configuration_legacy10buspowered, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(flags_tree, hf_usb_configuration_selfpowered, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(flags_item, " %sSELF-POWERED", (flags&0x40)?"":"NOT "); - proto_tree_add_item(flags_tree, hf_usb_configuration_remotewakeup, tvb, offset, 1, TRUE); + proto_tree_add_item(flags_tree, hf_usb_configuration_remotewakeup, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(flags_item, " %sREMOTE-WAKEUP", (flags&0x20)?"":"NO "); offset++; @@ -1761,7 +1761,7 @@ dissect_usb_bmrequesttype(proto_tree *parent_tree, tvbuff_t *tvb, int offset, } *type = USB_TYPE(tvb_get_guint8(tvb, offset)); - proto_tree_add_item(tree, hf_usb_bmRequestType_direction, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bmRequestType_direction, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_usb_bmRequestType_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_usb_bmRequestType_recipient, tvb, offset, 1, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-v52.c b/epan/dissectors/packet-v52.c index 497cf87e8f..f714bbfdf8 100644 --- a/epan/dissectors/packet-v52.c +++ b/epan/dissectors/packet-v52.c @@ -1718,7 +1718,7 @@ dissect_v5_time_slot_identification(tvbuff_t *tvb, packet_info *pinfo, proto_tre proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); proto_tree_add_item(info_tree, hf_v52_v5_link_id, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); - proto_tree_add_item(info_tree, hf_v52_override, info_tvb, info_offset+3, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_override, info_tvb, info_offset+3, info_element_length, ENC_BIG_ENDIAN); proto_tree_add_item(info_tree, hf_v52_v5_time_slot, info_tvb, info_offset+3, info_element_length, ENC_BIG_ENDIAN); v5_link_id_tmp = tvb_get_guint8(info_tvb, info_offset+2); diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c index c3cf35db6b..ac4a33ff9a 100644 --- a/epan/dissectors/packet-v5ua.c +++ b/epan/dissectors/packet-v5ua.c @@ -240,12 +240,12 @@ guint8 tei = -1; if (iua_version == RFC) offset = DLCI_SAPI_OFFSET; else if(iua_version == DRAFT) offset = DLCI_HEADER_LENGTH + tvb_get_ntohs(parameter_tvb, DLCI_LENGTH_OFFSET); - proto_tree_add_item(parameter_tree, hf_dlci_zero_bit, parameter_tvb, offset, DLCI_SAPI_LENGTH, FALSE); - proto_tree_add_item(parameter_tree, hf_dlci_spare_bit, parameter_tvb, offset, DLCI_SAPI_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_dlci_zero_bit, parameter_tvb, offset, DLCI_SAPI_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_dlci_spare_bit, parameter_tvb, offset, DLCI_SAPI_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(parameter_tree, hf_dlci_sapi, parameter_tvb, offset, DLCI_SAPI_LENGTH, ENC_BIG_ENDIAN); offset += DLCI_SAPI_LENGTH; - proto_tree_add_item(parameter_tree, hf_dlci_one_bit, parameter_tvb, offset, DLCI_TEI_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_dlci_one_bit, parameter_tvb, offset, DLCI_TEI_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(parameter_tree, hf_dlci_tei, parameter_tvb, offset, DLCI_TEI_LENGTH, ENC_BIG_ENDIAN); sapi = tvb_get_ntohs(parameter_tvb, offset-DLCI_TEI_LENGTH-DLCI_SAPI_LENGTH)>>2; diff --git a/epan/dissectors/packet-vcdu.c b/epan/dissectors/packet-vcdu.c index 7a63f50641..68460cf59c 100644 --- a/epan/dissectors/packet-vcdu.c +++ b/epan/dissectors/packet-vcdu.c @@ -287,12 +287,12 @@ dissect_vcdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(smex_tree, hf_smex_framelen, tvb, offset, 2, first_word); offset += 2; - proto_tree_add_item(smex_tree, hf_smex_rs_enable, tvb, offset, 1, FALSE); - proto_tree_add_item(smex_tree, hf_smex_rs_error, tvb, offset, 1, FALSE); - proto_tree_add_item(smex_tree, hf_smex_crc_enable, tvb, offset, 1, FALSE); - proto_tree_add_item(smex_tree, hf_smex_crc_error, tvb, offset, 1, FALSE); - proto_tree_add_item(smex_tree, hf_smex_mcs_enable, tvb, offset, 1, FALSE); - proto_tree_add_item(smex_tree, hf_smex_mcs_num_error, tvb, offset, 1, FALSE); + proto_tree_add_item(smex_tree, hf_smex_rs_enable, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(smex_tree, hf_smex_rs_error, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(smex_tree, hf_smex_crc_enable, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(smex_tree, hf_smex_crc_error, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(smex_tree, hf_smex_mcs_enable, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(smex_tree, hf_smex_mcs_num_error, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(smex_tree, hf_smex_data_inv, tvb, offset, 1, ENC_BIG_ENDIAN); ++offset; @@ -340,7 +340,7 @@ dissect_vcdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; proto_tree_add_item(vcdu_tree, hf_vcdu_seq, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; - proto_tree_add_item(vcdu_tree, hf_vcdu_replay, tvb, offset, 1, FALSE); + proto_tree_add_item(vcdu_tree, hf_vcdu_replay, tvb, offset, 1, ENC_BIG_ENDIAN); ++offset; /* extract mpdu/bpdu header word */ diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 34f0cb0668..bac63631f1 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -1087,7 +1087,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, col_set_str(pinfo->cinfo, COL_INFO, "Authentication result"); proto_tree_add_item(tree, hf_vnc_auth_result, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); auth_result = tvb_get_ntohl(tvb, offset); offset += 4; @@ -1120,7 +1120,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, col_set_str(pinfo->cinfo, COL_INFO, "Share desktop flag"); proto_tree_add_item(tree, hf_vnc_share_desktop_flag, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); per_conversation_info->vnc_next_state = VNC_SESSION_STATE_SERVER_INIT; @@ -1148,7 +1148,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, offset += 1; proto_tree_add_item(tree, hf_vnc_server_big_endian_flag, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_vnc_server_true_color_flag, @@ -1394,7 +1394,7 @@ vnc_client_set_pixel_format(tvbuff_t *tvb, packet_info *pinfo, gint *offset, *offset += 1; proto_tree_add_item(tree, hf_vnc_client_big_endian_flag, tvb, *offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); *offset += 1; proto_tree_add_item(tree, hf_vnc_client_true_color_flag, tvb, *offset, @@ -1497,7 +1497,7 @@ vnc_client_framebuffer_update_request(tvbuff_t *tvb, packet_info *pinfo, col_set_str(pinfo->cinfo, COL_INFO, "Client framebuffer update request"); proto_tree_add_item(tree, hf_vnc_update_req_incremental, - tvb, *offset, 1, FALSE); + tvb, *offset, 1, ENC_BIG_ENDIAN); *offset += 1; proto_tree_add_item(tree, hf_vnc_update_req_x_pos, @@ -1524,7 +1524,7 @@ vnc_client_key_event(tvbuff_t *tvb, packet_info *pinfo, gint *offset, { col_set_str(pinfo->cinfo, COL_INFO, "Client key event"); - proto_tree_add_item(tree, hf_vnc_key_down, tvb, *offset, 1, FALSE); + proto_tree_add_item(tree, hf_vnc_key_down, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset += 1; proto_tree_add_item(tree, hf_vnc_padding, tvb, *offset, 2, ENC_NA); @@ -1915,19 +1915,19 @@ vnc_hextile_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset, proto_tree_add_item(subencoding_mask_tree, hf_vnc_hextile_raw, tvb, *offset, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(subencoding_mask_tree, hf_vnc_hextile_bg, tvb, *offset, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(subencoding_mask_tree, hf_vnc_hextile_fg, tvb, *offset, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(subencoding_mask_tree, hf_vnc_hextile_anysubrects, tvb, *offset, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(subencoding_mask_tree, hf_vnc_hextile_subrectscolored, tvb, *offset, 1, - FALSE); + ENC_BIG_ENDIAN); *offset += 1; if(subencoding_mask & 0x1) { /* Raw */ diff --git a/epan/dissectors/packet-vrrp.c b/epan/dissectors/packet-vrrp.c index c257a11e90..bdfc458387 100644 --- a/epan/dissectors/packet-vrrp.c +++ b/epan/dissectors/packet-vrrp.c @@ -206,10 +206,10 @@ dissect_vrrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) while (addr_count > 0) { if (is_ipv6) { - proto_tree_add_item(vrrp_tree, hf_vrrp_ip6, tvb, offset, 16, FALSE); + proto_tree_add_item(vrrp_tree, hf_vrrp_ip6, tvb, offset, 16, ENC_NA); offset+=16; } else { - proto_tree_add_item(vrrp_tree, hf_vrrp_ip, tvb, offset, 4, FALSE); + proto_tree_add_item(vrrp_tree, hf_vrrp_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; } addr_count--; diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c index 668a1bed9c..3157731a40 100644 --- a/epan/dissectors/packet-vtp.c +++ b/epan/dissectors/packet-vtp.c @@ -177,7 +177,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 4; proto_tree_add_item(vtp_tree, hf_vtp_upd_id, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; upd_timestamp = tvb_get_ptr(tvb, offset, 12); diff --git a/epan/dissectors/packet-vuze-dht.c b/epan/dissectors/packet-vuze-dht.c index 42a3645ae7..9d121ad0c1 100644 --- a/epan/dissectors/packet-vuze-dht.c +++ b/epan/dissectors/packet-vuze-dht.c @@ -301,11 +301,11 @@ dissect_vuze_dht_address(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, switch(ip_length) { case TL_IPv4: - proto_tree_add_item(sub_tree, hf_vuze_dht_address_v4, tvb, offset, ip_length, FALSE); + proto_tree_add_item(sub_tree, hf_vuze_dht_address_v4, tvb, offset, ip_length, ENC_BIG_ENDIAN); SET_ADDRESS( &addr, AT_IPv4, ip_length, tvb_get_ptr( tvb, offset, ip_length) ); break; case TL_IPv6: - proto_tree_add_item(sub_tree, hf_vuze_dht_address_v6, tvb, offset, ip_length, FALSE); + proto_tree_add_item(sub_tree, hf_vuze_dht_address_v6, tvb, offset, ip_length, ENC_NA); SET_ADDRESS( &addr, AT_IPv6, ip_length, tvb_get_ptr( tvb, offset, ip_length) ); break; default: diff --git a/epan/dissectors/packet-vxi11.c b/epan/dissectors/packet-vxi11.c index 93f4946c81..d12eb0b6d2 100644 --- a/epan/dissectors/packet-vxi11.c +++ b/epan/dissectors/packet-vxi11.c @@ -238,9 +238,9 @@ dissect_flags(tvbuff_t *tvb, int offset, proto_tree *tree) proto_tree *flags_tree = proto_item_add_subtree(flags_item, ett_vxi11_core_flags); - proto_tree_add_item(flags_tree, hf_vxi11_core_flag_wait_lock, tvb, offset, 4, FALSE); - proto_tree_add_item(flags_tree, hf_vxi11_core_flag_end, tvb, offset, 4, FALSE); - proto_tree_add_item(flags_tree, hf_vxi11_core_flag_term_chr_set, tvb, offset, 4, FALSE); + proto_tree_add_item(flags_tree, hf_vxi11_core_flag_wait_lock, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_vxi11_core_flag_end, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_vxi11_core_flag_term_chr_set, tvb, offset, 4, ENC_BIG_ENDIAN); if (flags != 0) { @@ -283,9 +283,9 @@ dissect_reason(tvbuff_t *tvb, int offset, proto_tree *tree) proto_tree *reason_tree = proto_item_add_subtree(reason_item, ett_vxi11_core_reason); - proto_tree_add_item(reason_tree, hf_vxi11_core_reason_req_cnt, tvb, offset, 4, FALSE); - proto_tree_add_item(reason_tree, hf_vxi11_core_reason_chr, tvb, offset, 4, FALSE); - proto_tree_add_item(reason_tree, hf_vxi11_core_reason_end, tvb, offset, 4, FALSE); + proto_tree_add_item(reason_tree, hf_vxi11_core_reason_req_cnt, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(reason_tree, hf_vxi11_core_reason_chr, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(reason_tree, hf_vxi11_core_reason_end, tvb, offset, 4, ENC_BIG_ENDIAN); if (reason != 0) { diff --git a/epan/dissectors/packet-wai.c b/epan/dissectors/packet-wai.c index 613eb34e86..d763000510 100644 --- a/epan/dissectors/packet-wai.c +++ b/epan/dissectors/packet-wai.c @@ -251,14 +251,14 @@ dissect_flag(tvbuff_t *tvb, guint offset, proto_tree *tree) flag_item = proto_tree_add_item(tree, hf_wai_flag, tvb, offset, 1, ENC_BIG_ENDIAN); flag_tree = proto_item_add_subtree (flag_item, ett_wai_flags); - proto_tree_add_item (flag_tree, hf_wai_bk_rekeying_flag, tvb, offset, 1, FALSE); - proto_tree_add_item (flag_tree, hf_wai_preauthentication_flag, tvb, offset, 1, FALSE); - proto_tree_add_item (flag_tree, hf_wai_certificate_flag, tvb, offset, 1, FALSE); - proto_tree_add_item (flag_tree, hf_wai_optional_flag, tvb, offset, 1, FALSE); - proto_tree_add_item (flag_tree, hf_wai_usk_rekeying_flag, tvb, offset, 1, FALSE); - proto_tree_add_item (flag_tree, hf_wai_negotiation_flag, tvb, offset, 1, FALSE); - proto_tree_add_item (flag_tree, hf_wai_revoking_flag, tvb, offset, 1, FALSE); - proto_tree_add_item (flag_tree, hf_wai_reserved_flag, tvb, offset, 1, FALSE); + proto_tree_add_item (flag_tree, hf_wai_bk_rekeying_flag, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (flag_tree, hf_wai_preauthentication_flag, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (flag_tree, hf_wai_certificate_flag, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (flag_tree, hf_wai_optional_flag, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (flag_tree, hf_wai_usk_rekeying_flag, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (flag_tree, hf_wai_negotiation_flag, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (flag_tree, hf_wai_revoking_flag, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (flag_tree, hf_wai_reserved_flag, tvb, offset, 1, ENC_BIG_ENDIAN); } inline static void diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c index a16ff73552..815b454f57 100644 --- a/epan/dissectors/packet-wccp.c +++ b/epan/dissectors/packet-wccp.c @@ -364,7 +364,7 @@ dissect_web_cache_list_entry(tvbuff_t *tvb, int offset, int idx, "Web-Cache List Entry(%d)", idx); list_entry_tree = proto_item_add_subtree(tl, ett_cache_info); proto_tree_add_item(list_entry_tree, hf_cache_ip, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); dissect_hash_data(tvb, offset + 4, list_entry_tree); } diff --git a/epan/dissectors/packet-windows-common.c b/epan/dissectors/packet-windows-common.c index 843c317cca..58d09433a0 100644 --- a/epan/dissectors/packet-windows-common.c +++ b/epan/dissectors/packet-windows-common.c @@ -2180,13 +2180,13 @@ dissect_nt_ace_object(tvbuff_t *tvb, int offset, proto_tree *parent_tree) /* is there a GUID ? */ if(flags&0x00000001){ - proto_tree_add_item(tree, hf_nt_ace_guid, tvb, offset, 16, TRUE); + proto_tree_add_item(tree, hf_nt_ace_guid, tvb, offset, 16, ENC_LITTLE_ENDIAN); offset+=16; } /* is there an inherited GUID ? */ if(flags&0x00000002){ - proto_tree_add_item(tree, hf_nt_ace_inherited_guid, tvb, offset, 16, TRUE); + proto_tree_add_item(tree, hf_nt_ace_inherited_guid, tvb, offset, 16, ENC_LITTLE_ENDIAN); offset+=16; } diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c index 9f780f2dc2..814d0e6dd9 100644 --- a/epan/dissectors/packet-winsrepl.c +++ b/epan/dissectors/packet-winsrepl.c @@ -250,7 +250,7 @@ dissect_winsrepl_wins_owner(tvbuff_t *winsrepl_tvb, _U_ packet_info *pinfo, } /* ADDRESS */ - proto_tree_add_item(owner_tree, hf_winsrepl_owner_address, winsrepl_tvb, winsrepl_offset, 4, FALSE); + proto_tree_add_item(owner_tree, hf_winsrepl_owner_address, winsrepl_tvb, winsrepl_offset, 4, ENC_BIG_ENDIAN); winsrepl_offset += 4; /* MAX_VERSION */ @@ -294,7 +294,7 @@ dissect_winsrepl_table_reply(tvbuff_t *winsrepl_tvb, packet_info *pinfo, } /* INITIATOR */ - proto_tree_add_item(table_tree, hf_winsrepl_table_initiator, winsrepl_tvb, winsrepl_offset, 4, FALSE); + proto_tree_add_item(table_tree, hf_winsrepl_table_initiator, winsrepl_tvb, winsrepl_offset, 4, ENC_BIG_ENDIAN); winsrepl_offset += 4; return winsrepl_offset; @@ -328,7 +328,7 @@ dissect_winsrepl_wins_ip(tvbuff_t *winsrepl_tvb, _U_ packet_info *pinfo, } /* OWNER */ - proto_tree_add_item(ip_tree, hf_winsrepl_ip_owner, winsrepl_tvb, winsrepl_offset, 4, FALSE); + proto_tree_add_item(ip_tree, hf_winsrepl_ip_owner, winsrepl_tvb, winsrepl_offset, 4, ENC_BIG_ENDIAN); winsrepl_offset += 4; /* IP */ @@ -482,7 +482,7 @@ dissect_winsrepl_wins_name(tvbuff_t *winsrepl_tvb, packet_info *pinfo, } /* UNKNOWN, little or big endian??? */ - proto_tree_add_item(name_tree, hf_winsrepl_name_unknown, winsrepl_tvb, winsrepl_offset, 4, FALSE); + proto_tree_add_item(name_tree, hf_winsrepl_name_unknown, winsrepl_tvb, winsrepl_offset, 4, ENC_BIG_ENDIAN); winsrepl_offset += 4; proto_item_set_len(name_item, winsrepl_offset - old_offset); diff --git a/epan/dissectors/packet-wow.c b/epan/dissectors/packet-wow.c index 9fea17baa8..30bee5f251 100644 --- a/epan/dissectors/packet-wow.c +++ b/epan/dissectors/packet-wow.c @@ -278,7 +278,7 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 4; proto_tree_add_item(wow_tree, hf_wow_ip, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(wow_tree, diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c index e2b95d8756..e53b125cef 100644 --- a/epan/dissectors/packet-wps.c +++ b/epan/dissectors/packet-wps.c @@ -1649,8 +1649,8 @@ dissect_exteap_wps(proto_tree *eap_tree, tvbuff_t *tvb, int offset, pi = proto_tree_add_item(eap_tree, hf_eapwps_flags, tvb, offset, 1, ENC_BIG_ENDIAN); pt = proto_item_add_subtree(pi, ett_eap_wps_flags); - proto_tree_add_item(pt, hf_eapwps_flag_mf, tvb, offset, 1, FALSE); - proto_tree_add_item(pt, hf_eapwps_flag_lf, tvb, offset, 1, FALSE); + proto_tree_add_item(pt, hf_eapwps_flag_mf, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(pt, hf_eapwps_flag_lf, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; size -= 1; if (flags & MASK_WSC_FLAG_LF) { diff --git a/epan/dissectors/packet-x224.c b/epan/dissectors/packet-x224.c index 6900cfbbcb..2419acd3e7 100644 --- a/epan/dissectors/packet-x224.c +++ b/epan/dissectors/packet-x224.c @@ -167,7 +167,7 @@ dissect_x224_dt(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int off /* EOT / NR */ - proto_tree_add_item(tree, hf_x224_eot, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_x224_eot, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_x224_nr, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c index 157453d7c6..34305d2f67 100644 --- a/epan/dissectors/packet-xmcp.c +++ b/epan/dissectors/packet-xmcp.c @@ -603,7 +603,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, if (attr_length < 20) break; proto_tree_add_item(attr_tree, xmcp_attr_serv_instance, tvb, (offset+4), - 16, FALSE); + 16, ENC_BIG_ENDIAN); { e_guid_t guid; char buf[GUID_STR_LEN]; @@ -649,7 +649,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, } else { guint32 ip; proto_tree_add_item(attr_tree, xmcp_attr_servtrans_ipv4, tvb, - (offset+4), 4, FALSE); + (offset+4), 4, ENC_BIG_ENDIAN); ip = tvb_get_ipv4(tvb, (offset+4)); proto_item_append_text(attr_tree, ": %s:%u", ip_to_str((guint8 *)&ip), tvb_get_ntohs(tvb, (offset+2))); @@ -662,7 +662,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, } else { struct e_in6_addr ipv6; proto_tree_add_item(attr_tree, xmcp_attr_servtrans_ipv6, tvb, - (offset+4), 16, FALSE); + (offset+4), 16, ENC_NA); tvb_get_ipv6(tvb, (offset+4), &ipv6); proto_item_append_text(attr_tree, ": [%s]:%u", ip6_to_str(&ipv6), tvb_get_ntohs(tvb, (offset+2))); @@ -719,7 +719,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, tvb, current_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(flag_tree, xmcp_attr_flag_removal_reason_network_withdraw, - tvb, current_offset, 2, FALSE); + tvb, current_offset, 2, ENC_BIG_ENDIAN); if (flag_value & XMCP_REMOVAL_REASON_NETWORK_WITHDRAW) { proto_item_append_text(flag_tree, " (network withdraw)"); } @@ -739,7 +739,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, tvb, current_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(flag_tree, xmcp_attr_flag_visibility_unauthenticated, - tvb, current_offset, 2, FALSE); + tvb, current_offset, 2, ENC_BIG_ENDIAN); if (flag_value & XMCP_SERVICE_VISIBILITY_UNAUTHENTICATED) { proto_item_append_text(flag_tree, " (visible to unauthenticated clients)"); diff --git a/epan/dissectors/packet-ypbind.c b/epan/dissectors/packet-ypbind.c index c1783fc583..5c6a3bddd6 100644 --- a/epan/dissectors/packet-ypbind.c +++ b/epan/dissectors/packet-ypbind.c @@ -89,7 +89,7 @@ dissect_ypbind_domain_v2_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_ case YPBIND_RESP_TYPE_SUCC_VAL: /* ip address */ proto_tree_add_item(tree, hf_ypbind_addr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* port */ @@ -116,7 +116,7 @@ dissect_ypbind_setdomain_v2_request(tvbuff_t *tvb, int offset, packet_info *pinf /* ip address */ proto_tree_add_item(tree, hf_ypbind_addr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* port */ diff --git a/epan/dissectors/packet-ypserv.c b/epan/dissectors/packet-ypserv.c index fca5ba5de0..998a4aca6d 100644 --- a/epan/dissectors/packet-ypserv.c +++ b/epan/dissectors/packet-ypserv.c @@ -350,7 +350,7 @@ dissect_xfr_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree * offset = dissect_rpc_string(tvb, sub_tree, hf_ypserv_peer, offset, NULL); - proto_tree_add_item(tree, hf_ypserv_transid, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ypserv_transid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; offset = dissect_rpc_uint32(tvb, tree, hf_ypserv_prog, offset); @@ -383,7 +383,7 @@ dissect_xfr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree { proto_item_append_text(tree, " XFR reply"); - proto_tree_add_item(tree, hf_ypserv_transid, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ypserv_transid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; offset = dissect_rpc_uint32(tvb, tree, hf_ypserv_xfrstat, offset); diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c index 2774329798..363197d775 100644 --- a/epan/dissectors/packet-zbee-zcl.c +++ b/epan/dissectors/packet-zbee-zcl.c @@ -1429,7 +1429,7 @@ static void dissect_zcl_attr_data(tvbuff_t *tvb, proto_tree *tree, guint *offset proto_item_append_text(tree, ", %s: 0x%02x", val_to_str_ext_const(data_type, &zbee_zcl_short_data_type_names_ext, "Reserved"), attr_uint); - proto_tree_add_item(tree, hf_zbee_zcl_attr_boolean, tvb, *offset, 1, FALSE); + proto_tree_add_item(tree, hf_zbee_zcl_attr_boolean, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset += sizeof(guint8); break; diff --git a/epan/dissectors/packet-zebra.c b/epan/dissectors/packet-zebra.c index 48aaa451e8..58fcda7696 100644 --- a/epan/dissectors/packet-zebra.c +++ b/epan/dissectors/packet-zebra.c @@ -225,12 +225,12 @@ dissect_zebra_request(proto_tree *tree, gboolean request, tvbuff_t *tvb, /* XXX - switch on the address family here, instead? */ if (len == 17) { /* IPv4 */ proto_tree_add_item(tree, hf_zebra_prefix4, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else if (len == 41) { /* IPv6 */ proto_tree_add_item(tree, hf_zebra_prefix6, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_NA); offset += 16; } else break; @@ -241,12 +241,12 @@ dissect_zebra_request(proto_tree *tree, gboolean request, tvbuff_t *tvb, if (len == 17) { /* IPv4 */ proto_tree_add_item(tree, hf_zebra_dest4, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else if (len == 41) { /* IPv6 */ proto_tree_add_item(tree, hf_zebra_dest6, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_NA); offset += 16; } break; @@ -298,7 +298,7 @@ dissect_zebra_request(proto_tree *tree, gboolean request, tvbuff_t *tvb, while (i--) { proto_tree_add_item(tree, hf_zebra_nexthop4, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; } } @@ -375,7 +375,7 @@ dissect_zebra_request(proto_tree *tree, gboolean request, tvbuff_t *tvb, while (i--) { proto_tree_add_item(tree, hf_zebra_nexthop6, tvb, - offset, 16, FALSE); + offset, 16, ENC_NA); offset += 16; } } @@ -416,7 +416,7 @@ dissect_zebra_request(proto_tree *tree, gboolean request, tvbuff_t *tvb, break; case ZEBRA_IPV4_NEXTHOP_LOOKUP: proto_tree_add_item(tree, hf_zebra_nexthop4, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_zebra_metric, |