diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-09-18 21:18:34 -0400 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-09-19 01:38:08 +0000 |
| commit | 18d72987cb44eb3594b054a8509c447dbc709b46 (patch) | |
| tree | b987bbcf662d0bbff0251b64f212ac70d2f45726 /epan/dissectors | |
| parent | 4bdf5145129a2b9dbae3d927a761d9be5cecacd5 (diff) | |
Do encoding-arg changes (all benign)
For:
- FT_BYTES: Always use just ENC_NA
- integral/floating (other than FT_[U]INT8): Do ENC_NA --> ENC_BIG_ENDIAN
Also:
- FT_UINT... --> FT_UINT8 in a few cases (to match proto_tree_add_item...)
- Change one case of incorrect '||' to '|'
Change-Id: I427e0e61618ff8faf55691c8a695930f67d455b0
Reviewed-on: https://code.wireshark.org/review/4184
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors')
56 files changed, 203 insertions, 204 deletions
diff --git a/epan/dissectors/packet-alljoyn.c b/epan/dissectors/packet-alljoyn.c index 564be1dda9..c71515d240 100644 --- a/epan/dissectors/packet-alljoyn.c +++ b/epan/dissectors/packet-alljoyn.c @@ -1664,7 +1664,7 @@ ns_parse_answers_v0(tvbuff_t *tvb, gint* offset, proto_tree* alljoyn_tree, guint count = tvb_get_guint8(tvb, *offset); (*offset) += 1; - proto_tree_add_item(alljoyn_answers_tree, hf_alljoyn_ns_isat_port, tvb, *offset, 2, ENC_NA); + proto_tree_add_item(alljoyn_answers_tree, hf_alljoyn_ns_isat_port, tvb, *offset, 2, ENC_BIG_ENDIAN); (*offset) += 2; if(flags & ISAT_S) { @@ -1814,7 +1814,7 @@ ns_parse_answers_v1(tvbuff_t *tvb, gint* offset, proto_tree* alljoyn_tree, guint proto_tree_add_item(alljoyn_answers_tree, hf_alljoyn_ns_isat_ipv4, tvb, *offset, 4, ENC_NA); (*offset) += 4; - proto_tree_add_item(alljoyn_answers_tree, hf_alljoyn_ns_isat_port, tvb, *offset, 2, ENC_NA); + proto_tree_add_item(alljoyn_answers_tree, hf_alljoyn_ns_isat_port, tvb, *offset, 2, ENC_BIG_ENDIAN); (*offset) += 2; } @@ -1822,7 +1822,7 @@ ns_parse_answers_v1(tvbuff_t *tvb, gint* offset, proto_tree* alljoyn_tree, guint proto_tree_add_item(alljoyn_answers_tree, hf_alljoyn_ns_isat_ipv4, tvb, *offset, 4, ENC_NA); (*offset) += 4; - proto_tree_add_item(alljoyn_answers_tree, hf_alljoyn_ns_isat_port, tvb, *offset, 2, ENC_NA); + proto_tree_add_item(alljoyn_answers_tree, hf_alljoyn_ns_isat_port, tvb, *offset, 2, ENC_BIG_ENDIAN); (*offset) += 2; } @@ -1830,7 +1830,7 @@ ns_parse_answers_v1(tvbuff_t *tvb, gint* offset, proto_tree* alljoyn_tree, guint proto_tree_add_item(alljoyn_answers_tree, hf_alljoyn_ns_isat_ipv6, tvb, *offset, 16, ENC_NA); (*offset) += 16; - proto_tree_add_item(alljoyn_answers_tree, hf_alljoyn_ns_isat_port, tvb, *offset, 2, ENC_NA); + proto_tree_add_item(alljoyn_answers_tree, hf_alljoyn_ns_isat_port, tvb, *offset, 2, ENC_BIG_ENDIAN); (*offset) += 2; } @@ -1838,7 +1838,7 @@ ns_parse_answers_v1(tvbuff_t *tvb, gint* offset, proto_tree* alljoyn_tree, guint proto_tree_add_item(alljoyn_answers_tree, hf_alljoyn_ns_isat_ipv6, tvb, *offset, 16, ENC_NA); (*offset) += 16; - proto_tree_add_item(alljoyn_answers_tree, hf_alljoyn_ns_isat_port, tvb, *offset, 2, ENC_NA); + proto_tree_add_item(alljoyn_answers_tree, hf_alljoyn_ns_isat_port, tvb, *offset, 2, ENC_BIG_ENDIAN); (*offset) += 2; } diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c index 7a5a392414..8adb921b86 100644 --- a/epan/dissectors/packet-artnet.c +++ b/epan/dissectors/packet-artnet.c @@ -2239,12 +2239,12 @@ dissect_artnet_diag_data(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 1; proto_tree_add_item(tree, hf_artnet_diag_data_index, tvb, - offset, 2, ENC_NA); + offset, 2, ENC_BIG_ENDIAN); offset += 2; length = tvb_get_ntohs(tvb, offset); proto_tree_add_item(tree, hf_artnet_diag_data_length, tvb, - offset, 2, ENC_NA); + offset, 2, ENC_BIG_ENDIAN); offset+=2; proto_tree_add_item(tree, hf_artnet_diag_data_data, tvb, @@ -2323,7 +2323,7 @@ dissect_artnet_directory(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 1; proto_tree_add_item(tree, hf_artnet_directory_file, tvb, - offset, 2, ENC_NA); + offset, 2, ENC_BIG_ENDIAN); offset += 2; return offset; @@ -2342,7 +2342,7 @@ dissect_artnet_directory_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 1; proto_tree_add_item(tree, hf_artnet_directory_reply_file, tvb, - offset, 2, ENC_NA); + offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_artnet_directory_reply_name, tvb, @@ -2354,7 +2354,7 @@ dissect_artnet_directory_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 64; proto_tree_add_item(tree, hf_artnet_directory_reply_length, tvb, - offset, 8, ENC_NA); + offset, 8, ENC_BIG_ENDIAN); offset += 8; proto_tree_add_item(tree, hf_artnet_directory_reply_data, tvb, @@ -2395,7 +2395,7 @@ dissect_artnet_file_tn_master(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 1; proto_tree_add_item(tree, hf_artnet_file_tn_master_length, tvb, - offset, 4, ENC_NA); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_artnet_file_tn_master_name, tvb, @@ -2403,7 +2403,7 @@ dissect_artnet_file_tn_master(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 14; proto_tree_add_item(tree, hf_artnet_file_tn_master_checksum, tvb, - offset, 2, ENC_NA); + offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_artnet_file_tn_master_spare, tvb, diff --git a/epan/dissectors/packet-atmtcp.c b/epan/dissectors/packet-atmtcp.c index 531c48baeb..eccbc0ebac 100644 --- a/epan/dissectors/packet-atmtcp.c +++ b/epan/dissectors/packet-atmtcp.c @@ -71,21 +71,21 @@ dissect_atmtcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ atmtcp_tree = proto_item_add_subtree(ti, ett_atmtcp); /* VPI */ - proto_tree_add_item(atmtcp_tree, hf_atmtcp_vpi, tvb, offset, 2, ENC_NA); + proto_tree_add_item(atmtcp_tree, hf_atmtcp_vpi, tvb, offset, 2, ENC_BIG_ENDIAN); } offset += 2; if (tree) { /* VCI */ - proto_tree_add_item(atmtcp_tree, hf_atmtcp_vci, tvb, offset, 2, ENC_NA); + proto_tree_add_item(atmtcp_tree, hf_atmtcp_vci, tvb, offset, 2, ENC_BIG_ENDIAN); } offset += 2; if (tree) { /* Length */ - proto_tree_add_item(atmtcp_tree, hf_atmtcp_length, tvb, offset, 4, ENC_NA); + proto_tree_add_item(atmtcp_tree, hf_atmtcp_length, tvb, offset, 4, ENC_BIG_ENDIAN); } length = tvb_get_ntohl(tvb, offset); if(length == ATMTCP_HDR_MAGIC) diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index 665b18ad76..fbed8cc07a 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.c @@ -3334,7 +3334,7 @@ void proto_register_batadv(void) }, { &hf_batadv_icmp_rr_pointer, { "Pointer", "batadv.icmp.rr_pointer", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL} }, { &hf_batadv_icmp_rr_ether, diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 90022d2b19..5e2fc78010 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -2495,7 +2495,7 @@ decode_mcast_vpn_nlri(proto_tree *tree, tvbuff_t *tvb, gint offset, guint16 afi) offset += BGP_ROUTE_DISTINGUISHER_SIZE; proto_tree_add_item(nlri_tree, hf_bgp_mcast_vpn_nlri_source_as, tvb, - offset, 4, ENC_NA); + offset, 4, ENC_BIG_ENDIAN); offset += 4; ret = decode_mcast_vpn_nlri_addresses(nlri_tree, tvb, offset); @@ -2599,7 +2599,7 @@ decode_MPLS_stack_tree(tvbuff_t *tvb, gint offset, proto_tree *parent_tree) while ((label_entry & BGP_MPLS_BOTTOM_L_STACK) == 0) { label_entry = tvb_get_ntoh24(tvb, indx); - label_item = proto_tree_add_item(labels_tree, hf_bgp_update_mpls_label_value, tvb, indx, 3, ENC_NA); + label_item = proto_tree_add_item(labels_tree, hf_bgp_update_mpls_label_value, tvb, indx, 3, ENC_BIG_ENDIAN); /* withdrawn routes may contain 0 or 0x800000 in the first label */ if((indx == offset)&&(label_entry==0||label_entry==0x800000)) { proto_item_append_text(labels_item, " (withdrawn)"); @@ -2825,7 +2825,7 @@ static int decode_bgp_link_node_descriptor(tvbuff_t *tvb, proto_tree *tree, gint BGP_NLRI_TLV_LEN_AUTONOMOUS_SYSTEM, sub_length); break; } - proto_tree_add_item(tlv_tree, hf_bgp_ls_tlv_autonomous_system_id, tvb, offset + 4, 4, ENC_NA); + proto_tree_add_item(tlv_tree, hf_bgp_ls_tlv_autonomous_system_id, tvb, offset + 4, 4, ENC_BIG_ENDIAN); break; case BGP_NLRI_TLV_BGP_LS_IDENTIFIER: tlv_item = proto_tree_add_item(tree, hf_bgp_ls_tlv_bgp_ls_identifier, tvb, offset, sub_length+4, ENC_NA); @@ -2838,7 +2838,7 @@ static int decode_bgp_link_node_descriptor(tvbuff_t *tvb, proto_tree *tree, gint BGP_NLRI_TLV_LEN_BGP_LS_IDENTIFIER, sub_length); break; } - proto_tree_add_item(tlv_tree, hf_bgp_ls_tlv_bgp_ls_identifier_id, tvb, offset + 4, 4, ENC_NA); + proto_tree_add_item(tlv_tree, hf_bgp_ls_tlv_bgp_ls_identifier_id, tvb, offset + 4, 4, ENC_BIG_ENDIAN); break; case BGP_NLRI_TLV_AREA_ID: tlv_item = proto_tree_add_item(tree, hf_bgp_ls_tlv_area_id, tvb, offset, sub_length+4, ENC_NA); @@ -2851,7 +2851,7 @@ static int decode_bgp_link_node_descriptor(tvbuff_t *tvb, proto_tree *tree, gint BGP_NLRI_TLV_LEN_AREA_ID, sub_length); break; } - proto_tree_add_item(tlv_tree, hf_bgp_ls_tlv_area_id_id, tvb, offset + 4, 4, ENC_NA); + proto_tree_add_item(tlv_tree, hf_bgp_ls_tlv_area_id_id, tvb, offset + 4, 4, ENC_BIG_ENDIAN); break; case BGP_NLRI_TLV_IGP_ROUTER_ID: tlv_item = proto_tree_add_item(tree, hf_bgp_ls_tlv_igp_router, tvb, offset, sub_length+4, ENC_NA); @@ -3703,7 +3703,7 @@ static int decode_evpn_nlri(proto_tree *tree, tvbuff_t *tvb, gint offset, packet 10, ENC_NA); proto_tree_add_item(prefix_tree, hf_bgp_evpn_nlri_etag, tvb, start_offset+20, - 4, ENC_NA); + 4, ENC_BIG_ENDIAN); stack_strbuf = wmem_strbuf_new_label(wmem_packet_scope()); labnum = decode_MPLS_stack(tvb, offset + 24, @@ -3743,7 +3743,7 @@ static int decode_evpn_nlri(proto_tree *tree, tvbuff_t *tvb, gint offset, packet 10, ENC_NA); proto_tree_add_item(prefix_tree, hf_bgp_evpn_nlri_etag, tvb, start_offset+20, - 4, ENC_NA); + 4, ENC_BIG_ENDIAN); proto_tree_add_item(prefix_tree, hf_bgp_evpn_nlri_maclen, tvb, start_offset+24, 1, ENC_NA); @@ -3800,7 +3800,7 @@ static int decode_evpn_nlri(proto_tree *tree, tvbuff_t *tvb, gint offset, packet */ proto_tree_add_item(prefix_tree, hf_bgp_evpn_nlri_etag, tvb, start_offset+10, - 4, ENC_NA); + 4, ENC_BIG_ENDIAN); ip_len = tvb_get_guint8(tvb, offset + 14) / 8; proto_tree_add_item(prefix_tree, hf_bgp_evpn_nlri_iplen, tvb, start_offset+14, @@ -5385,8 +5385,8 @@ dissect_bgp_update_ext_com(proto_tree *parent_tree, tvbuff_t *tvb, guint16 tlen, break; case BGP_EXT_COM_STYPE_EXP_F_RED: /* Flow spec redirect [RFC5575] */ - proto_tree_add_item(community_tree, hf_bgp_ext_com_value_as2, tvb, offset+2, 2, ENC_NA); - proto_tree_add_item(community_tree, hf_bgp_ext_com_value_an4, tvb, offset+4, 4, ENC_NA); + proto_tree_add_item(community_tree, hf_bgp_ext_com_value_as2, tvb, offset+2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(community_tree, hf_bgp_ext_com_value_an4, tvb, offset+4, 4, ENC_BIG_ENDIAN); proto_item_append_text(community_item, " RT %u:%u", tvb_get_ntohs(tvb,offset+2), tvb_get_ntohl(tvb,offset+4)); break; @@ -5421,7 +5421,7 @@ dissect_bgp_update_ext_com(proto_tree *parent_tree, tvbuff_t *tvb, guint16 tlen, proto_tree_add_item(community_tree, hf_bgp_ext_com_type_high, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(community_tree, hf_bgp_ext_com_stype_tr_exp_fs_ip4, tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(community_tree, hf_bgp_ext_com_value_IP4, tvb, offset+2, 4, ENC_NA); - proto_tree_add_item(community_tree, hf_bgp_ext_com_value_an2, tvb, offset+6, 2, ENC_NA); + proto_tree_add_item(community_tree, hf_bgp_ext_com_value_an2, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_item_append_text(community_item, " %s %s: %s%s%u", val_to_str_const(com_type_high_byte, bgpext_com_type_high, "Unknown"), val_to_str_const(com_stype_low_byte, bgpext_com_stype_tr_exp_fs_ip4, "Unknown"), @@ -5431,8 +5431,8 @@ dissect_bgp_update_ext_com(proto_tree *parent_tree, tvbuff_t *tvb, guint16 tlen, case BGP_EXT_COM_TYPE_HIGH_TR_EXP_FSAS4: proto_tree_add_item(community_tree, hf_bgp_ext_com_type_high, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(community_tree, hf_bgp_ext_com_stype_tr_exp_fs_as4, tvb, offset+1, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(community_tree, hf_bgp_ext_com_value_as4, tvb, offset+2, 4, ENC_NA); - proto_tree_add_item(community_tree, hf_bgp_ext_com_value_an2, tvb, offset+6, 2, ENC_NA); + proto_tree_add_item(community_tree, hf_bgp_ext_com_value_as4, tvb, offset+2, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(community_tree, hf_bgp_ext_com_value_an2, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_item_append_text(community_item, " %s %s: %u.%u(%u):%u", val_to_str_const(com_type_high_byte, bgpext_com_type_high, "Unknown"), val_to_str_const(com_stype_low_byte, bgpext_com_stype_tr_exp_fs_as4, "Unknown"), @@ -6218,8 +6218,8 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo) ett_bgp_tunnel_tlv_subtree, NULL, "%s (%u bytes)", val_to_str_const(encaps_tunnel_type, bgp_attr_tunnel_type, "Unknown"), encaps_tunnel_len + 4); - proto_tree_add_item(subtree4, hf_bgp_update_encaps_tunnel_tlv_type, tvb, q, 2, ENC_NA); - proto_tree_add_item(subtree4, hf_bgp_update_encaps_tunnel_tlv_len, tvb, q + 2, 2, ENC_NA); + proto_tree_add_item(subtree4, hf_bgp_update_encaps_tunnel_tlv_type, tvb, q, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree4, hf_bgp_update_encaps_tunnel_tlv_len, tvb, q + 2, 2, ENC_BIG_ENDIAN); subtree5 = proto_tree_add_subtree(subtree4, tvb, q + 4, encaps_tunnel_len, ett_bgp_tunnel_subtlv, NULL, "Sub-TLV Encodings"); diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index d5de57d57d..835a616a92 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -5000,7 +5000,7 @@ dissect_eir_ad_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) end_offset = offset + length; while (offset < end_offset) { if (tvb_get_ntohs(tvb, offset) == 0x0000) { - sub_item = proto_tree_add_item(entry_tree, hf_btcommon_eir_ad_uuid_32, tvb, offset, 4, ENC_NA); + sub_item = proto_tree_add_item(entry_tree, hf_btcommon_eir_ad_uuid_32, tvb, offset, 4, ENC_BIG_ENDIAN); proto_item_append_text(sub_item, " (%s)", val_to_str_ext_const(tvb_get_ntohs(tvb, offset + 2), &bt_sig_uuid_vals_ext, "Unknown")); } else { sub_item = proto_tree_add_item(entry_tree, hf_btcommon_eir_ad_custom_uuid, tvb, offset, 4, ENC_NA); diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index b045c3e13f..6bf6c841e0 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -2660,7 +2660,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, value = tvb_get_ntohs(tvb, list_offset); wmem_strbuf_append_printf(info_buf, "Lang ID: %s", val_to_str_ext_const(value, &usb_langid_vals_ext, "Unknown")); proto_item_append_text(entry_item, ": Lang ID: %s", val_to_str_ext_const(value, &usb_langid_vals_ext, "Unknown")); - proto_tree_add_item(last_tree, hf_sdp_lang_id, tvb, list_offset, entry_length, ENC_ASCII | ENC_NA); + proto_tree_add_item(last_tree, hf_sdp_lang_id, tvb, list_offset, entry_length, ENC_BIG_ENDIAN); list_offset += entry_length; dissect_data_element(sub_tree, &last_tree, pinfo, tvb, list_offset); @@ -2892,7 +2892,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, wmem_strbuf_append(info_buf, new_str); break; case 0x352: - proto_tree_add_item(next_tree, hf_bpp_character_repertoires_support, tvb, offset, size, ENC_ASCII | ENC_NA); + proto_tree_add_item(next_tree, hf_bpp_character_repertoires_support, tvb, offset, size, ENC_NA); new_str = tvb_bytes_to_ep_str(tvb, offset, size); wmem_strbuf_append(info_buf, new_str); break; diff --git a/epan/dissectors/packet-carp.c b/epan/dissectors/packet-carp.c index db4d3eee6c..cd569bb3b8 100644 --- a/epan/dissectors/packet-carp.c +++ b/epan/dissectors/packet-carp.c @@ -156,7 +156,7 @@ dissect_carp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_tree_add_item(carp_tree, hf_carp_counter, tvb, offset, 8, ENC_BIG_ENDIAN); offset+=8; - proto_tree_add_item(carp_tree, hf_carp_hmac, tvb, offset, 20, ENC_ASCII|ENC_NA); + proto_tree_add_item(carp_tree, hf_carp_hmac, tvb, offset, 20, ENC_NA); offset+=20; return offset; diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c index cbb9b1de7e..83a8b90f70 100644 --- a/epan/dissectors/packet-ceph.c +++ b/epan/dissectors/packet-ceph.c @@ -6161,7 +6161,7 @@ guint c_dissect_msg_client_caps(proto_tree *root, off += 4; proto_tree_add_item(tree, hf_msg_client_caps_snap_follows, - tvb, off, 8, ENC_NA); + tvb, off, 8, ENC_BIG_ENDIAN); off += 8; snap_trace_len = tvb_get_letohl(tvb, off); diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index b7bb09aee7..efeb23f5e4 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -4643,7 +4643,7 @@ cops_downstream_service_i04_i05(tvbuff_t *tvb, proto_tree *st, guint n, guint32 info_to_display(tvb,stt,offset,1,"Envelope",NULL,FMT_DEC,&hf_cops_pcmm_envelope); offset += 1; - proto_tree_add_item(stt, hf_cops_reserved24, tvb, offset, 3, ENC_NA); + proto_tree_add_item(stt, hf_cops_reserved24, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; /* Authorized Envelope */ diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index 0607fa5d17..aa17909478 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -1717,7 +1717,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, } proto_tree_add_item(subtree, hf_remoteid_enterprise, tvb, off, 4, ENC_BIG_ENDIAN); off += 4; - proto_tree_add_item(subtree, hf_remoteid_enterprise_id, tvb, off, optlen - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_remoteid_enterprise_id, tvb, off, optlen - 4, ENC_NA); break; case OPTION_SUBSCRIBER_ID: if (optlen == 0) { diff --git a/epan/dissectors/packet-dis.c b/epan/dissectors/packet-dis.c index 6a4634a430..52f1142346 100644 --- a/epan/dissectors/packet-dis.c +++ b/epan/dissectors/packet-dis.c @@ -5873,7 +5873,7 @@ static gint parseField_VariableParameter(tvbuff_t *tvb, proto_tree *tree, gint o offset = dissect_DIS_FIELDS_VP_ENTITY_ASSOCIATION(tvb, tree, offset); break; default: - proto_tree_add_item(tree, hf_dis_str_data, tvb, offset, 15, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dis_str_data, tvb, offset, 15, ENC_NA); offset += 15; break; } diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 01d1e3dd5f..086ac096e4 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -3147,7 +3147,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, case T_NID: /* NodeID (104) */ { - proto_tree_add_item(rr_tree, hf_dns_ilnp_nodeid_preference, tvb, cur_offset, 2, ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_ilnp_nodeid_preference, tvb, cur_offset, 2, ENC_BIG_ENDIAN); cur_offset += 2; proto_tree_add_item(rr_tree, hf_dns_ilnp_nodeid, tvb, cur_offset, 8, ENC_NA); @@ -3159,7 +3159,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, case T_L32: /* Locator (105) */ { - proto_tree_add_item(rr_tree, hf_dns_ilnp_locator32_preference, tvb, cur_offset, 2, ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_ilnp_locator32_preference, tvb, cur_offset, 2, ENC_BIG_ENDIAN); cur_offset += 2; proto_tree_add_item(rr_tree, hf_dns_ilnp_locator32, tvb, cur_offset, 4, ENC_NA); @@ -3171,7 +3171,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, case T_L64: /* Locator64 (106) */ { - proto_tree_add_item(rr_tree, hf_dns_ilnp_locator64_preference, tvb, cur_offset, 2, ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_ilnp_locator64_preference, tvb, cur_offset, 2, ENC_BIG_ENDIAN); cur_offset += 2; proto_tree_add_item(rr_tree, hf_dns_ilnp_locator64, tvb, cur_offset, 8, ENC_NA); @@ -3185,7 +3185,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, int lp_len; const guchar *lp_str; - proto_tree_add_item(rr_tree, hf_dns_ilnp_locatorfqdn_preference, tvb, cur_offset, 2, ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_ilnp_locatorfqdn_preference, tvb, cur_offset, 2, ENC_BIG_ENDIAN); cur_offset += 2; /* XXX Fix data length */ diff --git a/epan/dissectors/packet-dvb-s2-bb.c b/epan/dissectors/packet-dvb-s2-bb.c index 5319b0d1b2..5d63bf6d55 100644 --- a/epan/dissectors/packet-dvb-s2-bb.c +++ b/epan/dissectors/packet-dvb-s2-bb.c @@ -629,7 +629,7 @@ static int dissect_dvb_s2_gse(tvbuff_t *tvb, int cur_off, proto_tree *tree, pack if (BIT_IS_SET(gse_hdr, DVB_S2_GSE_HDR_STOP_POS)) col_append_str(pinfo->cinfo, COL_INFO, "3 "); - proto_tree_add_item(dvb_s2_gse_tree, hf_dvb_s2_gse_label3, tvb, cur_off + new_off, 3, ENC_NA); + proto_tree_add_item(dvb_s2_gse_tree, hf_dvb_s2_gse_label3, tvb, cur_off + new_off, 3, ENC_BIG_ENDIAN); new_off += 3; } else { @@ -688,7 +688,7 @@ static int dissect_dvb_s2_gse(tvbuff_t *tvb, int cur_off, proto_tree *tree, pack /* add crc32 if last fragment */ if (BIT_IS_CLEAR(gse_hdr, DVB_S2_GSE_HDR_START_POS) && BIT_IS_SET(gse_hdr, DVB_S2_GSE_HDR_STOP_POS)) { - proto_tree_add_item(dvb_s2_gse_tree, hf_dvb_s2_gse_crc32, tvb, cur_off + new_off, DVB_S2_GSE_CRC32_LEN, ENC_NA); + proto_tree_add_item(dvb_s2_gse_tree, hf_dvb_s2_gse_crc32, tvb, cur_off + new_off, DVB_S2_GSE_CRC32_LEN, ENC_BIG_ENDIAN); new_off += DVB_S2_GSE_CRC32_LEN; } } diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 1d7a1e2c1b..cba9decc7f 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -2012,7 +2012,7 @@ dissect_cpf(enip_request_key_t *request_key, int command, tvbuff_t *tvb, /* Revision */ proto_tree_add_item(item_tree, hf_enip_lir_revision, - tvb, offset+30, 2, ENC_NA ); + tvb, offset+30, 2, ENC_BIG_ENDIAN ); /* Status */ proto_tree_add_item(item_tree, hf_enip_lir_status, diff --git a/epan/dissectors/packet-foundry.c b/epan/dissectors/packet-foundry.c index 4cba24dff0..c9b9feb9ea 100644 --- a/epan/dissectors/packet-foundry.c +++ b/epan/dissectors/packet-foundry.c @@ -347,7 +347,7 @@ proto_register_fdp(void) 0x0, NULL, HFILL }}, { &hf_fdp_holdtime, - { "Holdtime", "fdp.holdtime", FT_UINT16, BASE_DEC, NULL, + { "Holdtime", "fdp.holdtime", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_fdp_checksum, diff --git a/epan/dissectors/packet-glusterfs_hndsk.c b/epan/dissectors/packet-glusterfs_hndsk.c index 97425fe8c6..0d53f313a6 100644 --- a/epan/dissectors/packet-glusterfs_hndsk.c +++ b/epan/dissectors/packet-glusterfs_hndsk.c @@ -121,7 +121,7 @@ gluster_hndsk_2_getspec_call(tvbuff_t *tvb, int offset, { if (tree) proto_tree_add_item(tree, hf_gluster_hndsk_flags, tvb, offset, - 4, ENC_NA); + 4, ENC_BIG_ENDIAN); offset += 4; offset = dissect_rpc_string(tvb, tree, hf_gluster_hndsk_key, offset, NULL); diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c index 0bcb0eb6ae..2d7a7c05cc 100644 --- a/epan/dissectors/packet-h264.c +++ b/epan/dissectors/packet-h264.c @@ -2105,7 +2105,7 @@ dissect_h264_pacsi(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, gint off while (tvb_reported_length_remaining(tvb, offset) > 0 && !error) { nal_unit_size = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_h264_nalu_size, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_h264_nalu_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if (nal_unit_size == 0 || nal_unit_size > tvb_reported_length_remaining(tvb, offset)) @@ -2141,14 +2141,14 @@ dissect_h264_stap(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, gint /* If it is a STAP-B then the Decoder Order Number if present before the NAL Units */ if (nal_type == H264_STAP_B) { - proto_tree_add_item(tree, hf_h264_don, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_h264_don, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } while (tvb_reported_length_remaining(tvb, offset) > 0) { /* Get the size of the NAL unit and display */ - proto_tree_add_item(tree, hf_h264_nalu_size, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_h264_nalu_size, tvb, offset, 2, ENC_BIG_ENDIAN); nal_unit_size = tvb_get_ntohs(tvb, offset); offset += 2; @@ -2185,12 +2185,12 @@ dissect_h264_mtap(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, gint proto_item *item; /* Get the DON base value for type MTAP16 & MTAP24 */ - proto_tree_add_item(tree, hf_h264_don, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_h264_don, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; while (tvb_reported_length_remaining(tvb, offset) > 0) { - proto_tree_add_item(tree, hf_h264_nalu_size, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_h264_nalu_size, tvb, offset, 2, ENC_BIG_ENDIAN); nal_unit_size = tvb_get_ntohs(tvb, offset); size_offset = offset; offset += 2; @@ -2200,13 +2200,13 @@ dissect_h264_mtap(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, gint if (nal_type == H264_MTAP16) { /* Get the 16 bit DOND value */ - proto_tree_add_item(tree, hf_h264_ts_offset16, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_h264_ts_offset16, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } else { /* Get the 24 bit DOND value */ - proto_tree_add_item(tree, hf_h264_ts_offset24, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_h264_ts_offset24, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 3; } @@ -2263,16 +2263,16 @@ dissect_h264_nalu_extension (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo while (tvb_reported_length_remaining(tvb, offset) > 0) { proto_tree_add_text(tree, tvb, offset, 1, "NI-MTAP Unit %d", unit++); - proto_tree_add_item(tree, hf_h264_nalu_size, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_h264_nalu_size, tvb, offset, 2, ENC_BIG_ENDIAN); nal_unit_size = tvb_get_ntohs(tvb, offset); size_offset = offset; offset += 2; - proto_tree_add_item(tree, hf_h264_ts_offset16, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_h264_ts_offset16, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* If J flag is set then DON is present in packet */ if (j_flag) { - proto_tree_add_item(tree, hf_h264_don, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_h264_don, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } if (nal_unit_size == 0 || tvb_reported_length_remaining(tvb, offset) < nal_unit_size) diff --git a/epan/dissectors/packet-hdmi.c b/epan/dissectors/packet-hdmi.c index b0ec2a2ff1..8d059992fd 100644 --- a/epan/dissectors/packet-hdmi.c +++ b/epan/dissectors/packet-hdmi.c @@ -154,7 +154,7 @@ dissect_hdmi_edid(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tr proto_item_append_text(yi, " (year %d)", 1990+year); offset += 1; - proto_tree_add_item(edid_tree, hf_hdmi_edid_version, tvb, offset, 2, ENC_NA); + proto_tree_add_item(edid_tree, hf_hdmi_edid_version, tvb, offset, 2, ENC_BIG_ENDIAN); /* XXX dissect the parts following the EDID header */ diff --git a/epan/dissectors/packet-iapp.c b/epan/dissectors/packet-iapp.c index 044795cd9f..0357a98292 100644 --- a/epan/dissectors/packet-iapp.c +++ b/epan/dissectors/packet-iapp.c @@ -302,7 +302,7 @@ append_pduval_str(proto_tree *tree, int type, int len, tvbuff_t *tvb, int offset "Pattern set %d, sequence %d", ((val >> 6) & 3) + 1, (val & 31) + 1); } else - proto_tree_add_item(tree, hf_iapp_pdu_uint, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_iapp_pdu_uint, tvb, offset, 1, ENC_BIG_ENDIAN); break; case IAPP_PDU_OUIIDENT: proto_tree_add_item(tree, hf_iapp_pdu_oui_ident, tvb, offset, 3, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-idrp.c b/epan/dissectors/packet-idrp.c index c9b80e57d0..883ed95a2b 100644 --- a/epan/dissectors/packet-idrp.c +++ b/epan/dissectors/packet-idrp.c @@ -391,7 +391,7 @@ static int dissect_BISPDU_OPEN(tvbuff_t * tvb, int offset, proto_tree * tree) offset += 1; /* Source RDI */ - proto_tree_add_item(tree, hf_idrp_open_src_rdi, tvb, offset, rdi_len, ENC_ASCII | ENC_NA); + proto_tree_add_item(tree, hf_idrp_open_src_rdi, tvb, offset, rdi_len, ENC_NA); offset += rdi_len; /* Number of Non-empty RIB-Atts */ @@ -437,7 +437,7 @@ static int dissect_BISPDU_OPEN(tvbuff_t * tvb, int offset, proto_tree * tree) tvb, offset, length_indicator_guint8, - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; /* 1 octet Qos length */ @@ -450,7 +450,7 @@ static int dissect_BISPDU_OPEN(tvbuff_t * tvb, int offset, proto_tree * tree) tvb, offset, length_indicator_guint8, - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; /* 1 octet Metric length */ @@ -464,7 +464,7 @@ static int dissect_BISPDU_OPEN(tvbuff_t * tvb, int offset, proto_tree * tree) tvb, offset, length_indicator_guint8, - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; break; case IDRP_PATH_ATTR_TYPE_SECURITY: @@ -481,7 +481,7 @@ static int dissect_BISPDU_OPEN(tvbuff_t * tvb, int offset, proto_tree * tree) tvb, offset, length_indicator_guint8, - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; /* length of Security Information */ @@ -495,7 +495,7 @@ static int dissect_BISPDU_OPEN(tvbuff_t * tvb, int offset, proto_tree * tree) tvb, offset, length_indicator_guint8, - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; break; @@ -520,7 +520,7 @@ static int dissect_BISPDU_OPEN(tvbuff_t * tvb, int offset, proto_tree * tree) /* process Nth RDI */ proto_tree_add_item(tree, hf_idrp_open_confederation, tvb, - offset, length_indicator_guint8, ENC_ASCII | ENC_NA); + offset, length_indicator_guint8, ENC_NA); offset += length_indicator_guint8; } @@ -531,7 +531,7 @@ static int dissect_BISPDU_OPEN(tvbuff_t * tvb, int offset, proto_tree * tree) /* Authentication Data */ proto_tree_add_item(tree, hf_idrp_open_authentication_data, tvb, offset, - tvb_reported_length_remaining(tvb, offset), ENC_ASCII | ENC_NA); + tvb_reported_length_remaining(tvb, offset), ENC_NA); offset += tvb_reported_length_remaining(tvb, offset); return offset; @@ -651,7 +651,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree) tvb, offset, length_indicator_guint8, - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; } } @@ -698,7 +698,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree) tvb, offset, length_indicator_guint8, - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; /* number of SNPA */ @@ -721,7 +721,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree) tvb, offset, length_indicator_guint8 , - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; } } /* while: process Nth next hop */ @@ -748,7 +748,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree) tvb, offset, length_indicator_guint8 , - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; } break; @@ -774,7 +774,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree) tvb, offset, length_indicator_guint8 , - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; } break; @@ -828,7 +828,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree) tvb, offset, length_indicator_guint8 , - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; /* 1 octet Qoslength */ length_indicator_guint8 = tvb_get_guint8(tvb, offset); @@ -839,7 +839,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree) tvb, offset, length_indicator_guint8 , - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; /* 1 octet Metric length */ length_indicator_guint8 = tvb_get_guint8(tvb, offset); @@ -850,7 +850,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree) tvb, offset, length_indicator_guint8 , - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; break; case IDRP_PATH_ATTR_TYPE_HIERARCHICALRECORDING: @@ -883,7 +883,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree) tvb, offset, length_indicator_guint8 , - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; /* length of Security Information */ @@ -895,7 +895,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree) tvb, offset, length_indicator_guint8, - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; break; case IDRP_PATH_ATTR_TYPE_CAPACITY: @@ -932,7 +932,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree) /* N octets Proto identity: in case of ISO 8473 one octet with the value 0x81 */ proto_tree_add_item(tree, hf_idrp_update_nlri_proto_id, tvb, offset, - proto_len, ENC_ASCII | ENC_NA); + proto_len, ENC_NA); offset += proto_len; /* 2 octets length of address */ @@ -951,7 +951,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree) offset += 1; proto_tree_add_item(tree, hf_idrp_update_nlri_addr_info, tvb, - offset, rdi_len, ENC_ASCII | ENC_NA); + offset, rdi_len, ENC_NA); offset += rdi_len; } return offset; @@ -999,7 +999,7 @@ static int dissect_BISPDU_ERROR(tvbuff_t * tvb, int offset, proto_tree * tree) data_length = tvb_reported_length_remaining(tvb, offset); if (data_length>0) { proto_tree_add_item(tree, hf_idrp_error_data, tvb, offset, data_length, - ENC_ASCII | ENC_NA); + ENC_NA); offset += data_length; } @@ -1072,7 +1072,7 @@ static int dissect_BISPDU_RIB_REFRESH(tvbuff_t * tvb, packet_info *pinfo, int of tvb, offset, length_indicator_guint8, - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; /* 1 octet Qos length */ @@ -1085,7 +1085,7 @@ static int dissect_BISPDU_RIB_REFRESH(tvbuff_t * tvb, packet_info *pinfo, int of tvb, offset, length_indicator_guint8, - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; /* 1 octet Metric length */ @@ -1099,7 +1099,7 @@ static int dissect_BISPDU_RIB_REFRESH(tvbuff_t * tvb, packet_info *pinfo, int of tvb, offset, length_indicator_guint8, - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; break; case IDRP_PATH_ATTR_TYPE_SECURITY: @@ -1116,7 +1116,7 @@ static int dissect_BISPDU_RIB_REFRESH(tvbuff_t * tvb, packet_info *pinfo, int of tvb, offset, length_indicator_guint8, - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; /* length of Security Information */ @@ -1130,7 +1130,7 @@ static int dissect_BISPDU_RIB_REFRESH(tvbuff_t * tvb, packet_info *pinfo, int of tvb, offset, length_indicator_guint8, - ENC_ASCII | ENC_NA); + ENC_NA); offset += length_indicator_guint8; break; @@ -1194,7 +1194,7 @@ dissect_idrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ /* 16 octets validation */ proto_tree_add_item(idrp_tree, hf_idrp_validation_pattern, - tvb, offset, 16, ENC_ASCII | ENC_NA); + tvb, offset, 16, ENC_NA); offset += 16; switch (pdu_type) { diff --git a/epan/dissectors/packet-ieee1722a.c b/epan/dissectors/packet-ieee1722a.c index 834308423b..7fe82ad11b 100644 --- a/epan/dissectors/packet-ieee1722a.c +++ b/epan/dissectors/packet-ieee1722a.c @@ -366,7 +366,7 @@ static void dissect_1722a (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Loop through all timestamps and add them to the timestamp tree. */ for (j = 0; j < (datalen / IEEE_1722A_CRF_TIMESTAMP_SIZE); j++) { - proto_tree_add_item(timestamp_tree, hf_1722a_crf_timestamp_data, tvb, offset, IEEE_1722A_CRF_TIMESTAMP_SIZE, ENC_NA); + proto_tree_add_item(timestamp_tree, hf_1722a_crf_timestamp_data, tvb, offset, IEEE_1722A_CRF_TIMESTAMP_SIZE, ENC_BIG_ENDIAN); offset += IEEE_1722A_CRF_TIMESTAMP_SIZE; } } diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 181e49e7f0..6be54fb4ab 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -1572,15 +1572,15 @@ dissect_ipopt_qs(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, proto_item_append_text(tf, ", %s, QS TTL %u, QS TTL diff %u", val_to_str_ext(rate, &qs_rate_vals_ext, "Unknown (%u)"), tvb_get_guint8(tvb, offset + 3), ttl_diff); - proto_tree_add_item(field_tree, hf_ip_opt_qs_nonce, tvb, offset + 4, 4, ENC_NA); - proto_tree_add_item(field_tree, hf_ip_opt_qs_reserved, tvb, offset + 4, 4, ENC_NA); + proto_tree_add_item(field_tree, hf_ip_opt_qs_nonce, tvb, offset + 4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree, hf_ip_opt_qs_reserved, tvb, offset + 4, 4, ENC_BIG_ENDIAN); } else if (function == QS_RATE_REPORT) { proto_tree_add_item(field_tree, hf_ip_opt_qs_rate, tvb, offset + 2, 1, ENC_NA); proto_item_append_text(tf, ", %s", val_to_str_ext(rate, &qs_rate_vals_ext, "Unknown (%u)")); proto_tree_add_item(field_tree, hf_ip_opt_qs_unused, tvb, offset + 3, 1, ENC_NA); - proto_tree_add_item(field_tree, hf_ip_opt_qs_nonce, tvb, offset + 4, 4, ENC_NA); - proto_tree_add_item(field_tree, hf_ip_opt_qs_reserved, tvb, offset + 4, 4, ENC_NA); + proto_tree_add_item(field_tree, hf_ip_opt_qs_nonce, tvb, offset + 4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree, hf_ip_opt_qs_reserved, tvb, offset + 4, 4, ENC_BIG_ENDIAN); } } diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index ce20b64b44..063da8af1f 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -1186,8 +1186,8 @@ dissect_opts(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info * pinfo, c val_to_str_ext(rate, &qs_rate_vals_ext, "Unknown (%u)"), tvb_get_guint8(tvb, offset), ttl_diff); offset += 1; - proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_nonce, tvb, offset, 4, ENC_NA); - proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_reserved, tvb, offset, 4, ENC_NA); + proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_nonce, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_reserved, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else if (function == QS_RATE_REPORT) { proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_rate, tvb, offset, 1, ENC_NA); @@ -1196,8 +1196,8 @@ dissect_opts(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info * pinfo, c val_to_str_ext(rate, &qs_rate_vals_ext, "Unknown (%u)")); proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_unused, tvb, offset, 1, ENC_NA); offset += 1; - proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_nonce, tvb, offset, 4, ENC_NA); - proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_reserved, tvb, offset, 4, ENC_NA); + proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_nonce, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_reserved, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c index d4bec5173e..af0858840b 100644 --- a/epan/dissectors/packet-isis-lsp.c +++ b/epan/dissectors/packet-isis-lsp.c @@ -342,7 +342,7 @@ static void dissect_lsp_mt_id(tvbuff_t *tvb, proto_tree *tree, int offset) { - proto_tree_add_item(tree, hf_isis_lsp_mt_id_reserved, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_isis_lsp_mt_id_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_isis_lsp_mt_id, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-lbmr.c b/epan/dissectors/packet-lbmr.c index ebb76522c0..4d1dcbbd7d 100644 --- a/epan/dissectors/packet-lbmr.c +++ b/epan/dissectors/packet-lbmr.c @@ -3166,7 +3166,7 @@ static int dissect_lbmr_tnwg_address_opt(tvbuff_t * tvb, int offset, packet_info proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_address_type, tvb, offset + O_LBMR_TNWG_OPT_ADDRESS_T_TYPE, L_LBMR_TNWG_OPT_ADDRESS_T_TYPE, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_address_len, tvb, offset + O_LBMR_TNWG_OPT_ADDRESS_T_LEN, L_LBMR_TNWG_OPT_ADDRESS_T_LEN, ENC_BIG_ENDIAN); - flags_item = proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_address_flags, tvb, offset + O_LBMR_TNWG_OPT_ADDRESS_T_FLAGS, L_LBMR_TNWG_OPT_ADDRESS_T_FLAGS, ENC_NA); + flags_item = proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_address_flags, tvb, offset + O_LBMR_TNWG_OPT_ADDRESS_T_FLAGS, L_LBMR_TNWG_OPT_ADDRESS_T_FLAGS, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_item, ett_lbmr_tnwg_address_opt_flags); proto_tree_add_item(flags_tree, hf_lbmr_tnwg_opt_address_flags_ignore, tvb, offset + O_LBMR_TNWG_OPT_ADDRESS_T_FLAGS, L_LBMR_TNWG_OPT_ADDRESS_T_FLAGS, ENC_BIG_ENDIAN); @@ -3190,7 +3190,7 @@ static int dissect_lbmr_tnwg_domain_opt(tvbuff_t * tvb, int offset, packet_info proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_domain_type, tvb, offset + O_LBMR_TNWG_OPT_DOMAIN_T_TYPE, L_LBMR_TNWG_OPT_DOMAIN_T_TYPE, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_domain_len, tvb, offset + O_LBMR_TNWG_OPT_DOMAIN_T_LEN, L_LBMR_TNWG_OPT_DOMAIN_T_LEN, ENC_BIG_ENDIAN); - flags_item = proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_domain_flags, tvb, offset + O_LBMR_TNWG_OPT_DOMAIN_T_FLAGS, L_LBMR_TNWG_OPT_DOMAIN_T_FLAGS, ENC_NA); + flags_item = proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_domain_flags, tvb, offset + O_LBMR_TNWG_OPT_DOMAIN_T_FLAGS, L_LBMR_TNWG_OPT_DOMAIN_T_FLAGS, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_item, ett_lbmr_tnwg_domain_opt_flags); proto_tree_add_item(flags_tree, hf_lbmr_tnwg_opt_domain_flags_ignore, tvb, offset + O_LBMR_TNWG_OPT_DOMAIN_T_FLAGS, L_LBMR_TNWG_OPT_DOMAIN_T_FLAGS, ENC_BIG_ENDIAN); @@ -3214,7 +3214,7 @@ static int dissect_lbmr_tnwg_name_opt(tvbuff_t * tvb, int offset, packet_info * proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_name_type, tvb, offset + O_LBMR_TNWG_OPT_T_TYPE, L_LBMR_TNWG_OPT_T_TYPE, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_name_len, tvb, offset + O_LBMR_TNWG_OPT_T_LEN, L_LBMR_TNWG_OPT_T_LEN, ENC_BIG_ENDIAN); - flags_item = proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_name_flags, tvb, offset + O_LBMR_TNWG_OPT_T_FLAGS, L_LBMR_TNWG_OPT_T_FLAGS, ENC_NA); + flags_item = proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_name_flags, tvb, offset + O_LBMR_TNWG_OPT_T_FLAGS, L_LBMR_TNWG_OPT_T_FLAGS, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_item, ett_lbmr_tnwg_name_opt_flags); proto_tree_add_item(flags_tree, hf_lbmr_tnwg_opt_name_flags_ignore, tvb, offset + O_LBMR_TNWG_OPT_T_FLAGS, L_LBMR_TNWG_OPT_T_FLAGS, ENC_BIG_ENDIAN); @@ -3238,7 +3238,7 @@ static int dissect_lbmr_tnwg_unknown_opt(tvbuff_t * tvb, int offset, packet_info proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_type, tvb, offset + O_LBMR_TNWG_OPT_T_TYPE, L_LBMR_TNWG_OPT_T_TYPE, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_len, tvb, offset + O_LBMR_TNWG_OPT_T_LEN, L_LBMR_TNWG_OPT_T_LEN, ENC_BIG_ENDIAN); - flags_item = proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_flags, tvb, offset + O_LBMR_TNWG_OPT_T_FLAGS, L_LBMR_TNWG_OPT_T_FLAGS, ENC_NA); + flags_item = proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_flags, tvb, offset + O_LBMR_TNWG_OPT_T_FLAGS, L_LBMR_TNWG_OPT_T_FLAGS, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_item, ett_lbmr_tnwg_unknown_opt_flags); proto_tree_add_item(flags_tree, hf_lbmr_tnwg_opt_flags_ignore, tvb, offset + O_LBMR_TNWG_OPT_T_FLAGS, L_LBMR_TNWG_OPT_T_FLAGS, ENC_BIG_ENDIAN); @@ -3701,7 +3701,7 @@ static int dissect_lbmr_tir_options(tvbuff_t * tvb, int offset, packet_info * pi opt_tree = proto_item_add_subtree(opt_item, ett_lbmr_topt_ume); proto_tree_add_item(opt_tree, hf_lbmr_topt_ume_type, tvb, curr_offset + O_LBMR_TOPIC_OPT_UME_T_TYPE, L_LBMR_TOPIC_OPT_UME_T_TYPE, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_lbmr_topt_ume_len, tvb, curr_offset + O_LBMR_TOPIC_OPT_UME_T_LEN, L_LBMR_TOPIC_OPT_UME_T_LEN, ENC_BIG_ENDIAN); - flags_item = proto_tree_add_item(opt_tree, hf_lbmr_topt_ume_flags, tvb, curr_offset + O_LBMR_TOPIC_OPT_UME_T_FLAGS, L_LBMR_TOPIC_OPT_UME_T_FLAGS, ENC_NA); + flags_item = proto_tree_add_item(opt_tree, hf_lbmr_topt_ume_flags, tvb, curr_offset + O_LBMR_TOPIC_OPT_UME_T_FLAGS, L_LBMR_TOPIC_OPT_UME_T_FLAGS, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_item, ett_lbmr_topt_ume_flags); proto_tree_add_item(flags_tree, hf_lbmr_topt_ume_flags_ignore, tvb, curr_offset + O_LBMR_TOPIC_OPT_UME_T_FLAGS, L_LBMR_TOPIC_OPT_UME_T_FLAGS, ENC_BIG_ENDIAN); proto_tree_add_item(flags_tree, hf_lbmr_topt_ume_flags_latejoin, tvb, curr_offset + O_LBMR_TOPIC_OPT_UME_T_FLAGS, L_LBMR_TOPIC_OPT_UME_T_FLAGS, ENC_BIG_ENDIAN); @@ -3748,7 +3748,7 @@ static int dissect_lbmr_tir_options(tvbuff_t * tvb, int offset, packet_info * pi opt_tree = proto_item_add_subtree(opt_item, ett_lbmr_topt_latejoin); proto_tree_add_item(opt_tree, hf_lbmr_topt_latejoin_type, tvb, curr_offset + O_LBMR_TOPIC_OPT_LATEJOIN_T_TYPE, L_LBMR_TOPIC_OPT_LATEJOIN_T_TYPE, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_lbmr_topt_latejoin_len, tvb, curr_offset + O_LBMR_TOPIC_OPT_LATEJOIN_T_LEN, L_LBMR_TOPIC_OPT_LATEJOIN_T_LEN, ENC_BIG_ENDIAN); - flags_item = proto_tree_add_item(opt_tree, hf_lbmr_topt_latejoin_flags, tvb, curr_offset + O_LBMR_TOPIC_OPT_LATEJOIN_T_FLAGS, L_LBMR_TOPIC_OPT_LATEJOIN_T_FLAGS, ENC_NA); + flags_item = proto_tree_add_item(opt_tree, hf_lbmr_topt_latejoin_flags, tvb, curr_offset + O_LBMR_TOPIC_OPT_LATEJOIN_T_FLAGS, L_LBMR_TOPIC_OPT_LATEJOIN_T_FLAGS, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_item, ett_lbmr_topt_latejoin_flags); proto_tree_add_item(flags_tree, hf_lbmr_topt_latejoin_flags_ignore, tvb, curr_offset + O_LBMR_TOPIC_OPT_LATEJOIN_T_FLAGS, L_LBMR_TOPIC_OPT_LATEJOIN_T_FLAGS, ENC_BIG_ENDIAN); proto_tree_add_item(flags_tree, hf_lbmr_topt_latejoin_flags_acktosrc, tvb, curr_offset + O_LBMR_TOPIC_OPT_LATEJOIN_T_FLAGS, L_LBMR_TOPIC_OPT_LATEJOIN_T_FLAGS, ENC_BIG_ENDIAN); @@ -3764,7 +3764,7 @@ static int dissect_lbmr_tir_options(tvbuff_t * tvb, int offset, packet_info * pi opt_tree = proto_item_add_subtree(opt_item, ett_lbmr_topt_umq_rcridx); proto_tree_add_item(opt_tree, hf_lbmr_topt_umq_rcridx_type, tvb, curr_offset + O_LBMR_TOPIC_OPT_UMQ_RCRIDX_T_TYPE, L_LBMR_TOPIC_OPT_UMQ_RCRIDX_T_TYPE, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_lbmr_topt_umq_rcridx_len, tvb, curr_offset + O_LBMR_TOPIC_OPT_UMQ_RCRIDX_T_LEN, L_LBMR_TOPIC_OPT_UMQ_RCRIDX_T_LEN, ENC_BIG_ENDIAN); - flags_item = proto_tree_add_item(opt_tree, hf_lbmr_topt_umq_rcridx_flags, tvb, curr_offset + O_LBMR_TOPIC_OPT_UMQ_RCRIDX_T_FLAGS, L_LBMR_TOPIC_OPT_UMQ_RCRIDX_T_FLAGS, ENC_NA); + flags_item = proto_tree_add_item(opt_tree, hf_lbmr_topt_umq_rcridx_flags, tvb, curr_offset + O_LBMR_TOPIC_OPT_UMQ_RCRIDX_T_FLAGS, L_LBMR_TOPIC_OPT_UMQ_RCRIDX_T_FLAGS, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_item, ett_lbmr_topt_umq_rcridx_flags); proto_tree_add_item(flags_tree, hf_lbmr_topt_umq_rcridx_flags_ignore, tvb, curr_offset + O_LBMR_TOPIC_OPT_UMQ_RCRIDX_T_FLAGS, L_LBMR_TOPIC_OPT_UMQ_RCRIDX_T_FLAGS, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_lbmr_topt_umq_rcridx_rcr_idx, tvb, curr_offset + O_LBMR_TOPIC_OPT_UMQ_RCRIDX_T_RCR_IDX, L_LBMR_TOPIC_OPT_UMQ_RCRIDX_T_RCR_IDX, ENC_BIG_ENDIAN); @@ -3775,7 +3775,7 @@ static int dissect_lbmr_tir_options(tvbuff_t * tvb, int offset, packet_info * pi proto_tree_add_item(opt_tree, hf_lbmr_topt_umq_qinfo_type, tvb, curr_offset + O_LBMR_TOPIC_OPT_T_TYPE, L_LBMR_TOPIC_OPT_T_TYPE, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_lbmr_topt_umq_qinfo_len, tvb, curr_offset + O_LBMR_TOPIC_OPT_T_LEN, L_LBMR_TOPIC_OPT_T_LEN, ENC_BIG_ENDIAN); qname_len = opt_len - L_LBMR_TOPIC_OPT_T; - flags_item = proto_tree_add_item(opt_tree, hf_lbmr_topt_umq_qinfo_flags, tvb, curr_offset + O_LBMR_TOPIC_OPT_T_FLAGS, L_LBMR_TOPIC_OPT_T_FLAGS, ENC_NA); + flags_item = proto_tree_add_item(opt_tree, hf_lbmr_topt_umq_qinfo_flags, tvb, curr_offset + O_LBMR_TOPIC_OPT_T_FLAGS, L_LBMR_TOPIC_OPT_T_FLAGS, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_item, ett_lbmr_topt_umq_qinfo_flags); proto_tree_add_item(flags_tree, hf_lbmr_topt_umq_qinfo_flags_ignore, tvb, curr_offset + O_LBMR_TOPIC_OPT_T_FLAGS, L_LBMR_TOPIC_OPT_T_FLAGS, ENC_BIG_ENDIAN); proto_tree_add_item(flags_tree, hf_lbmr_topt_umq_qinfo_flags_queue, tvb, curr_offset + O_LBMR_TOPIC_OPT_T_FLAGS, L_LBMR_TOPIC_OPT_T_FLAGS, ENC_BIG_ENDIAN); @@ -3801,7 +3801,7 @@ static int dissect_lbmr_tir_options(tvbuff_t * tvb, int offset, packet_info * pi opt_tree = proto_item_add_subtree(opt_item, ett_lbmr_topt_otid); proto_tree_add_item(opt_tree, hf_lbmr_topt_otid_type, tvb, curr_offset + O_LBMR_TOPIC_OPT_OTID_T_TYPE, L_LBMR_TOPIC_OPT_OTID_T_TYPE, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_lbmr_topt_otid_len, tvb, curr_offset + O_LBMR_TOPIC_OPT_OTID_T_LEN, L_LBMR_TOPIC_OPT_OTID_T_LEN, ENC_BIG_ENDIAN); - flags_item = proto_tree_add_item(opt_tree, hf_lbmr_topt_otid_flags, tvb, curr_offset + O_LBMR_TOPIC_OPT_OTID_T_FLAGS, L_LBMR_TOPIC_OPT_OTID_T_FLAGS, ENC_NA); + flags_item = proto_tree_add_item(opt_tree, hf_lbmr_topt_otid_flags, tvb, curr_offset + O_LBMR_TOPIC_OPT_OTID_T_FLAGS, L_LBMR_TOPIC_OPT_OTID_T_FLAGS, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_item, ett_lbmr_topt_otid_flags); proto_tree_add_item(flags_tree, hf_lbmr_topt_otid_flags_ignore, tvb, curr_offset + O_LBMR_TOPIC_OPT_OTID_T_FLAGS, L_LBMR_TOPIC_OPT_OTID_T_FLAGS, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_lbmr_topt_otid_originating_transport, tvb, curr_offset + O_LBMR_TOPIC_OPT_OTID_T_ORIGINATING_TRANSPORT, L_LBMR_TOPIC_OPT_OTID_T_ORIGINATING_TRANSPORT, ENC_NA); @@ -3833,7 +3833,7 @@ static int dissect_lbmr_tir_options(tvbuff_t * tvb, int offset, packet_info * pi opt_tree = proto_item_add_subtree(opt_item, ett_lbmr_topt_ulb); proto_tree_add_item(opt_tree, hf_lbmr_topt_ulb_type, tvb, curr_offset + O_LBMR_TOPIC_OPT_ULB_T_TYPE, L_LBMR_TOPIC_OPT_ULB_T_TYPE, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_lbmr_topt_ulb_len, tvb, curr_offset + O_LBMR_TOPIC_OPT_ULB_T_LEN, L_LBMR_TOPIC_OPT_ULB_T_LEN, ENC_BIG_ENDIAN); - flags_item = proto_tree_add_item(opt_tree, hf_lbmr_topt_ulb_flags, tvb, curr_offset + O_LBMR_TOPIC_OPT_ULB_T_FLAGS, L_LBMR_TOPIC_OPT_ULB_T_FLAGS, ENC_NA); + flags_item = proto_tree_add_item(opt_tree, hf_lbmr_topt_ulb_flags, tvb, curr_offset + O_LBMR_TOPIC_OPT_ULB_T_FLAGS, L_LBMR_TOPIC_OPT_ULB_T_FLAGS, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_item, ett_lbmr_topt_ulb_flags); proto_tree_add_item(flags_tree, hf_lbmr_topt_ulb_flags_ignore, tvb, curr_offset + O_LBMR_TOPIC_OPT_ULB_T_FLAGS, L_LBMR_TOPIC_OPT_ULB_T_FLAGS, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_lbmr_topt_ulb_queue_id, tvb, curr_offset + O_LBMR_TOPIC_OPT_ULB_T_QUEUE_ID, L_LBMR_TOPIC_OPT_ULB_T_QUEUE_ID, ENC_BIG_ENDIAN); @@ -3869,13 +3869,13 @@ static int dissect_lbmr_tir_options(tvbuff_t * tvb, int offset, packet_info * pi opt_tree = proto_item_add_subtree(opt_item, ett_lbmr_topt_exfunc); proto_tree_add_item(opt_tree, hf_lbmr_topt_exfunc_type, tvb, curr_offset + O_LBMR_TOPIC_OPT_EXFUNC_T_TYPE, L_LBMR_TOPIC_OPT_EXFUNC_T_TYPE, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_lbmr_topt_exfunc_len, tvb, curr_offset + O_LBMR_TOPIC_OPT_EXFUNC_T_LEN, L_LBMR_TOPIC_OPT_EXFUNC_T_LEN, ENC_BIG_ENDIAN); - flags_item = proto_tree_add_item(opt_tree, hf_lbmr_topt_exfunc_flags, tvb, curr_offset + O_LBMR_TOPIC_OPT_EXFUNC_T_FLAGS, L_LBMR_TOPIC_OPT_EXFUNC_T_FLAGS, ENC_NA); + flags_item = proto_tree_add_item(opt_tree, hf_lbmr_topt_exfunc_flags, tvb, curr_offset + O_LBMR_TOPIC_OPT_EXFUNC_T_FLAGS, L_LBMR_TOPIC_OPT_EXFUNC_T_FLAGS, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_item, ett_lbmr_topt_exfunc_flags); proto_tree_add_item(flags_tree, hf_lbmr_topt_exfunc_flags_ignore, tvb, curr_offset + O_LBMR_TOPIC_OPT_EXFUNC_T_FLAGS, L_LBMR_TOPIC_OPT_EXFUNC_T_FLAGS, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_lbmr_topt_exfunc_src_tcp_port, tvb, curr_offset + O_LBMR_TOPIC_OPT_EXFUNC_T_SRC_TCP_PORT, L_LBMR_TOPIC_OPT_EXFUNC_T_SRC_TCP_PORT, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_lbmr_topt_exfunc_reserved, tvb, curr_offset + O_LBMR_TOPIC_OPT_EXFUNC_T_RESERVED, L_LBMR_TOPIC_OPT_EXFUNC_T_RESERVED, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_lbmr_topt_exfunc_src_ip_addr, tvb, curr_offset + O_LBMR_TOPIC_OPT_EXFUNC_T_SRC_IP_ADDR, L_LBMR_TOPIC_OPT_EXFUNC_T_SRC_IP_ADDR, ENC_BIG_ENDIAN); - fflags_item = proto_tree_add_item(opt_tree, hf_lbmr_topt_exfunc_functionality_flags, tvb, curr_offset + O_LBMR_TOPIC_OPT_EXFUNC_T_FUNCTIONALITY_FLAGS, L_LBMR_TOPIC_OPT_EXFUNC_T_FUNCTIONALITY_FLAGS, ENC_NA); + fflags_item = proto_tree_add_item(opt_tree, hf_lbmr_topt_exfunc_functionality_flags, tvb, curr_offset + O_LBMR_TOPIC_OPT_EXFUNC_T_FUNCTIONALITY_FLAGS, L_LBMR_TOPIC_OPT_EXFUNC_T_FUNCTIONALITY_FLAGS, ENC_BIG_ENDIAN); fflags_tree = proto_item_add_subtree(fflags_item, ett_lbmr_topt_exfunc_functionality_flags); proto_tree_add_item(fflags_tree, hf_lbmr_topt_exfunc_functionality_flags_ulb, tvb, curr_offset + O_LBMR_TOPIC_OPT_EXFUNC_T_FUNCTIONALITY_FLAGS, L_LBMR_TOPIC_OPT_EXFUNC_T_FUNCTIONALITY_FLAGS, ENC_BIG_ENDIAN); proto_tree_add_item(fflags_tree, hf_lbmr_topt_exfunc_functionality_flags_umq, tvb, curr_offset + O_LBMR_TOPIC_OPT_EXFUNC_T_FUNCTIONALITY_FLAGS, L_LBMR_TOPIC_OPT_EXFUNC_T_FUNCTIONALITY_FLAGS, ENC_BIG_ENDIAN); @@ -5009,7 +5009,7 @@ static int dissect_lbmr_opt_version(tvbuff_t * tvb, int offset, packet_info * pi subtree = proto_item_add_subtree(subtree_item, ett_lbmr_opt_version); proto_tree_add_item(subtree, hf_lbmr_opt_version_type, tvb, offset + O_LBMR_LBMR_OPT_VERSION_T_TYPE, L_LBMR_LBMR_OPT_VERSION_T_TYPE, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_lbmr_opt_version_len, tvb, offset + O_LBMR_LBMR_OPT_VERSION_T_LEN, L_LBMR_LBMR_OPT_VERSION_T_LEN, ENC_BIG_ENDIAN); - flags_item = proto_tree_add_item(subtree, hf_lbmr_opt_version_flags, tvb, offset + O_LBMR_LBMR_OPT_VERSION_T_FLAGS, L_LBMR_LBMR_OPT_VERSION_T_FLAGS, ENC_NA); + flags_item = proto_tree_add_item(subtree, hf_lbmr_opt_version_flags, tvb, offset + O_LBMR_LBMR_OPT_VERSION_T_FLAGS, L_LBMR_LBMR_OPT_VERSION_T_FLAGS, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_item, ett_lbmr_opt_version_flags); proto_tree_add_item(flags_tree, hf_lbmr_opt_version_flags_ignore, tvb, offset + O_LBMR_LBMR_OPT_VERSION_T_FLAGS, L_LBMR_LBMR_OPT_VERSION_T_FLAGS, ENC_BIG_ENDIAN); proto_tree_add_item(flags_tree, hf_lbmr_opt_version_flags_ume, tvb, offset + O_LBMR_LBMR_OPT_VERSION_T_FLAGS, L_LBMR_LBMR_OPT_VERSION_T_FLAGS, ENC_BIG_ENDIAN); @@ -5029,7 +5029,7 @@ static int dissect_lbmr_opt_local_domain(tvbuff_t * tvb, int offset, packet_info subtree = proto_item_add_subtree(subtree_item, ett_lbmr_opt_local_domain); proto_tree_add_item(subtree, hf_lbmr_opt_local_domain_type, tvb, offset + O_LBMR_LBMR_OPT_LOCAL_DOMAIN_T_TYPE, L_LBMR_LBMR_OPT_LOCAL_DOMAIN_T_TYPE, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_lbmr_opt_local_domain_len, tvb, offset + O_LBMR_LBMR_OPT_LOCAL_DOMAIN_T_LEN, L_LBMR_LBMR_OPT_LOCAL_DOMAIN_T_LEN, ENC_BIG_ENDIAN); - flags_item = proto_tree_add_item(subtree, hf_lbmr_opt_local_domain_flags, tvb, offset + O_LBMR_LBMR_OPT_LOCAL_DOMAIN_T_FLAGS, L_LBMR_LBMR_OPT_LOCAL_DOMAIN_T_FLAGS, ENC_NA); + flags_item = proto_tree_add_item(subtree, hf_lbmr_opt_local_domain_flags, tvb, offset + O_LBMR_LBMR_OPT_LOCAL_DOMAIN_T_FLAGS, L_LBMR_LBMR_OPT_LOCAL_DOMAIN_T_FLAGS, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_item, ett_lbmr_opt_local_domain_flags); proto_tree_add_item(flags_tree, hf_lbmr_opt_local_domain_flags_ignore, tvb, offset + O_LBMR_LBMR_OPT_LOCAL_DOMAIN_T_FLAGS, L_LBMR_LBMR_OPT_LOCAL_DOMAIN_T_FLAGS, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_lbmr_opt_local_domain_local_domain_id, tvb, offset + O_LBMR_LBMR_OPT_LOCAL_DOMAIN_T_LOCAL_DOMAIN_ID, L_LBMR_LBMR_OPT_LOCAL_DOMAIN_T_LOCAL_DOMAIN_ID, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c index 4f8781ae2b..def732f215 100644 --- a/epan/dissectors/packet-lisp.c +++ b/epan/dissectors/packet-lisp.c @@ -2210,7 +2210,7 @@ dissect_lisp_map_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tre itr_afi = tvb_get_ntohs(tvb, offset); tir = proto_tree_add_item(lisp_tree, hf_lisp_mreq_itr_rloc, tvb, offset, 2, ENC_NA); lisp_itr_tree = proto_item_add_subtree(tir, ett_lisp_itr); - proto_tree_add_item(lisp_itr_tree, hf_lisp_mreq_itr_rloc_afi, tvb, offset, 2, ENC_NA); + proto_tree_add_item(lisp_itr_tree, hf_lisp_mreq_itr_rloc_afi, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; switch (itr_afi) { @@ -2269,7 +2269,7 @@ dissect_lisp_map_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tre proto_tree_add_item(lisp_record_tree, hf_lisp_mreq_record_prefix_length, tvb, offset, 1, ENC_NA); offset += 1; - proto_tree_add_item(lisp_record_tree, hf_lisp_mreq_record_prefix_afi, tvb, offset, 2, ENC_NA); + proto_tree_add_item(lisp_record_tree, hf_lisp_mreq_record_prefix_afi, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; switch (prefix_afi) { diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index 1aaf1868d3..ef5ad522a0 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -1048,7 +1048,7 @@ dissect_lldp_chassis_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui break; default: strPtr = tvb_bytes_to_ep_str(tvb, offset, (dataLen-2)); - proto_tree_add_item(chassis_tree, hf_chassis_id, tvb, offset, (dataLen-2), ENC_ASCII|ENC_NA); + proto_tree_add_item(chassis_tree, hf_chassis_id, tvb, offset, (dataLen-2), ENC_NA); break; } @@ -1089,7 +1089,7 @@ dissect_lldp_chassis_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui break; } - proto_tree_add_item(chassis_tree, hf_chassis_id, tvb, offset, (dataLen-1), ENC_ASCII|ENC_NA); + proto_tree_add_item(chassis_tree, hf_chassis_id, tvb, offset, (dataLen-1), ENC_NA); offset += (dataLen - 1); break; diff --git a/epan/dissectors/packet-lltd.c b/epan/dissectors/packet-lltd.c index ef51a30d2e..8a51d5d747 100644 --- a/epan/dissectors/packet-lltd.c +++ b/epan/dissectors/packet-lltd.c @@ -637,7 +637,7 @@ dissect_lltd_discovery(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int func_subtree = proto_tree_add_subtree(func_tree, tvb, offset+16+loop_offset, 20, ett_recvee_descs_item, NULL, "RecveeDescs Item"); - proto_tree_add_item(func_subtree, hf_lltd_queryresp_type, tvb, offset+16+loop_offset, 2, ENC_NA); + proto_tree_add_item(func_subtree, hf_lltd_queryresp_type, tvb, offset+16+loop_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(func_subtree, hf_lltd_queryresp_real_src_addr, tvb, offset+16+loop_offset+2, 6, ENC_NA); proto_tree_add_item(func_subtree, hf_lltd_queryresp_ethernet_src_addr, tvb, offset+16+loop_offset+8, 6, ENC_NA); proto_tree_add_item(func_subtree, hf_lltd_queryresp_ethernet_dest_addr, tvb, offset+16+loop_offset+14, 6, ENC_NA); diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c index f4132e82cc..bc529b4cf4 100644 --- a/epan/dissectors/packet-maccontrol.c +++ b/epan/dissectors/packet-maccontrol.c @@ -187,14 +187,14 @@ dissect_macctrl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Assigned Port */ proto_tree_add_item(macctrl_tree, hf_reg_port, tvb, - 6, 2, ENC_NA); + 6, 2, ENC_BIG_ENDIAN); /* Flags */ proto_tree_add_item(macctrl_tree, hf_reg_flags, tvb, 8, 1, ENC_NA); /* Synch Time */ proto_tree_add_item(macctrl_tree, hf_reg_time, tvb, - 9, 2, ENC_NA); + 9, 2, ENC_BIG_ENDIAN); /* Echoed Pending Grants */ proto_tree_add_item(macctrl_tree, hf_reg_grants, tvb, @@ -209,11 +209,11 @@ dissect_macctrl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Echoed Assigned Port */ proto_tree_add_item(macctrl_tree, hf_reg_ack_port, tvb, - 7, 2, ENC_NA); + 7, 2, ENC_BIG_ENDIAN); /* Echoed Synch Time */ proto_tree_add_item(macctrl_tree, hf_reg_ack_time, tvb, - 9, 2, ENC_NA); + 9, 2, ENC_BIG_ENDIAN); break; case MACCTRL_CLASS_BASED_FLOW_CNTRL_PAUSE: diff --git a/epan/dissectors/packet-macsec.c b/epan/dissectors/packet-macsec.c index b759cd8d4a..bbd61b9b36 100644 --- a/epan/dissectors/packet-macsec.c +++ b/epan/dissectors/packet-macsec.c @@ -124,13 +124,13 @@ static int dissect_macsec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v proto_tree_add_item(tci_tree, hf_macsec_TCI_C, tvb, sectag_offset, 1, ENC_NA); proto_tree_add_item(tci_tree, hf_macsec_AN, tvb, sectag_offset, 1, ENC_NA); proto_tree_add_item(macsec_tree, hf_macsec_SL, tvb, sectag_offset + 1, 1, ENC_NA); - proto_tree_add_item(macsec_tree, hf_macsec_PN, tvb, sectag_offset + 2, 4, ENC_NA); + proto_tree_add_item(macsec_tree, hf_macsec_PN, tvb, sectag_offset + 2, 4, ENC_BIG_ENDIAN); if (sectag_length == 14) { proto_tree_add_item(macsec_tree, hf_macsec_SCI_System_identifier, tvb, sectag_offset + 6, 6, ENC_NA); proto_tree_add_item(macsec_tree, hf_macsec_SCI_port_number, tvb, - sectag_offset + 12, 2, ENC_NA); + sectag_offset + 12, 2, ENC_BIG_ENDIAN); } call_dissector(data_handle, next_tvb, pinfo, tree); diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c index 621a32aada..4a8f524b59 100644 --- a/epan/dissectors/packet-mikey.c +++ b/epan/dissectors/packet-mikey.c @@ -957,7 +957,7 @@ dissect_payload_idr(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo _U_, p if (tree) { proto_tree_add_item(tree, hf_mikey[POS_ID_ROLE], tvb, 1, 1, ENC_NA); proto_tree_add_item(tree, hf_mikey[POS_ID_TYPE], tvb, 2, 1, ENC_NA); - proto_tree_add_item(tree, hf_mikey[POS_ID_LEN], tvb, 3, 2, ENC_NA); + proto_tree_add_item(tree, hf_mikey[POS_ID_LEN], tvb, 3, 2, ENC_BIG_ENDIAN); } tvb_ensure_bytes_exist(tvb, offset+5, length); diff --git a/epan/dissectors/packet-mrp-mmrp.c b/epan/dissectors/packet-mrp-mmrp.c index ec75791a75..b2165eaff1 100644 --- a/epan/dissectors/packet-mrp-mmrp.c +++ b/epan/dissectors/packet-mrp-mmrp.c @@ -334,7 +334,7 @@ dissect_mmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) vect_offset += vect_attr_len; /* Move to next Vector Attribute, if there is one */ } /* Multiple VectorAttribute while() */ - proto_tree_add_item(attr_list_tree, hf_mmrp_end_mark, tvb, offset, 2, ENC_NA); /* VectorAttribute EndMark */ + proto_tree_add_item(attr_list_tree, hf_mmrp_end_mark, tvb, offset, 2, ENC_BIG_ENDIAN); /* VectorAttribute EndMark */ proto_item_set_len(attr_list_ti, vect_offset); /*without an endmark*/ msg_offset += vect_offset + 2; /* + endmark; Move to next Message, if there is one */ @@ -342,7 +342,7 @@ dissect_mmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Multiple Message while() */ - proto_tree_add_item(mmrp_tree, hf_mmrp_end_mark, tvb, offset+2, 2, ENC_NA); /* Message EndMark */ + proto_tree_add_item(mmrp_tree, hf_mmrp_end_mark, tvb, offset+2, 2, ENC_BIG_ENDIAN); /* Message EndMark */ } } diff --git a/epan/dissectors/packet-mrp-mvrp.c b/epan/dissectors/packet-mrp-mvrp.c index ce010f5ed5..2be8238073 100644 --- a/epan/dissectors/packet-mrp-mvrp.c +++ b/epan/dissectors/packet-mrp-mvrp.c @@ -331,7 +331,7 @@ dissect_mvrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) vect_offset += vect_attr_len; /* Move to next Vector Attribute, if there is one */ } /* Multiple VectorAttribute while() */ - proto_tree_add_item(attr_list_tree, hf_mvrp_end_mark, tvb, offset, 2, ENC_NA); /* VectorAttribute EndMark */ + proto_tree_add_item(attr_list_tree, hf_mvrp_end_mark, tvb, offset, 2, ENC_BIG_ENDIAN); /* VectorAttribute EndMark */ proto_item_set_len(attr_list_ti, vect_offset); /*without an endmark*/ msg_offset += vect_offset + 2; /* + endmark; Move to next Message, if there is one */ @@ -339,7 +339,7 @@ dissect_mvrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Multiple Message while() */ - proto_tree_add_item(mvrp_tree, hf_mvrp_end_mark, tvb, offset+2, 2, ENC_NA); /* Message EndMark */ + proto_tree_add_item(mvrp_tree, hf_mvrp_end_mark, tvb, offset+2, 2, ENC_BIG_ENDIAN); /* Message EndMark */ } } diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index 40e6147ff0..1087767558 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -980,7 +980,7 @@ mysql_dissect_login(tvbuff_t *tvb, packet_info *pinfo, int offset, int length; lenfle = tvb_get_fle(tvb, offset, &connattrs_length, NULL); - tf = proto_tree_add_item(login_tree, hf_mysql_connattrs, tvb, offset, (guint32)connattrs_length, ENC_ASCII|ENC_NA); + tf = proto_tree_add_item(login_tree, hf_mysql_connattrs, tvb, offset, (guint32)connattrs_length, ENC_NA); connattrs_tree = proto_item_add_subtree(tf, ett_connattrs); proto_tree_add_uint64(connattrs_tree, hf_mysql_connattrs_length, tvb, offset, lenfle, connattrs_length); offset += lenfle; @@ -1308,7 +1308,7 @@ mysql_dissect_request(tvbuff_t *tvb,packet_info *pinfo, int offset, int length; lenfle = tvb_get_fle(tvb, offset, &connattrs_length, NULL); - tf = proto_tree_add_item(req_tree, hf_mysql_connattrs, tvb, offset, (guint32)connattrs_length, ENC_ASCII|ENC_NA); + tf = proto_tree_add_item(req_tree, hf_mysql_connattrs, tvb, offset, (guint32)connattrs_length, ENC_NA); connattrs_tree = proto_item_add_subtree(tf, ett_connattrs); proto_tree_add_uint64(connattrs_tree, hf_mysql_connattrs_length, tvb, offset, lenfle, connattrs_length); offset += lenfle; @@ -1447,7 +1447,7 @@ mysql_dissect_request(tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree_add_item(req_tree, hf_mysql_binlog_position, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(req_tree, hf_mysql_binlog_flags, tvb, offset, 2, ENC_NA); + proto_tree_add_item(req_tree, hf_mysql_binlog_flags, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(req_tree, hf_mysql_binlog_server_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-openflow_v4.c b/epan/dissectors/packet-openflow_v4.c index f17fea22f3..9e7868bd33 100644 --- a/epan/dissectors/packet-openflow_v4.c +++ b/epan/dissectors/packet-openflow_v4.c @@ -1687,7 +1687,7 @@ dissect_openflow_switch_features_v4(tvbuff_t *tvb, packet_info *pinfo _U_, proto proto_tree *cap_tree; /* uint64_t datapath_id; */ - proto_tree_add_item(tree, hf_openflow_v4_switch_features_datapath_id, tvb, offset, 8, ENC_NA); + proto_tree_add_item(tree, hf_openflow_v4_switch_features_datapath_id, tvb, offset, 8, ENC_BIG_ENDIAN); offset+=8; /* uint32_t n_buffers; */ @@ -1703,7 +1703,7 @@ dissect_openflow_switch_features_v4(tvbuff_t *tvb, packet_info *pinfo _U_, proto offset++; /* uint8_t pad[2]; */ - proto_tree_add_item(tree, hf_openflow_v4_switch_features_pad, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_openflow_v4_switch_features_pad, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; /* uint32_t capabilities; */ @@ -1720,7 +1720,7 @@ dissect_openflow_switch_features_v4(tvbuff_t *tvb, packet_info *pinfo _U_, proto offset+=4; /* uint32_t reserved; */ - proto_tree_add_item(tree, hf_openflow_v4_switch_features_reserved, tvb, offset, 4, ENC_NA); + proto_tree_add_item(tree, hf_openflow_v4_switch_features_reserved, tvb, offset, 4, ENC_BIG_ENDIAN); /*offset+=4;*/ } diff --git a/epan/dissectors/packet-openflow_v5.c b/epan/dissectors/packet-openflow_v5.c index 73e3f31fe4..a848b2c8f4 100644 --- a/epan/dissectors/packet-openflow_v5.c +++ b/epan/dissectors/packet-openflow_v5.c @@ -1914,7 +1914,7 @@ dissect_openflow_switch_features_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto proto_tree *cap_tree; /* uint64_t datapath_id; */ - proto_tree_add_item(tree, hf_openflow_v5_switch_features_datapath_id, tvb, offset, 8, ENC_NA); + proto_tree_add_item(tree, hf_openflow_v5_switch_features_datapath_id, tvb, offset, 8, ENC_BIG_ENDIAN); offset+=8; /* uint32_t n_buffers; */ @@ -1930,7 +1930,7 @@ dissect_openflow_switch_features_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto offset++; /* uint8_t pad[2]; */ - proto_tree_add_item(tree, hf_openflow_v5_switch_features_pad, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_openflow_v5_switch_features_pad, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; /* uint32_t capabilities; */ @@ -1947,7 +1947,7 @@ dissect_openflow_switch_features_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto offset+=4; /* uint32_t reserved; */ - proto_tree_add_item(tree, hf_openflow_v5_switch_features_reserved, tvb, offset, 4, ENC_NA); + proto_tree_add_item(tree, hf_openflow_v5_switch_features_reserved, tvb, offset, 4, ENC_BIG_ENDIAN); /*offset+=4;*/ } @@ -3030,7 +3030,7 @@ dissect_openflow_flowmod_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t offset+=2; /* uint16_t importance; */ - proto_tree_add_item(tree, hf_openflow_v5_flowmod_importance, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_openflow_v5_flowmod_importance, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; /* struct ofp_match match; */ @@ -3749,7 +3749,7 @@ dissect_openflow_table_features_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ offset+=8; /* uint32_t capabilities; */ - ti = proto_tree_add_item(feat_tree, hf_openflow_v5_table_features_capabilities, tvb, offset, 4, ENC_NA); + ti = proto_tree_add_item(feat_tree, hf_openflow_v5_table_features_capabilities, tvb, offset, 4, ENC_BIG_ENDIAN); caps_tree = proto_item_add_subtree(ti, ett_openflow_v5_table_features_capabilities); proto_tree_add_item(caps_tree, hf_openflow_v5_table_features_capabilities_eviction, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -3929,7 +3929,7 @@ dissect_openflow_flow_monitor_request_v5(tvbuff_t *tvb, packet_info *pinfo _U_, offset+=4; /* uint16_t flags; */ - ti = proto_tree_add_item(tree, hf_openflow_v5_flow_monitor_request_flags, tvb, offset, 2, ENC_NA); + ti = proto_tree_add_item(tree, hf_openflow_v5_flow_monitor_request_flags, tvb, offset, 2, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(ti, ett_openflow_v5_flow_monitor_request_flags); proto_tree_add_item(flags_tree, hf_openflow_v5_flow_monitor_request_flags_initial, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -4182,7 +4182,7 @@ dissect_openflow_flow_stats_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree offset+=2; /* uint16_t importance; */ - proto_tree_add_item(stats_tree, hf_openflow_v5_flow_stats_importance, tvb, offset, 4, ENC_NA); + proto_tree_add_item(stats_tree, hf_openflow_v5_flow_stats_importance, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=2; /* uint8_t pad2[2]; */ diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index 6aab96b519..d79df6c235 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -1152,7 +1152,7 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case OSPF_VERSION_2: /* Authentication is only valid for OSPFv2 */ - proto_tree_add_item(ospf_header_tree, hf_ospf_header_auth_type, tvb, 14, 2, ENC_NA); + proto_tree_add_item(ospf_header_tree, hf_ospf_header_auth_type, tvb, 14, 2, ENC_BIG_ENDIAN); auth_type = tvb_get_ntohs(tvb, 14); switch (auth_type) { case OSPF_AUTH_NONE: diff --git a/epan/dissectors/packet-ouch.c b/epan/dissectors/packet-ouch.c index 583529f67c..f3b41423d2 100644 --- a/epan/dissectors/packet-ouch.c +++ b/epan/dissectors/packet-ouch.c @@ -1256,7 +1256,7 @@ dissect_ouch( /* Unknown */ proto_tree_add_item(tree, hf_ouch_message, - tvb, offset, -1, ENC_ASCII|ENC_NA); + tvb, offset, -1, ENC_NA); offset += reported_len - 1; break; } diff --git a/epan/dissectors/packet-pathport.c b/epan/dissectors/packet-pathport.c index 412662a5ef..29fdd3a464 100644 --- a/epan/dissectors/packet-pathport.c +++ b/epan/dissectors/packet-pathport.c @@ -378,13 +378,13 @@ static guint dissect_one_tlv(tvbuff_t *tvb, proto_tree *tree, const char *name = val_to_str_ext(type, &pp_pid_vals_ext, TYPE_UNKNOWN); proto_item_append_text(ti, " : %s", name); - proto_tree_add_item(tlv_tree, hf_pp_pid_type, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tlv_tree, hf_pp_pid_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; len = tvb_get_ntohs(tvb, offset); proto_item_set_len(ti, 4 + len); - proto_tree_add_item(tlv_tree, hf_pp_pid_len, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tlv_tree, hf_pp_pid_len, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tlv_tree, hf_pp_pid_value, tvb, offset, len, ENC_NA); @@ -418,7 +418,7 @@ dissect_multiple_get_pids(tvbuff_t *tvb, proto_item *tree, guint offset, guint l while(offset < end) { - proto_tree_add_item(tree, hf_pp_get_type, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_pp_get_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } return len; @@ -435,16 +435,16 @@ dissect_data_payload(tvbuff_t *tvb, proto_item *tree, guint offset, guint len) { proto_item *ti; proto_tree *data_tree = proto_tree_add_subtree(tree, tvb, offset, 0, ett_pp_data, &ti, "xDMX Data: "); - proto_tree_add_item(data_tree, hf_pp_data_encoding, tvb, offset, 2, ENC_NA); + proto_tree_add_item(data_tree, hf_pp_data_encoding, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; blklen = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(data_tree, hf_pp_data_len, tvb, offset, 2, ENC_NA); + proto_tree_add_item(data_tree, hf_pp_data_len, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(data_tree, hf_pp_reserved, tvb, offset++, 1, ENC_NA); stc = tvb_get_guint8(tvb, offset); proto_tree_add_item(data_tree, hf_pp_data_start_code, tvb, offset++, 1, ENC_NA); xdmx = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(data_tree, hf_pp_data_dst, tvb, offset, 2, ENC_NA); + proto_tree_add_item(data_tree, hf_pp_data_dst, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(data_tree, hf_pp_data_levels, tvb, offset, blklen, ENC_NA); proto_item_append_text(ti, "%d Channels at xDMX %d (Univ %d.%d) StartCode: %d ", blklen, xdmx, xdmx / 512 + 1, xdmx % 512, stc); @@ -456,7 +456,7 @@ dissect_data_payload(tvbuff_t *tvb, proto_item *tree, guint offset, guint len) static guint dissect_arp_reply(tvbuff_t *tvb, proto_tree *tree, guint offset, guint len) { - proto_tree_add_item(tree, hf_pp_arp_id, tvb, offset, 4, ENC_NA); + proto_tree_add_item(tree, hf_pp_arp_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_pp_arp_ip, tvb, offset, 4, ENC_NA); offset += 4; @@ -480,13 +480,13 @@ dissect_one_pdu(tvbuff_t *tvb, proto_tree *tree, guint offset) proto_item_append_text(ti, " : %s", name); - proto_tree_add_item(pdu_tree, hf_pp_pdu_type, tvb, offset, 2, ENC_NA); + proto_tree_add_item(pdu_tree, hf_pp_pdu_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; len = tvb_get_ntohs(tvb, offset); proto_item_set_len(ti, 4 + len); - proto_tree_add_item(pdu_tree, hf_pp_pdu_len, tvb, offset, 2, ENC_NA); + proto_tree_add_item(pdu_tree, hf_pp_pdu_len, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; switch(type) @@ -529,17 +529,17 @@ dissect_header(tvbuff_t *tvb, proto_tree *parent, guint offset) { proto_tree *tree = proto_tree_add_subtree(parent, tvb, offset, PATHPORT_HEADER_LENGTH, ett_pathport, NULL, "Header"); - proto_tree_add_item(tree, hf_pp_prot, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_pp_prot, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_pp_version, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_pp_version, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_pp_seq, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_pp_seq, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pp_reserved, tvb, offset, 6, ENC_NA); offset += 6; - proto_tree_add_item(tree, hf_pp_src, tvb, offset, 4, ENC_NA); + proto_tree_add_item(tree, hf_pp_src, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pp_dst, tvb, offset, 4, ENC_NA); + proto_tree_add_item(tree, hf_pp_dst, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; } diff --git a/epan/dissectors/packet-pdc.c b/epan/dissectors/packet-pdc.c index f3c5a7b2fa..22d1fe7d3a 100644 --- a/epan/dissectors/packet-pdc.c +++ b/epan/dissectors/packet-pdc.c @@ -191,13 +191,13 @@ static int dissect_simpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset, guint break; case PARAM_CODE_REFERENCES: proto_tree_add_item(simpduVarTree1, hf_pdc_simpdu_var_len, tvb, offset + bytesProcessed, 1, ENC_NA); - proto_tree_add_item(simpduVarTree1, hf_pdc_simpdu_var_REFSRC, tvb, offset + bytesProcessed + 1, 2, ENC_NA); - proto_tree_add_item(simpduVarTree1, hf_pdc_simpdu_var_REFDEST, tvb, offset + bytesProcessed + 3, 2, ENC_NA); + proto_tree_add_item(simpduVarTree1, hf_pdc_simpdu_var_REFSRC, tvb, offset + bytesProcessed + 1, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(simpduVarTree1, hf_pdc_simpdu_var_REFDEST, tvb, offset + bytesProcessed + 3, 2, ENC_BIG_ENDIAN); bytesProcessed += 5; break; case PARAM_CODE_TRANSPORT: proto_tree_add_item(simpduVarTree1, hf_pdc_simpdu_var_len, tvb, offset + bytesProcessed, 1, ENC_NA); - proto_tree_add_item(simpduVarTree1, hf_pdc_simpdu_var_TSEL, tvb, offset + bytesProcessed + 1, 2, ENC_NA); + proto_tree_add_item(simpduVarTree1, hf_pdc_simpdu_var_TSEL, tvb, offset + bytesProcessed + 1, 2, ENC_BIG_ENDIAN); bytesProcessed += 3; break; } diff --git a/epan/dissectors/packet-ppcap.c b/epan/dissectors/packet-ppcap.c index af216641d7..cb6cccd3da 100644 --- a/epan/dissectors/packet-ppcap.c +++ b/epan/dissectors/packet-ppcap.c @@ -323,7 +323,7 @@ dissect_ppcap_source_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree * ppc else if (key1 == 4) { - proto_tree_add_item(ppcap_tree1, hf_ppcap_source_nodeid, tvb, offset, msg_len, ENC_BIG_ENDIAN|ENC_ASCII); + proto_tree_add_item(ppcap_tree1, hf_ppcap_source_nodeid, tvb, offset, msg_len, ENC_ASCII|ENC_NA); TVB_SET_ADDRESS(&pinfo->net_src, AT_STRINGZ, tvb, offset, msg_len); COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); } @@ -499,7 +499,7 @@ dissect_ppcap_tcp_sip_msg(tvbuff_t *tvb,proto_tree * ppcap_tree1, int offset) { proto_tree_add_item( ppcap_tree1, hf_ppcap_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; - proto_tree_add_item(ppcap_tree1, hf_ppcap_tcp_sip_type, tvb, offset, 4, ENC_BIG_ENDIAN|ENC_ASCII); + proto_tree_add_item(ppcap_tree1, hf_ppcap_tcp_sip_type, tvb, offset, 4, ENC_ASCII|ENC_NA); offset += 4; return offset; } diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c index a1c79558dd..a27f590af0 100644 --- a/epan/dissectors/packet-ptp.c +++ b/epan/dissectors/packet-ptp.c @@ -2643,7 +2643,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, PTP_V2_AN_TLV_OFFSET + tlv_total_length + PTP_V2_AN_TLV_OE_IEEEC37238TLV_RESERVED_OFFSET, 2, - ENC_NA); + ENC_BIG_ENDIAN); break; } default: diff --git a/epan/dissectors/packet-quic.c b/epan/dissectors/packet-quic.c index cf1dfd4435..1ebf92d740 100644 --- a/epan/dissectors/packet-quic.c +++ b/epan/dissectors/packet-quic.c @@ -162,7 +162,7 @@ dissect_quic_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Version */ if(puflags & PUFLAGS_VRSN){ - proto_tree_add_item(quic_tree, hf_quic_version, tvb, offset, 4, ENC_ASCII||ENC_NA); + proto_tree_add_item(quic_tree, hf_quic_version, tvb, offset, 4, ENC_ASCII|ENC_NA); offset += 4; } diff --git a/epan/dissectors/packet-rpki-rtr.c b/epan/dissectors/packet-rpki-rtr.c index 85f18027ae..20d14f4729 100644 --- a/epan/dissectors/packet-rpki-rtr.c +++ b/epan/dissectors/packet-rpki-rtr.c @@ -269,7 +269,7 @@ static int dissect_rpkirtr_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_length, tvb, offset, 4, ENC_BIG_ENDIAN); /* TODO: Add check length ? */ offset += 4; - proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_subject_key_identifier, tvb, offset, 20, ENC_ASCII|ENC_NA); + proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_subject_key_identifier, tvb, offset, 20, ENC_NA); offset += 20; proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_as_number, tvb, offset, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 7b280d8111..a84c6137fb 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -2740,10 +2740,10 @@ dissect_rtcp_profile_specific_extensions (packet_info *pinfo, tvbuff_t *tvb, pro val_to_str_const(extension_type, rtcp_ms_profile_extension_vals, "Unknown")); proto_tree_add_item(pse_tree, hf_rtcp_profile_specific_extension_type, tvb, offset, - 2, ENC_NA); + 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(pse_tree, hf_rtcp_profile_specific_extension_length, tvb, offset, - 2, ENC_NA); + 2, ENC_BIG_ENDIAN); offset += 2; switch (extension_type) diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index 90e8c8f4f9..da9a75b536 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -2487,7 +2487,7 @@ dissect_amf(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) headers_tree = proto_tree_add_subtree(amf_tree, tvb, offset, -1, ett_amf_headers, NULL, "Headers"); for (i = 0; i < header_count; i++) { string_length = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(headers_tree, hf_amf_header_name, tvb, offset, 2, ENC_BIG_ENDIAN|ENC_UTF_8); + proto_tree_add_item(headers_tree, hf_amf_header_name, tvb, offset, 2, ENC_UTF_8|ENC_BIG_ENDIAN); offset += 2 + string_length; proto_tree_add_item(headers_tree, hf_amf_header_must_understand, tvb, offset, 1, ENC_NA); offset += 1; @@ -2510,10 +2510,10 @@ dissect_amf(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) messages_tree = proto_tree_add_subtree(amf_tree, tvb, offset, -1, ett_amf_messages, NULL, "Messages"); for (i = 0; i < message_count; i++) { string_length = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(messages_tree, hf_amf_message_target_uri, tvb, offset, 2, ENC_BIG_ENDIAN|ENC_UTF_8); + proto_tree_add_item(messages_tree, hf_amf_message_target_uri, tvb, offset, 2, ENC_UTF_8|ENC_BIG_ENDIAN); offset += 2 + string_length; string_length = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(messages_tree, hf_amf_message_response_uri, tvb, offset, 2, ENC_BIG_ENDIAN|ENC_UTF_8); + proto_tree_add_item(messages_tree, hf_amf_message_response_uri, tvb, offset, 2, ENC_UTF_8|ENC_BIG_ENDIAN); offset += 2 + string_length; message_length = tvb_get_ntohl(tvb, offset); if (message_length == 0xFFFFFFFF) diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index cdca4183f6..24707d8a78 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -2509,8 +2509,7 @@ void rtps_util_add_seq_octets(proto_tree *tree, packet_info *pinfo, tvbuff_t* tv return; } - proto_tree_add_item(tree, hf_id, tvb, offset+4, seq_length, - little_endian ? ENC_LITTLE_ENDIAN : ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_id, tvb, offset+4, seq_length, ENC_NA); } @@ -4098,7 +4097,7 @@ static gboolean dissect_parameter_sequence_v1(proto_tree *rtps_parameter_tree, p case PID_PAD: if (param_length > 0) { proto_tree_add_item(rtps_parameter_tree, hf_rtps_parameter_data, tvb, - offset, param_length, little_endian ? ENC_LITTLE_ENDIAN : ENC_BIG_ENDIAN); + offset, param_length, ENC_NA); } break; @@ -4441,7 +4440,7 @@ static gint dissect_parameter_sequence(proto_tree *tree, packet_info *pinfo, tvb pStatusInfo, vendor_id)) { if (param_length > 0) { proto_tree_add_item(rtps_parameter_tree, hf_rtps_parameter_data, tvb, - offset, param_length, little_endian ? ENC_LITTLE_ENDIAN : ENC_BIG_ENDIAN); + offset, param_length, ENC_NA); } } } @@ -4636,7 +4635,7 @@ static void dissect_serialized_data(proto_tree *tree, packet_info *pinfo, tvbuff case ENCAPSULATION_CDR_LE: case ENCAPSULATION_CDR_BE: proto_tree_add_item(rtps_parameter_sequence_tree, hf_rtps_issue_data, tvb, - offset, size, encapsulation_little_endian ? ENC_LITTLE_ENDIAN : ENC_BIG_ENDIAN); + offset, size, ENC_NA); break; case ENCAPSULATION_PL_CDR_LE: @@ -4651,7 +4650,7 @@ static void dissect_serialized_data(proto_tree *tree, packet_info *pinfo, tvbuff default: proto_tree_add_item(rtps_parameter_sequence_tree, hf_rtps_data_serialize_data, tvb, - offset, size, encapsulation_little_endian ? ENC_LITTLE_ENDIAN : ENC_BIG_ENDIAN); + offset, size, ENC_NA); } } @@ -5067,7 +5066,7 @@ static void dissect_DATA_v1(tvbuff_t *tvb, packet_info *pinfo, gint offset, guin } else { proto_tree_add_item(tree, hf_rtps_issue_data, tvb, offset, octets_to_next_header - (offset - old_offset) + 4, - little_endian ? ENC_LITTLE_ENDIAN : ENC_BIG_ENDIAN); + ENC_NA); } } } @@ -5464,7 +5463,7 @@ static void dissect_NOKEY_DATA(tvbuff_t *tvb, packet_info *pinfo, gint offset, g if ((version < 0x0200) && (flags & FLAG_NOKEY_DATA_D) == 0) { proto_tree_add_item(tree, hf_rtps_issue_data, tvb, offset, octets_to_next_header - (offset - old_offset) + 4, - little_endian ? ENC_LITTLE_ENDIAN : ENC_BIG_ENDIAN); + ENC_NA); } if ((version >= 0x0200) && (flags & FLAG_DATA_D_v2) != 0) { diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index a6f6ea75a7..461c53b21a 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -3323,7 +3323,7 @@ dissect_spc_extcopy(tvbuff_t *tvb, packet_info *pinfo _U_, } offset += 1; - proto_tree_add_item(tree, hf_scsi_reserved_64, tvb, offset, 8, ENC_NA); + proto_tree_add_item(tree, hf_scsi_reserved_64, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; proto_tree_add_item(tree, hf_scsi_spc_xcopy_param_list_len, tvb, offset, 4, ENC_BIG_ENDIAN); /*param_list_len = tvb_get_ntohl(tvb, offset); */ @@ -3350,7 +3350,7 @@ dissect_spc_extcopy(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_scsi_spc_xcopy_cscd_desc_list_len, tvb, offset, 2, ENC_BIG_ENDIAN); cscd_desc_list_len = tvb_get_ntohs(tvb, offset); offset += 2; - proto_tree_add_item(tree, hf_scsi_reserved_32, tvb, offset, 4, ENC_NA); + proto_tree_add_item(tree, hf_scsi_reserved_32, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_scsi_spc_xcopy_seg_desc_list_len, tvb, offset, 4, ENC_BIG_ENDIAN); seg_desc_list_len = tvb_get_ntohl(tvb, offset); @@ -3428,15 +3428,15 @@ dissect_spc_extcopy(tvbuff_t *tvb, packet_info *pinfo _U_, offset += 1; proto_tree_add_text(seg_tree, tvb, offset, 2, "Segment descriptor length (bytes): %u", seg_desc_len); offset += 2; - proto_tree_add_item(seg_tree, hf_scsi_spc_xcopy_seg_des_src_desc_id, tvb, offset, 2, ENC_NA); + proto_tree_add_item(seg_tree, hf_scsi_spc_xcopy_seg_des_src_desc_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(seg_tree, hf_scsi_spc_xcopy_seg_des_dest_desc_id, tvb, offset, 2, ENC_NA); + proto_tree_add_item(seg_tree, hf_scsi_spc_xcopy_seg_des_dest_desc_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; seg_param_tree = proto_tree_add_subtree(seg_tree, tvb, offset, seg_desc_len - 4, ett_scsi_xcopy_seg_param, NULL, "Segment descriptor parameters"); seg_desc_list_len -= (seg_desc_len + 4); if (seg_type == BLOCK_TO_BLOCK) { - proto_tree_add_item(seg_param_tree, hf_scsi_reserved_16, tvb, offset, 2, ENC_NA); + proto_tree_add_item(seg_param_tree, hf_scsi_reserved_16, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(seg_param_tree, hf_scsi_spc_xcopy_num_of_blocks, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -3482,7 +3482,7 @@ void dissect_spc_recvcopy(tvbuff_t *tvb _U_, packet_info *pinfo _U_, cdata->itlq->flags = serv_action; } offset += 1; - proto_tree_add_item(tree, hf_scsi_reserved_64, tvb, offset, 8, ENC_NA); + proto_tree_add_item(tree, hf_scsi_reserved_64, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; proto_tree_add_item(tree, hf_scsi_alloclen32, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -3504,7 +3504,7 @@ void dissect_spc_recvcopy(tvbuff_t *tvb _U_, packet_info *pinfo _U_, offset += 4; proto_tree_add_item(tree, hf_scsi_recv_copy_snlid, tvb, offset, 1, ENC_NA); offset += 1; - proto_tree_add_item(tree, hf_scsi_reserved_24, tvb, offset, 3, ENC_NA); + proto_tree_add_item(tree, hf_scsi_reserved_24, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; proto_tree_add_item(tree, hf_scsi_recv_copy_max_cscd_desc_count, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -3520,7 +3520,7 @@ void dissect_spc_recvcopy(tvbuff_t *tvb _U_, packet_info *pinfo _U_, offset += 4; proto_tree_add_item(tree, hf_scsi_recv_copy_max_stream_dev_trans_size, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_scsi_reserved_16, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_scsi_reserved_16, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_scsi_recv_copy_total_con_copies, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -3532,7 +3532,7 @@ void dissect_spc_recvcopy(tvbuff_t *tvb _U_, packet_info *pinfo _U_, offset += 1; proto_tree_add_item(tree, hf_scsi_recv_copy_held_data_gran, tvb, offset, 1, ENC_NA); offset += 1; - proto_tree_add_item(tree, hf_scsi_reserved_24, tvb, offset, 3, ENC_NA); + proto_tree_add_item(tree, hf_scsi_reserved_24, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; proto_tree_add_item(tree, hf_scsi_recv_copy_implemented_desc_list_len, tvb, offset, 1, ENC_NA); imp_desc_list_len = tvb_get_guint8(tvb, offset); @@ -4888,9 +4888,9 @@ dissect_spc_persistentreserveout(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr hf_scsi_persresvout_control, ett_persresv_control, persresv_fields, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_persresvout_rel_tpi, tvb, - offset+18, 2, ENC_NA); + offset+18, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_persresvout_transportid_len, tvb, - offset+20, 4, ENC_NA); + offset+20, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_persresvout_transportid, tvb, offset+24, tid_len, ENC_NA); } diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index 66ee7a866f..a5096a8d2c 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -1664,9 +1664,9 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto if (master_key_length != 0) { proto_tree_add_text(parameter_tree, tvb, offset, tokenlen, "Key and Salt"); proto_tree_add_item(parameter_tree, hf_sdp_crypto_master_key, - key_salt_tvb, 0, master_key_length, ENC_UTF_8|ENC_NA); + key_salt_tvb, 0, master_key_length, ENC_NA); proto_tree_add_item(parameter_tree, hf_sdp_crypto_master_salt, - key_salt_tvb, master_key_length, master_salt_length, ENC_UTF_8|ENC_NA); + key_salt_tvb, master_key_length, master_salt_length, ENC_NA); } else { proto_tree_add_text(parameter_tree, key_salt_tvb, 0, -1, "Key and Salt"); } diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index 4b30dda503..00d6903aec 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -1999,7 +1999,7 @@ dissect_fastser_frame(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, int o /* Add Index Number and Timestamp offset to tree */ proto_tree_add_item(fastser_element_tree, hf_selfm_fastser_unsresp_elmt_idx, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(fastser_element_tree, hf_selfm_fastser_unsresp_elmt_ts_ofs, tvb, offset+1, 3, ENC_NA); + proto_tree_add_item(fastser_element_tree, hf_selfm_fastser_unsresp_elmt_ts_ofs, tvb, offset+1, 3, ENC_BIG_ENDIAN); proto_tree_add_text(fastser_element_tree, tvb, offset+1, 3, "SER Element Timestamp Offset (decoded): %s", time_msecs_to_str(wmem_packet_scope(), tod_ms + (elmt_ts_offset/1000))); proto_tree_add_uint(fastser_element_tree, hf_selfm_fastser_unsresp_elmt_status, tvb, elmt_status32_ofs, 4, elmt_status); diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 5720800bbd..6811b06adc 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -11957,7 +11957,7 @@ dissect_4_2_16_2(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, CHECK_BYTE_COUNT_SUBR(2); proto_tree_add_item( - subtree, hf_smb_ea_data_length, tvb, offset, 2, ENC_NA); + subtree, hf_smb_ea_data_length, tvb, offset, 2, ENC_BIG_ENDIAN); COUNT_BYTES_SUBR(2); /* EA name */ diff --git a/epan/dissectors/packet-soupbintcp.c b/epan/dissectors/packet-soupbintcp.c index 9fcd04ba46..dbeb94939d 100644 --- a/epan/dissectors/packet-soupbintcp.c +++ b/epan/dissectors/packet-soupbintcp.c @@ -396,7 +396,7 @@ dissect_soupbintcp_common( /* Unknown */ proto_tree_add_item(tree, hf_soupbintcp_message, - tvb, offset, -1, ENC_ASCII|ENC_NA); + tvb, offset, -1, ENC_NA); break; } } @@ -439,7 +439,7 @@ dissect_soupbintcp_common( proto_tree_add_item(soupbintcp_tree, hf_soupbintcp_message, sub_tvb, 0, -1, - ENC_ASCII|ENC_NA); + ENC_NA); } } } diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c index 886f76d777..5e7a39b00b 100644 --- a/epan/dissectors/packet-spice.c +++ b/epan/dissectors/packet-spice.c @@ -2526,7 +2526,7 @@ dissect_spice_usbredir_client(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre { switch (message_type) { case SPICE_MSGC_SPICEVMC_DATA: - proto_tree_add_item(tree, hf_raw_data, tvb, offset, message_size, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_raw_data, tvb, offset, message_size, ENC_NA); offset += message_size; break; default: @@ -2541,7 +2541,7 @@ dissect_spice_usbredir_server(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre { switch (message_type) { case SPICE_MSG_SPICEVMC_DATA: - proto_tree_add_item(tree, hf_raw_data, tvb, offset, message_size, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_raw_data, tvb, offset, message_size, ENC_NA); offset += message_size; break; default: @@ -2556,7 +2556,7 @@ dissect_spice_port_client(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, c { switch (message_type) { case SPICE_MSGC_SPICEVMC_DATA: - proto_tree_add_item(tree, hf_raw_data, tvb, offset, message_size, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_raw_data, tvb, offset, message_size, ENC_NA); offset += message_size; break; case SPICE_MSGC_PORT_EVENT: @@ -2575,7 +2575,7 @@ dissect_spice_port_server(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, c { switch (message_type) { case SPICE_MSG_SPICEVMC_DATA: - proto_tree_add_item(tree, hf_raw_data, tvb, offset, message_size, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_raw_data, tvb, offset, message_size, ENC_NA); offset += message_size; break; case SPICE_MSG_PORT_INIT: diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c index c6d6c44ff9..31751bb762 100644 --- a/epan/dissectors/packet-zbee-zcl-general.c +++ b/epan/dissectors/packet-zbee-zcl-general.c @@ -2028,10 +2028,10 @@ dissect_zcl_ota_file_version_field(tvbuff_t *tvb, proto_tree *tree, guint *offse file_version = tvb_get_ntohl(tvb, *offset); ti = proto_tree_add_text(tree, tvb, *offset, 4, "File Version: 0x%08x", file_version); sub_tree = proto_item_add_subtree(ti, ett_zbee_zcl_ota_file_version); - proto_tree_add_item(sub_tree, hf_zbee_zcl_ota_file_version_appl_release, tvb, *offset, 4, ENC_NA); - proto_tree_add_item(sub_tree, hf_zbee_zcl_ota_file_version_appl_build, tvb, *offset, 4, ENC_NA); - proto_tree_add_item(sub_tree, hf_zbee_zcl_ota_file_version_stack_release, tvb, *offset, 4, ENC_NA); - proto_tree_add_item(sub_tree, hf_zbee_zcl_ota_file_version_stack_build, tvb, *offset, 4, ENC_NA); + proto_tree_add_item(sub_tree, hf_zbee_zcl_ota_file_version_appl_release, tvb, *offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_zbee_zcl_ota_file_version_appl_build, tvb, *offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_zbee_zcl_ota_file_version_stack_release, tvb, *offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_zbee_zcl_ota_file_version_stack_build, tvb, *offset, 4, ENC_BIG_ENDIAN); *offset += 4; } /*dissect_zcl_ota_file_version_field*/ @@ -2783,7 +2783,7 @@ void proto_register_zbee_zcl_ota(void) 0x0, NULL, HFILL } }, { &hf_zbee_zcl_ota_query_jitter, - { "Query Jitter", "zbee_zcl_general.ota.query_jitter", FT_UINT16, BASE_CUSTOM, decode_zcl_time_in_seconds, + { "Query Jitter", "zbee_zcl_general.ota.query_jitter", FT_UINT8, BASE_CUSTOM, decode_zcl_time_in_seconds, 0x0, NULL, HFILL } }, { &hf_zbee_zcl_ota_manufacturer_code, diff --git a/epan/dissectors/packet-zebra.c b/epan/dissectors/packet-zebra.c index fdec329079..5c34f26ec5 100644 --- a/epan/dissectors/packet-zebra.c +++ b/epan/dissectors/packet-zebra.c @@ -452,7 +452,7 @@ zebra_nexthop_lookup(proto_tree *tree, tvbuff_t *tvb, int offset, guint16 len, ENC_BIG_ENDIAN); offset += 4; } - proto_tree_add_item(tree, hf_zebra_metric,tvb, offset, 4, ENC_NA); + proto_tree_add_item(tree, hf_zebra_metric,tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; offset = zebra_route_nexthop(tree, tvb, offset, len); return offset; |