From a0863f4f37761dcbb986f453e39203dae2ad918d Mon Sep 17 00:00:00 2001 From: Martin Mathieson Date: Tue, 17 Jun 2025 09:46:14 +0000 Subject: [PATCH] Another batch of encodings --- .../asn1/HI2Operations/HI2Operations.cnf | 4 ++-- epan/dissectors/packet-HI2Operations.c | 4 ++-- epan/dissectors/packet-aim.c | 2 +- epan/dissectors/packet-at-ldf.c | 2 +- epan/dissectors/packet-awdl.c | 2 +- epan/dissectors/packet-batadv.c | 6 +++--- epan/dissectors/packet-bgp.c | 2 +- epan/dissectors/packet-bhttp.c | 2 +- epan/dissectors/packet-bt-utp.c | 2 +- epan/dissectors/packet-btatt.c | 6 +++--- epan/dissectors/packet-capwap.c | 2 +- epan/dissectors/packet-cisco-fp-mim.c | 6 +++--- epan/dissectors/packet-dect-nwk.c | 16 ++++++++-------- epan/dissectors/packet-http2.c | 2 +- epan/dissectors/packet-http3.c | 2 +- epan/dissectors/packet-isis-hello.c | 8 ++++---- epan/dissectors/packet-juniper.c | 4 ++-- epan/dissectors/packet-llrp.c | 6 +++--- epan/dissectors/packet-loratap.c | 10 +++++----- epan/dissectors/packet-srt.c | 2 +- epan/dissectors/packet-ubertooth.c | 12 ++++++------ 21 files changed, 51 insertions(+), 51 deletions(-) diff --git a/epan/dissectors/asn1/HI2Operations/HI2Operations.cnf b/epan/dissectors/asn1/HI2Operations/HI2Operations.cnf index ee8d3cd679..7427ed8aa7 100644 --- a/epan/dissectors/asn1/HI2Operations/HI2Operations.cnf +++ b/epan/dissectors/asn1/HI2Operations/HI2Operations.cnf @@ -38,7 +38,7 @@ GSMLocation/geoCoordinates/longitude geoCoordinates_longitude if (!parameter_tvb) return offset; - proto_tree_add_item(tree, hf_HI2Operations_apn_str, parameter_tvb, 0, tvb_captured_length(tvb), ENC_APN_STR | ENC_NA); + proto_tree_add_item(tree, hf_HI2Operations_apn_str, parameter_tvb, 0, tvb_captured_length(tvb), ENC_APN_STR); #.FN_HDR UUS1-Content @@ -215,7 +215,7 @@ GSMLocation/geoCoordinates/longitude geoCoordinates_longitude /* IMEISV is 16 digits, but often transmitted BCD coded in 8 octets. Some implementations use IMEI (15 digits) instead of IMEISV */ if (tvb_len == 8) { - proto_tree_add_item(tree, hf_HI2Operations_imei, tvb, offset, tvb_len, ENC_BCD_DIGITS_0_9|ENC_LITTLE_ENDIAN|ENC_NA); + proto_tree_add_item(tree, hf_HI2Operations_imei, tvb, offset, tvb_len, ENC_BCD_DIGITS_0_9|ENC_LITTLE_ENDIAN); } else { proto_tree_add_item(tree, hf_HI2Operations_imei, tvb, offset, tvb_len, ENC_ASCII); } diff --git a/epan/dissectors/packet-HI2Operations.c b/epan/dissectors/packet-HI2Operations.c index e85ec64add..8d6e4652dd 100644 --- a/epan/dissectors/packet-HI2Operations.c +++ b/epan/dissectors/packet-HI2Operations.c @@ -1309,7 +1309,7 @@ dissect_HI2Operations_T_imei(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offse /* IMEISV is 16 digits, but often transmitted BCD coded in 8 octets. Some implementations use IMEI (15 digits) instead of IMEISV */ if (tvb_len == 8) { - proto_tree_add_item(tree, hf_HI2Operations_imei, tvb, offset, tvb_len, ENC_BCD_DIGITS_0_9|ENC_LITTLE_ENDIAN|ENC_NA); + proto_tree_add_item(tree, hf_HI2Operations_imei, tvb, offset, tvb_len, ENC_BCD_DIGITS_0_9|ENC_LITTLE_ENDIAN); } else { proto_tree_add_item(tree, hf_HI2Operations_imei, tvb, offset, tvb_len, ENC_ASCII); } @@ -2866,7 +2866,7 @@ dissect_HI2Operations_APN(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ if (!parameter_tvb) return offset; - proto_tree_add_item(tree, hf_HI2Operations_apn_str, parameter_tvb, 0, tvb_captured_length(tvb), ENC_APN_STR | ENC_NA); + proto_tree_add_item(tree, hf_HI2Operations_apn_str, parameter_tvb, 0, tvb_captured_length(tvb), ENC_APN_STR); return offset; diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index ac421ffb08..c792499857 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -3159,7 +3159,7 @@ dissect_aim_plugin(proto_tree *entry, tvbuff_t *tvb, int offset, e_guid_t* out_p plugin = aim_find_plugin(uuid); - ti = proto_tree_add_item(entry, hf_aim_messaging_plugin, tvb, offset, 16, ENC_NA); + ti = proto_tree_add_item(entry, hf_aim_messaging_plugin, tvb, offset, 16, ENC_BIG_ENDIAN); proto_item_append_text(ti, " (%s)", plugin ? plugin->name:"Unknown"); return offset+16; diff --git a/epan/dissectors/packet-at-ldf.c b/epan/dissectors/packet-at-ldf.c index 565083918d..32f76ec3b7 100644 --- a/epan/dissectors/packet-at-ldf.c +++ b/epan/dissectors/packet-at-ldf.c @@ -78,7 +78,7 @@ dissect_at_ldf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ offset += 4; proto_tree_add_item(at_ldf_tree, hf_at_ldf_ttl, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(at_ldf_tree, hf_at_ldf_id, tvb, offset, 7, ENC_NA); + proto_tree_add_item(at_ldf_tree, hf_at_ldf_id, tvb, offset, 7, ENC_BIG_ENDIAN); offset += 7; proto_tree_add_item(at_ldf_tree, hf_at_ldf_text, tvb, offset, 64, ENC_ASCII); diff --git a/epan/dissectors/packet-awdl.c b/epan/dissectors/packet-awdl.c index b093f242b5..f6d86e2be4 100644 --- a/epan/dissectors/packet-awdl.c +++ b/epan/dissectors/packet-awdl.c @@ -888,7 +888,7 @@ awdl_tag_election_params(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree proto_tree_add_item(tree, hf_awdl_electionparams_flags, tvb, offset, 1, ENC_NA); offset += 1; - proto_tree_add_item(tree, hf_awdl_electionparams_id, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_awdl_electionparams_id, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_awdl_electionparams_distance, tvb, offset, 1, ENC_NA); offset += 1; diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index 1de40f87c8..3844be96c7 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.c @@ -4386,7 +4386,7 @@ static void dissect_batadv_tvlv_v15_roam(tvbuff_t *tvb, packet_info *pinfo, offset += 6; proto_tree_add_bitmask(tree, tvb, offset, hf_batadv_tvlv_roam_vid, - ett_batadv_tvlv_vid, flags, ENC_NA); + ett_batadv_tvlv_vid, flags, ENC_BIG_ENDIAN); } static void dissect_batadv_tvlv_v15_tt(tvbuff_t *tvb, packet_info *pinfo, @@ -4530,7 +4530,7 @@ static int dissect_batadv_tvlv_v15_tt_vlan(tvbuff_t *tvb, proto_tree_add_bitmask(vlan_tree, tvb, offset, hf_batadv_tvlv_tt_vlan_vid, - ett_batadv_tvlv_vid, flags, ENC_NA); + ett_batadv_tvlv_vid, flags, ENC_BIG_ENDIAN); offset += 2; /* Skip 2 byte of padding. */ @@ -4579,7 +4579,7 @@ static int dissect_batadv_tvlv_v15_tt_change(tvbuff_t *tvb, proto_tree_add_bitmask(change_tree, tvb, offset, hf_batadv_tvlv_tt_change_vid, - ett_batadv_tvlv_vid, flags_vlan, ENC_NA); + ett_batadv_tvlv_vid, flags_vlan, ENC_BIG_ENDIAN); offset += 2; return offset; diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 54e31f70c8..92761f9048 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -6405,7 +6405,7 @@ decode_link_state_attribute_tlv(proto_tree *tree, tvbuff_t *tvb, int offset, pac local_offset += 4; } else { /* FF: most common case is IS-IS, so if it is not OSPF we go that way */ - proto_tree_add_item(tlv_tree, hf_bgp_ls_sr_tlv_srv6_endx_sid_neighbor_isis, tvb, local_offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_bgp_ls_sr_tlv_srv6_endx_sid_neighbor_isis, tvb, local_offset, 6, ENC_NA); local_offset += 6; } proto_tree_add_item(tlv_tree, hf_bgp_ls_sr_tlv_srv6_endx_sid_sid, tvb, local_offset, 16, ENC_NA); diff --git a/epan/dissectors/packet-bhttp.c b/epan/dissectors/packet-bhttp.c index 44da40f81c..35ad24c3ef 100644 --- a/epan/dissectors/packet-bhttp.c +++ b/epan/dissectors/packet-bhttp.c @@ -498,7 +498,7 @@ dissect_bhttp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off unsigned orig_offset = offset; - ti_ft = proto_tree_add_item(tree, hf_bhttp_frame, tvb, offset, 1, ENC_NA); + ti_ft = proto_tree_add_item(tree, hf_bhttp_frame, tvb, offset, 1, ENC_BIG_ENDIAN); ft_tree = proto_item_add_subtree(ti_ft, ett_bhttp_ft); proto_tree_add_item_ret_varint(ft_tree, hf_bhttp_framing_indicator, tvb, offset, -1, ENC_VARINT_QUIC, &framing_indicator, &lenvar); diff --git a/epan/dissectors/packet-bt-utp.c b/epan/dissectors/packet-bt-utp.c index 5dc537997a..47b91552f4 100644 --- a/epan/dissectors/packet-bt-utp.c +++ b/epan/dissectors/packet-bt-utp.c @@ -892,7 +892,7 @@ dissect_utp_extension(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, in if (extension_length != 4) { expert_add_info(pinfo, ti, &ei_extension_len_invalid); } - proto_tree_add_item(ext_tree, hf_bt_utp_extension_close_reason, tvb, offset, 4, ENC_NA); + proto_tree_add_item(ext_tree, hf_bt_utp_extension_close_reason, tvb, offset, 4, ENC_BIG_ENDIAN); break; } default: diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index 0b136f636a..63a10b6abd 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -7532,7 +7532,7 @@ dissect_attribute_value(proto_tree *tree, proto_item *patron_item, packet_info * } if (flags & 0x100) { - proto_tree_add_bitmask(tree, tvb, offset, hf_btatt_cycling_power_measurement_extreme_angles, ett_btatt_value, hfx_btatt_cycling_power_measurement_extreme_angles, ENC_NA); + proto_tree_add_bitmask(tree, tvb, offset, hf_btatt_cycling_power_measurement_extreme_angles, ett_btatt_value, hfx_btatt_cycling_power_measurement_extreme_angles, ENC_LITTLE_ENDIAN); offset += 3; } @@ -10111,10 +10111,10 @@ dissect_attribute_value(proto_tree *tree, proto_item *patron_item, packet_info * if (bluetooth_gatt_has_no_parameter(att_data->opcode)) break; - proto_tree_add_bitmask(tree, tvb, offset, hf_btatt_fitness_machine_features, ett_btatt_value, hfx_btatt_fitness_machine_features, ENC_NA); + proto_tree_add_bitmask(tree, tvb, offset, hf_btatt_fitness_machine_features, ett_btatt_value, hfx_btatt_fitness_machine_features, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_bitmask(tree, tvb, offset, hf_btatt_target_setting_features, ett_btatt_value, hfx_btatt_target_setting_features, ENC_NA); + proto_tree_add_bitmask(tree, tvb, offset, hf_btatt_target_setting_features, ett_btatt_value, hfx_btatt_target_setting_features, ENC_LITTLE_ENDIAN); offset += 4; break; diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index 0215c68a75..677d8ed92d 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -2108,7 +2108,7 @@ dissect_capwap_message_element_vendor_cisco_type(tvbuff_t *tvb, proto_tree *sub_ offset += 2; break; case VSP_CISCO_AP_TIMESYNC: /* AP Timesync (151) */ - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_cisco_ap_timesync, tvb, offset, 4, ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_cisco_ap_timesync, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_cisco_ap_timesync_type, tvb, offset, 1, ENC_NA); diff --git a/epan/dissectors/packet-cisco-fp-mim.c b/epan/dissectors/packet-cisco-fp-mim.c index e1db33935a..d2d1f21586 100644 --- a/epan/dissectors/packet-cisco-fp-mim.c +++ b/epan/dissectors/packet-cisco-fp-mim.c @@ -201,9 +201,9 @@ fp_add_hmac (tvbuff_t *tvb, proto_tree *tree, int offset) { eid = ((eid & 0x00C0) >> 6) + ((eid & 0xFC00) >> 8); proto_tree_add_uint(tree, hf_eid, tvb, offset, FP_BF_LEN, eid); - proto_tree_add_item (tree, hf_ul, tvb, offset, FP_BF_LEN, ENC_NA); - proto_tree_add_item (tree, hf_ig, tvb, offset, FP_BF_LEN, ENC_NA); - proto_tree_add_item (tree, hf_ooodl, tvb, offset, FP_BF_LEN, ENC_NA); + proto_tree_add_item (tree, hf_ul, tvb, offset, FP_BF_LEN, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ig, tvb, offset, FP_BF_LEN, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ooodl, tvb, offset, FP_BF_LEN, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swid, tvb, offset, FP_BF_LEN, ENC_BIG_ENDIAN); offset += FP_BF_LEN; diff --git a/epan/dissectors/packet-dect-nwk.c b/epan/dissectors/packet-dect-nwk.c index 77f974cc4f..4cac31cebb 100644 --- a/epan/dissectors/packet-dect-nwk.c +++ b/epan/dissectors/packet-dect-nwk.c @@ -1871,7 +1871,7 @@ static int dissect_dect_nwk_s_ie_auth_type(tvbuff_t *tvb, unsigned offset, proto def = ( tvb_get_uint8(tvb, offset) & DECT_NWK_S_IE_AUTH_TYPE_DEF_MASK ) >> DECT_NWK_S_IE_AUTH_TYPE_DEF_SHIFT; offset++; if( def ) { - proto_tree_add_item(tree, hf_dect_nwk_s_ie_auth_type_default_cipher_key_index, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_dect_nwk_s_ie_auth_type_default_cipher_key_index, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_dect_nwk_s_ie_auth_type_default_cipher_key_algorithm, tvb, offset, 1, ENC_NA); offset++; @@ -1948,7 +1948,7 @@ static int dissect_dect_nwk_s_ie_fixed_identity(tvbuff_t *tvb, unsigned offset, proto_tree_add_item(tree, hf_dect_nwk_s_ie_fixed_identity_arc, tvb, offset, 1, ENC_NA); bit_offset = ( offset * 8 ) + 4; no_of_bits = value_length - 4; - proto_tree_add_bits_item(tree, hf_dect_nwk_s_ie_fixed_identity_ard, tvb, bit_offset, no_of_bits, ENC_NA); + proto_tree_add_bits_item(tree, hf_dect_nwk_s_ie_fixed_identity_ard, tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); bit_offset += no_of_bits; offset += value_length / 8; if (value_length % 8) { @@ -1977,7 +1977,7 @@ static int dissect_dect_nwk_s_ie_iwu_to_iwu(tvbuff_t *tvb, unsigned offset, uint proto_tree_add_item(tree, hf_dect_nwk_s_ie_iwu_to_iwu_user_specific_contents, tvb, offset, remaining_length, ENC_NA); if ( discriminator_type == DECT_NWK_S_IE_IWU_TO_IWU_DISCRIMINATOR_TYPE_EMC ) { - proto_tree_add_item(tree, hf_dect_nwk_s_ie_iwu_to_iwu_emc_discriminator, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_dect_nwk_s_ie_iwu_to_iwu_emc_discriminator, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; remaining_length -= 2; proto_tree_add_item(tree, hf_dect_nwk_s_ie_iwu_to_iwu_proprietary_contents, tvb, offset, remaining_length, ENC_NA); @@ -2081,10 +2081,10 @@ static int dissect_dect_nwk_s_ie_portable_identity(tvbuff_t *tvb, unsigned offse no_of_bits = value_length - 4; switch(ipui_type) { case DECT_NWK_IPUI_TYPE_N: - proto_tree_add_bits_item(tree, hf_dect_nwk_s_ie_portable_identity_ipei, tvb, bit_offset, no_of_bits, ENC_NA); + proto_tree_add_bits_item(tree, hf_dect_nwk_s_ie_portable_identity_ipei, tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); break; case DECT_NWK_IPUI_TYPE_O: - proto_tree_add_bits_item(tree, hf_dect_nwk_s_ie_portable_identity_ipui_o_number, tvb, bit_offset, no_of_bits, ENC_NA); + proto_tree_add_bits_item(tree, hf_dect_nwk_s_ie_portable_identity_ipui_o_number, tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); break; case DECT_NWK_IPUI_TYPE_P: proto_tree_add_bits_item(tree, hf_dect_nwk_s_ie_portable_identity_ipui_p_poc, tvb, bit_offset, 16, ENC_BIG_ENDIAN); @@ -2123,13 +2123,13 @@ static int dissect_dect_nwk_s_ie_portable_identity(tvbuff_t *tvb, unsigned offse break; case DECT_NWK_S_IE_PORTABLE_IDENTITY_IPEI: no_of_bits = value_length - 4; - proto_tree_add_bits_item(tree, hf_dect_nwk_s_ie_portable_identity_ipei, tvb, bit_offset, no_of_bits, ENC_NA); + proto_tree_add_bits_item(tree, hf_dect_nwk_s_ie_portable_identity_ipei, tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); offset += 5; break; case DECT_NWK_S_IE_PORTABLE_IDENTITY_TPUI: no_of_bits = value_length; proto_tree_add_item(tree, hf_dect_nwk_s_ie_portable_identity_tpui_assignment_type, tvb, offset, 1, ENC_NA); - proto_tree_add_bits_item(tree, hf_dect_nwk_s_ie_portable_identity_tpui_value, tvb, bit_offset, no_of_bits, ENC_NA); + proto_tree_add_bits_item(tree, hf_dect_nwk_s_ie_portable_identity_tpui_value, tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); offset += 3; break; } @@ -2423,7 +2423,7 @@ static int dissect_dect_nwk_s_ie_escape_to_proprietary(tvbuff_t *tvb, unsigned o discriminator_type = tvb_get_uint8(tvb, offset) & DECT_NWK_S_IE_ESCAPE_TO_PROPRIETARY_DISCRIMINATOR_TYPE_MASK; offset++; if (discriminator_type == DECT_NWK_S_IE_ESCAPE_TO_PROPRIETARY_DISCRIMINATOR_TYPE_EMC) { - proto_tree_add_item(tree, hf_dect_nwk_s_ie_escape_to_proprietary_discriminator, tvb, offset, 2, ENC_NA); + proto_tree_add_item(tree, hf_dect_nwk_s_ie_escape_to_proprietary_discriminator, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; } /* FIXME: Content Handling */ diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c index 11edfbf4bd..e9abf5a18b 100644 --- a/epan/dissectors/packet-http2.c +++ b/epan/dissectors/packet-http2.c @@ -2921,7 +2921,7 @@ dissect_frame_prio(tvbuff_t *tvb, proto_tree *http2_tree, unsigned offset, uint8 if(flags & HTTP2_FLAGS_PRIORITY) { - proto_tree_add_item(http2_tree, hf_http2_excl_dependency, tvb, offset, 4, ENC_NA); + proto_tree_add_item(http2_tree, hf_http2_excl_dependency, tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(http2_tree, hf_http2_stream_dependency, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(http2_tree, hf_http2_weight, tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-http3.c b/epan/dissectors/packet-http3.c index 69e0519c64..4c8ccd644a 100644 --- a/epan/dissectors/packet-http3.c +++ b/epan/dissectors/packet-http3.c @@ -2207,7 +2207,7 @@ dissect_http3_uni_stream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in proto_item_set_text(ti_stream, "UNI STREAM: %s off=%" PRIu64, stream_display_name, stream_info->stream_offset); } else { stream_type = http3_stream->uni_stream_type; - /*ti_stream_type = proto_tree_add_item(stream_tree, hf_http3_stream_uni_type, tvb, offset, -1, ENC_NA);*/ + /*ti_stream_type = proto_tree_add_item(stream_tree, hf_http3_stream_uni_type, tvb, offset, -1, ENC_BIG_ENDIAN);*/ } switch (stream_type) { diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c index 7ec2e9232c..def0fa6c2e 100644 --- a/epan/dissectors/packet-isis-hello.c +++ b/epan/dissectors/packet-isis-hello.c @@ -390,10 +390,10 @@ dissect_hello_mt_port_cap_port_trill_ver_clv(tvbuff_t *tvb, packet_info* pinfo _ offset++; - proto_tree_add_item(subtree, hf_isis_hello_trill_hello_reduction, tvb, offset, 4, ENC_NA); - proto_tree_add_item(subtree, hf_isis_hello_trill_unassigned_1, tvb, offset, 4, ENC_NA); - proto_tree_add_item(subtree, hf_isis_hello_trill_hop_by_hop_flags, tvb, offset, 4, ENC_NA); - proto_tree_add_item(subtree, hf_isis_hello_trill_unassigned_2, tvb, offset, 4, ENC_NA); + proto_tree_add_item(subtree, hf_isis_hello_trill_hello_reduction, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_isis_hello_trill_unassigned_1, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_isis_hello_trill_hop_by_hop_flags, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_isis_hello_trill_unassigned_2, tvb, offset, 4, ENC_BIG_ENDIAN); } static void diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c index 4df683b352..42221017af 100644 --- a/epan/dissectors/packet-juniper.c +++ b/epan/dissectors/packet-juniper.c @@ -1326,9 +1326,9 @@ static int dissect_juniper_st(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tre return tvb_captured_length(tvb); } esp_tree = proto_tree_add_subtree(juniper_subtree, tvb, offset, 8, ett_juniper_st_esp, NULL, "Tunnel ESP Header"); - proto_tree_add_item(esp_tree, hf_juniper_st_esp_spi, tvb, offset, 4, ENC_NA); + proto_tree_add_item(esp_tree, hf_juniper_st_esp_spi, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(esp_tree, hf_juniper_st_esp_seq, tvb, offset, 4, ENC_NA); + proto_tree_add_item(esp_tree, hf_juniper_st_esp_seq, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* 16 bytes unknown data remains in example trace */ proto_tree_add_subtree(juniper_subtree, tvb, offset, 16, ett_juniper_st_unknown, NULL, "Tunnel Unknown Data"); diff --git a/epan/dissectors/packet-llrp.c b/epan/dissectors/packet-llrp.c index 43e744ecbb..ce88007557 100644 --- a/epan/dissectors/packet-llrp.c +++ b/epan/dissectors/packet-llrp.c @@ -1556,7 +1556,7 @@ dissect_llrp_impinj_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *par suboffset += 2; break; case LLRP_IMPINJ_PARAM_TAG_DIRECTION_REPORTING: - proto_tree_add_item(param_tree, hf_llrp_impinj_en_tag_dir, tvb, suboffset, 2, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_impinj_en_tag_dir, tvb, suboffset, 2, ENC_BIG_ENDIAN); suboffset += 2; proto_tree_add_item(param_tree, hf_llrp_impinj_antenna_conf, tvb, suboffset, 2, ENC_BIG_ENDIAN); suboffset += 2; @@ -1964,7 +1964,7 @@ dissect_llrp_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_FREQ_HOP_TABLE: - proto_tree_add_item(param_tree, hf_llrp_hop_table_id, tvb, suboffset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_hop_table_id, tvb, suboffset, 1, ENC_BIG_ENDIAN); suboffset += 1; proto_tree_add_item(param_tree, hf_llrp_rfu, tvb, suboffset, 1, ENC_NA); suboffset += 1; @@ -3332,7 +3332,7 @@ proto_register_llrp(void) NULL, HFILL }}, { &hf_llrp_gpi_state, - { "GPI state", "llrp.param.gpi_state", FT_UINT16, BASE_DEC, NULL, 0, + { "GPI state", "llrp.param.gpi_state", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_llrp_hold_events_and_reports, diff --git a/epan/dissectors/packet-loratap.c b/epan/dissectors/packet-loratap.c index a2ef5e62ca..f4f1188e35 100644 --- a/epan/dissectors/packet-loratap.c +++ b/epan/dissectors/packet-loratap.c @@ -156,7 +156,7 @@ dissect_loratap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *d current_offset++; proto_tree_add_item(loratap_tree, hf_loratap_header_padding, tvb, current_offset, 1, ENC_NA); current_offset++; - proto_tree_add_item_ret_uint(loratap_tree, hf_loratap_header_length_type, tvb, current_offset, 2, ENC_NA, <_length); + proto_tree_add_item_ret_uint(loratap_tree, hf_loratap_header_length_type, tvb, current_offset, 2, ENC_BIG_ENDIAN, <_length); current_offset += 2; if (lt_version == 1) { proto_tree_add_item(loratap_tree, hf_loratap_header_source_gw_type, tvb, header_v1_offset, 8, ENC_NA); @@ -164,7 +164,7 @@ dissect_loratap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *d copy_address_shallow(&pinfo->src, &pinfo->dl_src); proto_item_append_text(ti, ", Src: %s", address_to_display(pinfo->pool, &pinfo->src)); header_v1_offset += 8; - proto_tree_add_item(loratap_tree, hf_loratap_header_timestamp_type, tvb, header_v1_offset, 4, ENC_NA); + proto_tree_add_item(loratap_tree, hf_loratap_header_timestamp_type, tvb, header_v1_offset, 4, ENC_BIG_ENDIAN); header_v1_offset += 4; proto_tree_add_bitmask(loratap_tree, tvb, header_v1_offset, hf_loratap_header_flags_type, ett_loratap_flags, hfx_loratap_header_flags, ENC_NA); try_dissect = (tvb_get_uint8(tvb, header_v1_offset) & 0x28); /* Only try the next dissector for CRC OK and No CRC packets with v1 encapsulation */ @@ -175,7 +175,7 @@ dissect_loratap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *d channel_item = proto_tree_add_item(loratap_tree, hf_loratap_header_channel_type, tvb, current_offset, 0, ENC_NA); channel_tree = proto_item_add_subtree(channel_item, ett_loratap_channel); - proto_tree_add_item(channel_tree, hf_loratap_header_channel_frequency_type, tvb, current_offset, 4, ENC_NA); + proto_tree_add_item(channel_tree, hf_loratap_header_channel_frequency_type, tvb, current_offset, 4, ENC_BIG_ENDIAN); current_offset += 4; proto_tree_add_item(channel_tree, hf_loratap_header_channel_bandwidth_type, tvb, current_offset, 1, ENC_NA); current_offset++; @@ -184,7 +184,7 @@ dissect_loratap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *d if (lt_version == 1) { proto_tree_add_item(channel_tree, hf_loratap_header_cr_type, tvb, header_v1_offset, 1, ENC_NA); header_v1_offset++; - proto_tree_add_item(channel_tree, hf_loratap_header_datarate_type, tvb, header_v1_offset, 2, ENC_NA); + proto_tree_add_item(channel_tree, hf_loratap_header_datarate_type, tvb, header_v1_offset, 2, ENC_BIG_ENDIAN); header_v1_offset += 2; proto_tree_add_item(channel_tree, hf_loratap_header_if_channel_type, tvb, header_v1_offset, 1, ENC_NA); header_v1_offset++; @@ -205,7 +205,7 @@ dissect_loratap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *d proto_tree_add_item_ret_uint(loratap_tree, hf_loratap_header_syncword_type, tvb, current_offset, 1, ENC_NA, &syncword); current_offset++; if (lt_version == 1) { - proto_tree_add_item(loratap_tree, hf_loratap_header_tag_type, tvb, header_v1_offset, 2, ENC_NA); + proto_tree_add_item(loratap_tree, hf_loratap_header_tag_type, tvb, header_v1_offset, 2, ENC_BIG_ENDIAN); } /* Seek to data - skip lt_length of header, this allows future extensions */ diff --git a/epan/dissectors/packet-srt.c b/epan/dissectors/packet-srt.c index 7de0767e68..6a507016e4 100644 --- a/epan/dissectors/packet-srt.c +++ b/epan/dissectors/packet-srt.c @@ -596,7 +596,7 @@ static void dissect_srt_hs_ext_field(proto_tree* tree, }; proto_tree_add_bitmask_with_flags(tree, tvb, baseoff, hf_srt_handshake_ext_field_v5, - ett_srt_handshake_ext_field_flags, ext_hs_ext_field_flags, ENC_NA, BMT_NO_APPEND); + ett_srt_handshake_ext_field_flags, ext_hs_ext_field_flags, ENC_BIG_ENDIAN, BMT_NO_APPEND); return; } diff --git a/epan/dissectors/packet-ubertooth.c b/epan/dissectors/packet-ubertooth.c index f3987033f9..8b9540113f 100644 --- a/epan/dissectors/packet-ubertooth.c +++ b/epan/dissectors/packet-ubertooth.c @@ -1800,19 +1800,19 @@ dissect_ubertooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat break; case 5: /* Get Rx LED */ - proto_tree_add_item(main_tree, hf_rx_led, tvb, offset, 1, ENC_NA); + proto_tree_add_item(main_tree, hf_rx_led, tvb, offset, 1, ENC_LITTLE_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " = %s", val_to_str_ext_const(tvb_get_uint8(tvb, offset), &led_state_vals_ext, "Unknown")); offset += 1; break; case 7: /* Get Tx LED */ - proto_tree_add_item(main_tree, hf_tx_led, tvb, offset, 1, ENC_NA); + proto_tree_add_item(main_tree, hf_tx_led, tvb, offset, 1, ENC_LITTLE_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " = %s", val_to_str_ext_const(tvb_get_uint8(tvb, offset), &led_state_vals_ext, "Unknown")); offset += 1; break; case 9: /* Get 1V8 */ - proto_tree_add_item(main_tree, hf_1v8_led, tvb, offset, 1, ENC_NA); + proto_tree_add_item(main_tree, hf_1v8_led, tvb, offset, 1, ENC_LITTLE_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " = %s", val_to_str_ext_const(tvb_get_uint8(tvb, offset), &led_state_vals_ext, "Unknown")); offset += 1; @@ -1856,19 +1856,19 @@ dissect_ubertooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat break; case 16: /* Get PAEN */ - proto_tree_add_item(main_tree, hf_paen, tvb, offset, 1, ENC_NA); + proto_tree_add_item(main_tree, hf_paen, tvb, offset, 1, ENC_LITTLE_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " = %s", val_to_str_ext_const(tvb_get_uint8(tvb, offset), &state_vals_ext, "Unknown")); offset += 1; break; case 18: /* Get HGM */ - proto_tree_add_item(main_tree, hf_hgm, tvb, offset, 1, ENC_NA); + proto_tree_add_item(main_tree, hf_hgm, tvb, offset, 1, ENC_LITTLE_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " = %s", val_to_str_ext_const(tvb_get_uint8(tvb, offset), &state_vals_ext, "Unknown")); offset += 1; break; case 22: /* Get Modulation */ - proto_tree_add_item(main_tree, hf_modulation, tvb, offset, 1, ENC_NA); + proto_tree_add_item(main_tree, hf_modulation, tvb, offset, 1, ENC_LITTLE_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " = %s", val_to_str_ext_const(tvb_get_uint8(tvb, offset), &modulation_vals_ext, "Unknown")); offset += 1;