diff options
author | Bill Meier <wmeier@newsguy.com> | 2014-12-11 18:37:07 -0500 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2014-12-12 15:33:36 +0000 |
commit | 64cb5104d609e741cfb9365adb933b84b8c16433 (patch) | |
tree | fb62f690320e7a948fbd4d567db9d8058734f0db /epan/dissectors | |
parent | 29c1b58f3c974eeab6a164c4d05f99979a447076 (diff) | |
download | wireshark-64cb5104d609e741cfb9365adb933b84b8c16433.tar.gz |
Change ENC_NA to ENC_BIG_ENDIAN for all fetches of integral type fields.
Change-Id: Ia4f5735c61eedcbe8354eabd5da05d02e167f25e
Reviewed-on: https://code.wireshark.org/review/5734
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-ansi_683.c | 184 | ||||
-rw-r--r-- | epan/dissectors/packet-capwap.c | 30 | ||||
-rw-r--r-- | epan/dissectors/packet-ieee17221.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-lldp.c | 20 | ||||
-rw-r--r-- | epan/dissectors/packet-nfs.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-oampdu.c | 86 | ||||
-rw-r--r-- | epan/dissectors/packet-pim.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-ppp.c | 100 | ||||
-rw-r--r-- | epan/dissectors/packet-rmt-norm.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-sml.c | 134 | ||||
-rw-r--r-- | epan/dissectors/packet-sna.c | 18 |
11 files changed, 297 insertions, 297 deletions
diff --git a/epan/dissectors/packet-ansi_683.c b/epan/dissectors/packet-ansi_683.c index 3fdafdef0d..e446fcb58b 100644 --- a/epan/dissectors/packet-ansi_683.c +++ b/epan/dissectors/packet-ansi_683.c @@ -672,7 +672,7 @@ rev_param_block_nam_cdma_analog(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tre offset++; proto_tree_add_item(tree, hf_ansi_683_home_sid, tvb, offset, 3, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_ansi_683_extended_address_indicator, tvb, offset + 2, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_extended_address_indicator, tvb, offset + 2, 1, ENC_BIG_ENDIAN); offset += 2; @@ -712,7 +712,7 @@ rev_param_block_nam_cdma_analog(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tre offset++; proto_tree_add_item(tree, hf_ansi_683_mcc_m_01ff80, tvb, offset, 3, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_ansi_683_imsi_m_11_12_7f, tvb, offset, 3, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_imsi_m_11_12_7f, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; @@ -720,13 +720,13 @@ rev_param_block_nam_cdma_analog(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tre offset += 4; - proto_tree_add_item(tree, hf_ansi_683_accolc_3c, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ansi_683_local_control_status_02, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ansi_683_mob_term_home_01, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_accolc_3c, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ansi_683_local_control_status_02, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ansi_683_mob_term_home_01, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_ansi_683_mob_term_for_sid_80, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ansi_683_mob_term_for_nid_40, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_mob_term_for_sid_80, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ansi_683_mob_term_for_nid_40, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_ansi_683_max_sid_nid_3fc0, tvb, offset, 2, ENC_BIG_ENDIAN); offset++; @@ -756,7 +756,7 @@ param_block_nam_mdn(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *tree, gui count = (value & 0xf0) >> 4; - proto_tree_add_item(tree, hf_ansi_683_n_digits, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_n_digits, tvb, offset, 1, ENC_BIG_ENDIAN); for (i=0; i < count; i++) { @@ -793,12 +793,12 @@ rev_param_block_nam_cdma(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *tree saved_offset = offset; proto_tree_add_bits_item(tree, hf_ansi_683_reserved8, tvb, (offset<<3)+6, 2, ENC_NA); - proto_tree_add_item(tree, hf_ansi_683_slotted_mode, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_slotted_mode, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_bits_item(tree, hf_ansi_683_reserved8, tvb, offset<<3, 5, ENC_NA); offset++; - proto_tree_add_item(tree, hf_ansi_683_mob_p_rev_ff, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_mob_p_rev_ff, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; value = tvb_get_ntohs(tvb, offset); @@ -846,7 +846,7 @@ param_block_nam_imsi_t(tvbuff_t *tvb, proto_tree *tree, guint len _U_, guint32 o value = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_imsi_t_class, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_imsi_t_class, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_uint_format_value(tree, hf_ansi_683_imsi_t_addr_num, tvb, offset, 1, value, "%u, %u digits in NMSI", (value & 0x70) >> 4, (value & 0x80) ? ((value & 0x70) >> 4) + 4 : 0); @@ -880,8 +880,8 @@ for_param_block_nam_cdma_analog(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tre value = tvb_get_ntoh24(tvb, offset); proto_tree_add_item(tree, hf_ansi_683_home_sid, tvb, offset, 3, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_ansi_683_extended_address_indicator, tvb, offset + 2, 1, ENC_NA); - proto_tree_add_item(tree, hf_ansi_683_imsi_m_class10, tvb, offset + 2, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_extended_address_indicator, tvb, offset + 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ansi_683_imsi_m_class10, tvb, offset + 2, 1, ENC_BIG_ENDIAN); proto_tree_add_uint_format_value(tree, hf_ansi_683_ismi_m_addr_num_e, tvb, offset + 2, 1, value, "%u, %u digits in NMSI", (value & 0x0e) >> 1, (value & 0x10) ? ((value & 0x0e) >> 1) + 4 : 0); @@ -889,15 +889,15 @@ for_param_block_nam_cdma_analog(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tre offset += 2; proto_tree_add_item(tree, hf_ansi_683_mcc_m_01ff80, tvb, offset, 3, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_ansi_683_imsi_m_11_12_7f, tvb, offset + 2, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_imsi_m_11_12_7f, tvb, offset + 2, 1, ENC_BIG_ENDIAN); offset += 3; proto_tree_add_item(tree, hf_ansi_683_imsi_m_10, tvb, offset, 5, ENC_NA); offset += 4; - proto_tree_add_item(tree, hf_ansi_683_accolc_3c, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ansi_683_local_control_status_02, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ansi_683_mob_term_home_01, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_accolc_3c, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ansi_683_local_control_status_02, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ansi_683_mob_term_home_01, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(tree, hf_ansi_683_mob_term_for_sid_8000, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -1018,7 +1018,7 @@ msg_config_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len, g num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -1054,7 +1054,7 @@ msg_download_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len, num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -1145,7 +1145,7 @@ msg_ms_key_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len, g akey_prev = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_a_key_protocol_revision, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_a_key_protocol_revision, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (akey_prev < 0x03) @@ -1253,13 +1253,13 @@ msg_protocap_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len, saved_offset = offset; - proto_tree_add_item(tree, hf_ansi_683_otasp_protocol_revision, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_otasp_protocol_revision, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; num_cap = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_capability_records, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_capability_records, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -1292,7 +1292,7 @@ msg_sspr_config_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint l saved_offset = offset; oct = tvb_get_guint8(tvb, offset); - item = proto_tree_add_item(tree, hf_ansi_683_rev_param_block_sspr, tvb, offset, 1, ENC_NA); + item = proto_tree_add_item(tree, hf_ansi_683_rev_param_block_sspr, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (oct == REV_BLOCK_SSPR_PRL) @@ -1308,7 +1308,7 @@ msg_sspr_config_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint l proto_tree_add_item(subtree, hf_ansi_683_segment_offset, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(subtree, hf_ansi_683_maximum_segment_size, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_683_maximum_segment_size, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } @@ -1330,7 +1330,7 @@ msg_sspr_download_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint saved_offset = offset; - item = proto_tree_add_item(tree, hf_ansi_683_for_param_block_sspr, tvb, offset, 1, ENC_NA); + item = proto_tree_add_item(tree, hf_ansi_683_for_param_block_sspr, tvb, offset, 1, ENC_BIG_ENDIAN); subtree = proto_item_add_subtree(item, ett_for_sspr_block); offset++; @@ -1378,7 +1378,7 @@ msg_validate_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len, num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -1392,7 +1392,7 @@ msg_validate_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len, tvb, offset, 1, ett_for_val_block, &item, "Block #%u", i+1); - proto_tree_add_item(subtree, hf_ansi_683_param_block_val, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_683_param_block_val, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; block_len = tvb_get_guint8(tvb, offset); @@ -1463,7 +1463,7 @@ msg_puzl_config_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint l saved_offset = offset; - item = proto_tree_add_item(tree, hf_ansi_683_rev_param_block_puzl, tvb, offset, 1, ENC_NA); + item = proto_tree_add_item(tree, hf_ansi_683_rev_param_block_puzl, tvb, offset, 1, ENC_BIG_ENDIAN); block_len = len - (offset - saved_offset); if (block_len > 0) @@ -1494,7 +1494,7 @@ msg_puzl_download_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -1565,7 +1565,7 @@ msg_3gpd_config_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint l num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -1603,7 +1603,7 @@ msg_3gpd_download_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -1732,7 +1732,7 @@ msg_mmd_config_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint le num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -1770,7 +1770,7 @@ msg_mmd_download_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -1838,7 +1838,7 @@ msg_systag_config_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint saved_offset = offset; item = proto_tree_add_item(tree, hf_ansi_683_rev_param_block_systag, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* @@ -1860,7 +1860,7 @@ msg_systag_config_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint proto_tree_add_item(subtree, hf_ansi_683_segment_offset, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(subtree, hf_ansi_683_maximum_segment_size, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_683_maximum_segment_size, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } @@ -1880,7 +1880,7 @@ msg_systag_download_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, gui saved_offset = offset; - proto_tree_add_item(tree, hf_ansi_683_for_param_block_systag, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_for_param_block_systag, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; block_len = tvb_get_guint8(tvb, offset); @@ -1944,7 +1944,7 @@ msg_mms_config_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint le num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -1981,7 +1981,7 @@ msg_mms_download_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -2051,7 +2051,7 @@ msg_config_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len, g num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -2148,7 +2148,7 @@ msg_download_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len, num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -2160,10 +2160,10 @@ msg_download_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len, tvb, offset, 2, ett_for_nam_block, NULL, "Block #%u", i+1); proto_tree_add_item(subtree, hf_ansi_683_for_param_block_nam, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(subtree, hf_ansi_683_result_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_683_result_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } @@ -2178,7 +2178,7 @@ msg_ms_key_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len, g { EXACT_DATA_CHECK(len, 1); - proto_tree_add_item(tree, hf_ansi_683_key_exchange_result_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_key_exchange_result_code, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -2194,7 +2194,7 @@ msg_key_gen_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len, saved_offset = offset; - proto_tree_add_item(tree, hf_ansi_683_key_exchange_result_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_key_exchange_result_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; result_len = tvb_get_guint8(tvb, offset); @@ -2226,7 +2226,7 @@ msg_reauth_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len, g offset += 2; proto_tree_add_item(tree, hf_ansi_683_randc, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_ansi_683_call_history_parameter, tvb, offset + 1, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_call_history_parameter, tvb, offset + 1, 1, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_ansi_683_authentication_data_input_parameter, tvb, offset, 3, ENC_BIG_ENDIAN); @@ -2240,7 +2240,7 @@ msg_commit_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len, g { EXACT_DATA_CHECK(len, 1); - proto_tree_add_item(tree, hf_ansi_683_data_commit_result_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_data_commit_result_code, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -2261,12 +2261,12 @@ msg_protocap_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len, proto_tree_add_item(tree, hf_ansi_683_mobile_station_fw_rev, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_ansi_683_mobile_station_manuf_model_number, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_mobile_station_manuf_model_number, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; num_feat = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_num_features, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_num_features, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; SHORT_DATA_CHECK((len - (offset - saved_offset)), (guint32)(num_feat * 2)); @@ -2283,7 +2283,7 @@ msg_protocap_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len, subtree = proto_item_add_subtree(item, ett_rev_feat); offset++; - proto_tree_add_item(subtree, hf_ansi_683_feature_protocol_version, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_683_feature_protocol_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } @@ -2332,10 +2332,10 @@ msg_sspr_config_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint l saved_offset = offset; - proto_tree_add_item(tree, hf_ansi_683_rev_param_block_sspr, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_rev_param_block_sspr, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_ansi_683_sspr_configuration_result_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_sspr_configuration_result_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; block_len = tvb_get_guint8(tvb, offset); @@ -2373,10 +2373,10 @@ msg_sspr_download_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint block_id = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_for_param_block_sspr, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_for_param_block_sspr, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_ansi_683_sspr_download_result_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_sspr_download_result_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; switch (block_id) @@ -2386,7 +2386,7 @@ msg_sspr_download_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint proto_tree_add_item(tree, hf_ansi_683_segment_offset, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_ansi_683_maximum_segment_size, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_maximum_segment_size, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; break; } @@ -2408,7 +2408,7 @@ msg_validate_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len, num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -2420,10 +2420,10 @@ msg_validate_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len, tvb, offset, 2, ett_for_val_block, NULL, "Block ID #%u", i+1); - proto_tree_add_item(subtree, hf_ansi_683_param_block_val, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_683_param_block_val, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(subtree, hf_ansi_683_result_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_683_result_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } @@ -2455,7 +2455,7 @@ msg_otapa_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len, gu proto_tree_add_bits_item(tree, hf_ansi_683_reserved8, tvb, (offset<<3)+1, 7, ENC_NA); - proto_tree_add_item(tree, hf_ansi_683_nam_lock_indicator, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_nam_lock_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (oct & 0x01) @@ -2482,10 +2482,10 @@ msg_puzl_config_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint l saved_offset = offset; - proto_tree_add_item(tree, hf_ansi_683_rev_param_block_puzl, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_rev_param_block_puzl, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_ansi_683_puzl_configuration_result_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_puzl_configuration_result_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; block_len = tvb_get_guint8(tvb, offset); @@ -2528,7 +2528,7 @@ msg_puzl_download_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -2543,10 +2543,10 @@ msg_puzl_download_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint tvb, offset, 1, ett_for_puzl_block, &item, "Block #%u", i+1); - proto_tree_add_item(subtree, hf_ansi_683_for_param_block_puzl, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_683_for_param_block_puzl, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(subtree, hf_ansi_683_result_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_683_result_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; oct = tvb_get_guint8(tvb, offset); @@ -2592,7 +2592,7 @@ msg_3gpd_config_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint l num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -2652,7 +2652,7 @@ msg_3gpd_config_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint l SHORT_DATA_CHECK(len, 1); - proto_tree_add_item(tree, hf_ansi_683_result_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_result_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } @@ -2681,7 +2681,7 @@ msg_3gpd_download_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -2692,10 +2692,10 @@ msg_3gpd_download_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint subtree = proto_tree_add_subtree_format(tree, tvb, offset, 2, ett_for_3gpd_block, NULL, "Block #%u", i+1); - proto_tree_add_item(subtree, hf_ansi_683_for_param_block_3gpd, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_683_for_param_block_3gpd, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(subtree, hf_ansi_683_result_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_683_result_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } @@ -2710,7 +2710,7 @@ msg_secure_mode_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint l { EXACT_DATA_CHECK(len, 1); - proto_tree_add_item(tree, hf_ansi_683_secure_mode_result_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_secure_mode_result_code, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -2728,17 +2728,17 @@ msg_ext_protocap_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint saved_offset = offset; - proto_tree_add_item(tree, hf_ansi_683_otasp_mobile_protocol_revision, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_otasp_mobile_protocol_revision, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(tree, hf_ansi_683_mobile_station_fw_rev, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_ansi_683_mobile_station_manuf_model_number, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_mobile_station_manuf_model_number, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; num_recs = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_num_features, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_num_features, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; SHORT_DATA_CHECK((len - (offset - saved_offset)), (guint32)(num_recs * 2)); @@ -2755,7 +2755,7 @@ msg_ext_protocap_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint subtree = proto_item_add_subtree(item, ett_rev_feat); offset++; - proto_tree_add_item(subtree, hf_ansi_683_feature_protocol_version, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_683_feature_protocol_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } @@ -2763,7 +2763,7 @@ msg_ext_protocap_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint num_recs = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_capability_records, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_capability_records, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* minimum required length */ @@ -2776,7 +2776,7 @@ msg_ext_protocap_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint subtree = proto_tree_add_subtree_format(tree, tvb, offset, 1, ett_rev_cap, &item, "Block ID #%u", i+1); - proto_tree_add_item(subtree, hf_ansi_683_cap_info_record_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_683_cap_info_record_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; block_len = tvb_get_guint8(tvb, offset); @@ -2835,7 +2835,7 @@ msg_mmd_config_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint le num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -2888,7 +2888,7 @@ msg_mmd_config_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint le SHORT_DATA_CHECK(len, 1); - proto_tree_add_item(tree, hf_ansi_683_result_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_result_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } @@ -2917,7 +2917,7 @@ msg_mmd_download_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; SHORT_DATA_CHECK((len - (offset - saved_offset)), (guint32)(num_blocks * 2)); @@ -2928,10 +2928,10 @@ msg_mmd_download_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint tvb, offset, 2, ett_for_mmd_block, NULL, "Block #%u", i+1); - proto_tree_add_item(subtree, hf_ansi_683_for_param_block_mmd, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_683_for_param_block_mmd, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(subtree, hf_ansi_683_result_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_683_result_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } @@ -2951,10 +2951,10 @@ msg_systag_config_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint saved_offset = offset; - proto_tree_add_item(tree, hf_ansi_683_rev_param_block_systag, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_rev_param_block_systag, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_ansi_683_system_tag_result_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_system_tag_result_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; block_len = tvb_get_guint8(tvb, offset); @@ -2988,10 +2988,10 @@ msg_systag_download_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, gui saved_offset = offset; block_id = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_for_param_block_systag, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_for_param_block_systag, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_ansi_683_system_tag_download_result_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_system_tag_download_result_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; switch (block_id) @@ -3004,7 +3004,7 @@ msg_systag_download_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, gui proto_tree_add_item(tree, hf_ansi_683_segment_offset, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_ansi_683_segment_size, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_segment_size, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; break; @@ -3023,7 +3023,7 @@ msg_srvckey_gen_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint l { EXACT_DATA_CHECK(len, 1); - proto_tree_add_item(tree, hf_ansi_683_service_key_generation_result_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_service_key_generation_result_code, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -3043,7 +3043,7 @@ msg_mms_config_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint le num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -3058,7 +3058,7 @@ msg_mms_config_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint le tvb, offset, 1, ett_rev_mms_block, &item, "Block #%u", i+1); - proto_tree_add_item(subtree, hf_ansi_683_rev_param_block_mms, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_683_rev_param_block_mms, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; block_len = tvb_get_guint8(tvb, offset); @@ -3098,7 +3098,7 @@ msg_mms_config_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint le SHORT_DATA_CHECK(len, 1); - proto_tree_add_item(subtree, hf_ansi_683_result_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_683_result_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } @@ -3127,7 +3127,7 @@ msg_mms_download_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint num_blocks = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_683_number_of_parameter_blocks, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -3139,10 +3139,10 @@ msg_mms_download_rsp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint tvb, offset, 1, ett_for_mms_block, NULL, "Block #%u", i+1); - proto_tree_add_item(subtree, hf_ansi_683_for_param_block_mms, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_683_for_param_block_mms, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(subtree, hf_ansi_683_result_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_683_result_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index 7023a4ecd7..a6a60c681d 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -1002,9 +1002,9 @@ dissect_capwap_encryption_capabilities(tvbuff_t *tvb, proto_tree *encryption_cap encryption_capabilities_item = proto_tree_add_item(encryption_capabilities_tree, hf_capwap_msg_element_type_wtp_descriptor_encrypt, tvb, offset, 3, ENC_NA); sub_encryption_capabilities_tree = proto_item_add_subtree(encryption_capabilities_item, ett_capwap_encryption_capability); - proto_tree_add_item(sub_encryption_capabilities_tree, hf_capwap_msg_element_type_wtp_descriptor_encrypt_reserved, tvb, offset, 1, ENC_NA); + proto_tree_add_item(sub_encryption_capabilities_tree, hf_capwap_msg_element_type_wtp_descriptor_encrypt_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (sub_encryption_capabilities_tree, hf_capwap_msg_element_type_wtp_descriptor_encrypt_wbid, tvb, offset, 1, ENC_NA); + proto_tree_add_item (sub_encryption_capabilities_tree, hf_capwap_msg_element_type_wtp_descriptor_encrypt_wbid, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(encryption_capabilities_item, ": (WBID %d)",tvb_get_guint8(tvb, offset) & 0x1F); @@ -1740,7 +1740,7 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_ offset += 1; while (offset < offset_end) { - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_rate_set_rate_set, tvb, offset, 1, ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_rate_set_rate_set, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } @@ -1753,9 +1753,9 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_ break; } offset_end = offset + 4 + optlen; - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_radio_id, tvb, offset+4, 1, ENC_NA); - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_association_id, tvb, offset+5, 2, ENC_NA); - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_flags, tvb, offset+7, 1, ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_radio_id, tvb, offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_association_id, tvb, offset+5, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_flags, tvb, offset+7, 1, ENC_BIG_ENDIAN); proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_mac_address, tvb, offset+8, 6, ENC_NA); msg_element_type_item_flag = proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_capabilities, tvb, offset+14, 2, ENC_BIG_ENDIAN); sub_msg_element_type_flag_tree = proto_item_add_subtree(msg_element_type_item_flag, ett_capwap_ieee80211_station_capabilities); @@ -1775,11 +1775,11 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_ proto_tree_add_item(sub_msg_element_type_flag_tree, hf_capwap_msg_element_type_ieee80211_station_capabilities_o, tvb, offset+14, 2, ENC_BIG_ENDIAN); proto_tree_add_item(sub_msg_element_type_flag_tree, hf_capwap_msg_element_type_ieee80211_station_capabilities_k, tvb, offset+14, 2, ENC_BIG_ENDIAN); proto_tree_add_item(sub_msg_element_type_flag_tree, hf_capwap_msg_element_type_ieee80211_station_capabilities_l, tvb, offset+14, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_wlan_id, tvb, offset+16, 1, ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_wlan_id, tvb, offset+16, 1, ENC_BIG_ENDIAN); offset += 17; while (offset < offset_end) { - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_supported_rates, tvb, offset, 1, ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_supported_rates, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } @@ -1809,11 +1809,11 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_ offset += 4; offset_end = offset + optlen; - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_supported_rates_radio_id, tvb, offset, 1, ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_supported_rates_radio_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; while (offset < offset_end) { - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_supported_rates_rate, tvb, offset, 1, ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_supported_rates_rate, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } break; @@ -1824,9 +1824,9 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_ "IEEE80211 Tx Power length %u wrong, must be = 4", optlen); break; } - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_tx_power_radio_id, tvb, offset+4, 1, ENC_NA); - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_tx_power_reserved, tvb, offset+5, 1, ENC_NA); - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_tx_power_current_tx_power, tvb, offset+6, 2, ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_tx_power_radio_id, tvb, offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_tx_power_reserved, tvb, offset+5, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_tx_power_current_tx_power, tvb, offset+6, 2, ENC_BIG_ENDIAN); break; case IEEE80211_TX_POWER_LEVEL:{ /* ieee80211 Tx Power Level (1042) */ @@ -2106,8 +2106,8 @@ dissect_capwap_preamble(tvbuff_t *tvb, proto_tree *capwap_control_tree, guint of ti = proto_tree_add_item(capwap_control_tree, hf_capwap_preamble, tvb, offset+plen, -1, ENC_NA); capwap_preamble_tree = proto_item_add_subtree(ti, ett_capwap_preamble); - proto_tree_add_item(capwap_preamble_tree, hf_capwap_preamble_version, tvb, offset+plen, 1, ENC_NA); - proto_tree_add_item(capwap_preamble_tree, hf_capwap_preamble_type, tvb, offset+plen, 1, ENC_NA); + proto_tree_add_item(capwap_preamble_tree, hf_capwap_preamble_version, tvb, offset+plen, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(capwap_preamble_tree, hf_capwap_preamble_type, tvb, offset+plen, 1, ENC_BIG_ENDIAN); *type_header = tvb_get_guint8(tvb, offset+plen) & 0x0F; plen++; /* DTLS Header ? */ diff --git a/epan/dissectors/packet-ieee17221.c b/epan/dissectors/packet-ieee17221.c index 63ffbaf6df..cc921f2bf8 100644 --- a/epan/dissectors/packet-ieee17221.c +++ b/epan/dissectors/packet-ieee17221.c @@ -4007,7 +4007,7 @@ dissect_17221_aecp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aecp_tree) proto_tree_add_item(aecp_tree, hf_acmp_stream_dest_mac, tvb, AECP_OFFSET_STREAM_INFO_STREAM_DEST_MAC, 6, ENC_NA); proto_tree_add_item(aecp_tree, hf_aecp_msrp_failure_code, tvb, - AECP_OFFSET_STREAM_INFO_MSRP_FAILURE_CODE, 1, ENC_NA); + AECP_OFFSET_STREAM_INFO_MSRP_FAILURE_CODE, 1, ENC_BIG_ENDIAN); proto_tree_add_item(aecp_tree, hf_aecp_msrp_failure_bridge_id, tvb, AECP_OFFSET_STREAM_INFO_MSRP_FAILURE_BRIDGE_ID, 8, ENC_NA); } diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index 73db60dace..065f345b8e 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -2109,7 +2109,7 @@ dissect_ieee_802_1_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } case 0xA: /* ETS Recommendation */ { - proto_tree_add_item(tree, hf_dcbx_feature_pgid_reserved, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_dcbx_feature_pgid_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -2219,7 +2219,7 @@ dissect_ieee_802_1_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } case 0xC: /* Application Priority */ { - proto_tree_add_item(tree, hf_ieee_8021az_app_reserved, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ieee_8021az_app_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -2252,7 +2252,7 @@ dissect_ieee_802_1_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, static void dissect_oui_default_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 offset) { - proto_tree_add_item(tree, hf_unknown_subtype, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_unknown_subtype, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_unknown_subtype_content, tvb, (offset+1), -1, ENC_NA); } @@ -3131,7 +3131,7 @@ dissect_hytec_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint case HYTEC_TBD__SINGLE_MODE: if(msg_len == expected_data_length) { - tlm = proto_tree_add_item(tree, hf_hytec_single_mode, tvb, offset, msg_len, ENC_NA); + tlm = proto_tree_add_item(tree, hf_hytec_single_mode, tvb, offset, msg_len, ENC_BIG_ENDIAN); proto_item_append_text(tlm, " m"); } else @@ -3143,7 +3143,7 @@ dissect_hytec_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint case HYTEC_TBD__MULTI_MODE_50: if(msg_len == expected_data_length) { - tlm = proto_tree_add_item(tree, hf_hytec_multi_mode_50, tvb, offset, msg_len, ENC_NA); + tlm = proto_tree_add_item(tree, hf_hytec_multi_mode_50, tvb, offset, msg_len, ENC_BIG_ENDIAN); proto_item_append_text(tlm, " m"); } else @@ -3155,7 +3155,7 @@ dissect_hytec_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint case HYTEC_TBD__MULTI_MODE_62_5: if(msg_len == expected_data_length) { - tlm = proto_tree_add_item(tree, hf_hytec_multi_mode_62_5, tvb, offset, msg_len, ENC_NA); + tlm = proto_tree_add_item(tree, hf_hytec_multi_mode_62_5, tvb, offset, msg_len, ENC_BIG_ENDIAN); proto_item_append_text(tlm, " m"); } else @@ -3262,7 +3262,7 @@ dissect_hytec_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset += 6; proto_tree_add_item(hytec_data, hf_hytec_request_mac_address, tvb, offset, 6, ENC_NA); offset += 6; - proto_tree_add_item(hytec_data, hf_hytec_maximum_depth, tvb, offset, 1, ENC_NA); + proto_tree_add_item(hytec_data, hf_hytec_maximum_depth, tvb, offset, 1, ENC_BIG_ENDIAN); /*offset += 1;*/ } else @@ -3281,7 +3281,7 @@ dissect_hytec_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset += 6; proto_tree_add_item(hytec_data, hf_hytec_answering_mac_address, tvb, offset, 6, ENC_NA); offset += 6; - proto_tree_add_item(hytec_data, hf_hytec_actual_depth, tvb, offset, 1, ENC_NA); + proto_tree_add_item(hytec_data, hf_hytec_actual_depth, tvb, offset, 1, ENC_BIG_ENDIAN); /*offset += 1;*/ } else @@ -3319,7 +3319,7 @@ dissect_hytec_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint break; case HYTEC_MC__END_OF_TRACE: expected_data_length = 1; - if(msg_len == expected_data_length) proto_tree_add_item(tree, hf_hytec_end_of_trace, tvb, offset, msg_len, ENC_NA); + if(msg_len == expected_data_length) proto_tree_add_item(tree, hf_hytec_end_of_trace, tvb, offset, msg_len, ENC_BIG_ENDIAN); else { /* unexpected length */ expert_add_info_format(pinfo, tree, &ei_lldp_bad_length, "%s length (%d) != expected length (%d)", val_to_str_const(identifier, hytec_mc, ""), msg_len, expected_data_length); @@ -3346,7 +3346,7 @@ dissect_hytec_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint break; case HYTEC_MC__TRACE_IDENTIFIER: expected_data_length = 4; - if(msg_len == expected_data_length) proto_tree_add_item(tree, hf_hytec_trace_identifier, tvb, offset, msg_len, ENC_NA); + if(msg_len == expected_data_length) proto_tree_add_item(tree, hf_hytec_trace_identifier, tvb, offset, msg_len, ENC_BIG_ENDIAN); else { /* unexpected length */ expert_add_info_format(pinfo, tree, &ei_lldp_bad_length, "%s length (%d) != expected length (%d)", val_to_str_const(identifier, hytec_mc, ""), msg_len, expected_data_length); diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 8d00785ad7..47cb8b74cd 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -2215,10 +2215,10 @@ dissect_fhandle_data_DCACHE(tvbuff_t* tvb, packet_info *pinfo _U_, proto_tree *t obj_len = tvb_get_guint8(tvb, offset + 16); - proto_tree_add_item(tree, hf_nfs_fh_version, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_nfs_fh_version, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_nfs_fh_generation, tvb, offset+4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_nfs_fh_dc_exportid, tvb, offset+8, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_nfs_fh_dc_handle_type, tvb, offset+15, 1, ENC_NA); + proto_tree_add_item(tree, hf_nfs_fh_dc_handle_type, tvb, offset+15, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_nfs_fh_dc_opaque, tvb, offset + 17, obj_len, ENC_NA); out: ; @@ -10742,7 +10742,7 @@ proto_register_nfs(void) "export_id", "nfs.fh.dc.exportid", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_nfs_fh_dc_handle_type, { - "fh type", "nfs.fh.dc.type", FT_UINT32, BASE_DEC, + "fh type", "nfs.fh.dc.type", FT_UINT8, BASE_DEC, VALS(dcache_handle_types), 0, NULL, HFILL }}, { &hf_nfs2_status, { "Status", "nfs.status2", FT_UINT32, BASE_DEC|BASE_EXT_STRING, diff --git a/epan/dissectors/packet-oampdu.c b/epan/dissectors/packet-oampdu.c index 3495736815..c749a677e0 100644 --- a/epan/dissectors/packet-oampdu.c +++ b/epan/dissectors/packet-oampdu.c @@ -1244,12 +1244,12 @@ dissect_oampdu_information(tvbuff_t *tvb, proto_tree *tree) }; proto_tree_add_item(info_tree, hf_oampdu_info_len, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += OAMPDU_INFO_LENGTH_SZ; proto_tree_add_item(info_tree, hf_oampdu_info_version, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += OAMPDU_INFO_VERSION_SZ; @@ -1300,7 +1300,7 @@ dissect_oampdu_information(tvbuff_t *tvb, proto_tree *tree) /* see IEEE802.3, section 57.5.2.3 for more details */ raw_octet = tvb_get_guint8(tvb, offset); proto_tree_add_item(info_tree, hf_oampdu_info_len, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += OAMPDU_INFO_LENGTH_SZ; @@ -1820,7 +1820,7 @@ dissect_oampdu_vendor_specific(tvbuff_t *tvb, proto_tree *tree) offset += 3; oampdu_vendor_specific_tree = proto_item_add_subtree(oui_item, ett_oampdu_vendor_specific); - dpoe_opcode_item = proto_tree_add_item(oampdu_vendor_specific_tree, hf_oampdu_vendor_specific_dpoe_opcode, tvb, offset, 1, ENC_NA); + dpoe_opcode_item = proto_tree_add_item(oampdu_vendor_specific_tree, hf_oampdu_vendor_specific_dpoe_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); dpoe_opcode_tree = proto_item_add_subtree(dpoe_opcode_item, ett_dpoe_opcode); dpoe_opcode = tvb_get_guint8(tvb, offset); offset +=1; @@ -1831,7 +1831,7 @@ dissect_oampdu_vendor_specific(tvbuff_t *tvb, proto_tree *tree) case DPOE_OPCODE_GET_REQUEST: leaf_branch = tvb_get_ntoh24(tvb, offset); if (leaf_branch == DPOE_LB_ONU_OBJ) { - proto_tree_add_item(dpoe_opcode_tree, hf_dpoe_variable_descriptor, tvb, offset, 3, ENC_NA); + proto_tree_add_item(dpoe_opcode_tree, hf_dpoe_variable_descriptor, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; variable_length = tvb_get_guint8(tvb, offset); offset += 1; @@ -1839,7 +1839,7 @@ dissect_oampdu_vendor_specific(tvbuff_t *tvb, proto_tree *tree) } next_byte = tvb_get_guint8(tvb, offset); while (next_byte != 0x00) { - proto_tree_add_item(dpoe_opcode_tree, hf_dpoe_variable_descriptor, tvb, offset, 3, ENC_NA); + proto_tree_add_item(dpoe_opcode_tree, hf_dpoe_variable_descriptor, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; next_byte = tvb_get_guint8(tvb, offset); } @@ -1848,13 +1848,13 @@ dissect_oampdu_vendor_specific(tvbuff_t *tvb, proto_tree *tree) case DPOE_OPCODE_SET_REQUEST: /* Set-Request */ case DPOE_OPCODE_SET_RESPONSE: /* Set-Response */ while (next_byte != 0x00) { - dpoe_opcode_response = proto_tree_add_item(dpoe_opcode_tree, hf_dpoe_variable_descriptor, tvb, offset, 3, ENC_NA); + dpoe_opcode_response = proto_tree_add_item(dpoe_opcode_tree, hf_dpoe_variable_descriptor, tvb, offset, 3, ENC_BIG_ENDIAN); leaf_branch = tvb_get_ntoh24(tvb, offset); offset += 3; variable_length = tvb_get_guint8(tvb, offset); dpoe_opcode_response_tree = proto_item_add_subtree(dpoe_opcode_response, ett_dpoe_opcode_response); if (variable_length >= 0x80) { - proto_tree_add_item(dpoe_opcode_response_tree, hf_dpoe_variable_response_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(dpoe_opcode_response_tree, hf_dpoe_variable_response_code, tvb, offset, 1, ENC_BIG_ENDIAN); variable_length = 0; offset += 1; } else if (variable_length == 0) { @@ -1866,16 +1866,16 @@ dissect_oampdu_vendor_specific(tvbuff_t *tvb, proto_tree *tree) if (leaf_branch == (DPOE_LB_ONU_ID)) { proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_response_eth, tvb, offset, variable_length, ENC_NA); } else if (leaf_branch == DPOE_LB_MAX_LL) { - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_mll_b, tvb, offset, 2, ENC_NA); - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_mll_do, tvb, offset+2, 2, ENC_NA); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_mll_b, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_mll_do, tvb, offset+2, 2, ENC_BIG_ENDIAN); } else if (leaf_branch == DPOE_LB_MAX_NET_PORTS) { - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_response_int, tvb, offset, variable_length, ENC_NA); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_response_int, tvb, offset, variable_length, ENC_BIG_ENDIAN); } else if (leaf_branch == DPOE_LB_NUM_S1_INT) { - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_response_int, tvb, offset, variable_length, ENC_NA); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_response_int, tvb, offset, variable_length, ENC_BIG_ENDIAN); } else if (leaf_branch == DPOE_LB_OAM_FR) { - dpoe_opcode_response = proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_frame_rate_minimum, tvb, offset, 1, ENC_NA); + dpoe_opcode_response = proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_frame_rate_minimum, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(dpoe_opcode_response, " (PDUs/100ms)"); - dpoe_opcode_response = proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_frame_rate_maximum, tvb, offset+1, 1, ENC_NA); + dpoe_opcode_response = proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_frame_rate_maximum, tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_item_append_text(dpoe_opcode_response, " (Number of 100ms)"); } else if (leaf_branch == DPOE_LB_REP_THRESH) { guint8 nqs; @@ -1883,14 +1883,14 @@ dissect_oampdu_vendor_specific(tvbuff_t *tvb, proto_tree *tree) guint8 nqs_i; guint8 rvpqs_i; - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_repthr_nqs, tvb, offset, 1, ENC_NA); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_repthr_nqs, tvb, offset, 1, ENC_BIG_ENDIAN); nqs = tvb_get_guint8(tvb, offset); - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_repthr_rvpqs, tvb, offset+1, 1, ENC_NA); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_repthr_rvpqs, tvb, offset+1, 1, ENC_BIG_ENDIAN); rvpqs = tvb_get_guint8(tvb, offset+1); for (nqs_i = 0; nqs_i < nqs; nqs_i++) { for (rvpqs_i = 0; rvpqs_i < rvpqs; rvpqs_i++) { - dpoe_opcode_response = proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_report_threshold, tvb, offset+2+(2*(nqs_i+rvpqs_i)), 2, ENC_NA); + dpoe_opcode_response = proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_report_threshold, tvb, offset+2+(2*(nqs_i+rvpqs_i)), 2, ENC_BIG_ENDIAN); proto_item_append_text(dpoe_opcode_response, " (Report Threshold %i for Queue Set %i)", nqs_i, rvpqs_i); } } @@ -1898,11 +1898,11 @@ dissect_oampdu_vendor_specific(tvbuff_t *tvb, proto_tree *tree) } else if (leaf_branch == DPOE_LB_S1_INT_PORT_AUTONEG) { proto_tree_add_bitmask(dpoe_opcode_response_tree, tvb, offset, hf_oam_dpoe_s1_autoneg, ett_oam_dpoe_s1_autoneg, s1_autoneg_mode_bits, ENC_BIG_ENDIAN); } else if (leaf_branch == DPOE_LB_USER_PORT_OBJ) { - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object, tvb, offset, 1, ENC_NA); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object, tvb, offset, 1, ENC_BIG_ENDIAN); } else if (leaf_branch == DPOE_LB_PORT_INGRESS_RULE) { guint8 pir_mvl; pir_subtype = tvb_get_guint8(tvb, offset); - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_subtype, tvb, offset, 1, ENC_NA); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_subtype, tvb, offset, 1, ENC_BIG_ENDIAN); switch (pir_subtype) { /* Terminator */ case 0: @@ -1910,22 +1910,22 @@ dissect_oampdu_vendor_specific(tvbuff_t *tvb, proto_tree *tree) break; /* Header */ case 1: - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_header_precedence, tvb, offset+1, 1, ENC_NA); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_header_precedence, tvb, offset+1, 1, ENC_BIG_ENDIAN); break; /* Clause */ case 2: - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_clause_fc, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_clause_fi, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_clause_msbm, tvb, offset+3, 1, ENC_NA); - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_clause_lsbm, tvb, offset+4, 1, ENC_NA); - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_clause_operator, tvb, offset+5, 1, ENC_NA); - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_clause_mvl, tvb, offset+6, 1, ENC_NA); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_clause_fc, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_clause_fi, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_clause_msbm, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_clause_lsbm, tvb, offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_clause_operator, tvb, offset+5, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_clause_mvl, tvb, offset+6, 1, ENC_BIG_ENDIAN); pir_mvl = tvb_get_guint8(tvb, offset+6); - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_clause_mv, tvb, offset+7, pir_mvl, ENC_NA); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_clause_mv, tvb, offset+7, pir_mvl, ENC_BIG_ENDIAN); break; /* Result */ case 3: - dpoe_opcode_response = proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr, tvb, offset+1, 1, ENC_NA); + dpoe_opcode_response = proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr, tvb, offset+1, 1, ENC_BIG_ENDIAN); rr_byte = tvb_get_guint8(tvb, offset+1); switch (rr_byte) { case 0x00: @@ -1939,36 +1939,36 @@ dissect_oampdu_vendor_specific(tvbuff_t *tvb, proto_tree *tree) break; case 0x03: proto_item_append_text(dpoe_opcode_response, " Set destination queue for frame"); - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_queue, tvb, offset+2, 3, ENC_NA); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_queue, tvb, offset+2, 3, ENC_BIG_ENDIAN); break; case 0x04: proto_item_append_text(dpoe_opcode_response, " Set output field"); - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_set_fc, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_set_fi, tvb, offset+3, 1, ENC_NA); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_set_fc, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_set_fi, tvb, offset+3, 1, ENC_BIG_ENDIAN); break; case 0x05: proto_item_append_text(dpoe_opcode_response, " Copy output field"); - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_copy, tvb, offset+2, 2, ENC_NA); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_copy, tvb, offset+2, 2, ENC_BIG_ENDIAN); break; case 0x06: proto_item_append_text(dpoe_opcode_response, " Delete field"); - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_delete, tvb, offset+2, 2, ENC_NA); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_delete, tvb, offset+2, 2, ENC_BIG_ENDIAN); break; case 0x07: proto_item_append_text(dpoe_opcode_response, " Insert field"); - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_insert, tvb, offset+2, 2, ENC_NA); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_insert, tvb, offset+2, 2, ENC_BIG_ENDIAN); break; case 0x08: proto_item_append_text(dpoe_opcode_response, " Delete field and Insert current output field"); - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_replace, tvb, offset+2, 2, ENC_NA); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_replace, tvb, offset+2, 2, ENC_BIG_ENDIAN); break; case 0x09: proto_item_append_text(dpoe_opcode_response, " Do not delete field (override other Delete result)"); - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_cd, tvb, offset+2, 2, ENC_NA); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_cd, tvb, offset+2, 2, ENC_BIG_ENDIAN); break; case 0x0A: proto_item_append_text(dpoe_opcode_response, " Do not insert field (override other Insert result)"); - proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_ci, tvb, offset+2, 2, ENC_NA); + proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_ci, tvb, offset+2, 2, ENC_BIG_ENDIAN); break; default: break; @@ -1996,34 +1996,34 @@ dissect_oampdu_vendor_specific(tvbuff_t *tvb, proto_tree *tree) proto_tree *dpoe_oam_qc_nq_subtree; qc_n = tvb_get_guint8(tvb, offset); - dpoe_oam_qc_upstream = proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_qc_ll_u, tvb, offset, 1, ENC_NA); + dpoe_oam_qc_upstream = proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_qc_ll_u, tvb, offset, 1, ENC_BIG_ENDIAN); dpoe_oam_qc_upstream_subtree = proto_item_add_subtree(dpoe_oam_qc_upstream, ett_oam_dpoe_qc_u); for (qc_n_i = 0; qc_n_i < qc_n; qc_n_i++) { offset++; qc_m = tvb_get_guint8(tvb, offset); - dpoe_oam_qc_nq = proto_tree_add_item(dpoe_oam_qc_upstream_subtree, hf_oam_dpoe_qc_nq, tvb, offset, 1, ENC_NA); + dpoe_oam_qc_nq = proto_tree_add_item(dpoe_oam_qc_upstream_subtree, hf_oam_dpoe_qc_nq, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(dpoe_oam_qc_nq, " (Upstream link %i)", qc_n_i); dpoe_oam_qc_nq_subtree = proto_item_add_subtree(dpoe_oam_qc_nq, ett_oam_dpoe_qc_nq); for (qc_m_i = 0; qc_m_i < qc_m; qc_m_i++) { offset++; - dpoe_opcode_response = proto_tree_add_item(dpoe_oam_qc_nq_subtree, hf_oam_dpoe_qc_queue_size, tvb, offset, 1, ENC_NA); + dpoe_opcode_response = proto_tree_add_item(dpoe_oam_qc_nq_subtree, hf_oam_dpoe_qc_queue_size, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(dpoe_opcode_response, " (Upstream link %i queue %i size)", qc_n_i, qc_m_i); } } offset++; qc_p = tvb_get_guint8(tvb, offset); - dpoe_oam_qc_downstream = proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_qc_ports_d, tvb, offset, 1, ENC_NA); + dpoe_oam_qc_downstream = proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_qc_ports_d, tvb, offset, 1, ENC_BIG_ENDIAN); dpoe_oam_qc_downstream_subtree = proto_item_add_subtree(dpoe_oam_qc_downstream, ett_oam_dpoe_qc_d); for (qc_p_i = 0; qc_p_i < qc_p; qc_p_i++) { offset++; qc_j = tvb_get_guint8(tvb, offset); - dpoe_oam_qc_nq = proto_tree_add_item(dpoe_oam_qc_downstream_subtree, hf_oam_dpoe_qc_nq, tvb, offset, 1, ENC_NA); + dpoe_oam_qc_nq = proto_tree_add_item(dpoe_oam_qc_downstream_subtree, hf_oam_dpoe_qc_nq, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(dpoe_oam_qc_nq, " (Downstream port %i)", qc_p_i); dpoe_oam_qc_nq_subtree = proto_item_add_subtree(dpoe_oam_qc_nq, ett_oam_dpoe_qc_nq); for (qc_j_i = 0; qc_j_i < qc_j; qc_j_i++) { offset++; - dpoe_opcode_response = proto_tree_add_item(dpoe_oam_qc_nq_subtree, hf_oam_dpoe_qc_queue_size, tvb, offset, 1, ENC_NA); + dpoe_opcode_response = proto_tree_add_item(dpoe_oam_qc_nq_subtree, hf_oam_dpoe_qc_queue_size, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(dpoe_opcode_response, " (Downstream port %i queue %i size)", qc_p_i, qc_j_i); } } diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c index f62a87b9cc..d9821b0702 100644 --- a/epan/dissectors/packet-pim.c +++ b/epan/dissectors/packet-pim.c @@ -1316,9 +1316,9 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { offset += advance; proto_tree_add_item(pimopt_tree, hf_pim_bd_offer_metric_pref, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(pimopt_tree, hf_pim_bd_offer_metric, tvb, offset, 4, ENC_NA); + proto_tree_add_item(pimopt_tree, hf_pim_bd_offer_metric, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(pimopt_tree, hf_pim_bd_offer_interval, tvb, offset, 2, ENC_NA); + proto_tree_add_item(pimopt_tree, hf_pim_bd_offer_interval, tvb, offset, 2, ENC_BIG_ENDIAN); break; case PIM_BDIR_DF_PASS: if (!dissect_pim_addr(pimopt_tree, tvb, offset, pimv2_unicast, @@ -1328,7 +1328,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { offset += advance; proto_tree_add_item(pimopt_tree, hf_pim_bd_pass_metric_pref, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(pimopt_tree, hf_pim_bd_pass_metric, tvb, offset, 4, ENC_NA); + proto_tree_add_item(pimopt_tree, hf_pim_bd_pass_metric, tvb, offset, 4, ENC_BIG_ENDIAN); break; } } diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index d02b832f66..c2f430f7cd 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -1874,7 +1874,7 @@ dissect_lcp_opt_type_len(tvbuff_t *tvb, int offset, proto_tree *tree, type = tvb_get_guint8(tvb, offset); proto_tree_add_uint_format_value(tree, hf_lcp_opt_type, tvb, offset, 1, type, "%s (%u)", name, type); - proto_tree_add_item(tree, hf_lcp_opt_length, tvb, offset + 1, 1, ENC_NA); + proto_tree_add_item(tree, hf_lcp_opt_length, tvb, offset + 1, 1, ENC_BIG_ENDIAN); } static void @@ -1897,7 +1897,7 @@ dissect_lcp_vendor_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, proto_item_append_text(ti, "(%s)", manuf); proto_tree_add_item(field_tree, hf_lcp_opt_kind, tvb, offset + 5, 1, - ENC_NA); + ENC_BIG_ENDIAN); if (length > 6) { proto_tree_add_item(field_tree, hf_lcp_opt_data, tvb, offset + 6, length - 6, ENC_NA); @@ -2003,7 +2003,7 @@ dissect_lcp_authprot_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, length -= 4; if (protocol == PPP_CHAP) { proto_tree_add_item(field_tree, hf_lcp_opt_algorithm, tvb, offset, - 1, ENC_NA); + 1, ENC_BIG_ENDIAN); if (length > 1) { proto_tree_add_item(field_tree, hf_lcp_opt_data, tvb, offset + 1, length - 1, ENC_NA); @@ -2182,7 +2182,7 @@ dissect_lcp_callback_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, val_to_str_const(operation, callback_op_vals, "Unknown")); dissect_lcp_opt_type_len(tvb, offset, field_tree, optp->name); proto_tree_add_item(field_tree, hf_lcp_opt_operation, tvb, offset + 2, 1, - ENC_NA); + ENC_BIG_ENDIAN); if (length > 3) { proto_tree_add_item(field_tree, hf_lcp_opt_message, tvb, offset + 3, @@ -2240,7 +2240,7 @@ dissect_lcp_multilink_ep_disc_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, multilink_ep_disc_class_vals, "Unknown")); dissect_lcp_opt_type_len(tvb, offset, field_tree, optp->name); proto_tree_add_item(field_tree, hf_lcp_opt_ep_disc_class, tvb, offset + 2, - 1, ENC_NA); + 1, ENC_BIG_ENDIAN); if (length <= 3) return; @@ -2322,7 +2322,7 @@ dissect_lcp_dce_identifier_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, val_to_str_const(mode, dce_id_mode_vals, "Unknown")); dissect_lcp_opt_type_len(tvb, offset, field_tree, optp->name); proto_tree_add_item(field_tree, hf_lcp_opt_mode, tvb, offset + 2, 1, - ENC_NA); + ENC_BIG_ENDIAN); } static void @@ -2415,7 +2415,7 @@ dissect_lcp_prefix_elision_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, offset += 2; while (length >= 2) { proto_tree_add_item(field_tree, hf_lcp_opt_class, tvb, offset, 1, - ENC_NA); + ENC_BIG_ENDIAN); pre_len = tvb_get_guint8(tvb, offset + 1); if ((guint)(pre_len + 2) <= length) { proto_tree_add_item(field_tree, hf_lcp_opt_prefix, tvb, @@ -2444,9 +2444,9 @@ dissect_lcp_multilink_hdr_fmt_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, field_tree = proto_tree_add_subtree(tree, tvb, offset, length, *optp->subtree_index, NULL, optp->name); dissect_lcp_opt_type_len(tvb, offset, field_tree, optp->name); proto_tree_add_item(field_tree, hf_lcp_opt_code, tvb, offset + 2, 1, - ENC_NA); + ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_lcp_opt_max_susp_classes, tvb, - offset + 3, 1, ENC_NA); + offset + 3, 1, ENC_BIG_ENDIAN); } @@ -2736,7 +2736,7 @@ dissect_ipcp_opt_type_len(tvbuff_t *tvb, int offset, proto_tree *tree, type = tvb_get_guint8(tvb, offset); proto_tree_add_uint_format_value(tree, hf_ipcp_opt_type, tvb, offset, 1, type, "%s (%u)", name, type); - proto_tree_add_item(tree, hf_ipcp_opt_length, tvb, offset + 1, 1, ENC_NA); + proto_tree_add_item(tree, hf_ipcp_opt_length, tvb, offset + 1, 1, ENC_BIG_ENDIAN); } /* http://tools.ietf.org/html/rfc1172#section-5.1 */ @@ -2804,7 +2804,7 @@ dissect_ipcp_compress_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, case IPCP_COMPRESS_VJ_1172: case IPCP_COMPRESS_VJ: proto_tree_add_item(field_tree, hf_ipcp_opt_max_slot_id, tvb, - offset + 4, 1, ENC_NA); + offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_ipcp_opt_comp_slot_id, tvb, offset + 5, 1, ENC_NA); break; @@ -2857,7 +2857,7 @@ dissect_ipcp_opt_rohc_type_len(tvbuff_t *tvb, int offset, proto_tree *tree, proto_tree_add_uint_format_value(tree, hf_ipcp_opt_rohc_type, tvb, offset, 1, type, "%s (%u)", name, type); proto_tree_add_item(tree, hf_ipcp_opt_rohc_length, tvb, offset + 1, 1, - ENC_NA); + ENC_BIG_ENDIAN); } static void @@ -2887,7 +2887,7 @@ dissect_ipcp_opt_iphc_type_len(tvbuff_t *tvb, int offset, proto_tree *tree, proto_tree_add_uint_format_value(tree, hf_ipcp_opt_iphc_type, tvb, offset, 1, type, "%s (%u)", name, type); proto_tree_add_item(tree, hf_ipcp_opt_iphc_length, tvb, offset + 1, 1, - ENC_NA); + ENC_BIG_ENDIAN); } static void @@ -2909,7 +2909,7 @@ dissect_ipcp_iphc_neghdrcomp_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, field_tree = proto_tree_add_subtree(tree, tvb, offset, length, *optp->subtree_index, NULL, optp->name); dissect_ipcp_opt_iphc_type_len(tvb, offset, field_tree, optp->name); proto_tree_add_item(field_tree, hf_ipcp_opt_iphc_param, tvb, offset + 2, 1, - ENC_NA); + ENC_BIG_ENDIAN); } static void @@ -3007,7 +3007,7 @@ dissect_osinlcp_opt_type_len(tvbuff_t *tvb, int offset, proto_tree *tree, proto_tree_add_uint_format_value(tree, hf_osinlcp_opt_type, tvb, offset, 1, type, "%s (%u)", name, type); proto_tree_add_item(tree, hf_osinlcp_opt_length, tvb, offset + 1, 1, - ENC_NA); + ENC_BIG_ENDIAN); } static void @@ -3021,7 +3021,7 @@ dissect_osinlcp_align_npdu_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, optp->name, tvb_get_guint8(tvb, offset + 2)); dissect_osinlcp_opt_type_len(tvb, offset, field_tree, optp->name); proto_tree_add_item(field_tree, hf_osinlcp_opt_alignment, tvb, offset + 2, - 1, ENC_NA); + 1, ENC_BIG_ENDIAN); } static void @@ -3029,7 +3029,7 @@ dissect_pppmuxcp_def_pid_opt(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offs guint length _U_, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { pppmux_def_prot_id = tvb_get_ntohs(tvb, offset + 2); - proto_tree_add_item(tree, hf_pppmux_def_prot_id, tvb, offset + 2, 2, ENC_NA); + proto_tree_add_item(tree, hf_pppmux_def_prot_id, tvb, offset + 2, 2, ENC_BIG_ENDIAN); } @@ -3042,7 +3042,7 @@ dissect_ccp_opt_type_len(tvbuff_t *tvb, int offset, proto_tree *tree, type = tvb_get_guint8(tvb, offset); proto_tree_add_uint_format_value(tree, hf_ccp_opt_type, tvb, offset, 1, type, "%s (%u)", name, type); - proto_tree_add_item(tree, hf_ccp_opt_length, tvb, offset + 1, 1, ENC_NA); + proto_tree_add_item(tree, hf_ccp_opt_length, tvb, offset + 1, 1, ENC_BIG_ENDIAN); } /* http://tools.ietf.org/html/rfc1962 */ @@ -3065,7 +3065,7 @@ static void dissect_ccp_oui_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, proto_item_append_text(ti, "(%s)", manuf); proto_tree_add_item(field_tree, hf_ccp_opt_subtype, tvb, offset + 5, 1, - ENC_NA); + ENC_BIG_ENDIAN); if (length > 6) { proto_tree_add_item(field_tree, hf_ccp_opt_data, tvb, offset + 6, length - 6, ENC_NA); @@ -3200,7 +3200,7 @@ static void dissect_ccp_gfza_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, dissect_ccp_opt_type_len(tvb, offset, field_tree, optp->name); proto_tree_add_item(field_tree, hf_ccp_opt_history, tvb, offset + 2, 1, - ENC_NA); + ENC_BIG_ENDIAN); if (length > 3) { proto_tree_add_item(field_tree, hf_ccp_opt_version, tvb, offset + 3, @@ -3240,9 +3240,9 @@ dissect_ccp_lzsdcp_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, proto_tree_add_item(field_tree, hf_ccp_opt_history_count, tvb, offset + 2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_ccp_opt_check_mode, tvb, offset + 4, 1, - ENC_NA); + ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_ccp_opt_process_mode, tvb, offset + 5, - 1, ENC_NA); + 1, ENC_BIG_ENDIAN); } /* http://tools.ietf.org/html/rfc1975 */ @@ -3255,12 +3255,12 @@ dissect_ccp_mvrca_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, field_tree = proto_tree_add_subtree(tree, tvb, offset, length, *optp->subtree_index, NULL, optp->name); dissect_ccp_opt_type_len(tvb, offset, field_tree, optp->name); - proto_tree_add_item(field_tree, hf_ccp_opt_fe, tvb, offset + 2, 1, ENC_NA); + proto_tree_add_item(field_tree, hf_ccp_opt_fe, tvb, offset + 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_ccp_opt_p, tvb, offset + 2, 1, ENC_NA); proto_tree_add_item(field_tree, hf_ccp_opt_History, tvb, offset + 2, 1, - ENC_NA); + ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_ccp_opt_contexts, tvb, offset + 3, 1, - ENC_NA); + ENC_BIG_ENDIAN); } /* http://tools.ietf.org/html/rfc1976 */ @@ -3274,7 +3274,7 @@ dissect_ccp_dce_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, dissect_ccp_opt_type_len(tvb, offset, field_tree, optp->name); proto_tree_add_item(field_tree, hf_ccp_opt_mode, tvb, offset + 2, 1, - ENC_NA); + ENC_BIG_ENDIAN); } static const value_string deflate_method_vals[] = { @@ -3302,11 +3302,11 @@ dissect_ccp_deflate_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, proto_tree_add_uint_format_value(field_tree, hf_ccp_opt_window, tvb, offset + 2, 1, window, "%u", 1 << (hi_nibble(window) + 8)); proto_tree_add_item(field_tree, hf_ccp_opt_method, tvb, offset + 2, 1, - ENC_NA); + ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_ccp_opt_mbz, tvb, offset + 3, 1, - ENC_NA); + ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_ccp_opt_chk, tvb, offset + 3, 1, - ENC_NA); + ENC_BIG_ENDIAN); } static const range_string v44lzjh_mode_dict_rvals[] = { @@ -3360,7 +3360,7 @@ dissect_cbcp_callback_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, field_tree = proto_tree_add_subtree(tree, tvb, offset, length, *optp->subtree_index, NULL, optp->name); - proto_tree_add_item(field_tree, hf_cbcp_callback_delay, tvb, offset + 2, 1, ENC_NA); + proto_tree_add_item(field_tree, hf_cbcp_callback_delay, tvb, offset + 2, 1, ENC_BIG_ENDIAN); offset += 3; length -= 3; @@ -3405,7 +3405,7 @@ dissect_bap_link_type_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, link_speed = tvb_get_ntohs(tvb, offset + 2); proto_tree_add_uint_format_value(field_tree, hf_bacp_link_speed, tvb, offset + 2, 2, link_speed, "%u kbps", link_speed); - proto_tree_add_item(field_tree, hf_bacp_link_type, tvb, offset + 4, 1, ENC_NA); + proto_tree_add_item(field_tree, hf_bacp_link_type, tvb, offset + 4, 1, ENC_BIG_ENDIAN); } static void @@ -3430,8 +3430,8 @@ dissect_bap_phone_delta_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, ett_bap_phone_delta_subopt, NULL, "Sub-Option (%u byte%s)", subopt_len, plurality(subopt_len, "", "s")); - proto_tree_add_item(suboption_tree, hf_bap_sub_option_type, tvb, offset, 1, ENC_NA); - ti = proto_tree_add_item(suboption_tree, hf_bap_sub_option_length, tvb, offset + 1, 1, ENC_NA); + proto_tree_add_item(suboption_tree, hf_bap_sub_option_type, tvb, offset, 1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(suboption_tree, hf_bap_sub_option_length, tvb, offset + 1, 1, ENC_BIG_ENDIAN); if (subopt_len < 2) { expert_add_info_format(pinfo, ti, &ei_bap_sub_option_length, @@ -3447,7 +3447,7 @@ dissect_bap_phone_delta_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, switch (subopt_type) { case BAP_PHONE_DELTA_SUBOPT_UNIQ_DIGIT: if (subopt_len == 3) { - proto_tree_add_item(suboption_tree, hf_bap_unique_digit, tvb, offset + 2, 1, ENC_NA); + proto_tree_add_item(suboption_tree, hf_bap_unique_digit, tvb, offset + 2, 1, ENC_BIG_ENDIAN); } else { expert_add_info_format(pinfo, ti, &ei_bap_sub_option_length, "Invalid suboption length: %u (must be == 3)", subopt_len); @@ -3507,15 +3507,15 @@ dissect_bap_call_status_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, field_tree = proto_tree_add_subtree(tree, tvb, offset, length, *optp->subtree_index, NULL, optp->name); - proto_tree_add_item(field_tree, hf_bap_call_status, tvb, offset + 2, 1, ENC_NA); - proto_tree_add_item(field_tree, hf_bap_call_action, tvb, offset + 3, 1, ENC_NA); + proto_tree_add_item(field_tree, hf_bap_call_status, tvb, offset + 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree, hf_bap_call_action, tvb, offset + 3, 1, ENC_BIG_ENDIAN); } static void dissect_vsncp_pdnid_opt(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, guint length _U_, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_tree_add_item(tree, hf_vsncp_pdn_identifier, tvb, offset+2, 1, ENC_NA); + proto_tree_add_item(tree, hf_vsncp_pdn_identifier, tvb, offset+2, 1, ENC_BIG_ENDIAN); } static const value_string vsncp_attach_vals[] = { @@ -3528,7 +3528,7 @@ static void dissect_vsncp_attachtype_opt(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, guint length _U_, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_tree_add_item(tree, hf_vsncp_attach_type, tvb, offset+2, 1, ENC_NA); + proto_tree_add_item(tree, hf_vsncp_attach_type, tvb, offset+2, 1, ENC_BIG_ENDIAN); } static const value_string vsncp_pdntype_vals[] = { @@ -3543,7 +3543,7 @@ static void dissect_vsncp_pdntype_opt(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, guint length _U_, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_tree_add_item(tree, hf_vsncp_pdn_type, tvb, offset+2, 1, ENC_NA); + proto_tree_add_item(tree, hf_vsncp_pdn_type, tvb, offset+2, 1, ENC_BIG_ENDIAN); } static const value_string vsncp_errorcode_vals[] = { @@ -3569,7 +3569,7 @@ static void dissect_vsncp_errorcode_opt(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, guint length _U_, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_tree_add_item(tree, hf_vsncp_error_code, tvb, offset+2, 1, ENC_NA); + proto_tree_add_item(tree, hf_vsncp_error_code, tvb, offset+2, 1, ENC_BIG_ENDIAN); } static void @@ -3584,7 +3584,7 @@ dissect_vsncp_pdnaddress_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, optp->name, length, plurality(length, "", "s")); pdnaddtype = tvb_get_guint8(tvb, offset + 2); - proto_tree_add_item(field_tree, hf_vsncp_pdn_type, tvb, offset + 2, 1, ENC_NA); + proto_tree_add_item(field_tree, hf_vsncp_pdn_type, tvb, offset + 2, 1, ENC_BIG_ENDIAN); switch (pdnaddtype) { case 1: @@ -3671,7 +3671,7 @@ static void dissect_vsncp_addressalloc_opt(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, guint length _U_, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_tree_add_item(tree, hf_vsncp_address_allocation_cause, tvb, offset+2, 1, ENC_NA); + proto_tree_add_item(tree, hf_vsncp_address_allocation_cause, tvb, offset+2, 1, ENC_BIG_ENDIAN); } static void @@ -3734,7 +3734,7 @@ dissect_vsncp_pco_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, while (i < (length - 3)) { len = tvb_get_guint8(tvb, (off + 2)); proto_tree_add_item(field_tree, hf_vsncp_protocol, tvb, off, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(field_tree, hf_vsncp_protocol_configuration_length, tvb, off + 2, 1, ENC_NA); + proto_tree_add_item(field_tree, hf_vsncp_protocol_configuration_length, tvb, off + 2, 1, ENC_BIG_ENDIAN); if (len > 0) { proto_tree_add_item(field_tree, hf_vsncp_protocol_configuration_data, tvb, off + 3, len, ENC_NA); } @@ -3767,7 +3767,7 @@ dissect_cp(tvbuff_t *tvb, int proto_id, int proto_subtree_index, fh_tree = proto_item_add_subtree(ti, proto_subtree_index); proto_tree_add_uint_format_value(fh_tree, hf_ppp_code, tvb, 0, 1, code, "%s (%u)", val_to_str_const(code, proto_vals, "Unknown"), code); - proto_tree_add_item(fh_tree, hf_ppp_identifier, tvb, 1, 1, ENC_NA); + proto_tree_add_item(fh_tree, hf_ppp_identifier, tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(fh_tree, hf_ppp_length, tvb, 2, 2, ENC_BIG_ENDIAN); } offset = 4; @@ -3796,7 +3796,7 @@ dissect_cp(tvbuff_t *tvb, int proto_id, int proto_subtree_index, } } proto_tree_add_item(fh_tree, hf_ppp_kind, tvb, offset + 7, 1, - ENC_NA); + ENC_BIG_ENDIAN); if (length > 8) { proto_tree_add_item(fh_tree, hf_ppp_data, tvb, offset + 8, length - 8, ENC_NA); @@ -4013,8 +4013,8 @@ dissect_vsncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_vsncp, tvb, 0, length, ENC_NA); fh_tree = proto_item_add_subtree(ti, ett_vsncp); - proto_tree_add_item(fh_tree, hf_vsncp_code, tvb, 0, 1, ENC_NA); - proto_tree_add_item(fh_tree, hf_vsncp_identifier, tvb, 1, 1, ENC_NA); + proto_tree_add_item(fh_tree, hf_vsncp_code, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(fh_tree, hf_vsncp_identifier, tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(fh_tree, hf_vsncp_length, tvb, 2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(fh_tree, hf_ppp_oui, tvb, 4, 3, ENC_BIG_ENDIAN); @@ -4260,8 +4260,8 @@ dissect_bap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_bap, tvb, 0, length, ENC_NA); fh_tree = proto_item_add_subtree(ti, ett_bap_options); - proto_tree_add_item(fh_tree, hf_bap_type, tvb, 0, 1, ENC_NA); - proto_tree_add_item(fh_tree, hf_bap_identifier, tvb, 1, 1, ENC_NA); + proto_tree_add_item(fh_tree, hf_bap_type, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(fh_tree, hf_bap_identifier, tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(fh_tree, hf_bap_length, tvb, 2, 2, ENC_BIG_ENDIAN); } offset = 4; @@ -4269,7 +4269,7 @@ dissect_bap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (type == BAP_CRES || type == BAP_CBRES || type == BAP_LDQRES || type == BAP_CSRES) { - proto_tree_add_item(fh_tree, hf_bap_response_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(fh_tree, hf_bap_response_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; } diff --git a/epan/dissectors/packet-rmt-norm.c b/epan/dissectors/packet-rmt-norm.c index 08805abec4..5c7574fcb2 100644 --- a/epan/dissectors/packet-rmt-norm.c +++ b/epan/dissectors/packet-rmt-norm.c @@ -262,7 +262,7 @@ static guint dissect_feccode(proto_tree *tree, tvbuff_t *tvb, guint offset, proto_tree_add_item(tree, hf_fec_encoding_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (reserved) { - proto_tree_add_item(tree, hf_reserved, tvb, offset, 1, ENC_NA); offset += 1; + proto_tree_add_item(tree, hf_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } proto_tree_add_item(tree, hf_object_transport_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; @@ -416,7 +416,7 @@ static guint dissect_norm_cmd_repairadv(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint8 hlen) { proto_tree_add_item(tree, hf_flags, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset +=2; + proto_tree_add_item(tree, hf_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if (offset < hdrlen2bytes(hlen)) { offset = dissect_norm_hdrext(tree, pinfo, tvb, offset, hlen); @@ -431,7 +431,7 @@ static guint dissect_norm_cmd_repairadv(proto_tree *tree, packet_info *pinfo, static guint dissect_norm_cmd_cc(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint8 hlen) { - proto_tree_add_item(tree, hf_reserved, tvb, offset, 1, ENC_NA); offset += 1; + proto_tree_add_item(tree, hf_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_cc_sequence, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_cc_sts, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -477,7 +477,7 @@ static guint dissect_norm_cmd_squelch(proto_tree *tree, packet_info *pinfo, static guint dissect_norm_cmd_ackreq(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, guint offset) { - proto_tree_add_item(tree, hf_reserved, tvb, offset, 1, ENC_NA); offset += 1; + proto_tree_add_item(tree, hf_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_ack_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_ack_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; return offset; diff --git a/epan/dissectors/packet-sml.c b/epan/dissectors/packet-sml.c index 033783262a..d92c56491e 100644 --- a/epan/dissectors/packet-sml.c +++ b/epan/dissectors/packet-sml.c @@ -410,7 +410,7 @@ static void sml_value(tvbuff_t *tvb,proto_tree *insert_tree,guint *offset, guint *offset+= *length; } else { - proto_tree_add_item (value_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (value_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; } proto_tree_add_item (value_tree, hf_sml_value, tvb, *offset, *data, ENC_NA); @@ -425,9 +425,9 @@ static void sml_time_type(tvbuff_t *tvb, proto_tree *SML_time_tree, guint *offse timetype_tree = proto_tree_add_subtree(SML_time_tree, tvb, *offset, 2, ett_sml_timetype, NULL, "SML-Time Type"); - proto_tree_add_item (timetype_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (timetype_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (timetype_tree, hf_sml_timetype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (timetype_tree, hf_sml_timetype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; } @@ -547,10 +547,10 @@ static void field_smlVersion(tvbuff_t *tvb, proto_tree *insert_tree, guint *offs if (*data > 0) { smlVersion_tree = proto_item_add_subtree (smlVersion, ett_sml_smlVersion); - proto_tree_add_item (smlVersion_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (smlVersion_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (smlVersion_tree, hf_sml_smlVersion, tvb, *offset, 1,ENC_NA); + proto_tree_add_item (smlVersion_tree, hf_sml_smlVersion, tvb, *offset, 1,ENC_BIG_ENDIAN); *offset+=1; } else @@ -617,7 +617,7 @@ static void field_status(tvbuff_t *tvb, proto_tree *insert_tree, guint *offset, ett_sml_status, NULL, "status %s", (*data == 0)? ": NOT SET" : ""); if (*data > 0){ - proto_tree_add_item (status_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (status_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; proto_tree_add_item (status_tree, hf_sml_status, tvb, *offset, *data, ENC_BIG_ENDIAN); *offset+= *data; @@ -635,9 +635,9 @@ static void field_unit(tvbuff_t *tvb, proto_tree *insert_tree, guint *offset, gu unit = proto_tree_add_uint_format (insert_tree, hf_sml_unit, tvb, *offset, *length + *data, *length + *data, "Unit %s", (*data == 0)? ": NOT SET" : ""); if (*data > 0) { unit_tree = proto_item_add_subtree (unit, ett_sml_unit); - proto_tree_add_item (unit_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (unit_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item(unit_tree, hf_sml_unit, tvb, *offset, 1, ENC_NA); + proto_tree_add_item(unit_tree, hf_sml_unit, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; } else @@ -654,9 +654,9 @@ static void field_scaler(tvbuff_t *tvb, proto_tree *insert_tree, guint *offset, if (*data > 0){ scaler_tree = proto_item_add_subtree (scaler, ett_sml_scaler); - proto_tree_add_item (scaler_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (scaler_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item(scaler_tree, hf_sml_scaler, tvb, *offset, 1, ENC_NA); + proto_tree_add_item(scaler_tree, hf_sml_scaler, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; } else @@ -715,7 +715,7 @@ static void field_regPeriod(tvbuff_t *tvb, proto_tree *insert_tree, guint *offse get_length(tvb, offset, data, length); regPeriod_tree = proto_tree_add_subtree(insert_tree, tvb, *offset, *length + *data, ett_sml_regPeriod, NULL, "regPeriod"); - proto_tree_add_item (regPeriod_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (regPeriod_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; proto_tree_add_item (regPeriod_tree, hf_sml_regPeriod, tvb, *offset, *data, ENC_BIG_ENDIAN); *offset+=*data; @@ -764,7 +764,7 @@ static void field_actTime(tvbuff_t *tvb, proto_tree *insert_tree, guint *offset, get_length(tvb, offset, data, length); actTime_tree = proto_tree_add_subtree(insert_tree, tvb, *offset, *length + *data, ett_sml_actTime, NULL, "actTime"); - proto_tree_add_item (actTime_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (actTime_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; proto_tree_add_item(actTime_tree, hf_sml_actTime, tvb, *offset, *data, ENC_BIG_ENDIAN); *offset+=*data; @@ -775,7 +775,7 @@ static void field_valTime(tvbuff_t *tvb, proto_tree *insert_tree, guint *offset, get_length(tvb, offset, data, length); valTime_tree = proto_tree_add_subtree(insert_tree, tvb, *offset, *length + *data, ett_sml_valTime, NULL, "valTime"); - proto_tree_add_item (valTime_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (valTime_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; proto_tree_add_item(valTime_tree, hf_sml_valTime, tvb, *offset, *data, ENC_BIG_ENDIAN); *offset+=*data; @@ -826,7 +826,7 @@ static void TupelEntryTree(tvbuff_t *tvb, proto_tree *procParValue_tree, guint * sml_time_type(tvb, SML_time_tree, offset); get_length(tvb, offset, &data, &length); secIndex_tree = proto_tree_add_subtree(SML_time_tree, tvb, *offset, length + data, ett_sml_secIndex, NULL, "secIndex"); - proto_tree_add_item (secIndex_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (secIndex_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; proto_tree_add_item(secIndex_tree, hf_sml_secIndex, tvb, *offset, data, ENC_BIG_ENDIAN); *offset+=data; @@ -837,68 +837,68 @@ static void TupelEntryTree(tvbuff_t *tvb, proto_tree *procParValue_tree, guint * /*unit_pA*/ unit_pA_tree = proto_tree_add_subtree(TupelEntry_list, tvb, *offset, 2, ett_sml_unit_pA, NULL, "unit_pA"); - proto_tree_add_item (unit_pA_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (unit_pA_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (unit_pA_tree, hf_sml_unit_pA, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (unit_pA_tree, hf_sml_unit_pA, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; /*scaler_pA*/ scaler_pA_tree = proto_tree_add_subtree(TupelEntry_list, tvb, *offset, 2, ett_sml_scaler_pA, NULL, "scaler_pA"); - proto_tree_add_item (scaler_pA_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (scaler_pA_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (scaler_pA_tree, hf_sml_scaler_pA, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (scaler_pA_tree, hf_sml_scaler_pA, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; /*value_pA*/ get_length(tvb, offset, &data, &length); value_pA_tree = proto_tree_add_subtree(TupelEntry_list, tvb, *offset, length+data, ett_sml_value_pA, NULL, "value_pA"); - proto_tree_add_item (value_pA_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (value_pA_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (value_pA_tree, hf_sml_value_pA, tvb, *offset, data, ENC_NA); + proto_tree_add_item (value_pA_tree, hf_sml_value_pA, tvb, *offset, data, ENC_BIG_ENDIAN); *offset+=data; /*unit_R1*/ unit_R1_tree = proto_tree_add_subtree(TupelEntry_list, tvb, *offset, 2, ett_sml_unit_R1, NULL, "unit_R1"); - proto_tree_add_item (unit_R1_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (unit_R1_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (unit_R1_tree, hf_sml_unit_R1, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (unit_R1_tree, hf_sml_unit_R1, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; /*scaler_R1*/ scaler_R1_tree = proto_tree_add_subtree(TupelEntry_list, tvb, *offset, 1, ett_sml_scaler_R1, NULL, "scaler_R1"); - proto_tree_add_item (scaler_R1_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (scaler_R1_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (scaler_R1_tree, hf_sml_scaler_R1, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (scaler_R1_tree, hf_sml_scaler_R1, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; /*value_R1*/ get_length(tvb, offset, &data, &length); value_R1_tree = proto_tree_add_subtree(TupelEntry_list, tvb, *offset, length+data, ett_sml_value_R1, NULL, "value_R1"); - proto_tree_add_item (value_R1_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (value_R1_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (value_R1_tree, hf_sml_value_R1, tvb, *offset, data, ENC_NA); + proto_tree_add_item (value_R1_tree, hf_sml_value_R1, tvb, *offset, data, ENC_BIG_ENDIAN); *offset+=data; /*unit_R4*/ unit_R4_tree = proto_tree_add_subtree(TupelEntry_list, tvb, *offset, 2, ett_sml_unit_R4, NULL, "unit_R4"); - proto_tree_add_item (unit_R4_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (unit_R4_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (unit_R4_tree, hf_sml_unit_R4, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (unit_R4_tree, hf_sml_unit_R4, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; /*scaler_R4*/ scaler_R4_tree = proto_tree_add_subtree(TupelEntry_list, tvb, *offset, 2, ett_sml_scaler_R4, NULL, "scaler_R4"); - proto_tree_add_item (scaler_R4_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (scaler_R4_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (scaler_R4_tree, hf_sml_scaler_R4, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (scaler_R4_tree, hf_sml_scaler_R4, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; /*value_R4*/ get_length(tvb, offset, &data, &length); value_R4_tree = proto_tree_add_subtree(TupelEntry_list, tvb, *offset, length+data, ett_sml_value_R4, NULL, "value_R4"); - proto_tree_add_item (value_R4_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (value_R4_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (value_R4_tree, hf_sml_value_R4, tvb, *offset, data, ENC_NA); + proto_tree_add_item (value_R4_tree, hf_sml_value_R4, tvb, *offset, data, ENC_BIG_ENDIAN); *offset+=data; /*signature_pA_R1_R4*/ @@ -911,68 +911,68 @@ static void TupelEntryTree(tvbuff_t *tvb, proto_tree *procParValue_tree, guint * /*unit_mA*/ unit_mA_tree = proto_tree_add_subtree(TupelEntry_list, tvb, *offset, 2, ett_sml_unit_mA, NULL, "unit_mA"); - proto_tree_add_item (unit_mA_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (unit_mA_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (unit_mA_tree, hf_sml_unit_mA, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (unit_mA_tree, hf_sml_unit_mA, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; /*scaler_mA*/ scaler_mA_tree = proto_tree_add_subtree(TupelEntry_list, tvb, *offset, 2, ett_sml_scaler_mA, NULL, "scaler_mA"); - proto_tree_add_item (scaler_mA_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (scaler_mA_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (scaler_mA_tree, hf_sml_scaler_mA, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (scaler_mA_tree, hf_sml_scaler_mA, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; /*value_mA*/ get_length(tvb, offset, &data, &length); value_mA_tree = proto_tree_add_subtree(TupelEntry_list, tvb, *offset, length+data, ett_sml_value_mA, NULL, "value_mA"); - proto_tree_add_item (value_mA_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (value_mA_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (value_mA_tree, hf_sml_value_mA, tvb, *offset, data, ENC_NA); + proto_tree_add_item (value_mA_tree, hf_sml_value_mA, tvb, *offset, data, ENC_BIG_ENDIAN); *offset+=data; /*unit_R2*/ unit_R2_tree = proto_tree_add_subtree(TupelEntry_list, tvb, *offset, 2, ett_sml_unit_R2, NULL, "unit_R2"); - proto_tree_add_item (unit_R2_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (unit_R2_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (unit_R2_tree, hf_sml_unit_R2, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (unit_R2_tree, hf_sml_unit_R2, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; /*scaler_R2*/ scaler_R2_tree = proto_tree_add_subtree(TupelEntry_list, tvb, *offset, 2, ett_sml_scaler_R2, NULL, "scaler_R2"); - proto_tree_add_item (scaler_R2_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (scaler_R2_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (scaler_R2_tree, hf_sml_scaler_R2, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (scaler_R2_tree, hf_sml_scaler_R2, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; /*value_R2*/ get_length(tvb, offset, &data, &length); value_R2_tree = proto_tree_add_subtree(TupelEntry_list, tvb, *offset, length+data, ett_sml_value_R2, NULL, "value_R2"); - proto_tree_add_item (value_R2_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (value_R2_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (value_R2_tree, hf_sml_value_R2, tvb, *offset, data, ENC_NA); + proto_tree_add_item (value_R2_tree, hf_sml_value_R2, tvb, *offset, data, ENC_BIG_ENDIAN); *offset+=data; /*unit_R3*/ unit_R3_tree = proto_tree_add_subtree(TupelEntry_list, tvb, *offset, 2, ett_sml_unit_R3, NULL, "unit_R3"); - proto_tree_add_item (unit_R3_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (unit_R3_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (unit_R3_tree, hf_sml_unit_R3, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (unit_R3_tree, hf_sml_unit_R3, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; /*scaler_R3*/ scaler_R3_tree = proto_tree_add_subtree(TupelEntry_list, tvb, *offset, 2, ett_sml_scaler_R3, NULL, "scaler_R3"); - proto_tree_add_item (scaler_R3_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (scaler_R3_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (scaler_R3_tree, hf_sml_scaler_R3, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (scaler_R3_tree, hf_sml_scaler_R3, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; /*value_R3*/ get_length(tvb, offset, &data, &length); value_R3_tree = proto_tree_add_subtree(TupelEntry_list, tvb, *offset, length+data, ett_sml_value_R3, NULL, "value_R3"); - proto_tree_add_item (value_R3_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (value_R3_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (value_R3_tree, hf_sml_value_R3, tvb, *offset, data, ENC_NA); + proto_tree_add_item (value_R3_tree, hf_sml_value_R3, tvb, *offset, data, ENC_BIG_ENDIAN); *offset+=data; /*signature_mA_R2_R3*/ @@ -1019,7 +1019,7 @@ static void child_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *insert_tre check = tvb_get_guint8(tvb, *offset); if (check == OPTIONAL){ - procParValue = proto_tree_add_item(insert_tree, hf_sml_procParValue, tvb, *offset, 1, ENC_NA); + procParValue = proto_tree_add_item(insert_tree, hf_sml_procParValue, tvb, *offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(procParValue, ": NOT SET"); *offset+=1; } @@ -1030,10 +1030,10 @@ static void child_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *insert_tre /*procParValue CHOOSE*/ procParValuetype_tree = proto_tree_add_subtree(procParValue_tree, tvb, *offset, 2, ett_sml_procParValuetype, NULL, "ProcParValueType"); - proto_tree_add_item (procParValuetype_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (procParValuetype_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; check = tvb_get_guint8(tvb, *offset); - proto_tree_add_item (procParValuetype_tree, hf_sml_procParValue, tvb, *offset, 1 ,ENC_NA); + proto_tree_add_item (procParValuetype_tree, hf_sml_procParValue, tvb, *offset, 1 ,ENC_BIG_ENDIAN); *offset+=1; switch (check) { @@ -1087,7 +1087,7 @@ static void child_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *insert_tre /*Time*/ get_length(tvb, offset, data, length); procParValueTime_tree = proto_tree_add_subtree(SML_time_tree, tvb, *offset, *length + *data, ett_sml_procParValueTime, NULL, "procParValueTime"); - proto_tree_add_item (procParValueTime_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (procParValueTime_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; proto_tree_add_item(procParValueTime_tree, hf_sml_procParValueTime, tvb, *offset, *data, ENC_BIG_ENDIAN); *offset+=*data; @@ -1224,7 +1224,7 @@ static void decode_PublicOpenRes (tvbuff_t *tvb, proto_tree *messagebodytree_lis /*refTime*/ get_length(tvb, offset, &data, &length); refTime_tree = proto_tree_add_subtree(SML_time_tree, tvb, *offset, length+data, ett_sml_refTime, NULL, "refTime"); - proto_tree_add_item (refTime_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (refTime_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; proto_tree_add_item(refTime_tree, hf_sml_refTime, tvb, *offset, data, ENC_BIG_ENDIAN); *offset+=data; @@ -1270,9 +1270,9 @@ static gboolean decode_GetProfile_List_Pack_Req (tvbuff_t *tvb, packet_info *pin if (data > 0) { withRawdata_tree = proto_item_add_subtree (withRawdata, ett_sml_withRawdata); - proto_tree_add_item (withRawdata_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (withRawdata_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (withRawdata_tree, hf_sml_withRawdata, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (withRawdata_tree, hf_sml_withRawdata, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; } else @@ -1295,7 +1295,7 @@ static gboolean decode_GetProfile_List_Pack_Req (tvbuff_t *tvb, packet_info *pin /*beginTime*/ get_length(tvb, offset, &data, &length); beginTime_tree = proto_tree_add_subtree(SML_time_tree, tvb, *offset, length + data, ett_sml_beginTime, NULL, "beginTime"); - proto_tree_add_item (beginTime_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (beginTime_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; proto_tree_add_item(beginTime_tree, hf_sml_beginTime, tvb, *offset, data, ENC_BIG_ENDIAN); *offset+=data; @@ -1319,7 +1319,7 @@ static gboolean decode_GetProfile_List_Pack_Req (tvbuff_t *tvb, packet_info *pin /*endTime*/ get_length(tvb, offset, &data, &length); endTime_tree = proto_tree_add_subtree(SML_time_tree, tvb, *offset, length + data, ett_sml_beginTime, NULL, "endTime"); - proto_tree_add_item (endTime_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (endTime_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; proto_tree_add_item(endTime_tree, hf_sml_endTime, tvb, *offset, data, ENC_BIG_ENDIAN); *offset+=data; @@ -1779,7 +1779,7 @@ static gboolean decode_GetListRes (tvbuff_t *tvb, packet_info *pinfo, proto_tree /*actSensorTime*/ get_length(tvb, offset, &data, &length); actSensorTime_tree = proto_tree_add_subtree(SML_time_tree, tvb, *offset, length + data, ett_sml_actSensorTime, NULL, "actSensorTime"); - proto_tree_add_item (actSensorTime_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (actSensorTime_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; proto_tree_add_item(actSensorTime_tree, hf_sml_actSensorTime, tvb, *offset, data, ENC_BIG_ENDIAN); *offset+=data; @@ -1877,7 +1877,7 @@ static gboolean decode_GetListRes (tvbuff_t *tvb, packet_info *pinfo, proto_tree get_length(tvb, offset, &data, &length); actGatewayTime_tree = proto_tree_add_subtree(SML_time_tree, tvb, *offset, length + data, ett_sml_actSensorTime, NULL, "actGatewayTime"); - proto_tree_add_item (actGatewayTime_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (actGatewayTime_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; proto_tree_add_item(actGatewayTime_tree, hf_sml_actGatewayTime, tvb, *offset, data, ENC_BIG_ENDIAN); *offset+=data; @@ -2237,16 +2237,16 @@ static void dissect_sml_file(tvbuff_t *tvb, packet_info *pinfo, gint *offset, pr /*Group No*/ groupNo_tree = proto_tree_add_subtree(mainlist_list, tvb, *offset, 2, ett_sml_group, NULL, "Group No"); - proto_tree_add_item (groupNo_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (groupNo_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item (groupNo_tree, hf_sml_groupNo, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (groupNo_tree, hf_sml_groupNo, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; /*abort on Error*/ abortOnError_tree = proto_tree_add_subtree(mainlist_list, tvb, *offset, 2, ett_sml_abort, NULL, "Abort on Error"); - proto_tree_add_item(abortOnError_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item(abortOnError_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; - proto_tree_add_item(abortOnError_tree, hf_sml_abortOnError, tvb, *offset, 1, ENC_NA); + proto_tree_add_item(abortOnError_tree, hf_sml_abortOnError, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; /*Sub List*/ @@ -2256,7 +2256,7 @@ static void dissect_sml_file(tvbuff_t *tvb, packet_info *pinfo, gint *offset, pr /*Zero Cutting Check*/ get_length(tvb, offset, &data, &length); messagebody_tree = proto_tree_add_subtree(sublist_list, tvb, *offset, length + data, ett_sml_mttree, &messagebody, "Messagetype"); - proto_tree_add_item (messagebody_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (messagebody_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; if (data == 4){ @@ -2370,7 +2370,7 @@ static void dissect_sml_file(tvbuff_t *tvb, packet_info *pinfo, gint *offset, pr return; } - proto_tree_add_item (crc16_tree, hf_sml_datatype, tvb, *offset, 1, ENC_NA); + proto_tree_add_item (crc16_tree, hf_sml_datatype, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; crc16 = proto_tree_add_item (crc16_tree, hf_sml_crc16, tvb, *offset, data, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index 8131683c4d..b41f1e56fc 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -1230,7 +1230,7 @@ dissect_nlp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if ((nhdr_1 & 0xf0) == 0x10) { proto_tree_add_item(tree, hf_sna_nlp_frh, - tvb, indx, 1, ENC_NA); + tvb, indx, 1, ENC_BIG_ENDIAN); indx ++; if (tvb_offset_exists(tvb, indx)) @@ -1713,20 +1713,20 @@ dissect_fid2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree) { /* Byte 0 */ - bf_item = proto_tree_add_item(tree, hf_sna_th_0, tvb, 0, 1, ENC_NA); + bf_item = proto_tree_add_item(tree, hf_sna_th_0, tvb, 0, 1, ENC_BIG_ENDIAN); bf_tree = proto_item_add_subtree(bf_item, ett_sna_th_fid); - proto_tree_add_item(bf_tree, hf_sna_th_fid, tvb, 0, 1, ENC_NA); - proto_tree_add_item(bf_tree, hf_sna_th_mpf, tvb, 0, 1, ENC_NA); - proto_tree_add_item(bf_tree, hf_sna_th_odai,tvb, 0, 1, ENC_NA); - proto_tree_add_item(bf_tree, hf_sna_th_efi, tvb, 0, 1, ENC_NA); + proto_tree_add_item(bf_tree, hf_sna_th_fid, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(bf_tree, hf_sna_th_mpf, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(bf_tree, hf_sna_th_odai,tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(bf_tree, hf_sna_th_efi, tvb, 0, 1, ENC_BIG_ENDIAN); /* Byte 1 */ proto_tree_add_item(tree, hf_sna_reserved, tvb, 1, 1, ENC_NA); /* Byte 2 */ - proto_tree_add_item(tree, hf_sna_th_daf, tvb, 2, 1, ENC_NA); + proto_tree_add_item(tree, hf_sna_th_daf, tvb, 2, 1, ENC_BIG_ENDIAN); } /* Set DST addr */ @@ -1735,7 +1735,7 @@ dissect_fid2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, SET_ADDRESS(&pinfo->dst, AT_SNA, SNA_FID2_ADDR_LEN, ptr); /* Byte 3 */ - proto_tree_add_item(tree, hf_sna_th_oaf, tvb, 3, 1, ENC_NA); + proto_tree_add_item(tree, hf_sna_th_oaf, tvb, 3, 1, ENC_BIG_ENDIAN); /* Set SRC addr */ ptr = tvb_get_ptr(tvb, 3, SNA_FID2_ADDR_LEN); @@ -2190,7 +2190,7 @@ dissect_rh(tvbuff_t *tvb, int offset, proto_tree *tree) proto_tree_add_bitmask(tree, tvb, offset, hf_sna_rh_2, ett_sna_rh_2, sna_rh_2_req_fields, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_sna_rh_2, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_sna_rh_2, tvb, offset, 1, ENC_BIG_ENDIAN); } /* XXX - check for sdi. If TRUE, the next 4 bytes will be sense data */ |