diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-12-13 12:52:20 -0500 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-12-13 18:45:56 +0000 |
| commit | f412c9a01aa031ef9f024ee1b8ec60bf4a73edb8 (patch) | |
| tree | ce4c0543d43c0c6f7b84050a1a187e9381c6b8d0 | |
| parent | 7592d39d46ee0f2442cc5263979a0f036f98468b (diff) | |
Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields ...
(for some dissectors which fetch all other integral fields using
ENC_BIG_ENDIAN).
Change-Id: Ic18e3172aad76af12b12d6732c88497be22aed56
Reviewed-on: https://code.wireshark.org/review/5748
Reviewed-by: Bill Meier <wmeier@newsguy.com>
122 files changed, 1219 insertions, 1219 deletions
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index 452fa97a32..01e9078756 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -2206,7 +2206,7 @@ dissect_6lowpan_mesh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 } offset += 1; if ((mesh_header & LOWPAN_MESH_HEADER_HOPS) == LOWPAN_MESH_HEADER_HOPS) { - if (tree) proto_tree_add_item(mesh_tree, hf_6lowpan_mesh_hops8, tvb, offset, 1, ENC_NA); + if (tree) proto_tree_add_item(mesh_tree, hf_6lowpan_mesh_hops8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } diff --git a/epan/dissectors/packet-acr122.c b/epan/dissectors/packet-acr122.c index dc579ad655..3269223bfa 100644 --- a/epan/dissectors/packet-acr122.c +++ b/epan/dissectors/packet-acr122.c @@ -324,19 +324,19 @@ dissect_acr122(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) col_add_fstr(pinfo->cinfo, COL_INFO, "Command: %s", val_to_str_ext_const(command, &command_vals_ext, "Unknown")); - proto_tree_add_item(main_tree, hf_class, tvb, offset, 1, ENC_NA); + proto_tree_add_item(main_tree, hf_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(main_tree, hf_ins, tvb, offset, 1, ENC_NA); + proto_tree_add_item(main_tree, hf_ins, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - p1_item = proto_tree_add_item(main_tree, hf_p1, tvb, offset, 1, ENC_NA); + p1_item = proto_tree_add_item(main_tree, hf_p1, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - p2_item = proto_tree_add_item(main_tree, hf_p2, tvb, offset, 1, ENC_NA); + p2_item = proto_tree_add_item(main_tree, hf_p2, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(main_tree, hf_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(main_tree, hf_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; switch (command) { diff --git a/epan/dissectors/packet-aim-generic.c b/epan/dissectors/packet-aim-generic.c index 2561116923..1911823270 100644 --- a/epan/dissectors/packet-aim-generic.c +++ b/epan/dissectors/packet-aim-generic.c @@ -157,7 +157,7 @@ static int dissect_rate_class(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree_add_item(class_tree, hf_generic_rateinfo_currentlevel, tvb, offset, 4, ENC_BIG_ENDIAN);offset+=4; proto_tree_add_item(class_tree, hf_generic_rateinfo_maxlevel, tvb, offset, 4, ENC_BIG_ENDIAN);offset+=4; proto_tree_add_item(class_tree, hf_generic_rateinfo_lasttime, tvb, offset, 4, ENC_BIG_ENDIAN);offset+=4; - proto_tree_add_item(class_tree, hf_generic_rateinfo_curstate, tvb, offset, 1, ENC_NA);offset+=1; + proto_tree_add_item(class_tree, hf_generic_rateinfo_curstate, tvb, offset, 1, ENC_BIG_ENDIAN);offset+=1; return offset; } diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c index dd0181531f..187fd0baf4 100644 --- a/epan/dissectors/packet-ansi_801.c +++ b/epan/dissectors/packet-ansi_801.c @@ -378,12 +378,12 @@ for_req_time_off_meas(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset if (oct & 0x80) { - proto_tree_add_item(tree, hf_ansi_801_action_time, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ansi_801_reserved8_01, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_action_time, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ansi_801_reserved8_01, tvb, offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_ansi_801_reserved8_7F, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_reserved8_7F, tvb, offset, 1, ENC_BIG_ENDIAN); } offset++; @@ -407,7 +407,7 @@ for_req_cancel(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) proto_tree_add_uint_format_value(tree, hf_ansi_801_cancellation_type, tvb, offset, 1, oct, "(%u) %s", (oct & 0xf0) >> 4, str); - proto_tree_add_item(tree, hf_ansi_801_reserved8_0F, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_reserved8_0F, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; EXTRANEOUS_DATA_CHECK(len, offset - saved_offset); @@ -438,7 +438,7 @@ for_reject(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) } proto_tree_add_uint_format_value(tree, hf_ansi_801_reject_reason, tvb, offset, 1, oct, "%s", str); - proto_tree_add_item(tree, hf_ansi_801_reserved8_01, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_reserved8_01, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; EXTRANEOUS_DATA_CHECK(len, offset - saved_offset); @@ -454,9 +454,9 @@ for_pr_bs_cap(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) SHORT_DATA_CHECK(len, 2); - proto_tree_add_item(tree, hf_ansi_801_bs_ls_rev, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ansi_801_gps_capability_indicator, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ansi_801_afltc_id, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_bs_ls_rev, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ansi_801_gps_capability_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ansi_801_afltc_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; oct = tvb_get_guint8(tvb, offset); @@ -467,7 +467,7 @@ for_pr_bs_cap(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) } else { - proto_tree_add_item(tree, hf_ansi_801_apdc_id, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_apdc_id, tvb, offset, 1, ENC_BIG_ENDIAN); } offset++; @@ -810,7 +810,7 @@ rev_req_gps_loc_ass(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) saved_offset = offset; proto_tree_add_item(tree, hf_ansi_801_coordinate_type_requested, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ansi_801_reserved8_7F, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_reserved8_7F, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; EXTRANEOUS_DATA_CHECK(len, offset - saved_offset); @@ -826,7 +826,7 @@ rev_req_bs_alm(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) saved_offset = offset; proto_tree_add_item(tree, hf_ansi_801_extended_base_station_almanac, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ansi_801_reserved8_7F, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_reserved8_7F, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; EXTRANEOUS_DATA_CHECK(len, offset - saved_offset); @@ -842,7 +842,7 @@ rev_req_gps_ephemeris(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset saved_offset = offset; proto_tree_add_item(tree, hf_ansi_801_alpha_and_beta_parameters, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ansi_801_reserved8_7F, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_reserved8_7F, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; EXTRANEOUS_DATA_CHECK(len, offset - saved_offset); @@ -858,7 +858,7 @@ rev_req_gps_nav_msg_bits(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 off saved_offset = offset; proto_tree_add_item(tree, hf_ansi_801_subframes_4_and_5, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ansi_801_reserved8_7F, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_reserved8_7F, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -877,7 +877,7 @@ rev_req_loc_response(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) proto_tree_add_item(tree, hf_ansi_801_rev_req_loc_height_information, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_ansi_801_rev_req_loc_clock_correction_for_gps_time, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_ansi_801_rev_req_loc_velocity_information, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ansi_801_reserved8_1F, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_reserved8_1F, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; EXTRANEOUS_DATA_CHECK(len, offset - saved_offset); @@ -932,7 +932,7 @@ rev_reject(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) proto_tree_add_uint_format_value(tree, hf_ansi_801_reject_reason, tvb, offset, 1, oct, "%s", str); - proto_tree_add_item(tree, hf_ansi_801_reserved8_01, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_reserved8_01, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; EXTRANEOUS_DATA_CHECK(len, offset - saved_offset); @@ -1046,7 +1046,7 @@ rev_pr_can_ack(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) "(%u) %s", (oct & 0xf0) >> 4, str); proto_tree_add_item(tree, hf_ansi_801_no_outstanding_request_element, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ansi_801_reserved8_07, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_reserved8_07, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; EXTRANEOUS_DATA_CHECK(len, offset - saved_offset); @@ -1125,7 +1125,7 @@ for_request(tvbuff_t *tvb, proto_tree *tree, guint32 *offset_p, guint8 pd_msg_ty if (pd_msg_type == 0x00) { - proto_tree_add_item(tree, hf_ansi_801_reserved8_F0, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_reserved8_F0, tvb, offset, 1, ENC_BIG_ENDIAN); str = try_val_to_str_idx(oct & 0x0f, for_req_type_strings, &idx); if (str == NULL) @@ -1151,7 +1151,7 @@ for_request(tvbuff_t *tvb, proto_tree *tree, guint32 *offset_p, guint8 pd_msg_ty offset++; oct = tvb_get_guint8(tvb, offset); - proto_tree_add_item(subtree, hf_ansi_801_for_request_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_801_for_request_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (oct > 0) @@ -1182,7 +1182,7 @@ for_response(tvbuff_t *tvb, proto_tree *tree, guint32 *offset_p) offset = *offset_p; oct = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_801_reserved8_E0, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_reserved8_E0, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_ansi_801_unsolicited_response_indicator, tvb, offset, 1, ENC_NA); str = try_val_to_str_idx(oct & 0x0f, for_rsp_type_strings, &idx); @@ -1199,7 +1199,7 @@ for_response(tvbuff_t *tvb, proto_tree *tree, guint32 *offset_p) offset++; oct = tvb_get_guint8(tvb, offset); - proto_tree_add_item(subtree, hf_ansi_801_for_response_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_801_for_response_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -1231,7 +1231,7 @@ rev_request(tvbuff_t *tvb, proto_tree *tree, guint32 *offset_p, guint8 pd_msg_ty if (pd_msg_type == 0x00) { - proto_tree_add_item(tree, hf_ansi_801_reserved8_F0, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_reserved8_F0, tvb, offset, 1, ENC_BIG_ENDIAN); str = try_val_to_str_idx(oct & 0x0f, rev_req_type_strings, &idx); if (str == NULL) @@ -1257,7 +1257,7 @@ rev_request(tvbuff_t *tvb, proto_tree *tree, guint32 *offset_p, guint8 pd_msg_ty offset++; oct = tvb_get_guint8(tvb, offset); - proto_tree_add_item(subtree, hf_ansi_801_rev_request_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_801_rev_request_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -1287,7 +1287,7 @@ rev_response(tvbuff_t *tvb, proto_tree *tree, guint32 *offset_p) offset = *offset_p; oct = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ansi_801_reserved8_E0, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_reserved8_E0, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_ansi_801_unsolicited_response_indicator, tvb, offset, 1, ENC_NA); str = try_val_to_str_idx(oct & 0x0f, rev_rsp_type_strings, &idx); @@ -1304,7 +1304,7 @@ rev_response(tvbuff_t *tvb, proto_tree *tree, guint32 *offset_p) oct = tvb_get_guint8(tvb, offset); - proto_tree_add_item(subtree, hf_ansi_801_rev_response_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_ansi_801_rev_response_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -1336,9 +1336,9 @@ dissect_ansi_801_for_message(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ansi_801_session_start, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_ansi_801_session_end, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_ansi_801_session_source, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ansi_801_for_sess_tag, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_for_sess_tag, tvb, offset, 1, ENC_BIG_ENDIAN); - hidden_item = proto_tree_add_item(tree, hf_ansi_801_sess_tag, tvb, offset, 1, ENC_NA); + hidden_item = proto_tree_add_item(tree, hf_ansi_801_sess_tag, tvb, offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); offset++; @@ -1390,7 +1390,7 @@ dissect_ansi_801_for_message(tvbuff_t *tvb, proto_tree *tree) oct = tvb_get_guint8(tvb, offset); num_rsp = oct & 0xf0; - proto_tree_add_item(tree, hf_ansi_801_for_message_number_responsesF0, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_for_message_number_responsesF0, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } else @@ -1400,8 +1400,8 @@ dissect_ansi_801_for_message(tvbuff_t *tvb, proto_tree *tree) num_req = (oct & 0xf0) >> 4; num_rsp = oct & 0x0f; - proto_tree_add_item(tree, hf_ansi_801_for_message_number_requests8, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ansi_801_for_message_number_responses0F, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_for_message_number_requests8, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ansi_801_for_message_number_responses0F, tvb, offset, 1, ENC_BIG_ENDIAN); } offset++; @@ -1461,9 +1461,9 @@ dissect_ansi_801_rev_message(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ansi_801_session_start, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_ansi_801_session_end, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_ansi_801_session_source, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ansi_801_rev_sess_tag, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_rev_sess_tag, tvb, offset, 1, ENC_BIG_ENDIAN); - hidden_item = proto_tree_add_item(tree, hf_ansi_801_sess_tag, tvb, offset, 1, ENC_NA); + hidden_item = proto_tree_add_item(tree, hf_ansi_801_sess_tag, tvb, offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); offset++; @@ -1514,7 +1514,7 @@ dissect_ansi_801_rev_message(tvbuff_t *tvb, proto_tree *tree) oct = tvb_get_guint8(tvb, offset); num_rsp = oct & 0xf0; - proto_tree_add_item(tree, hf_ansi_801_rev_message_number_responsesF0, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_rev_message_number_responsesF0, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } else @@ -1524,8 +1524,8 @@ dissect_ansi_801_rev_message(tvbuff_t *tvb, proto_tree *tree) num_req = (oct & 0xf0) >> 4; num_rsp = oct & 0x0f; - proto_tree_add_item(tree, hf_ansi_801_rev_message_number_requests8, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ansi_801_rev_message_number_responses0F, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ansi_801_rev_message_number_requests8, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ansi_801_rev_message_number_responses0F, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c index 9e9e6b7986..8afec3e250 100644 --- a/epan/dissectors/packet-aodv.c +++ b/epan/dissectors/packet-aodv.c @@ -165,7 +165,7 @@ again: ext_tree = proto_tree_add_subtree(tree, tvb, offset, 2 + len, ett_aodv_extensions, NULL, "Extensions"); - proto_tree_add_item(ext_tree, hf_aodv_ext_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ext_tree, hf_aodv_ext_type, tvb, offset, 1, ENC_BIG_ENDIAN); len_item = proto_tree_add_uint_format_value(ext_tree, hf_aodv_ext_length, tvb, offset + 1, 1, len, "%u bytes", len); diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index 025ac4dc2f..00cc88def7 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -555,7 +555,7 @@ dissect_atm_nsap(tvbuff_t *tvb, packet_info* pinfo, int offset, int len, proto_t proto_item* ti; afi = tvb_get_guint8(tvb, offset); - ti = proto_tree_add_item(tree, hf_atmarp_src_atm_afi, tvb, offset, 1, ENC_NA); + ti = proto_tree_add_item(tree, hf_atmarp_src_atm_afi, tvb, offset, 1, ENC_BIG_ENDIAN); switch (afi) { case 0x39: /* DCC ATM format */ @@ -564,7 +564,7 @@ dissect_atm_nsap(tvbuff_t *tvb, packet_info* pinfo, int offset, int len, proto_t tvb, offset + 1, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_atmarp_src_atm_high_order_dsp, tvb, offset + 3, 10, ENC_NA); proto_tree_add_item(tree, hf_atmarp_src_atm_end_system_identifier, tvb, offset + 13, 6, ENC_NA); - proto_tree_add_item(tree, hf_atmarp_src_atm_selector, tvb, offset + 19, 1, ENC_NA); + proto_tree_add_item(tree, hf_atmarp_src_atm_selector, tvb, offset + 19, 1, ENC_BIG_ENDIAN); break; case 0x47: /* ICD ATM format */ @@ -573,7 +573,7 @@ dissect_atm_nsap(tvbuff_t *tvb, packet_info* pinfo, int offset, int len, proto_t tvb, offset + 1, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_atmarp_src_atm_high_order_dsp, tvb, offset + 3, 10, ENC_NA); proto_tree_add_item(tree, hf_atmarp_src_atm_end_system_identifier, tvb, offset + 13, 6, ENC_NA); - proto_tree_add_item(tree, hf_atmarp_src_atm_selector, tvb, offset + 19, 1, ENC_NA); + proto_tree_add_item(tree, hf_atmarp_src_atm_selector, tvb, offset + 19, 1, ENC_BIG_ENDIAN); break; case 0x45: /* E.164 ATM format */ @@ -582,7 +582,7 @@ dissect_atm_nsap(tvbuff_t *tvb, packet_info* pinfo, int offset, int len, proto_t tvb, offset + 1, 8, ENC_NA); proto_tree_add_item(tree, hf_atmarp_src_atm_high_order_dsp, tvb, offset + 9, 4, ENC_NA); proto_tree_add_item(tree, hf_atmarp_src_atm_end_system_identifier, tvb, offset + 13, 6, ENC_NA); - proto_tree_add_item(tree, hf_atmarp_src_atm_selector, tvb, offset + 19, 1, ENC_NA); + proto_tree_add_item(tree, hf_atmarp_src_atm_selector, tvb, offset + 19, 1, ENC_BIG_ENDIAN); break; default: diff --git a/epan/dissectors/packet-aruba-erm.c b/epan/dissectors/packet-aruba-erm.c index 3cc9be1513..bd2502542e 100644 --- a/epan/dissectors/packet-aruba-erm.c +++ b/epan/dissectors/packet-aruba-erm.c @@ -140,10 +140,10 @@ dissect_aruba_erm_pcap_radio(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * PROTO_ITEM_SET_GENERATED(ti_data_rate); offset += 2; - proto_tree_add_item(aruba_erm_tree, hf_aruba_erm_channel, tvb, offset, 1, ENC_NA); + proto_tree_add_item(aruba_erm_tree, hf_aruba_erm_channel, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(aruba_erm_tree, hf_aruba_erm_signal_strength, tvb, offset, 1, ENC_NA); + proto_tree_add_item(aruba_erm_tree, hf_aruba_erm_signal_strength, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; return offset; diff --git a/epan/dissectors/packet-asterix.c b/epan/dissectors/packet-asterix.c index ca6c78896b..1038e0cff1 100644 --- a/epan/dissectors/packet-asterix.c +++ b/epan/dissectors/packet-asterix.c @@ -7090,7 +7090,7 @@ static gint dissect_asterix_fields (tvbuff_t *tvb, guint offset, proto_tree *tre else if (current_uap[i]->type & RE) { asterix_field_item = proto_tree_add_item (tree, *current_uap[i]->hf, tvb, offset + start, len, ENC_NA); asterix_field_tree = proto_item_add_subtree (asterix_field_item, ett_asterix_subtree); - proto_tree_add_item (asterix_field_tree, hf_re_field_len, tvb, offset + start, 1, ENC_NA); + proto_tree_add_item (asterix_field_tree, hf_re_field_len, tvb, offset + start, 1, ENC_BIG_ENDIAN); start++; fspec_len = asterix_fspec_len (tvb, offset + start); proto_tree_add_item (asterix_field_tree, hf_asterix_fspec, tvb, offset + start, fspec_len, ENC_NA); diff --git a/epan/dissectors/packet-auto_rp.c b/epan/dissectors/packet-auto_rp.c index f38ca200ff..ef3ea44e8f 100644 --- a/epan/dissectors/packet-auto_rp.c +++ b/epan/dissectors/packet-auto_rp.c @@ -184,7 +184,7 @@ static int do_auto_rp_map(tvbuff_t *tvb, int offset, proto_tree *auto_rp_tree) proto_tree_add_item(map_tree, hf_auto_rp_rp_addr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(map_tree, hf_auto_rp_pim_ver, tvb, offset, 1, ENC_NA); + proto_tree_add_item(map_tree, hf_auto_rp_pim_ver, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_uint(map_tree, hf_auto_rp_group_num, tvb, offset, 1, group_count); offset++; diff --git a/epan/dissectors/packet-babel.c b/epan/dissectors/packet-babel.c index a971a44292..2a01a1efc4 100644 --- a/epan/dissectors/packet-babel.c +++ b/epan/dissectors/packet-babel.c @@ -213,8 +213,8 @@ dissect_babel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U ti = proto_tree_add_item(tree, proto_babel, tvb, 0, -1, ENC_NA); babel_tree = proto_item_add_subtree(ti, ett_babel); - proto_tree_add_item(babel_tree, hf_babel_magic, tvb, 0, 1, ENC_NA); - proto_tree_add_item(babel_tree, hf_babel_version, tvb, 1, 1, ENC_NA); + proto_tree_add_item(babel_tree, hf_babel_magic, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(babel_tree, hf_babel_version, tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(babel_tree, hf_babel_bodylen, tvb, 2, 2, ENC_BIG_ENDIAN); } @@ -247,7 +247,7 @@ dissect_babel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U if (tree) { message_tree = proto_item_add_subtree(ti, ett_message); proto_tree_add_item(message_tree, hf_babel_message_type, - tvb, message, 1, ENC_NA); + tvb, message, 1, ENC_BIG_ENDIAN); } if (type == MESSAGE_PAD1) { @@ -291,7 +291,7 @@ dissect_babel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U format_address(rc < 0 ? NULL : addr_str)); proto_tree_add_item(subtree, hf_babel_message_ae, - tvb, message + 2, 1, ENC_NA); + tvb, message + 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_babel_message_prefix, tvb, message + 4, len - 2, ENC_NA); } else if (type == MESSAGE_ROUTER_ID) { @@ -311,7 +311,7 @@ dissect_babel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U "NH: %s", format_address(rc < 0 ? NULL : nh)); proto_tree_add_item(subtree, hf_babel_message_ae, - tvb, message + 2, 1, ENC_NA); + tvb, message + 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_babel_message_prefix, tvb, message + 4, len - 2, ENC_NA); } else if (type == MESSAGE_UPDATE) { @@ -335,7 +335,7 @@ dissect_babel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U } proto_tree_add_item(message_tree, hf_babel_message_flags, - tvb, message + 3, 1, ENC_NA); + tvb, message + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(message_tree, hf_babel_message_interval, tvb, message + 6, 2, ENC_BIG_ENDIAN); proto_tree_add_item(message_tree, hf_babel_message_seqno, @@ -349,11 +349,11 @@ dissect_babel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U format_prefix(rc < 0 ? NULL : p, plen)); proto_tree_add_item(subtree, hf_babel_message_ae, - tvb, message + 2, 1, ENC_NA); + tvb, message + 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_babel_message_plen, - tvb, message + 4, 1, ENC_NA); + tvb, message + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_babel_message_omitted, - tvb, message + 5, 1, ENC_NA); + tvb, message + 5, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_babel_message_prefix, tvb, message + 12, len - 10, ENC_NA); } else if (type == MESSAGE_REQUEST) { @@ -373,9 +373,9 @@ dissect_babel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U format_prefix(rc < 0 ? NULL : p, plen)); proto_tree_add_item(subtree, hf_babel_message_ae, - tvb, message + 2, 1, ENC_NA); + tvb, message + 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_babel_message_plen, - tvb, message + 3, 1, ENC_NA); + tvb, message + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_babel_message_prefix, tvb, message + 4, len - 2, ENC_NA); } else if (type == MESSAGE_MH_REQUEST) { @@ -391,7 +391,7 @@ dissect_babel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U proto_tree_add_item(message_tree, hf_babel_message_seqno, tvb, message + 4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(message_tree, hf_babel_message_hopcount, - tvb, message + 6, 1, ENC_NA); + tvb, message + 6, 1, ENC_BIG_ENDIAN); proto_tree_add_item(message_tree, hf_babel_message_routerid, tvb, message + 8, 8, ENC_NA); subtree = proto_tree_add_subtree_format(message_tree, @@ -401,9 +401,9 @@ dissect_babel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U format_prefix(rc < 0 ? NULL : p, plen)); proto_tree_add_item(subtree, hf_babel_message_ae, - tvb, message + 2, 1, ENC_NA); + tvb, message + 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_babel_message_plen, - tvb, message + 3, 1, ENC_NA); + tvb, message + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_babel_message_prefix, tvb, message + 16, len - 14, ENC_NA); } diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index 3484555228..0e472333a4 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.c @@ -2191,7 +2191,7 @@ dissect_batadv_icmp_rr(proto_tree *batadv_icmp_tree, tvbuff_t *tvb, int offset) field_tree = proto_tree_add_subtree(batadv_icmp_tree, tvb, offset, 1+ 6 * BAT_RR_LEN, ett_batadv_icmp_rr, NULL, "ICMP RR"); - proto_tree_add_item(field_tree, hf_batadv_icmp_rr_pointer, tvb, offset, 1, ENC_NA); + proto_tree_add_item(field_tree, hf_batadv_icmp_rr_pointer, tvb, offset, 1, ENC_BIG_ENDIAN); ptr--; offset++; @@ -2489,7 +2489,7 @@ static void dissect_batadv_icmp_v15(tvbuff_t *tvb, packet_info *pinfo, icmp_packeth->rr_ptr = tvb_get_guint8(tvb, offset); proto_tree_add_item(batadv_icmp_tree, hf_batadv_icmp_rr_pointer, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); offset += 1; icmp_packeth->seqno = tvb_get_ntohs(tvb, offset); diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index c6548a8826..7c900effcd 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -2283,7 +2283,7 @@ decode_flowspec_nlri(proto_tree *tree, tvbuff_t *tvb, gint offset, guint16 afi, { filter_item = proto_tree_add_item(nlri_tree, hf_bgp_flowspec_nlri_filter, tvb, offset+cursor_fspec, 1, ENC_NA); filter_tree = proto_item_add_subtree(filter_item, ett_bgp_flow_spec_nlri_filter); - proto_tree_add_item(filter_tree, hf_bgp_flowspec_nlri_filter_type, tvb, offset+cursor_fspec, 1, ENC_NA); + proto_tree_add_item(filter_tree, hf_bgp_flowspec_nlri_filter_type, tvb, offset+cursor_fspec, 1, ENC_BIG_ENDIAN); proto_item_append_text(filter_item, ": %s", val_to_str(tvb_get_guint8(tvb,offset+cursor_fspec), flowspec_nlri_opvaluepair_type, "Unknown filter %d")); switch (tvb_get_guint8(tvb,offset+cursor_fspec)) { case BGPNLRI_FSPEC_DST_PFIX: @@ -3655,11 +3655,11 @@ static int decode_evpn_nlri(proto_tree *tree, tvbuff_t *tvb, gint offset, packet prefix_tree = proto_item_add_subtree(ti, ett_bgp_evpn_nlri); proto_tree_add_item(prefix_tree, hf_bgp_evpn_nlri_rt, tvb, start_offset, - 1, ENC_NA); + 1, ENC_BIG_ENDIAN); proto_item_append_text(ti, ": %s", val_to_str(tvb_get_guint8(tvb, offset), evpnrtypevals, "Unknown capability %d")); proto_tree_add_item(prefix_tree, hf_bgp_evpn_nlri_len, tvb, start_offset+1, - 1, ENC_NA); + 1, ENC_BIG_ENDIAN); if (route_type == EVPN_ETH_SEGMENT_ROUTE && nlri_len < 21) { if (nlri_len < 21) { @@ -3733,14 +3733,14 @@ static int decode_evpn_nlri(proto_tree *tree, tvbuff_t *tvb, gint offset, packet 4, ENC_BIG_ENDIAN); proto_tree_add_item(prefix_tree, hf_bgp_evpn_nlri_maclen, tvb, start_offset+24, - 1, ENC_NA); + 1, ENC_BIG_ENDIAN); proto_tree_add_item(prefix_tree, hf_bgp_evpn_nlri_mac_addr, tvb, start_offset+25, 6, ENC_NA); ip_len = tvb_get_guint8(tvb, offset + 31) / 8; proto_tree_add_item(prefix_tree, hf_bgp_evpn_nlri_iplen, tvb, start_offset+31, - 1, ENC_NA); + 1, ENC_BIG_ENDIAN); total_length = 31; @@ -3789,7 +3789,7 @@ static int decode_evpn_nlri(proto_tree *tree, tvbuff_t *tvb, gint offset, packet ip_len = tvb_get_guint8(tvb, offset + 14) / 8; proto_tree_add_item(prefix_tree, hf_bgp_evpn_nlri_iplen, tvb, start_offset+14, - 1, ENC_NA); + 1, ENC_BIG_ENDIAN); total_length = 15; @@ -3831,7 +3831,7 @@ static int decode_evpn_nlri(proto_tree *tree, tvbuff_t *tvb, gint offset, packet ip_len = tvb_get_guint8(tvb, offset + 14) / 8; proto_tree_add_item(prefix_tree, hf_bgp_evpn_nlri_iplen, tvb, start_offset+14, - 1, ENC_NA); + 1, ENC_BIG_ENDIAN); total_length = 21; @@ -4779,7 +4779,7 @@ dissect_bgp_capability_item(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, offset += 1; /* SAFI */ - proto_tree_add_item(cap_tree, hf_bgp_cap_mp_safi, tvb, offset, 1, ENC_NA); + proto_tree_add_item(cap_tree, hf_bgp_cap_mp_safi, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } @@ -5435,10 +5435,10 @@ dissect_bgp_update_pmsi_attr(packet_info *pinfo, proto_tree *parent_tree, tvbuff tunnel_id_len = tlen - 5; proto_tree_add_item(parent_tree, hf_bgp_pmsi_tunnel_flags, tvb, offset, - 1, ENC_NA); + 1, ENC_BIG_ENDIAN); pmsi_tunnel_type_item = proto_tree_add_item(parent_tree, hf_bgp_pmsi_tunnel_type, tvb, offset+1, - 1, ENC_NA); + 1, ENC_BIG_ENDIAN); decode_MPLS_stack_tree(tvb, offset+2, parent_tree); tunnel_id_item = proto_tree_add_item(parent_tree, hf_bgp_pmsi_tunnel_id, tvb, offset+5, @@ -6146,8 +6146,8 @@ dissect_bgp_path_attr(proto_tree *subtree, tvbuff_t *tvb, guint16 path_attr_len, subtree6 = proto_tree_add_subtree_format(subtree5, tvb, q, encaps_tunnel_sublen + 2, ett_bgp_tunnel_tlv_subtree, NULL, "%s (%u bytes)", val_to_str_const(encaps_tunnel_subtype, subtlv_type, "Unknown"), encaps_tunnel_sublen + 2); - proto_tree_add_item(subtree6, hf_bgp_update_encaps_tunnel_subtlv_type, tvb, q, 1, ENC_NA); - proto_tree_add_item(subtree6, hf_bgp_update_encaps_tunnel_subtlv_len, tvb, q + 1, 1, ENC_NA); + proto_tree_add_item(subtree6, hf_bgp_update_encaps_tunnel_subtlv_type, tvb, q, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree6, hf_bgp_update_encaps_tunnel_subtlv_len, tvb, q + 1, 1, ENC_BIG_ENDIAN); switch (encaps_tunnel_subtype) { case TUNNEL_SUBTLV_ENCAPSULATION: @@ -6355,34 +6355,34 @@ dissect_bgp_notification(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo) /* print error code */ - proto_tree_add_item(tree, hf_bgp_notify_major_error, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_bgp_notify_major_error, tvb, offset, 1, ENC_BIG_ENDIAN); major_error = tvb_get_guint8(tvb, offset); offset += 1; switch(major_error){ case BGP_MAJOR_ERROR_MSG_HDR: - proto_tree_add_item(tree, hf_bgp_notify_minor_msg_hdr, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_bgp_notify_minor_msg_hdr, tvb, offset, 1, ENC_BIG_ENDIAN); break; case BGP_MAJOR_ERROR_OPEN_MSG: - proto_tree_add_item(tree, hf_bgp_notify_minor_open_msg, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_bgp_notify_minor_open_msg, tvb, offset, 1, ENC_BIG_ENDIAN); break; case BGP_MAJOR_ERROR_UPDATE_MSG: - proto_tree_add_item(tree,hf_bgp_notify_minor_update_msg, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree,hf_bgp_notify_minor_update_msg, tvb, offset, 1, ENC_BIG_ENDIAN); break; case BGP_MAJOR_ERROR_HT_EXPIRED: - proto_tree_add_item(tree, hf_bgp_notify_minor_ht_expired, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_bgp_notify_minor_ht_expired, tvb, offset, 1, ENC_BIG_ENDIAN); break; case BGP_MAJOR_ERROR_STATE_MACHINE: - proto_tree_add_item(tree, hf_bgp_notify_minor_state_machine, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_bgp_notify_minor_state_machine, tvb, offset, 1, ENC_BIG_ENDIAN); break; case BGP_MAJOR_ERROR_CEASE: - proto_tree_add_item(tree, hf_bgp_notify_minor_cease, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_bgp_notify_minor_cease, tvb, offset, 1, ENC_BIG_ENDIAN); break; case BGP_MAJOR_ERROR_CAP_MSG: - proto_tree_add_item(tree, hf_bgp_notify_minor_cap_msg, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_bgp_notify_minor_cap_msg, tvb, offset, 1, ENC_BIG_ENDIAN); break; default: - ti = proto_tree_add_item(tree, hf_bgp_notify_minor_unknown, tvb, offset, 1, ENC_NA); + ti = proto_tree_add_item(tree, hf_bgp_notify_minor_unknown, tvb, offset, 1, ENC_BIG_ENDIAN); expert_add_info_format(pinfo, ti, &ei_bgp_notify_minor_unknown, "Unknown notification error (%d)",major_error); break; } diff --git a/epan/dissectors/packet-bzr.c b/epan/dissectors/packet-bzr.c index ef321ce34f..7693d5a45e 100644 --- a/epan/dissectors/packet-bzr.c +++ b/epan/dissectors/packet-bzr.c @@ -178,7 +178,7 @@ dissect_body(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree) while (tvb_reported_length_remaining(tvb, offset) > 0) { cmd = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_bzr_packet_kind, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_bzr_packet_kind, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; switch (cmd) { @@ -190,7 +190,7 @@ dissect_body(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree) break; case 'o': proto_tree_add_item(tree, hf_bzr_result, tvb, offset, 1, - ENC_NA); + ENC_BIG_ENDIAN); offset += 1; break; case 'e': diff --git a/epan/dissectors/packet-carp.c b/epan/dissectors/packet-carp.c index cd569bb3b8..e1bce1f091 100644 --- a/epan/dissectors/packet-carp.c +++ b/epan/dissectors/packet-carp.c @@ -125,7 +125,7 @@ dissect_carp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) offset++; proto_tree_add_item(carp_tree, hf_carp_authlen, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(carp_tree, hf_carp_demotion, tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c index 9023d54cd5..1ef9c995c4 100644 --- a/epan/dissectors/packet-cdp.c +++ b/epan/dissectors/packet-cdp.c @@ -551,13 +551,13 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case TYPE_HELLO_CLUSTER_MGMT: proto_tree_add_item(tlv_tree, hf_cdp_cluster_master_ip, tvb, offset+9, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_cluster_ip, tvb, offset+13, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cdp_cluster_version, tvb, offset+17, 1, ENC_NA); - proto_tree_add_item(tlv_tree, hf_cdp_cluster_sub_version, tvb, offset+18, 1, ENC_NA); - proto_tree_add_item(tlv_tree, hf_cdp_cluster_status, tvb, offset+19, 1, ENC_NA); - proto_tree_add_item(tlv_tree, hf_cdp_cluster_unknown, tvb, offset+20, 1, ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_cluster_version, tvb, offset+17, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_cluster_sub_version, tvb, offset+18, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_cluster_status, tvb, offset+19, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_cluster_unknown, tvb, offset+20, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_cluster_commander_mac, tvb, offset+21, 6, ENC_NA); proto_tree_add_item(tlv_tree, hf_cdp_cluster_switch_mac, tvb, offset+27, 6, ENC_NA); - proto_tree_add_item(tlv_tree, hf_cdp_cluster_unknown, tvb, offset+33, 1, ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_cluster_unknown, tvb, offset+33, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_cluster_management_vlan, tvb, offset+34, 2, ENC_BIG_ENDIAN); break; default: @@ -689,7 +689,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_get_guint8(tvb, offset + 4)); proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cdp_trust_bitmap, tvb, offset + 4, 1, ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_trust_bitmap, tvb, offset + 4, 1, ENC_BIG_ENDIAN); } offset += length; break; @@ -701,7 +701,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_get_guint8(tvb, offset + 4)); proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cdp_untrusted_port_cos, tvb, offset + 4, 1, ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_untrusted_port_cos, tvb, offset + 4, 1, ENC_BIG_ENDIAN); } offset += length; break; @@ -764,7 +764,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_format_text(tvb, offset + 5, length - 5)); proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cdp_location_unknown, tvb, offset + 4, 1, ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_location_unknown, tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_location, tvb, offset + 5, length - 5, ENC_NA|ENC_ASCII); } offset += length; @@ -1075,14 +1075,14 @@ dissect_address_tlv(tvbuff_t *tvb, int offset, int length, proto_tree *tree) return -1; address_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_cdp_address, &ti, "Truncated address"); protocol_type = tvb_get_guint8(tvb, offset); - proto_tree_add_item(address_tree, hf_cdp_protocol_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(address_tree, hf_cdp_protocol_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; if (length < 1) return -1; protocol_length = tvb_get_guint8(tvb, offset); - proto_tree_add_item(address_tree, hf_cdp_protocol_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(address_tree, hf_cdp_protocol_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c index e36d7fa089..261b628484 100644 --- a/epan/dissectors/packet-chdlc.c +++ b/epan/dissectors/packet-chdlc.c @@ -142,7 +142,7 @@ chdlctype(guint16 chdlc_type, tvbuff_t *tvb, int offset_after_chdlctype, padbyte == NLPID_ISO9542_ESIS || padbyte == NLPID_ISO10589_ISIS)) { /* There is a Padding Byte for CLNS protocols over Cisco HDLC */ - proto_tree_add_item(fh_tree, hf_chdlc_clns_padding, tvb, offset_after_chdlctype, 1, ENC_NA); + proto_tree_add_item(fh_tree, hf_chdlc_clns_padding, tvb, offset_after_chdlctype, 1, ENC_BIG_ENDIAN); next_tvb = tvb_new_subset_remaining(tvb, offset_after_chdlctype + 1); } else { next_tvb = tvb_new_subset_remaining(tvb, offset_after_chdlctype); diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index eeeded7843..be33fc73b3 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -304,7 +304,7 @@ dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(type_tree, hf_clnp_cnf_segmentation, tvb, P_CLNP_TYPE, 1, ENC_NA); proto_tree_add_item(type_tree, hf_clnp_cnf_more_segments, tvb, P_CLNP_TYPE, 1, ENC_NA); proto_tree_add_item(type_tree, hf_clnp_cnf_report_error, tvb, P_CLNP_TYPE, 1, ENC_NA); - proto_tree_add_item(type_tree, hf_clnp_cnf_type, tvb, P_CLNP_TYPE, 1, ENC_NA); + proto_tree_add_item(type_tree, hf_clnp_cnf_type, tvb, P_CLNP_TYPE, 1, ENC_BIG_ENDIAN); /* If we don't have the full header - i.e., not enough to see the segmentation part and determine whether this datagram is segmented diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index efeb23f5e4..4c20702457 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -4351,7 +4351,7 @@ cops_unsolicited_grant_service_i04_i05(tvbuff_t *tvb, proto_tree *st, guint n, g info_to_display(tvb,object_tree,offset,1,"Grants Per Interval",NULL,FMT_DEC,&hf_cops_pcmm_grants_per_interval); offset += 1; - proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Nominal Grant Interval */ @@ -4393,7 +4393,7 @@ cops_unsolicited_grant_service_i04_i05(tvbuff_t *tvb, proto_tree *st, guint n, g info_to_display(tvb,object_tree,offset,1,"Grants Per Interval",NULL,FMT_DEC,&hf_cops_pcmm_grants_per_interval); offset += 1; - proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Nominal Grant Interval */ @@ -4435,7 +4435,7 @@ cops_unsolicited_grant_service_i04_i05(tvbuff_t *tvb, proto_tree *st, guint n, g info_to_display(tvb,object_tree,offset,1,"Grants Per Interval",NULL,FMT_DEC,&hf_cops_pcmm_grants_per_interval); offset += 1; - proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Nominal Grant Interval */ @@ -4494,7 +4494,7 @@ cops_ugs_with_activity_detection_i04_i05(tvbuff_t *tvb, proto_tree *st, guint n, info_to_display(tvb,object_tree,offset,1,"Grants Per Interval",NULL,FMT_DEC,&hf_cops_pcmm_grants_per_interval); offset += 1; - proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Nominal Grant Interval */ @@ -4544,7 +4544,7 @@ cops_ugs_with_activity_detection_i04_i05(tvbuff_t *tvb, proto_tree *st, guint n, info_to_display(tvb,object_tree,offset,1,"Grants Per Interval",NULL,FMT_DEC,&hf_cops_pcmm_grants_per_interval); offset += 1; - proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Nominal Grant Interval */ @@ -4594,7 +4594,7 @@ cops_ugs_with_activity_detection_i04_i05(tvbuff_t *tvb, proto_tree *st, guint n, info_to_display(tvb,object_tree,offset,1,"Grants Per Interval",NULL,FMT_DEC,&hf_cops_pcmm_grants_per_interval); offset += 1; - proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Nominal Grant Interval */ @@ -5263,7 +5263,7 @@ cops_unsolicited_grant_service(tvbuff_t *tvb, proto_tree *st, guint n, guint32 o info_to_display(tvb,object_tree,offset,1,"Grants Per Interval",NULL,FMT_DEC,&hf_cops_pcmm_grants_per_interval); offset += 1; - proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Nominal Grant Interval */ @@ -5291,7 +5291,7 @@ cops_unsolicited_grant_service(tvbuff_t *tvb, proto_tree *st, guint n, guint32 o info_to_display(tvb,object_tree,offset,1,"Grants Per Interval",NULL,FMT_DEC,&hf_cops_pcmm_grants_per_interval); offset += 1; - proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Nominal Grant Interval */ @@ -5319,7 +5319,7 @@ cops_unsolicited_grant_service(tvbuff_t *tvb, proto_tree *st, guint n, guint32 o info_to_display(tvb,object_tree,offset,1,"Grants Per Interval",NULL,FMT_DEC,&hf_cops_pcmm_grants_per_interval); offset += 1; - proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Nominal Grant Interval */ @@ -5364,7 +5364,7 @@ cops_ugs_with_activity_detection(tvbuff_t *tvb, proto_tree *st, guint n, guint32 info_to_display(tvb,object_tree,offset,1,"Grants Per Interval",NULL,FMT_DEC,&hf_cops_pcmm_grants_per_interval); offset += 1; - proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Nominal Grant Interval */ @@ -5400,7 +5400,7 @@ cops_ugs_with_activity_detection(tvbuff_t *tvb, proto_tree *st, guint n, guint32 info_to_display(tvb,object_tree,offset,1,"Grants Per Interval",NULL,FMT_DEC,&hf_cops_pcmm_grants_per_interval); offset += 1; - proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Nominal Grant Interval */ @@ -5436,7 +5436,7 @@ cops_ugs_with_activity_detection(tvbuff_t *tvb, proto_tree *st, guint n, guint32 info_to_display(tvb,object_tree,offset,1,"Grants Per Interval",NULL,FMT_DEC,&hf_cops_pcmm_grants_per_interval); offset += 1; - proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(object_tree, hf_cops_reserved8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Nominal Grant Interval */ diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index d4306897b4..c09d16991c 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -4992,7 +4992,7 @@ dissect_dcm_assoc_sopclass_extneg(tvbuff_t *tvb, proto_tree *tree, guint32 offse proto_item_set_text(assoc_item_extneg_item, "Ext. Neg.: "); assoc_item_extneg_tree = proto_item_add_subtree(assoc_item_extneg_item, ett_assoc_info_extneg); - proto_tree_add_item(assoc_item_extneg_tree, hf_dcm_assoc_item_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(assoc_item_extneg_tree, hf_dcm_assoc_item_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(assoc_item_extneg_tree, hf_dcm_assoc_item_len, tvb, offset+2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(assoc_item_extneg_tree, hf_dcm_info_extneg_sopclassuid_len, tvb, offset+4, 2, ENC_BIG_ENDIAN); @@ -5031,7 +5031,7 @@ dissect_dcm_assoc_sopclass_extneg(tvbuff_t *tvb, proto_tree *tree, guint32 offse } /* Support for Relational queries. */ - proto_tree_add_item(assoc_item_extneg_tree, hf_dcm_info_extneg_relational_query, tvb, offset+6+sop_class_uid_len, 1, ENC_NA); + proto_tree_add_item(assoc_item_extneg_tree, hf_dcm_info_extneg_relational_query, tvb, offset+6+sop_class_uid_len, 1, ENC_BIG_ENDIAN); --cnt; } @@ -5046,7 +5046,7 @@ dissect_dcm_assoc_sopclass_extneg(tvbuff_t *tvb, proto_tree *tree, guint32 offse } /* Combined Date-Time matching. */ - proto_tree_add_item(assoc_item_extneg_tree, hf_dcm_info_extneg_date_time_matching, tvb, offset+7+sop_class_uid_len, 1, ENC_NA); + proto_tree_add_item(assoc_item_extneg_tree, hf_dcm_info_extneg_date_time_matching, tvb, offset+7+sop_class_uid_len, 1, ENC_BIG_ENDIAN); --cnt; if (cnt<=0) @@ -5055,7 +5055,7 @@ dissect_dcm_assoc_sopclass_extneg(tvbuff_t *tvb, proto_tree *tree, guint32 offse } /* Fuzzy semantic matching of person names. */ - proto_tree_add_item(assoc_item_extneg_tree, hf_dcm_info_extneg_fuzzy_semantic_matching, tvb, offset+8+sop_class_uid_len, 1, ENC_NA); + proto_tree_add_item(assoc_item_extneg_tree, hf_dcm_info_extneg_fuzzy_semantic_matching, tvb, offset+8+sop_class_uid_len, 1, ENC_BIG_ENDIAN); --cnt; if (cnt<=0) @@ -5064,7 +5064,7 @@ dissect_dcm_assoc_sopclass_extneg(tvbuff_t *tvb, proto_tree *tree, guint32 offse } /* Timezone query adjustment. */ - proto_tree_add_item(assoc_item_extneg_tree, hf_dcm_info_extneg_timezone_query_adjustment, tvb, offset+9+sop_class_uid_len, 1, ENC_NA); + proto_tree_add_item(assoc_item_extneg_tree, hf_dcm_info_extneg_timezone_query_adjustment, tvb, offset+9+sop_class_uid_len, 1, ENC_BIG_ENDIAN); --cnt; } } @@ -5094,7 +5094,7 @@ dissect_dcm_assoc_role_selection(tvbuff_t *tvb, proto_tree *tree, guint32 offset proto_item_set_text(assoc_item_rolesel_item, "Role Selection: "); assoc_item_rolesel_tree = proto_item_add_subtree(assoc_item_rolesel_item, ett_assoc_info_rolesel); - proto_tree_add_item(assoc_item_rolesel_tree, hf_dcm_assoc_item_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(assoc_item_rolesel_tree, hf_dcm_assoc_item_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(assoc_item_rolesel_tree, hf_dcm_assoc_item_len, tvb, offset+2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(assoc_item_rolesel_tree, hf_dcm_info_rolesel_sopclassuid_len, tvb, offset+4, 2, ENC_BIG_ENDIAN); @@ -5127,8 +5127,8 @@ dissect_dcm_assoc_role_selection(tvbuff_t *tvb, proto_tree *tree, guint32 offset proto_tree_add_string(assoc_item_rolesel_tree, hf_dcm_info_rolesel_sopclassuid, tvb, offset+6, sop_class_uid_len, buf_desc); - proto_tree_add_item(assoc_item_rolesel_tree, hf_dcm_info_rolesel_scurole, tvb, offset+6+sop_class_uid_len, 1, ENC_NA); - proto_tree_add_item(assoc_item_rolesel_tree, hf_dcm_info_rolesel_scprole, tvb, offset+7+sop_class_uid_len, 1, ENC_NA); + proto_tree_add_item(assoc_item_rolesel_tree, hf_dcm_info_rolesel_scurole, tvb, offset+6+sop_class_uid_len, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(assoc_item_rolesel_tree, hf_dcm_info_rolesel_scprole, tvb, offset+7+sop_class_uid_len, 1, ENC_BIG_ENDIAN); } static void @@ -5149,7 +5149,7 @@ dissect_dcm_assoc_async_negotiation(tvbuff_t *tvb, proto_tree *tree, guint32 off proto_item_set_text(assoc_item_asyncneg_item, "Async Negotiation: "); assoc_item_asyncneg_tree = proto_item_add_subtree(assoc_item_asyncneg_item, ett_assoc_info_async_neg); - proto_tree_add_item(assoc_item_asyncneg_tree, hf_dcm_assoc_item_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(assoc_item_asyncneg_tree, hf_dcm_assoc_item_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(assoc_item_asyncneg_tree, hf_dcm_assoc_item_len, tvb, offset+2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(assoc_item_asyncneg_tree, hf_dcm_info_async_neg_max_num_ops_inv, tvb, offset+4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(assoc_item_asyncneg_tree, hf_dcm_info_async_neg_max_num_ops_per, tvb, offset+6, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index 83a0cefb4d..65bfae5a37 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -589,7 +589,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da htype_str); proto_tree_add_item(option_tree, hf_dhcpfo_client_hw_type, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_string(option_tree, hf_dhcpfo_client_hardware_address, tvb, offset+1, option_length-1, htype_str); break; diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c index 03d2740d35..3f7d0a9283 100644 --- a/epan/dissectors/packet-diameter_3gpp.c +++ b/epan/dissectors/packet-diameter_3gpp.c @@ -221,7 +221,7 @@ dissect_diameter_3gpp_ms_timezone(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t offset++; oct = tvb_get_guint8(tvb, offset) & 0x3; - proto_tree_add_item(tree, hf_diameter_3gpp_timezone_adjustment, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_diameter_3gpp_timezone_adjustment, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; diam_sub_dis->avp_str = wmem_strdup_printf(wmem_packet_scope(), "Timezone: GMT %c %d hours %d minutes %s", diff --git a/epan/dissectors/packet-dis.c b/epan/dissectors/packet-dis.c index 0adce591b8..af61679ba2 100644 --- a/epan/dissectors/packet-dis.c +++ b/epan/dissectors/packet-dis.c @@ -4102,13 +4102,13 @@ static gint parse_DIS_FIELDS_SIGNAL_LINK16_NETWORK_HEADER(tvbuff_t *tvb, proto_t proto_tree_add_item(sub_tree, hf_dis_signal_link16_network_number, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(sub_tree, hf_dis_signal_link16_tsec_cvll, tvb, offset, 1, ENC_NA); + proto_tree_add_item(sub_tree, hf_dis_signal_link16_tsec_cvll, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(sub_tree, hf_dis_signal_link16_msec_cvll, tvb, offset, 1, ENC_NA); + proto_tree_add_item(sub_tree, hf_dis_signal_link16_msec_cvll, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(sub_tree, hf_dis_signal_link16_message_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(sub_tree, hf_dis_signal_link16_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); if (messageType) *messageType = tvb_get_guint8(tvb, offset); offset++; @@ -4406,10 +4406,10 @@ static int dissect_DIS_FIELDS_VR_APPLICATION_HEALTH_STATUS(tvbuff_t *tvb, proto_ proto_tree_add_item(tree, hf_dis_vr_status_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_dis_vr_general_status, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_dis_vr_general_status, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_dis_vr_specific_status, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_dis_vr_specific_status, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(tree, hf_dis_vr_status_value_int, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -4609,11 +4609,11 @@ static int dissect_DIS_PARSER_ELECTROMAGNETIC_EMISSION_PDU(tvbuff_t *tvb, packet { sub_tree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_emission_system, &emission_ti, "Emission System"); - proto_tree_add_item(sub_tree, hf_dis_em_data_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(sub_tree, hf_dis_em_data_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; numBeams = tvb_get_guint8(tvb, offset); - proto_tree_add_item(sub_tree, hf_dis_em_num_beams, tvb, offset, 1, ENC_NA); + proto_tree_add_item(sub_tree, hf_dis_em_num_beams, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(sub_tree, hf_dis_padding, tvb, offset, 2, ENC_NA); @@ -4623,9 +4623,9 @@ static int dissect_DIS_PARSER_ELECTROMAGNETIC_EMISSION_PDU(tvbuff_t *tvb, packet proto_tree_add_item(sub_tree2, hf_dis_emitter_name, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(sub_tree2, hf_dis_emission_function, tvb, offset, 1, ENC_NA); + proto_tree_add_item(sub_tree2, hf_dis_emission_function, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(sub_tree2, hf_dis_emitter_id_number, tvb, offset, 1, ENC_NA); + proto_tree_add_item(sub_tree2, hf_dis_emitter_id_number, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; sub_tree2 = proto_tree_add_subtree(sub_tree, tvb, offset, 12, ett_emitter_location, NULL, "Location"); @@ -5447,7 +5447,7 @@ static int dissect_DIS_PARSER_START_RESUME_R_PDU(tvbuff_t *tvb, packet_info *pin offset = dissect_DIS_FIELDS_CLOCK_TIME(tvb, tree, offset, "Real World Time"); offset = dissect_DIS_FIELDS_CLOCK_TIME(tvb, tree, offset, "Simulation Time"); - proto_tree_add_item(tree, hf_dis_reliability, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_dis_reliability, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(tree, hf_dis_padding, tvb, offset, 3, ENC_NA); @@ -5471,7 +5471,7 @@ static int dissect_DIS_PARSER_STOP_FREEZE_R_PDU(tvbuff_t *tvb, packet_info *pinf proto_tree_add_item(tree, hf_dis_frozen_behavior, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_dis_reliability, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_dis_reliability, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(tree, hf_dis_padding, tvb, offset, 1, ENC_NA); @@ -5490,7 +5490,7 @@ static int dissect_DIS_PARSER_ACTION_REQUEST_R_PDU(tvbuff_t *tvb, packet_info *p offset = parseField_Entity(tvb, tree, offset, "Originating Entity ID"); offset = parseField_Entity(tvb, tree, offset, "Receiving Entity ID"); - proto_tree_add_item(tree, hf_dis_reliability, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_dis_reliability, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(tree, hf_dis_padding, tvb, offset, 3, ENC_NA); @@ -5523,7 +5523,7 @@ static int dissect_DIS_PARSER_DATA_R_PDU(tvbuff_t *tvb, packet_info *pinfo _U_, offset = parseField_Entity(tvb, tree, offset, "Originating Entity ID"); offset = parseField_Entity(tvb, tree, offset, "Receiving Entity ID"); - proto_tree_add_item(tree, hf_dis_reliability, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_dis_reliability, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(tree, hf_dis_padding, tvb, offset, 3, ENC_NA); @@ -5553,7 +5553,7 @@ static int dissect_DIS_PARSER_DATA_QUERY_R_PDU(tvbuff_t *tvb, packet_info *pinfo offset = parseField_Entity(tvb, tree, offset, "Originating Entity ID"); offset = parseField_Entity(tvb, tree, offset, "Receiving Entity ID"); - proto_tree_add_item(tree, hf_dis_reliability, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_dis_reliability, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(tree, hf_dis_padding, tvb, offset, 3, ENC_NA); @@ -5584,7 +5584,7 @@ static int dissect_DIS_PARSER_SIMAN_ENTITY_R_PDU(tvbuff_t *tvb, packet_info *pin offset = parseField_Entity(tvb, tree, offset, "Originating Entity ID"); offset = parseField_Entity(tvb, tree, offset, "Receiving Entity ID"); - proto_tree_add_item(tree, hf_dis_reliability, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_dis_reliability, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(tree, hf_dis_padding, tvb, offset, 3, ENC_NA); @@ -5608,13 +5608,13 @@ static int dissect_DIS_PARSER_APPLICATION_CONTROL_PDU(tvbuff_t *tvb, packet_info offset = parseField_Entity(tvb, tree, offset, "Originating Entity ID"); offset = parseField_Entity(tvb, tree, offset, "Receiving Entity ID"); - proto_tree_add_item(tree, hf_dis_reliability, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_dis_reliability, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_dis_time_interval8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_dis_time_interval8, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_dis_control_id, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_dis_control_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(tree, hf_dis_padding, tvb, offset, 1, ENC_NA); @@ -5629,10 +5629,10 @@ static int dissect_DIS_PARSER_APPLICATION_CONTROL_PDU(tvbuff_t *tvb, packet_info proto_tree_add_item(tree, hf_dis_request_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_dis_num_parts, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_dis_num_parts, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_dis_current_part, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_dis_current_part, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; numVariable = tvb_get_ntohs(tvb, offset); @@ -5716,10 +5716,10 @@ static int dissect_DIS_PARSER_DESCRIBE_OBJECT_PO_PDU(tvbuff_t *tvb, packet_info proto_tree_add_item(tree, hf_dis_sequence_number, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_dis_persist_obj_class, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_dis_persist_obj_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_dis_missing_from_world_state, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_dis_missing_from_world_state, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; return offset; @@ -5730,7 +5730,7 @@ static int dissect_DIS_PARSER_OBJECTS_PRESENT_PO_PDU(tvbuff_t *tvb, packet_info offset = dissect_DIS_FIELDS_SIMULATION_ADDRESS(tvb, tree, offset, "Owner"); offset = parseField_Entity(tvb, tree, offset, "World State ID"); - proto_tree_add_item(tree, hf_dis_obj_count, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_dis_obj_count, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; return offset; @@ -5742,7 +5742,7 @@ static int dissect_DIS_PARSER_OBJECT_REQUEST_PO_PDU(tvbuff_t *tvb, packet_info * offset = dissect_DIS_FIELDS_SIMULATION_ADDRESS(tvb, tree, offset, "Object Owner"); offset = parseField_Entity(tvb, tree, offset, "World State ID"); - proto_tree_add_item(tree, hf_dis_obj_count, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_dis_obj_count, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; return offset; @@ -5752,7 +5752,7 @@ static int dissect_DIS_PARSER_DELETE_OBJECTS_PO_PDU(tvbuff_t *tvb, packet_info * { offset = dissect_DIS_FIELDS_SIMULATION_ADDRESS(tvb, tree, offset, "Requesting Simulator"); - proto_tree_add_item(tree, hf_dis_obj_count, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_dis_obj_count, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; return offset; diff --git a/epan/dissectors/packet-dlsw.c b/epan/dissectors/packet-dlsw.c index 67806d9754..135560823f 100644 --- a/epan/dissectors/packet-dlsw.c +++ b/epan/dissectors/packet-dlsw.c @@ -301,8 +301,8 @@ dissect_dlsw_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data "DLSw header, %s", val_to_str_const(version , dlsw_version_vals, "Unknown Version")); - proto_tree_add_item(dlsw_header_tree, hf_dlsw_version, tvb, 0, 1, ENC_NA); - proto_tree_add_item(dlsw_header_tree, hf_dlsw_header_length, tvb, 1, 1, ENC_NA); + proto_tree_add_item(dlsw_header_tree, hf_dlsw_version, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dlsw_header_tree, hf_dlsw_header_length, tvb, 1, 1, ENC_BIG_ENDIAN); mlen=tvb_get_ntohs(tvb,2); proto_tree_add_item(dlsw_header_tree, hf_dlsw_message_length, tvb, 2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(dlsw_header_tree, hf_dlsw_remote_dlc, tvb, 4, 4, ENC_BIG_ENDIAN); @@ -314,7 +314,7 @@ dissect_dlsw_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",val_to_str_const(mtype , dlsw_type_vals, "Unknown message Type")); if (tree) { - proto_tree_add_item(dlsw_header_tree, hf_dlsw_message_type, tvb, 14, 1, ENC_NA); + proto_tree_add_item(dlsw_header_tree, hf_dlsw_message_type, tvb, 14, 1, ENC_BIG_ENDIAN); if (mtype==CAP_EXCHANGE) { proto_tree_add_expert(dlsw_header_tree, pinfo, &ei_dlsw_not_used_for_capex, tvb, 15, 1); @@ -322,7 +322,7 @@ dissect_dlsw_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data else { flags = tvb_get_guint8(tvb,15); - ti2 = proto_tree_add_item(dlsw_header_tree, hf_dlsw_flow_ctrl_byte, tvb, 15, 1, ENC_NA); + ti2 = proto_tree_add_item(dlsw_header_tree, hf_dlsw_flow_ctrl_byte, tvb, 15, 1, ENC_BIG_ENDIAN); dlsw_flags_tree = proto_item_add_subtree(ti2, ett_dlsw_fc); proto_tree_add_item(dlsw_flags_tree, hf_dlsw_flow_control_indication, tvb, 15, 1, ENC_BIG_ENDIAN); if (flags & 0x80) @@ -335,30 +335,30 @@ dissect_dlsw_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data { if (mtype==CAP_EXCHANGE) { - proto_tree_add_item(dlsw_header_tree, hf_dlsw_protocol_id, tvb, 16, 1, ENC_NA); - proto_tree_add_item(dlsw_header_tree, hf_dlsw_header_number, tvb, 17, 1, ENC_NA); + proto_tree_add_item(dlsw_header_tree, hf_dlsw_protocol_id, tvb, 16, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dlsw_header_tree, hf_dlsw_header_number, tvb, 17, 1, ENC_BIG_ENDIAN); proto_tree_add_expert(dlsw_header_tree, pinfo, &ei_dlsw_not_used_for_capex, tvb, 18, 5); - proto_tree_add_item(dlsw_header_tree, hf_dlsw_old_message_type, tvb, 23, 1, ENC_NA); + proto_tree_add_item(dlsw_header_tree, hf_dlsw_old_message_type, tvb, 23, 1, ENC_BIG_ENDIAN); proto_tree_add_expert(dlsw_header_tree, pinfo, &ei_dlsw_not_used_for_capex, tvb, 24, 14); - proto_tree_add_item(dlsw_header_tree, hf_dlsw_capex_type, tvb, 38, 1, ENC_NA); + proto_tree_add_item(dlsw_header_tree, hf_dlsw_capex_type, tvb, 38, 1, ENC_BIG_ENDIAN); proto_tree_add_expert(dlsw_header_tree, pinfo, &ei_dlsw_not_used_for_capex, tvb, 39, 33); } else { - proto_tree_add_item(dlsw_header_tree, hf_dlsw_protocol_id, tvb, 16, 1, ENC_NA); - proto_tree_add_item(dlsw_header_tree, hf_dlsw_header_number, tvb, 17, 1, ENC_NA); + proto_tree_add_item(dlsw_header_tree, hf_dlsw_protocol_id, tvb, 16, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dlsw_header_tree, hf_dlsw_header_number, tvb, 17, 1, ENC_BIG_ENDIAN); proto_tree_add_item(dlsw_header_tree, hf_dlsw_reserved, tvb, 18, 2, ENC_NA) ; - proto_tree_add_item(dlsw_header_tree, hf_dlsw_largest_frame_size, tvb, 20, 1, ENC_NA); - ti2 = proto_tree_add_item(dlsw_header_tree, hf_dlsw_ssp_flags, tvb, 21, 1, ENC_NA); + proto_tree_add_item(dlsw_header_tree, hf_dlsw_largest_frame_size, tvb, 20, 1, ENC_BIG_ENDIAN); + ti2 = proto_tree_add_item(dlsw_header_tree, hf_dlsw_ssp_flags, tvb, 21, 1, ENC_BIG_ENDIAN); dlsw_flags_tree = proto_item_add_subtree(ti2, ett_dlsw_sspflags); proto_tree_add_item (dlsw_flags_tree, hf_dlsw_flags_explorer_msg, tvb, 21, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(dlsw_header_tree, hf_dlsw_circuit_priority, tvb, 22, 1, ENC_NA); - proto_tree_add_item(dlsw_header_tree, hf_dlsw_old_message_type, tvb, 23, 1, ENC_NA); + proto_tree_add_item(dlsw_header_tree, hf_dlsw_circuit_priority, tvb, 22, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dlsw_header_tree, hf_dlsw_old_message_type, tvb, 23, 1, ENC_BIG_ENDIAN); proto_tree_add_item(dlsw_header_tree, hf_dlsw_target_mac_address, tvb, 24, 6, ENC_NA); proto_tree_add_item(dlsw_header_tree, hf_dlsw_origin_mac_address, tvb, 30, 6, ENC_NA); - proto_tree_add_item(dlsw_header_tree, hf_dlsw_origin_link_sap, tvb, 36, 1, ENC_NA); - proto_tree_add_item(dlsw_header_tree, hf_dlsw_target_link_sap, tvb, 37, 1, ENC_NA); - proto_tree_add_item(dlsw_header_tree, hf_dlsw_frame_direction, tvb, 38, 1, ENC_NA); + proto_tree_add_item(dlsw_header_tree, hf_dlsw_origin_link_sap, tvb, 36, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dlsw_header_tree, hf_dlsw_target_link_sap, tvb, 37, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dlsw_header_tree, hf_dlsw_frame_direction, tvb, 38, 1, ENC_BIG_ENDIAN); proto_tree_add_item(dlsw_header_tree, hf_dlsw_reserved, tvb, 39, 3, ENC_NA) ; dlchlen=tvb_get_ntohs(tvb,42); ti = proto_tree_add_item(dlsw_header_tree, hf_dlsw_dlc_header_length, tvb, 42, 2, ENC_BIG_ENDIAN); @@ -396,14 +396,14 @@ dissect_dlsw_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data default: if (dlchlen!=0) { - proto_tree_add_item(dlsw_data_tree, hf_dlsw_dlc_header_ac_byte, tvb, hlen, 1, ENC_NA); - proto_tree_add_item(dlsw_data_tree, hf_dlsw_dlc_header_fc_byte, tvb, hlen+1, 1, ENC_NA); + proto_tree_add_item(dlsw_data_tree, hf_dlsw_dlc_header_ac_byte, tvb, hlen, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dlsw_data_tree, hf_dlsw_dlc_header_fc_byte, tvb, hlen+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(dlsw_data_tree, hf_dlsw_dlc_header_da, tvb, hlen+2, 6, ENC_NA|ENC_ASCII); proto_tree_add_item(dlsw_data_tree, hf_dlsw_dlc_header_sa, tvb, hlen+8, 6, ENC_NA|ENC_ASCII); proto_tree_add_item(dlsw_data_tree, hf_dlsw_dlc_header_rif, tvb, hlen+14, 18, ENC_NA|ENC_ASCII); - proto_tree_add_item(dlsw_data_tree, hf_dlsw_dlc_header_dsap, tvb, hlen+32, 1, ENC_NA); - proto_tree_add_item(dlsw_data_tree, hf_dlsw_dlc_header_ssap, tvb, hlen+33, 1, ENC_NA); - proto_tree_add_item(dlsw_data_tree, hf_dlsw_dlc_header_ctrl, tvb, hlen+34, 1, ENC_NA); + proto_tree_add_item(dlsw_data_tree, hf_dlsw_dlc_header_dsap, tvb, hlen+32, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dlsw_data_tree, hf_dlsw_dlc_header_ssap, tvb, hlen+33, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dlsw_data_tree, hf_dlsw_dlc_header_ctrl, tvb, hlen+34, 1, ENC_BIG_ENDIAN); } proto_tree_add_item(dlsw_data_tree, hf_dlsw_data, tvb, hlen+dlchlen, mlen-dlchlen, ENC_NA); } @@ -437,8 +437,8 @@ dissect_dlsw_capex(tvbuff_t *tvb, proto_tree *tree, proto_tree *ti2) vtype=tvb_get_guint8(tvb,offset+1); dlsw_vector_tree=proto_tree_add_subtree (tree,tvb,offset,vlen,ett_dlsw_vector,NULL, val_to_str_const(vtype,dlsw_vector_vals,"Unknown vector type")); - proto_tree_add_item(dlsw_vector_tree, hf_dlsw_vector_length, tvb, offset, 1, ENC_NA); - proto_tree_add_item(dlsw_vector_tree, hf_dlsw_vector_type, tvb, offset+1, 1, ENC_NA); + proto_tree_add_item(dlsw_vector_tree, hf_dlsw_vector_length, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dlsw_vector_tree, hf_dlsw_vector_type, tvb, offset+1, 1, ENC_BIG_ENDIAN); switch (vtype){ case 0x81: proto_tree_add_item(dlsw_vector_tree, hf_dlsw_oui, tvb, offset+2, vlen-2, ENC_BIG_ENDIAN); @@ -469,7 +469,7 @@ dissect_dlsw_capex(tvbuff_t *tvb, proto_tree *tree, proto_tree *ti2) } break; case 0x87: - proto_tree_add_item(dlsw_vector_tree, hf_dlsw_tcp_connections, tvb, offset+2, vlen-2, ENC_NA); + proto_tree_add_item(dlsw_vector_tree, hf_dlsw_tcp_connections, tvb, offset+2, vlen-2, ENC_BIG_ENDIAN); break; case 0x88: proto_tree_add_text (dlsw_vector_tree,tvb,offset+2,vlen-2, @@ -486,7 +486,7 @@ dissect_dlsw_capex(tvbuff_t *tvb, proto_tree *tree, proto_tree *ti2) proto_tree_add_item(dlsw_vector_tree, hf_dlsw_vendor_oui, tvb, offset+2, vlen-2, ENC_BIG_ENDIAN); break; case 0x8c: - proto_tree_add_item(dlsw_vector_tree, hf_dlsw_multicast_version_number, tvb, offset+2, vlen-2, ENC_NA); + proto_tree_add_item(dlsw_vector_tree, hf_dlsw_multicast_version_number, tvb, offset+2, vlen-2, ENC_BIG_ENDIAN); break; default: proto_tree_add_item(dlsw_vector_tree, hf_dlsw_vector_data, tvb, offset+2, vlen-2, ENC_NA); diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index f88db857c3..93939b10b1 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -1436,9 +1436,9 @@ add_opt_rr_to_tree(proto_tree *rr_tree, tvbuff_t *tvb, int offset, proto_tree_add_item(rr_tree, hf_dns_rr_udp_payload_size, tvb, offset, 2, ENC_BIG_ENDIAN); } offset += 2; - proto_tree_add_item(rr_tree, hf_dns_rr_ext_rcode, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_rr_ext_rcode, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(rr_tree, hf_dns_rr_edns0_version, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_rr_edns0_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; Z_item = proto_tree_add_item(rr_tree, hf_dns_rr_z, tvb, offset, 2, ENC_BIG_ENDIAN); Z_tree = proto_item_add_subtree(Z_item, ett_dns_rr); @@ -2131,7 +2131,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, col_append_fstr(cinfo, COL_INFO, " %s", name); } - proto_tree_add_item(rr_tree, hf_dns_x25_length, tvb, cur_offset, 1, ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_x25_length, tvb, cur_offset, 1, ENC_BIG_ENDIAN); x25_len = tvb_get_guint8(tvb, cur_offset); cur_offset += 1; @@ -2151,7 +2151,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, col_append_fstr(cinfo, COL_INFO, " %s", name); } - proto_tree_add_item(rr_tree, hf_dns_isdn_length, tvb, cur_offset, 1, ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_isdn_length, tvb, cur_offset, 1, ENC_BIG_ENDIAN); isdn_address_len = tvb_get_guint8(tvb, cur_offset); cur_offset += 1; rr_len -= 1; @@ -2161,7 +2161,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, rr_len -= isdn_address_len; if (rr_len > 1) /* ISDN SA is optional */ { - proto_tree_add_item(rr_tree, hf_dns_isdn_sa_length, tvb, cur_offset, 1, ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_isdn_sa_length, tvb, cur_offset, 1, ENC_BIG_ENDIAN); isdn_sa_len = tvb_get_guint8(tvb, cur_offset); cur_offset += 1; @@ -2295,7 +2295,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, if (cinfo != NULL) { col_append_fstr(cinfo, COL_INFO, " %s", name); } - proto_tree_add_item(rr_tree, hf_dns_gpos_longitude_length, tvb, cur_offset, 1, ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_gpos_longitude_length, tvb, cur_offset, 1, ENC_BIG_ENDIAN); long_len = tvb_get_guint8(tvb, cur_offset); cur_offset += 1; @@ -2303,7 +2303,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, cur_offset += long_len; - proto_tree_add_item(rr_tree, hf_dns_gpos_latitude_length, tvb, cur_offset, 1, ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_gpos_latitude_length, tvb, cur_offset, 1, ENC_BIG_ENDIAN); lat_len = tvb_get_guint8(tvb, cur_offset); cur_offset += 1; @@ -2311,7 +2311,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, cur_offset += lat_len; - proto_tree_add_item(rr_tree, hf_dns_gpos_altitude_length, tvb, cur_offset, 1, ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_gpos_altitude_length, tvb, cur_offset, 1, ENC_BIG_ENDIAN); alt_len = tvb_get_guint8(tvb, cur_offset); cur_offset += 1; @@ -2813,11 +2813,11 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, int rr_len = data_len; - proto_tree_add_item(rr_tree, hf_dns_sshfp_algorithm, tvb, cur_offset, 1, ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_sshfp_algorithm, tvb, cur_offset, 1, ENC_BIG_ENDIAN); cur_offset += 1; rr_len -= 1; - proto_tree_add_item(rr_tree, hf_dns_sshfp_fingerprint_type, tvb, cur_offset, 1, ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_sshfp_fingerprint_type, tvb, cur_offset, 1, ENC_BIG_ENDIAN); cur_offset += 1; rr_len -= 1; @@ -3114,16 +3114,16 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, } hit_len = tvb_get_guint8(tvb, cur_offset); - proto_tree_add_item(rr_tree, hf_dns_hip_hit_length, tvb, cur_offset, 1, ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_hip_hit_length, tvb, cur_offset, 1, ENC_BIG_ENDIAN); cur_offset += 1; rr_len -= 1; - proto_tree_add_item(rr_tree, hf_dns_hip_pk_algo, tvb, cur_offset, 1, ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_hip_pk_algo, tvb, cur_offset, 1, ENC_BIG_ENDIAN); cur_offset += 1; rr_len -= 1; pk_len = tvb_get_ntohs(tvb, cur_offset); - proto_tree_add_item(rr_tree, hf_dns_hip_pk_length, tvb, cur_offset, 2, ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_hip_pk_length, tvb, cur_offset, 2, ENC_BIG_ENDIAN); cur_offset += 2; rr_len -= 2; @@ -5057,7 +5057,7 @@ proto_register_dns(void) { &hf_dns_hip_pk_length, { "PK length", "dns.hip.pk.length", - FT_UINT8, BASE_DEC, NULL, 0, + FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_dns_hip_hit, diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c index a35c184573..e654fca88e 100644 --- a/epan/dissectors/packet-dtn.c +++ b/epan/dissectors/packet-dtn.c @@ -1180,7 +1180,7 @@ dissect_admin_record(proto_tree *primary_tree, tvbuff_t *tvb, packet_info *pinfo ett_admin_record, &admin_record_item, "Administrative Record"); record_type = tvb_get_guint8(tvb, offset); - proto_tree_add_item(admin_record_tree, hf_bundle_admin_record_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(admin_record_tree, hf_bundle_admin_record_type, tvb, offset, 1, ENC_BIG_ENDIAN); switch ((record_type >> 4) & 0xf) { @@ -1823,7 +1823,7 @@ dissect_tcpcl_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat conv_tree = proto_tree_add_subtree(conv_proto_tree, tvb, 0, -1, ett_tcp_conv_hdr, NULL, "TCP Convergence Header"); conv_hdr = tvb_get_guint8(tvb, offset); - proto_tree_add_item(conv_tree, hf_tcp_convergence_pkt_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(conv_tree, hf_tcp_convergence_pkt_type, tvb, offset, 1, ENC_BIG_ENDIAN); col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const((conv_hdr>>4)&0xF, packet_type_vals, "Unknown")); switch (conv_hdr & TCP_CONVERGENCE_TYPE_MASK) diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c index e1241d4566..d51b1f8e15 100644 --- a/epan/dissectors/packet-dtp.c +++ b/epan/dissectors/packet-dtp.c @@ -239,8 +239,8 @@ dissect_dtp_tlv(packet_info *pinfo, tvbuff_t *tvb, int offset, int length, val_to_str_const(DTP_TOSVALUE(trunk_status), dtp_tos_vals, "Unknown operating status"), val_to_str_const(DTP_TASVALUE(trunk_status), dtp_tas_vals, "Unknown administrative status"), trunk_status); - proto_tree_add_item(field_tree, hf_dtp_tos, tvb, offset, length, ENC_NA); - proto_tree_add_item(field_tree, hf_dtp_tas, tvb, offset, length, ENC_NA); + proto_tree_add_item(field_tree, hf_dtp_tos, tvb, offset, length, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree, hf_dtp_tas, tvb, offset, length, ENC_BIG_ENDIAN); } else expert_add_info(pinfo, tlv_length_item, &ei_dtp_tlv_length_invalid); @@ -260,8 +260,8 @@ dissect_dtp_tlv(packet_info *pinfo, tvbuff_t *tvb, int offset, int length, val_to_str_const(DTP_TOTVALUE(trunk_type), dtp_tot_vals, "Unknown operating type"), val_to_str_const(DTP_TATVALUE(trunk_type), dtp_tat_vals, "Unknown administrative type"), trunk_type); - proto_tree_add_item(field_tree, hf_dtp_tot, tvb, offset, length, ENC_NA); - proto_tree_add_item(field_tree, hf_dtp_tat, tvb, offset, length, ENC_NA); + proto_tree_add_item(field_tree, hf_dtp_tot, tvb, offset, length, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree, hf_dtp_tat, tvb, offset, length, ENC_BIG_ENDIAN); } else expert_add_info(pinfo, tlv_length_item, &ei_dtp_tlv_length_invalid); diff --git a/epan/dissectors/packet-elmi.c b/epan/dissectors/packet-elmi.c index 21e390c776..a376856dea 100644 --- a/epan/dissectors/packet-elmi.c +++ b/epan/dissectors/packet-elmi.c @@ -289,7 +289,7 @@ dissect_elmi_info_elem( offset++; break; case TAG_DATA_INST: - proto_tree_add_item(info_elem_tree, hf_elmi_reserved, tvb, offset, 1, ENC_NA); + proto_tree_add_item(info_elem_tree, hf_elmi_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(info_elem_tree, hf_elmi_dat_inst, tvb, offset, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-epon.c b/epan/dissectors/packet-epon.c index fbdff86833..346f197679 100644 --- a/epan/dissectors/packet-epon.c +++ b/epan/dissectors/packet-epon.c @@ -114,7 +114,7 @@ dissect_epon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint dpoe_reserved; item = proto_tree_add_item(epon_tree, hf_epon_dpoe_security, - tvb, 2+offset, 1, ENC_NA); + tvb, 2+offset, 1, ENC_BIG_ENDIAN); sec_tree = proto_item_add_subtree(item, ett_epon_sec); /* The DPoE security byte is split into three fields: diff --git a/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c index 8e18a214e8..a471c65c9d 100644 --- a/epan/dissectors/packet-erldp.c +++ b/epan/dissectors/packet-erldp.c @@ -186,7 +186,7 @@ static gint dissect_etf_dist_header(packet_info *pinfo _U_, tvbuff_t *tvb, gint const gchar *str; num = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_erldp_num_atom_cache_refs, tvb, offset, 1, ENC_NA ); + proto_tree_add_item(tree, hf_erldp_num_atom_cache_refs, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; if (num == 0) @@ -359,7 +359,7 @@ static gint dissect_etf_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, etf_tree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_etf, &ti, (label) ? label : "External Term Format"); - proto_tree_add_item(etf_tree, hf_etf_version_magic, tvb, offset, 1, ENC_NA); + proto_tree_add_item(etf_tree, hf_etf_version_magic, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; tag = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c index abb455b774..40a62e51cb 100644 --- a/epan/dissectors/packet-etch.c +++ b/epan/dissectors/packet-etch.c @@ -381,7 +381,7 @@ read_type(unsigned int *offset, tvbuff_t *tvb, proto_tree *etch_tree) guint32 type_code; type_code = tvb_get_guint8(tvb, *offset); - proto_tree_add_item(etch_tree, hf_etch_typecode, tvb, *offset, 1, ENC_NA); + proto_tree_add_item(etch_tree, hf_etch_typecode, tvb, *offset, 1, ENC_BIG_ENDIAN); (*offset)++; return type_code; } @@ -470,7 +470,7 @@ read_array(unsigned int *offset, tvbuff_t *tvb, proto_tree *etch_tree) read_array_type(offset, tvb, etch_tree); /* Array dim */ - proto_tree_add_item(etch_tree, hf_etch_dim, tvb, *offset, 1, ENC_NA); + proto_tree_add_item(etch_tree, hf_etch_dim, tvb, *offset, 1, ENC_BIG_ENDIAN); (*offset)++; /* Array length */ @@ -752,7 +752,7 @@ dissect_etch_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* etch_tree = proto_item_add_subtree(ti, ett_etch); proto_tree_add_item(etch_tree, hf_etch_sig, tvb, 0, 4, ENC_BIG_ENDIAN); proto_tree_add_item(etch_tree, hf_etch_length, tvb, 4, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(etch_tree, hf_etch_version, tvb, 8, 1, ENC_NA); + proto_tree_add_item(etch_tree, hf_etch_version, tvb, 8, 1, ENC_BIG_ENDIAN); read_struct(&offset, tvb, etch_tree, 0); } diff --git a/epan/dissectors/packet-etsi_card_app_toolkit.c b/epan/dissectors/packet-etsi_card_app_toolkit.c index 88ea6dcfb9..7a720d2338 100644 --- a/epan/dissectors/packet-etsi_card_app_toolkit.c +++ b/epan/dissectors/packet-etsi_card_app_toolkit.c @@ -1017,65 +1017,65 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) case 0x01: /* command details */ if (len < 3) break; - proto_tree_add_item(elem_tree, hf_ctlv_cmd_nr, tvb, pos, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_cmd_nr, tvb, pos, 1, ENC_BIG_ENDIAN); if (tvb_get_guint8(tvb, pos) == 0x40) { ims_event = TRUE; dns_server = TRUE; } - proto_tree_add_item(elem_tree, hf_ctlv_cmd_type, tvb, pos+1, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_cmd_type, tvb, pos+1, 1, ENC_BIG_ENDIAN); /* append command type to INFO column */ g8 = tvb_get_guint8(tvb, pos+1); col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str_ext(g8, &cmd_type_vals_ext, "%02x ")); switch (g8) { case 0x01: - proto_tree_add_item(elem_tree, hf_ctlv_cmd_qual_refresh, tvb, pos+2, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_cmd_qual_refresh, tvb, pos+2, 1, ENC_BIG_ENDIAN); break; case 0x13: proto_tree_add_item(elem_tree, hf_ctlv_cmd_qual_send_short_msg, tvb, pos+2, 1, ENC_NA); sms_data.stk_packing_required = tvb_get_guint8(tvb, pos+2) & 0x01 ? TRUE : FALSE; break; case 0x26: - proto_tree_add_item(elem_tree, hf_ctlv_cmd_qual_loci, tvb, pos+2, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_cmd_qual_loci, tvb, pos+2, 1, ENC_BIG_ENDIAN); break; case 0x27: - proto_tree_add_item(elem_tree, hf_ctlv_cmd_qual_timer_mgmt, tvb, pos+2, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_cmd_qual_timer_mgmt, tvb, pos+2, 1, ENC_BIG_ENDIAN); break; case 0x43: proto_tree_add_item(elem_tree, hf_ctlv_cmd_qual_send_data, tvb, pos+2, 1, ENC_NA); break; default: - proto_tree_add_item(elem_tree, hf_ctlv_cmd_qual, tvb, pos+2, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_cmd_qual, tvb, pos+2, 1, ENC_BIG_ENDIAN); break; } break; case 0x02: /* device identity */ if (len < 2) break; - proto_tree_add_item(elem_tree, hf_ctlv_devid_src, tvb, pos, 1, ENC_NA); - proto_tree_add_item(elem_tree, hf_ctlv_devid_dst, tvb, pos+1, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_devid_src, tvb, pos, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(elem_tree, hf_ctlv_devid_dst, tvb, pos+1, 1, ENC_BIG_ENDIAN); break; case 0x03: /* Result */ g8 = tvb_get_guint8(tvb, pos); - proto_tree_add_item(elem_tree, hf_ctlv_result_gen, tvb, pos, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_result_gen, tvb, pos, 1, ENC_BIG_ENDIAN); switch (g8) { case 0x20: - proto_tree_add_item(elem_tree, hf_ctlv_result_term, tvb, pos+1, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_result_term, tvb, pos+1, 1, ENC_BIG_ENDIAN); break; case 0x26: - proto_tree_add_item(elem_tree, hf_ctlv_result_launch_browser, tvb, pos+1, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_result_launch_browser, tvb, pos+1, 1, ENC_BIG_ENDIAN); break; case 0x38: - proto_tree_add_item(elem_tree, hf_ctlv_result_multiplecard, tvb, pos+1, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_result_multiplecard, tvb, pos+1, 1, ENC_BIG_ENDIAN); break; case 0x39: - proto_tree_add_item(elem_tree, hf_ctlv_result_cc_ctrl_mo_sm_ctrl, tvb, pos+1, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_result_cc_ctrl_mo_sm_ctrl, tvb, pos+1, 1, ENC_BIG_ENDIAN); break; case 0x3a: - proto_tree_add_item(elem_tree, hf_ctlv_result_bip, tvb, pos+1, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_result_bip, tvb, pos+1, 1, ENC_BIG_ENDIAN); break; case 0x3c: - proto_tree_add_item(elem_tree, hf_ctlv_result_frames_cmd, tvb, pos+1, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_result_frames_cmd, tvb, pos+1, 1, ENC_BIG_ENDIAN); break; default: break; @@ -1084,8 +1084,8 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) case 0x04: /* Duration */ if (len < 2) break; - proto_tree_add_item(elem_tree, hf_ctlv_dur_time_intv, tvb, pos+1, 1, ENC_NA); - proto_tree_add_item(elem_tree, hf_ctlv_dur_time_unit, tvb, pos, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_dur_time_intv, tvb, pos+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(elem_tree, hf_ctlv_dur_time_unit, tvb, pos, 1, ENC_BIG_ENDIAN); break; case 0x05: /* alpha identifier */ break; @@ -1112,7 +1112,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (len == 0) break; /* 1st byte: encoding */ - proto_tree_add_item(elem_tree, hf_ctlv_text_string_enc, tvb, pos, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_text_string_enc, tvb, pos, 1, ENC_BIG_ENDIAN); g8 = tvb_get_guint8(tvb, pos); switch (g8 & 0xf0) { case 0x00: @@ -1142,7 +1142,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) case 0x0e: /* tone */ if (len < 1) break; - proto_tree_add_item(elem_tree, hf_ctlv_tone, tvb, pos, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_tone, tvb, pos, 1, ENC_BIG_ENDIAN); break; case 0x13: /* location information */ /* MCC/MNC / LAC / CellID */ @@ -1172,7 +1172,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) break; case 0x1b: /* location status */ for (i = 0; i < len; i++) - proto_tree_add_item(elem_tree, hf_ctlv_loc_status, tvb, pos+i, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_loc_status, tvb, pos+i, 1, ENC_BIG_ENDIAN); break; case 0x25: /* timer value */ { @@ -1220,8 +1220,8 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_tree_add_item(elem_tree, hf_ctlv_language, tvb, pos, len, ENC_ASCII|ENC_NA); break; case 0x2e: /* Timing Advance */ - proto_tree_add_item(elem_tree, hf_ctlv_me_status, tvb, pos, 1, ENC_NA); - proto_tree_add_item(elem_tree, hf_ctlv_timing_adv, tvb, pos+1, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_me_status, tvb, pos, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(elem_tree, hf_ctlv_timing_adv, tvb, pos+1, 1, ENC_BIG_ENDIAN); break; case 0x2f: /* AID */ { @@ -1246,7 +1246,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) break; case 0x32: /* bearer */ for (i = 0; i < len; i++) - proto_tree_add_item(elem_tree, hf_ctlv_bearer, tvb, pos+i, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_bearer, tvb, pos+i, 1, ENC_BIG_ENDIAN); break; case 0x35: /* bearer description */ g8 = tvb_get_guint8(tvb, pos); @@ -1299,7 +1299,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) case 0x3c: /* UICC/terminal interface transport level */ if (len < 3) break; - proto_tree_add_item(elem_tree, hf_ctlv_transport_ptype, tvb, pos, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_transport_ptype, tvb, pos, 1, ENC_BIG_ENDIAN); proto_tree_add_item(elem_tree, hf_ctlv_transport_port, tvb, pos+1, 2, ENC_BIG_ENDIAN); break; case 0x3e: /* other address */ @@ -1318,7 +1318,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) break; case 0x3f: /* access technology */ for (i = 0; i < len; i++) - proto_tree_add_item(elem_tree, hf_ctlv_access_tech, tvb, pos+i, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_access_tech, tvb, pos+i, 1, ENC_BIG_ENDIAN); break; case 0x40: /* Display parameters / DNS server address */ if (dns_server) { @@ -1340,13 +1340,13 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) de_sm_apn(tvb, elem_tree, pinfo, pos, len, NULL, 0); break; case 0x69: /* UTRAN EUTRAN measurement qualifier */ - proto_tree_add_item(elem_tree, hf_ctlv_utran_eutran_meas_qual, tvb, pos, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_utran_eutran_meas_qual, tvb, pos, 1, ENC_BIG_ENDIAN); break; case 0x73: /* Routing Area Information */ de_gmm_rai(tvb, elem_tree, pinfo, pos, len, NULL, 0); break; case 0x74: /* Update/Attach Type */ - proto_tree_add_item(elem_tree, hf_ctlv_upd_attach_type, tvb, pos, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_upd_attach_type, tvb, pos, 1, ENC_BIG_ENDIAN); break; case 0x76: /* Geographical Location Parameters / IARI */ if (ims_event) { @@ -1380,7 +1380,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } break; case 0x7a:/* Broadcast Network Information */ - proto_tree_add_item(elem_tree, hf_ctlv_broadcast_nw_tech, tvb, pos, 1, ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_broadcast_nw_tech, tvb, pos, 1, ENC_BIG_ENDIAN); proto_tree_add_item(elem_tree, hf_ctlv_broadcast_nw_loc_info, tvb, pos+1, len-1, ENC_NA); break; case 0x7c: /* EPS PDN connection activation parameters */ diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index cef4882551..285ec37e21 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -1293,7 +1293,7 @@ dissect_fcels_abtx (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, return; } - proto_tree_add_item(abtx_tree, hf_fcels_recovery_qualifier_status, tvb, offset+4, 1, ENC_NA); + proto_tree_add_item(abtx_tree, hf_fcels_recovery_qualifier_status, tvb, offset+4, 1, ENC_BIG_ENDIAN); proto_tree_add_string (abtx_tree, hf_fcels_nportid, tvb, offset+5, 3, tvb_fc_to_str (tvb, offset+5)); proto_tree_add_item (abtx_tree, hf_fcels_oxid, tvb, offset+8, 2, ENC_BIG_ENDIAN); @@ -1517,7 +1517,7 @@ dissect_fcels_rps (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (flag & 0x01) { /* Next 6 fields are from L_Port Extension field */ proto_tree_add_item(rps_tree, hf_fcels_l_port_status, tvb, offset+31, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(rps_tree, hf_fcels_lip_al_ps, tvb, offset+36, 1, ENC_NA); + proto_tree_add_item(rps_tree, hf_fcels_lip_al_ps, tvb, offset+36, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rps_tree, hf_fcels_lip_f7_initiated_count, tvb, offset+37, 4, ENC_BIG_ENDIAN); proto_tree_add_item(rps_tree, hf_fcels_lip_f7_received_count, tvb, offset+41, 4, ENC_BIG_ENDIAN); proto_tree_add_item(rps_tree, hf_fcels_lip_f8_initiated_count, tvb, offset+45, 4, ENC_BIG_ENDIAN); @@ -1605,7 +1605,7 @@ dissect_fcels_rscn (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (!isreq) return; - proto_tree_add_item(rscn_tree, hf_fcels_rscn_page_len, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rscn_tree, hf_fcels_rscn_page_len, tvb, offset, 1, ENC_BIG_ENDIAN); plen = tvb_get_ntohs (tvb, offset+1); proto_tree_add_item(rscn_tree, hf_fcels_rscn_payload_len, tvb, offset+1, 2, ENC_BIG_ENDIAN); numrec = (plen - 4)/4; @@ -1661,13 +1661,13 @@ dissect_fcels_rnft (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (isreq) { proto_tree_add_item(rnft_tree, hf_fcels_rnft_max_size, tvb, offset+2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(rnft_tree, hf_fcels_rnft_index, tvb, offset+7, 1, ENC_NA); + proto_tree_add_item(rnft_tree, hf_fcels_rnft_index, tvb, offset+7, 1, ENC_BIG_ENDIAN); } else { proto_tree_add_item(rnft_tree, hf_fcels_rnft_payload_len, tvb, offset+2, 2, ENC_BIG_ENDIAN); numrec = tvb_get_guint8 (tvb, offset+5); - proto_tree_add_item(rnft_tree, hf_fcels_rnft_list_length, tvb, offset+5, 1, ENC_NA); - proto_tree_add_item(rnft_tree, hf_fcels_rnft_index_of_first_rec_in_list, tvb, offset+7, 1, ENC_NA); + proto_tree_add_item(rnft_tree, hf_fcels_rnft_list_length, tvb, offset+5, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(rnft_tree, hf_fcels_rnft_index_of_first_rec_in_list, tvb, offset+7, 1, ENC_BIG_ENDIAN); offset = 8; for (i = 0; i < numrec; i++) { fc4_tree = proto_tree_add_subtree_format(rnft_tree, tvb, offset, 4, @@ -1731,7 +1731,7 @@ dissect_fcels_prlilo_payload (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item (prli_tree, hf_fcels_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(prli_tree, hf_fcels_prlilo_page_length, tvb, offset+1, 1, ENC_NA); + proto_tree_add_item(prli_tree, hf_fcels_prlilo_page_length, tvb, offset+1, 1, ENC_BIG_ENDIAN); payload_len = tvb_get_ntohs (tvb, offset+2); proto_tree_add_item(prli_tree, hf_fcels_prlilo_payload_length, tvb, offset+2, 2, ENC_BIG_ENDIAN); num_svcpg = payload_len/16; @@ -1742,15 +1742,15 @@ dissect_fcels_prlilo_payload (tvbuff_t *tvb, packet_info *pinfo _U_, ett_fcels_prli_svcpg, NULL, "Service Parameter Page %u", i); type = tvb_get_guint8 (tvb, offset); - proto_tree_add_item(svcpg_tree, hf_fcels_prlilo_type, tvb, offset, 1, ENC_NA); - proto_tree_add_item(svcpg_tree, hf_fcels_prlilo_type_code_extension, tvb, offset+1, 1, ENC_NA); + proto_tree_add_item(svcpg_tree, hf_fcels_prlilo_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(svcpg_tree, hf_fcels_prlilo_type_code_extension, tvb, offset+1, 1, ENC_BIG_ENDIAN); flag = tvb_get_guint8 (tvb, offset+2); dissect_prlilo_flags (svcpg_tree, tvb, offset+2, flag, opcode); if (!isreq && (opcode != FC_ELS_TPRLO)) { /* This is valid only for ACC */ - proto_tree_add_item(svcpg_tree, hf_fcels_prlilo_response_code, tvb, offset+2, 1, ENC_NA); + proto_tree_add_item(svcpg_tree, hf_fcels_prlilo_response_code, tvb, offset+2, 1, ENC_BIG_ENDIAN); } if (opcode != FC_ELS_TPRLO) { proto_tree_add_item(svcpg_tree, hf_fcels_prlilo_originator_pa, tvb, offset+4, 4, ENC_BIG_ENDIAN); @@ -1817,7 +1817,7 @@ dissect_fcels_lirr (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item (lirr_tree, hf_fcels_opcode, tvb, offset-4, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(lirr_tree, hf_fcels_lirr_regn_function, tvb, offset, 1, ENC_NA); + proto_tree_add_item(lirr_tree, hf_fcels_lirr_regn_function, tvb, offset, 1, ENC_BIG_ENDIAN); lirr_fmt = tvb_get_guint8 (tvb, offset+1); if (!lirr_fmt) { /* This scheme is resorted to because the value 0 has a string in @@ -1826,7 +1826,7 @@ dissect_fcels_lirr (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_uint_format_value(lirr_tree, hf_fcels_lirr_regn_format, tvb, offset, 1, 0, "Common Format"); } else { - proto_tree_add_item(lirr_tree, hf_fcels_lirr_regn_format, tvb, offset, 1, ENC_NA); + proto_tree_add_item(lirr_tree, hf_fcels_lirr_regn_format, tvb, offset, 1, ENC_BIG_ENDIAN); } } } @@ -1971,7 +1971,7 @@ dissect_fcels_rnid (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item (rnid_tree, hf_fcels_nodeidfmt, tvb, offset+4, 1, ENC_BIG_ENDIAN); clen = tvb_get_guint8 (tvb, offset+5); - proto_tree_add_item(rnid_tree, hf_fcels_common_identification_data_length, tvb, offset+5, 1, ENC_NA); + proto_tree_add_item(rnid_tree, hf_fcels_common_identification_data_length, tvb, offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (rnid_tree, hf_fcels_spidlen, tvb, offset+7, 1, ENC_BIG_ENDIAN); if (clen) { diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index ec9d8971b9..75ef72cd81 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -975,10 +975,10 @@ dissect_swils_rdi(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *rdi_tree, g offset = 12; for (i = 0; i < numrec; i++) { if (isreq) { - proto_tree_add_item(rdi_tree, hf_swils_requested_domain_id, tvb, offset+3, 1, ENC_NA); + proto_tree_add_item(rdi_tree, hf_swils_requested_domain_id, tvb, offset+3, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(rdi_tree, hf_swils_granted_domain_id, tvb, offset+3, 1, ENC_NA); + proto_tree_add_item(rdi_tree, hf_swils_granted_domain_id, tvb, offset+3, 1, ENC_BIG_ENDIAN); } offset += 4; } @@ -1092,7 +1092,7 @@ dissect_swils_lsupdate(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *lsu_tr if (lsu_tree) { dissect_swils_fspf_hdr(tvb, lsu_tree, offset); - proto_tree_add_item(lsu_tree, hf_swils_lsupdate_flags, tvb, offset+23, 1, ENC_NA); + proto_tree_add_item(lsu_tree, hf_swils_lsupdate_flags, tvb, offset+23, 1, ENC_BIG_ENDIAN); num_lsrec = tvb_get_ntohl(tvb, offset+24); proto_tree_add_item(lsu_tree, hf_swils_lsupdate_num_of_lsrs, tvb, offset+24, 4, ENC_BIG_ENDIAN); @@ -1113,7 +1113,7 @@ dissect_swils_lsack(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *lsa_tree, if (lsa_tree) { dissect_swils_fspf_hdr(tvb, lsa_tree, offset); - proto_tree_add_item(lsa_tree, hf_swils_lsack_flags, tvb, offset+23, 1, ENC_NA); + proto_tree_add_item(lsa_tree, hf_swils_lsack_flags, tvb, offset+23, 1, ENC_BIG_ENDIAN); num_lsrechdr = tvb_get_ntohl(tvb, offset+24); proto_tree_add_item(lsa_tree, hf_swils_lsack_num_of_lsr_headers, tvb, offset+24, 4, ENC_BIG_ENDIAN); @@ -1201,9 +1201,9 @@ dissect_swils_zone_mbr(tvbuff_t *tvb, proto_tree *zmbr_tree, int offset) mbrtype = tvb_get_guint8(tvb, offset); proto_tree_add_uint(zmbr_tree, hf_swils_zone_mbrtype, tvb, offset, 1, mbrtype); - proto_tree_add_item(zmbr_tree, hf_swils_zone_mbrflags, tvb, offset+2, 1, ENC_NA); + proto_tree_add_item(zmbr_tree, hf_swils_zone_mbrflags, tvb, offset+2, 1, ENC_BIG_ENDIAN); idlen = tvb_get_guint8(tvb, offset+3); - proto_tree_add_item(zmbr_tree, hf_swils_zone_mbr_identifier_length, tvb, offset+3, 1, ENC_NA); + proto_tree_add_item(zmbr_tree, hf_swils_zone_mbr_identifier_length, tvb, offset+3, 1, ENC_BIG_ENDIAN); switch (mbrtype) { case FC_SWILS_ZONEMBR_WWN: proto_tree_add_string(zmbr_tree, hf_swils_zone_mbrid, tvb, @@ -1363,7 +1363,7 @@ dissect_swils_mergereq(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *mr_tre offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item(mr_tree, hf_swils_zone_reason, tvb, offset+6, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(mr_tree, hf_swils_zone_vendor_unique, tvb, offset+7, 1, ENC_NA); + proto_tree_add_item(mr_tree, hf_swils_zone_vendor_unique, tvb, offset+7, 1, ENC_BIG_ENDIAN); } } } @@ -1396,7 +1396,7 @@ dissect_swils_aca(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *aca_tree, g offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item(aca_tree, hf_swils_zone_reason, tvb, offset+6, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(aca_tree, hf_swils_zone_vendor_unique, tvb, offset+7, 1, ENC_NA); + proto_tree_add_item(aca_tree, hf_swils_zone_vendor_unique, tvb, offset+7, 1, ENC_BIG_ENDIAN); } } } @@ -1413,7 +1413,7 @@ dissect_swils_rca(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *rca_tree, g offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rca_tree, hf_swils_zone_reason, tvb, offset+6, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(rca_tree, hf_swils_zone_vendor_unique, tvb, offset+7, 1, ENC_NA); + proto_tree_add_item(rca_tree, hf_swils_zone_vendor_unique, tvb, offset+7, 1, ENC_BIG_ENDIAN); } } } @@ -1492,7 +1492,7 @@ dissect_swils_sfc(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *sfc_tree, g offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item(sfc_tree, hf_swils_zone_reason, tvb, offset+6, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(sfc_tree, hf_swils_zone_vendor_unique, tvb, offset+7, 1, ENC_NA); + proto_tree_add_item(sfc_tree, hf_swils_zone_vendor_unique, tvb, offset+7, 1, ENC_BIG_ENDIAN); } } } @@ -1509,7 +1509,7 @@ dissect_swils_ufc(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *ufc_tree, g offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ufc_tree, hf_swils_zone_reason, tvb, offset+6, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(ufc_tree, hf_swils_zone_vendor_unique, tvb, offset+7, 1, ENC_NA); + proto_tree_add_item(ufc_tree, hf_swils_zone_vendor_unique, tvb, offset+7, 1, ENC_BIG_ENDIAN); } } } diff --git a/epan/dissectors/packet-fmtp.c b/epan/dissectors/packet-fmtp.c index 6652011408..f633011a70 100644 --- a/epan/dissectors/packet-fmtp.c +++ b/epan/dissectors/packet-fmtp.c @@ -116,10 +116,10 @@ dissect_fmtp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* } if (tree) { /* we are being asked for details */ fmtp_tree = proto_item_add_subtree(ti, ett_fmtp); - proto_tree_add_item(fmtp_tree, hf_fmtp_pdu_version, tvb, 0, 1, ENC_NA); - proto_tree_add_item(fmtp_tree, hf_fmtp_pdu_reserved, tvb, 1, 1, ENC_NA); + proto_tree_add_item(fmtp_tree, hf_fmtp_pdu_version, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(fmtp_tree, hf_fmtp_pdu_reserved, tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(fmtp_tree, hf_fmtp_pdu_length, tvb, 2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(fmtp_tree, hf_fmtp_pdu_type, tvb, 4, 1, ENC_NA); + proto_tree_add_item(fmtp_tree, hf_fmtp_pdu_type, tvb, 4, 1, ENC_BIG_ENDIAN); next_tvb = tvb_new_subset_remaining(tvb, FMTP_HEADER_LEN); call_dissector(data_handle, next_tvb, pinfo, fmtp_tree); diff --git a/epan/dissectors/packet-foundry.c b/epan/dissectors/packet-foundry.c index b749ab3d89..473faea2b3 100644 --- a/epan/dissectors/packet-foundry.c +++ b/epan/dissectors/packet-foundry.c @@ -284,9 +284,9 @@ dissect_fdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_fdp, tvb, offset, -1, ENC_NA); fdp_tree = proto_item_add_subtree(ti, ett_fdp); - proto_tree_add_item(fdp_tree, hf_fdp_version, tvb, offset, 1, ENC_NA); + proto_tree_add_item(fdp_tree, hf_fdp_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(fdp_tree, hf_fdp_holdtime, tvb, offset, 1, ENC_NA); + proto_tree_add_item(fdp_tree, hf_fdp_holdtime, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(fdp_tree, hf_fdp_checksum, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index 8bf96c9576..5a4403413b 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -4297,7 +4297,7 @@ dissect_giop_request_1_1 (tvbuff_t * tvb, packet_info * pinfo, response_expected = tvb_get_guint8( tvb, offset ); col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)", response_expected ? "two-way" : "one-way"); - proto_tree_add_item(request_tree, hf_giop_rsp_expected, tvb, offset, 1, ENC_NA); + proto_tree_add_item(request_tree, hf_giop_rsp_expected, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if ( header->GIOP_version.minor > 0) @@ -4454,7 +4454,7 @@ dissect_giop_request_1_2 (tvbuff_t * tvb, packet_info * pinfo, proto_tree_add_uint (request_tree, hf_giop_req_id, tvb, offset-4, 4, request_id); proto_tree_add_item(request_tree, hf_giop_response_flag, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); offset += 1; get_CDR_octet_seq( tvb, &reserved, &offset, 3); @@ -4679,8 +4679,8 @@ static int dissect_giop_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree header_version_tree = proto_tree_add_subtree_format(header_tree, tvb, 4, 2, ett_giop_header_version, &version_item, "Version: %u.%u", header.GIOP_version.major, header.GIOP_version.minor); - proto_tree_add_item(header_version_tree, hf_giop_message_major_version, tvb, 4, 1, ENC_NA); - proto_tree_add_item(header_version_tree, hf_giop_message_minor_version, tvb, 5, 1, ENC_NA); + proto_tree_add_item(header_version_tree, hf_giop_message_major_version, tvb, 4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(header_version_tree, hf_giop_message_minor_version, tvb, 5, 1, ENC_BIG_ENDIAN); if ((header.GIOP_version.major != GIOP_MAJOR) || (header.GIOP_version.minor > GIOP_MINOR)) @@ -4720,7 +4720,7 @@ static int dissect_giop_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree break; } - proto_tree_add_item(header_tree, hf_giop_message_type, tvb, 7, 1, ENC_NA); + proto_tree_add_item(header_tree, hf_giop_message_type, tvb, 7, 1, ENC_BIG_ENDIAN); if (stream_is_big_endian) { diff --git a/epan/dissectors/packet-gmr1_common.c b/epan/dissectors/packet-gmr1_common.c index 767866cfd6..d09aaef7b9 100644 --- a/epan/dissectors/packet-gmr1_common.c +++ b/epan/dissectors/packet-gmr1_common.c @@ -230,7 +230,7 @@ GMR1_IE_FUNC(gmr1_ie_com_cm2) /* [1] 11.5.1.8 - Spare Half Octet */ GMR1_IE_FUNC(gmr1_ie_com_spare_nibble) { - proto_tree_add_item(tree, hf_com_spare_nibble, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_com_spare_nibble, tvb, offset, 1, ENC_BIG_ENDIAN); return 1; } diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index f028267fcc..5ad130439b 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -809,7 +809,7 @@ de_network_name(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 off proto_tree_add_item(tree, hf_gsm_a_dtap_add_ci, tvb, curr_offset, 1, ENC_NA); num_spare_bits = oct & 0x07; - item = proto_tree_add_item(tree, hf_gsm_a_dtap_number_of_spare_bits, tvb, curr_offset, 1, ENC_NA); + item = proto_tree_add_item(tree, hf_gsm_a_dtap_number_of_spare_bits, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; NO_MORE_DATA_CHECK(len); @@ -1050,7 +1050,7 @@ de_day_saving_time(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin proto_tree_add_bits_item(tree, hf_gsm_a_spare_bits, tvb, curr_offset<<3, 6, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_gsm_a_dtap_dst_adjustment, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_gsm_a_dtap_dst_adjustment, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; EXTRANEOUS_DATA_CHECK(len, curr_offset - offset); @@ -1232,8 +1232,8 @@ de_aux_states(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 o proto_tree_add_item(tree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_bits_item(tree, hf_gsm_a_spare_bits, tvb, (curr_offset<<3)+1, 3, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_gsm_a_dtap_hold_auxiliary_state, tvb, curr_offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_gsm_a_dtap_multi_party_auxiliary_state, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_gsm_a_dtap_hold_auxiliary_state, tvb, curr_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gsm_a_dtap_multi_party_auxiliary_state, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; EXTRANEOUS_DATA_CHECK(len, curr_offset - offset); @@ -1635,7 +1635,7 @@ de_bearer_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 o proto_tree_add_item(subtree, is_uplink ? hf_gsm_a_dtap_compression_up : hf_gsm_a_dtap_compression, tvb, curr_offset, 1, ENC_NA); - proto_tree_add_item(subtree, hf_gsm_a_dtap_structure, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_dtap_structure, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_a_dtap_duplex_mode, tvb, curr_offset, 1, ENC_NA); proto_tree_add_item(subtree, hf_gsm_a_dtap_configuration, tvb, curr_offset, 1, ENC_NA); proto_tree_add_item(subtree, hf_gsm_a_dtap_nirr, tvb, curr_offset, 1, ENC_NA); @@ -1656,9 +1656,9 @@ de_bearer_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 o extended = (oct & 0x80) ? FALSE : TRUE; proto_tree_add_item(subtree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_gsm_a_dtap_access_identity, tvb, curr_offset, 1, ENC_NA); - proto_tree_add_item(subtree, hf_gsm_a_dtap_rate_adaption, tvb, curr_offset, 1, ENC_NA); - proto_tree_add_item(subtree, hf_gsm_a_dtap_signalling_access_protocol, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_dtap_access_identity, tvb, curr_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_gsm_a_dtap_rate_adaption, tvb, curr_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_gsm_a_dtap_signalling_access_protocol, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; NO_MORE_DATA_CHECK(len); @@ -1677,8 +1677,8 @@ de_bearer_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 o extended = (oct & 0x80) ? FALSE : TRUE; proto_tree_add_item(subtree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_gsm_a_dtap_other_itc, tvb, curr_offset, 1, ENC_NA); - proto_tree_add_item(subtree, hf_gsm_a_dtap_other_rate_adaption, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_dtap_other_itc, tvb, curr_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_gsm_a_dtap_other_rate_adaption, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_bits_item(tree, hf_gsm_a_spare_bits, tvb, (curr_offset<<3)+5, 3, ENC_BIG_ENDIAN); curr_offset++; @@ -1772,10 +1772,10 @@ bc_octet_6: extended = (oct & 0x80) ? FALSE : TRUE; proto_tree_add_item(subtree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_gsm_a_dtap_v110_x30_rate_adaptation, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_dtap_v110_x30_rate_adaptation, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_a_dtap_nic_on_tx, tvb, curr_offset, 1, ENC_NA); proto_tree_add_item(subtree, hf_gsm_a_dtap_nic_on_rx, tvb, curr_offset, 1, ENC_NA); - proto_tree_add_item(subtree, hf_gsm_a_dtap_parity_information, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_dtap_parity_information, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; NO_MORE_DATA_CHECK(len); @@ -1794,7 +1794,7 @@ bc_octet_6: extended = (oct & 0x80) ? FALSE : TRUE; proto_tree_add_item(subtree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_gsm_a_dtap_connection_element, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_dtap_connection_element, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_uint_format_value(subtree, hf_gsm_a_dtap_modem_type, tvb, curr_offset, 1, oct, "%s", val_to_str_const(oct & 0x1f, gsm_a_dtap_modem_type_vals, "Reserved")); @@ -1816,7 +1816,7 @@ bc_octet_6: extended = (oct & 0x80) ? FALSE : TRUE; proto_tree_add_item(subtree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_gsm_a_dtap_other_modem_type, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_dtap_other_modem_type, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_uint_format_value(subtree, hf_gsm_a_dtap_fixed_network_user_rate, tvb, curr_offset, 1, oct, "%s", val_to_str_const(oct & 0x1f, gsm_a_dtap_fixed_network_user_rate_vals, "Reserved")); curr_offset++; @@ -1874,11 +1874,11 @@ bc_octet_6: extended = (oct & 0x80) ? FALSE : TRUE; proto_tree_add_item(subtree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_gsm_a_dtap_uimi, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_dtap_uimi, tvb, curr_offset, 1, ENC_BIG_ENDIAN); if (is_uplink == IS_UPLINK_TRUE) { - proto_tree_add_item(subtree, hf_gsm_a_dtap_wanted_air_interface_user_rate, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_dtap_wanted_air_interface_user_rate, tvb, curr_offset, 1, ENC_BIG_ENDIAN); } else { @@ -1908,7 +1908,7 @@ bc_octet_6: proto_tree_add_item(subtree, hf_gsm_a_dtap_acceptable_channel_codings_ext_TCH_F28_8, tvb, curr_offset, 1, ENC_NA); proto_tree_add_item(subtree, hf_gsm_a_dtap_acceptable_channel_codings_ext_TCH_F32_0, tvb, curr_offset, 1, ENC_NA); proto_tree_add_item(subtree, hf_gsm_a_dtap_acceptable_channel_codings_ext_TCH_F43_2, tvb, curr_offset, 1, ENC_NA); - proto_tree_add_item(subtree, hf_gsm_a_dtap_channel_coding_asymmetry_indication, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_dtap_channel_coding_asymmetry_indication, tvb, curr_offset, 1, ENC_BIG_ENDIAN); } else { @@ -1986,7 +1986,7 @@ de_cc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offse } else { - proto_tree_add_item(tree, hf_gsm_a_dtap_maximum_number_of_supported_bearers, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_gsm_a_dtap_maximum_number_of_supported_bearers, tvb, curr_offset, 1, ENC_BIG_ENDIAN); } proto_tree_add_item(tree, hf_gsm_a_dtap_mcat, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -1999,7 +1999,7 @@ de_cc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offse NO_MORE_DATA_CHECK(len); proto_tree_add_bits_item(tree, hf_gsm_a_spare_bits, tvb, curr_offset<<3, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_gsm_a_dtap_max_num_of_speech_bearers, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_gsm_a_dtap_max_num_of_speech_bearers, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; @@ -2375,11 +2375,11 @@ de_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset curr_offset = offset; proto_tree_add_item(tree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_gsm_a_dtap_de_cause_coding_standard, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_gsm_a_dtap_de_cause_coding_standard, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_bits_item(tree, hf_gsm_a_spare_bits, tvb, (curr_offset<<3)+3, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_gsm_a_dtap_location, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_gsm_a_dtap_location, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; oct = tvb_get_guint8(tvb, curr_offset); @@ -2387,7 +2387,7 @@ de_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset if (!(oct & 0x80)) { proto_tree_add_item(tree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_gsm_a_dtap_recommendation, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_gsm_a_dtap_recommendation, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; @@ -3036,7 +3036,7 @@ de_stream_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 of } else { - proto_tree_add_item(tree, hf_gsm_a_dtap_stream_identifier, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_gsm_a_dtap_stream_identifier, tvb, curr_offset, 1, ENC_BIG_ENDIAN); if (add_string) g_snprintf(add_string, string_len, " - (%u)", oct); @@ -3398,7 +3398,7 @@ de_tp_loop_type(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 oct = tvb_get_guint8(tvb, curr_offset); - proto_tree_add_item(tree, hf_gsm_a_dtap_channel_coding03, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_gsm_a_dtap_channel_coding03, tvb, curr_offset, 1, ENC_BIG_ENDIAN); switch (oct & 0x1c) { @@ -3429,7 +3429,7 @@ de_tp_loop_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 oct = tvb_get_guint8(tvb, curr_offset); - proto_tree_add_item(tree, hf_gsm_a_dtap_channel_coding30, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_gsm_a_dtap_channel_coding30, tvb, curr_offset, 1, ENC_BIG_ENDIAN); switch (oct & 0x0e) { @@ -3520,7 +3520,7 @@ de_tp_mode_flag(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 else proto_tree_add_text(tree, tvb, curr_offset, 1, "MS shall itself generate the pseudorandom data"); - proto_tree_add_item(tree, hf_gsm_a_dtap_downlink_timeslot_offset, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_gsm_a_dtap_downlink_timeslot_offset, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset+= 1; @@ -3542,7 +3542,7 @@ de_tp_egprs_mode_flag(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g else proto_tree_add_text(tree, tvb, curr_offset, 1, "MS loops back blocks on the uplink using either GMSK or 8-PSK modulation following the detected received modulation"); - proto_tree_add_item(tree, hf_gsm_a_dtap_downlink_timeslot_offset, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_gsm_a_dtap_downlink_timeslot_offset, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset+= 1; @@ -3964,7 +3964,7 @@ dtap_mm_auth_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 break; default: - proto_tree_add_item(subtree, hf_gsm_a_dtap_ciphering_key_sequence_number, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_dtap_ciphering_key_sequence_number, tvb, curr_offset, 1, ENC_BIG_ENDIAN); break; } @@ -4063,7 +4063,7 @@ dtap_mm_cm_reestab_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, break; default: - proto_tree_add_item(subtree, hf_gsm_a_dtap_ciphering_key_sequence_number, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_dtap_ciphering_key_sequence_number, tvb, curr_offset, 1, ENC_BIG_ENDIAN); break; } @@ -4203,7 +4203,7 @@ dtap_mm_cm_srvc_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui break; default: - proto_tree_add_item(subtree, hf_gsm_a_dtap_ciphering_key_sequence_number70, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_dtap_ciphering_key_sequence_number70, tvb, curr_offset, 1, ENC_BIG_ENDIAN); break; } @@ -4212,7 +4212,7 @@ dtap_mm_cm_srvc_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui tvb, curr_offset, 1, ett_gsm_dtap_elem[DE_CM_SRVC_TYPE], NULL, val_to_str_ext_const(DE_CM_SRVC_TYPE, &gsm_dtap_elem_strings_ext, "")); - proto_tree_add_item(subtree, hf_gsm_a_dtap_service_type, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_dtap_service_type, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; curr_len--; @@ -4270,7 +4270,7 @@ dtap_mm_id_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 val_to_str_ext_const(DE_ID_TYPE, &gsm_dtap_elem_strings_ext, "")); proto_tree_add_bits_item(subtree, hf_gsm_a_spare_bits, tvb, (curr_offset<<3)+4, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_gsm_a_dtap_type_of_identity, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_dtap_type_of_identity, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; curr_len--; @@ -4434,7 +4434,7 @@ dtap_mm_loc_upd_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui break; default: - proto_tree_add_item(subtree, hf_gsm_a_dtap_ciphering_key_sequence_number70, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_dtap_ciphering_key_sequence_number70, tvb, curr_offset, 1, ENC_BIG_ENDIAN); break; } @@ -4447,7 +4447,7 @@ dtap_mm_loc_upd_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui proto_tree_add_bits_item(subtree, hf_gsm_a_spare_bits, tvb, (curr_offset<<3)+5, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_gsm_a_dtap_updating_type, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_dtap_updating_type, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(item, " - %s", val_to_str_const(oct & 0x03, gsm_a_dtap_updating_type_vals, "Reserved")); @@ -6030,7 +6030,7 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) } else { - proto_tree_add_item(pd_tree, hf_gsm_a_dtap_tio, tvb, 0, 1, ENC_NA); + proto_tree_add_item(pd_tree, hf_gsm_a_dtap_tio, tvb, 0, 1, ENC_BIG_ENDIAN); } } @@ -6038,7 +6038,7 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) (ti & DTAP_TIE_PRES_MASK) == DTAP_TIE_PRES_MASK) { proto_tree_add_item(tree, hf_gsm_a_extension, tvb, 1, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(pd_tree, hf_gsm_a_dtap_tie, tvb, 1, 1, ENC_NA); + proto_tree_add_item(pd_tree, hf_gsm_a_dtap_tie, tvb, 1, 1, ENC_BIG_ENDIAN); } /* diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c index 63a09e2bb3..1910b89de5 100644 --- a/epan/dissectors/packet-gsm_a_gm.c +++ b/epan/dissectors/packet-gsm_a_gm.c @@ -5349,7 +5349,7 @@ de_sm_tflow_temp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 of proto_tree_add_item(comp_tree, hf_gsm_a_sm_ip6_address, tvb, curr_offset, 16, ENC_NA); curr_offset += 16; curr_len -= 16; - proto_tree_add_item(comp_tree, hf_gsm_a_sm_ip6_prefix_length, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(comp_tree, hf_gsm_a_sm_ip6_prefix_length, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset += 1; curr_len -= 1; pf_length -= 17; @@ -5360,7 +5360,7 @@ de_sm_tflow_temp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 of proto_tree_add_item(comp_tree, hf_gsm_a_sm_ip6_address, tvb, curr_offset, 16, ENC_NA); curr_offset += 16; curr_len -= 16; - proto_tree_add_item(comp_tree, hf_gsm_a_sm_ip6_prefix_length, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(comp_tree, hf_gsm_a_sm_ip6_prefix_length, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset += 1; curr_len -= 1; pf_length -= 17; diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c index a5ce12f2ee..09ec1fd29f 100644 --- a/epan/dissectors/packet-gsm_a_rr.c +++ b/epan/dissectors/packet-gsm_a_rr.c @@ -2032,13 +2032,13 @@ de_rr_ch_dsc(tvbuff_t *tvb, proto_tree *subtree, packet_info *pinfo _U_, guint32 proto_tree_add_text(subtree,tvb, curr_offset, 1,"%s = %s %d",a_bigbuf,str,subchannel); } - proto_tree_add_item(subtree, hf_gsm_a_rr_timeslot, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_rr_timeslot, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset +=1; /* Octet 3 */ oct8 = tvb_get_guint8(tvb, curr_offset); - proto_tree_add_item(subtree, hf_gsm_a_rr_training_sequence, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_rr_training_sequence, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_a_rr_hopping_channel, tvb, curr_offset, 1, ENC_NA); if ((oct8 & 0x10) == 0x10) @@ -2128,13 +2128,13 @@ de_rr_ch_dsc2(tvbuff_t *tvb, proto_tree *subtree, packet_info *pinfo _U_, guint3 proto_tree_add_text(subtree,tvb, curr_offset, 1,"%s = %s %d",a_bigbuf,str,subchannel); } - proto_tree_add_item(subtree, hf_gsm_a_rr_timeslot, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_rr_timeslot, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset +=1; /* Octet 3 */ oct8 = tvb_get_guint8(tvb, curr_offset); - proto_tree_add_item(subtree, hf_gsm_a_rr_training_sequence, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_rr_training_sequence, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_a_rr_hopping_channel, tvb, curr_offset, 1, ENC_NA); if ((oct8 & 0x10) == 0x10) @@ -2174,7 +2174,7 @@ de_rr_ch_dsc3(tvbuff_t *tvb, proto_tree *subtree, packet_info *pinfo _U_, guint3 /* Octet 2 */ oct8 = tvb_get_guint8(tvb, curr_offset); - proto_tree_add_item(subtree, hf_gsm_a_rr_training_sequence, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_rr_training_sequence, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_a_rr_hopping_channel, tvb, curr_offset, 1, ENC_NA); if ((oct8 & 0x10) == 0x10) @@ -4421,13 +4421,13 @@ de_rr_packet_ch_desc(tvbuff_t *tvb, proto_tree *subtree, packet_info *pinfo _U_, ti = proto_tree_add_bits_item(subtree, hf_gsm_a_rr_spare, tvb, (curr_offset<<3)+3, 5, ENC_NA); proto_item_append_text(ti, "(ignored by receiver)"); /* TN */ - proto_tree_add_item(subtree, hf_gsm_a_rr_timeslot, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_rr_timeslot, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset +=1; /* Octet 3 */ oct8 = tvb_get_guint8(tvb, curr_offset); - proto_tree_add_item(subtree, hf_gsm_a_rr_training_sequence, tvb, curr_offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_gsm_a_rr_training_sequence, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_a_rr_hopping_channel, tvb, curr_offset, 1, ENC_NA); if ((oct8 & 0x10) == 0x10) @@ -10793,7 +10793,7 @@ dissect_ccch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ((ti != -1) && (ti & DTAP_TIE_PRES_MASK) == DTAP_TIE_PRES_MASK){ proto_tree_add_item(tree, hf_gsm_a_extension, tvb, 2, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(pd_tree, hf_gsm_a_rr_tie, tvb, 2, 1, ENC_NA); + proto_tree_add_item(pd_tree, hf_gsm_a_rr_tie, tvb, 2, 1, ENC_BIG_ENDIAN); } /* diff --git a/epan/dissectors/packet-gsm_sim.c b/epan/dissectors/packet-gsm_sim.c index 028a5d1d86..3d27536f10 100644 --- a/epan/dissectors/packet-gsm_sim.c +++ b/epan/dissectors/packet-gsm_sim.c @@ -1250,13 +1250,13 @@ dissect_gsm_apdu(guint8 ins, guint8 p1, guint8 p2, guint8 p3, tvbuff_t *tvb, proto_tree_add_item(tree, hf_apdu_data, tvb, offset+DATA_OFFS, p3, ENC_NA); break; case 0xA2: /* SEARCH RECORD */ - proto_tree_add_item(tree, hf_seek_mode, tvb, offset+P2_OFFS, 1, ENC_NA); - proto_tree_add_item(tree, hf_seek_type, tvb, offset+P2_OFFS, 1, ENC_NA); + proto_tree_add_item(tree, hf_seek_mode, tvb, offset+P2_OFFS, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_seek_type, tvb, offset+P2_OFFS, 1, ENC_BIG_ENDIAN); offset += DATA_OFFS; proto_tree_add_item(tree, hf_apdu_data, tvb, offset, p3, ENC_NA); offset += p3; if ((p2 & 0xF0) == 0x20) - proto_tree_add_item(tree, hf_seek_rec_nr, tvb, offset++, 1, ENC_NA); + proto_tree_add_item(tree, hf_seek_rec_nr, tvb, offset++, 1, ENC_BIG_ENDIAN); break; case 0x32: /* INCREASE */ break; diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 68cf4ae86b..d587346739 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -4001,7 +4001,7 @@ decode_quintuplet(tvbuff_t * tvb, int offset, proto_tree * tree, guint16 count) proto_tree_add_item(ext_tree_quint, hf_gtp_rand, tvb, offset + q_offset, 16, ENC_NA); q_offset = q_offset + 16; xres_len = tvb_get_guint8(tvb, offset + q_offset); - proto_tree_add_item(ext_tree_quint, hf_gtp_xres_length, tvb, offset + q_offset, 1, ENC_NA); + proto_tree_add_item(ext_tree_quint, hf_gtp_xres_length, tvb, offset + q_offset, 1, ENC_BIG_ENDIAN); q_offset++; proto_tree_add_item(ext_tree_quint, hf_gtp_xres, tvb, offset + q_offset, xres_len, ENC_NA); q_offset = q_offset + xres_len; @@ -4010,7 +4010,7 @@ decode_quintuplet(tvbuff_t * tvb, int offset, proto_tree * tree, guint16 count) proto_tree_add_item(ext_tree_quint, hf_gtp_quintuplet_integrity_key, tvb, offset + q_offset, 16, ENC_NA); q_offset = q_offset + 16; auth_len = tvb_get_guint8(tvb, offset + q_offset); - proto_tree_add_item(ext_tree_quint, hf_gtp_authentication_length, tvb, offset + q_offset, 1, ENC_NA); + proto_tree_add_item(ext_tree_quint, hf_gtp_authentication_length, tvb, offset + q_offset, 1, ENC_BIG_ENDIAN); q_offset++; proto_tree_add_item(ext_tree_quint, hf_gtp_auth, tvb, offset + q_offset, auth_len, ENC_NA); @@ -4808,8 +4808,8 @@ decode_gtp_pdp_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_ proto_tree_add_item(ext_tree_pdp, hf_gtp_vplmn_address_allowed, tvb, offset + 3, 1, ENC_NA); proto_tree_add_item(ext_tree_pdp, hf_gtp_activity_status_indicator, tvb, offset + 3, 1, ENC_NA); proto_tree_add_item(ext_tree_pdp, hf_gtp_reordering_required, tvb, offset + 3, 1, ENC_NA); - proto_tree_add_item(ext_tree_pdp, hf_gtp_nsapi, tvb, offset + 3, 1, ENC_NA); - proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_cntxt_sapi, tvb, offset + 4, 1, ENC_NA); + proto_tree_add_item(ext_tree_pdp, hf_gtp_nsapi, tvb, offset + 3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_cntxt_sapi, tvb, offset + 4, 1, ENC_BIG_ENDIAN); switch (gtp_version) { case 0: @@ -4830,8 +4830,8 @@ decode_gtp_pdp_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_ proto_tree_add_item(ext_tree_pdp, hf_gtp_sequence_number_down, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ext_tree_pdp, hf_gtp_sequence_number_up, tvb, offset + 2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(ext_tree_pdp, hf_gtp_send_n_pdu_number, tvb, offset + 4, 1, ENC_NA); - proto_tree_add_item(ext_tree_pdp, hf_gtp_receive_n_pdu_number, tvb, offset + 5, 1, ENC_NA); + proto_tree_add_item(ext_tree_pdp, hf_gtp_send_n_pdu_number, tvb, offset + 4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ext_tree_pdp, hf_gtp_receive_n_pdu_number, tvb, offset + 5, 1, ENC_BIG_ENDIAN); switch (gtp_version) { case 0: @@ -4841,7 +4841,7 @@ decode_gtp_pdp_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_ case 1: proto_tree_add_item(ext_tree_pdp, hf_gtp_ulink_teid_cp, tvb, offset + 6, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ext_tree_pdp, hf_gtp_ulink_teid_data, tvb, offset + 10, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_context_identifier, tvb, offset + 14, 1, ENC_NA); + proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_context_identifier, tvb, offset + 14, 1, ENC_BIG_ENDIAN); offset = offset + 15; break; default: @@ -4851,9 +4851,9 @@ decode_gtp_pdp_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_ pdp_type_num = tvb_get_guint8(tvb, offset + 1); pdp_addr_len = tvb_get_guint8(tvb, offset + 2); - proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_organization, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_type, tvb, offset + 1, 1, ENC_NA); - proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_address_length, tvb, offset + 2, 1, ENC_NA); + proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_organization, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_type, tvb, offset + 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_address_length, tvb, offset + 2, 1, ENC_BIG_ENDIAN); if (pdp_addr_len > 0) { switch (pdp_type_num) { @@ -4871,7 +4871,7 @@ decode_gtp_pdp_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_ offset = offset + 3 + pdp_addr_len; ggsn_addr_len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(ext_tree_pdp, hf_gtp_ggsn_address_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ext_tree_pdp, hf_gtp_ggsn_address_length, tvb, offset, 1, ENC_BIG_ENDIAN); switch (ggsn_addr_len) { case 4: @@ -4889,7 +4889,7 @@ decode_gtp_pdp_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_ if (gtp_version == 1) { ggsn_addr_len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(ext_tree_pdp, hf_gtp_ggsn_2_address_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ext_tree_pdp, hf_gtp_ggsn_2_address_length, tvb, offset, 1, ENC_BIG_ENDIAN); switch (ggsn_addr_len) { case 4: @@ -4906,7 +4906,7 @@ decode_gtp_pdp_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_ } apn_len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(ext_tree_pdp, hf_gtp_apn_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ext_tree_pdp, hf_gtp_apn_length, tvb, offset, 1, ENC_BIG_ENDIAN); decode_apn(tvb, offset + 1, apn_len, ext_tree_pdp, NULL); offset = offset + 1 + apn_len; @@ -4926,8 +4926,8 @@ decode_gtp_pdp_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_ pdp_type_num = tvb_get_guint8(tvb, offset); pdp_addr_len = tvb_get_guint8(tvb, offset + 1); - proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_type, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_address_length, tvb, offset + 1, 1, ENC_NA); + proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_address_length, tvb, offset + 1, 1, ENC_BIG_ENDIAN); if (pdp_addr_len > 0) { switch (pdp_type_num) { @@ -4962,7 +4962,7 @@ decode_gtp_apn(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * ext_tree_apn = proto_tree_add_subtree(tree, tvb, offset, length + 3, ett_gtp_ies[GTP_EXT_APN], &te, val_to_str_ext_const(GTP_EXT_APN, >p_val_ext, "Unknown field")); - proto_tree_add_item(ext_tree_apn, hf_gtp_apn_length, tvb, offset + 1, 2, ENC_NA); + proto_tree_add_item(ext_tree_apn, hf_gtp_apn_length, tvb, offset + 1, 2, ENC_BIG_ENDIAN); decode_apn(tvb, offset + 3, length, ext_tree_apn, te); return 3 + length; @@ -5122,7 +5122,7 @@ decode_gtp_auth_qui(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_t proto_tree_add_item(ext_tree, hf_gtp_rand, tvb, offset, 16, ENC_NA); offset = offset + 16; xres_len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(ext_tree, hf_gtp_xres_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ext_tree, hf_gtp_xres_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(ext_tree, hf_gtp_xres, tvb, offset, xres_len, ENC_NA); offset = offset + xres_len; @@ -5131,7 +5131,7 @@ decode_gtp_auth_qui(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_t proto_tree_add_item(ext_tree, hf_gtp_quintuplet_integrity_key, tvb, offset, 16, ENC_NA); offset = offset + 16; auth_len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(ext_tree, hf_gtp_authentication_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ext_tree, hf_gtp_authentication_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(ext_tree, hf_gtp_auth, tvb, offset, auth_len, ENC_NA); @@ -5174,7 +5174,7 @@ decode_gtp_tft(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * for (i = 0; i < no_packet_filters; i++) { - tee = proto_tree_add_item(ext_tree_tft, hf_gtp_tft_packet_filter_id, tvb, offset, 1, ENC_NA); + tee = proto_tree_add_item(ext_tree_tft, hf_gtp_tft_packet_filter_id, tvb, offset, 1, ENC_BIG_ENDIAN); ext_tree_tft_pf = proto_item_add_subtree(tee, ett_gtp_tft_pf); offset++; @@ -5184,7 +5184,7 @@ decode_gtp_tft(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * pf_len = tvb_get_guint8(tvb, offset + 1); proto_tree_add_uint(ext_tree_tft_pf, hf_gtp_tft_eval, tvb, offset, 1, pf_eval); - proto_tree_add_item(ext_tree_tft_pf, hf_gtp_tft_content_length, tvb, offset + 1, 1, ENC_NA); + proto_tree_add_item(ext_tree_tft_pf, hf_gtp_tft_content_length, tvb, offset + 1, 1, ENC_BIG_ENDIAN); offset = offset + 2; pf_offset = 0; @@ -5192,7 +5192,7 @@ decode_gtp_tft(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * while (pf_offset < pf_len) { pf_content_id = tvb_get_guint8(tvb, offset + pf_offset); - pf_item = proto_tree_add_item(ext_tree_tft_pf, hf_gtp_tft_content_id, tvb, offset + pf_offset, 1, ENC_NA); + pf_item = proto_tree_add_item(ext_tree_tft_pf, hf_gtp_tft_content_id, tvb, offset + pf_offset, 1, ENC_BIG_ENDIAN); switch (pf_content_id) { /* address IPv4 and mask = 8 bytes */ @@ -7684,12 +7684,12 @@ decode_gtp_data_req(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree /* Octet 4 Number of Data Records */ no = tvb_get_guint8(tvb, offset); - proto_tree_add_item(ext_tree, hf_gtp_number_of_data_records, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ext_tree, hf_gtp_number_of_data_records, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Octet 5 Data Record Format */ format = tvb_get_guint8(tvb, offset); - fmt_item = proto_tree_add_item(ext_tree, hf_gtp_data_record_format, tvb, offset, 1, ENC_NA); + fmt_item = proto_tree_add_item(ext_tree, hf_gtp_data_record_format, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* The value range is 1-255 in decimal. The value '0' should not be used. * Only the values 1-10 and 51-255 can be used for standards purposes. @@ -9362,7 +9362,7 @@ proto_register_gtp(void) { &hf_gtp_ggsn_2_address_length, { "GGSN 2 address length", "gtp.ggsn_2_address_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_gtp_ggsn_2_address_ipv4, { "GGSN 2 address", "gtp.ggsn_2_address.ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_gtp_ggsn_2_address_ipv6, { "GGSN 2 address", "gtp.ggsn_2_address.ipv6", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_gtp_apn_length, { "APN length", "gtp.apn_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_gtp_apn_length, { "APN length", "gtp.apn_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_gtp_transaction_identifier, { "Transaction identifier", "gtp.transaction_identifier", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_gtp_gsn_address_length, { "GSN address length", "gtp.gsn_address_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_gtp_gsn_address_information_element_length, { "GSN address Information Element length", "gtp.gsn_address_information_element_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index ec9cbe4416..5577c354d4 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -2488,7 +2488,7 @@ dissect_gtpv2_s103pdf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto /* (m+10) EPS Bearer ID Number = k */ k = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_gtpv2_eps_bearer_id_number, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_gtpv2_eps_bearer_id_number, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* (m+11) to (m+10+k) @@ -2516,7 +2516,7 @@ dissect_gtpv2_s1udf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_i offset += 1; /* 6 Serving GW Address Length = m */ m = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_gtpv2_serving_gw_address_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_gtpv2_serving_gw_address_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* 7 to (m+6) Serving GW Address [4..16] */ switch (m) { @@ -3679,7 +3679,7 @@ dissect_gtpv2_mm_context_eps_qq(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre proto_tree_add_item(tree, hf_gtpv2_mm_context_nh, tvb, offset, 32, ENC_NA); offset += 32; - proto_tree_add_item(tree, hf_gtpv2_mm_context_ncc, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_gtpv2_mm_context_ncc, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } @@ -3836,7 +3836,7 @@ dissect_gtpv2_pdn_numbers(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre int offset = 0; nsapi = (tvb_get_guint8(tvb, offset) & 0x08); - nsapi_ti = proto_tree_add_item(tree, hf_gtpv2_nsapi08, tvb, offset, 1, ENC_NA); + nsapi_ti = proto_tree_add_item(tree, hf_gtpv2_nsapi08, tvb, offset, 1, ENC_BIG_ENDIAN); nsapi_tree = proto_item_add_subtree(nsapi_ti, ett_gtpv2_pdn_numbers_nsapi); proto_tree_add_bits_item(nsapi_tree, hf_gtpv2_spare_bits, tvb, offset << 3, 4, ENC_BIG_ENDIAN); proto_tree_add_item(nsapi_tree, hf_gtpv2_pdn_numbers_nsapi, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -3893,7 +3893,7 @@ dissect_gtpv2_hop_counter(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre hop_counter = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_gtpv2_hop_counter, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_gtpv2_hop_counter, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(item, "%d", hop_counter); } diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c index 3d141eb89e..202faf64cb 100644 --- a/epan/dissectors/packet-h264.c +++ b/epan/dissectors/packet-h264.c @@ -2194,7 +2194,7 @@ dissect_h264_mtap(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, gint nal_unit_size = tvb_get_ntohs(tvb, offset); size_offset = offset; offset += 2; - proto_tree_add_item(tree, hf_h264_dond, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_h264_dond, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (nal_type == H264_MTAP16) @@ -2249,7 +2249,7 @@ dissect_h264_nalu_extension (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo j_flag = tvb_get_bits8(tvb, bit_offset+5, 1); /* NAL Header Extension Decoding */ - proto_tree_add_item(tree, hf_h264_nal_extension_subtype, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_h264_nal_extension_subtype, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_h264_nal_extension_j, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_h264_nal_extension_k, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_h264_nal_extension_l, tvb, offset, 1, ENC_NA); diff --git a/epan/dissectors/packet-hpsw.c b/epan/dissectors/packet-hpsw.c index 5d68cfae7d..04a4a89850 100644 --- a/epan/dissectors/packet-hpsw.c +++ b/epan/dissectors/packet-hpsw.c @@ -197,7 +197,7 @@ dissect_hpsw_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, case HPFOO_FIELD_12: if (length == 1) { - proto_tree_add_item(tree, hf_hpsw_field_12, tvb, offset, length, ENC_NA); + proto_tree_add_item(tree, hf_hpsw_field_12, tvb, offset, length, ENC_BIG_ENDIAN); } else { expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Field 12: Bad length %u", length); } diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c index 92d037ff8e..34978b1728 100644 --- a/epan/dissectors/packet-http2.c +++ b/epan/dissectors/packet-http2.c @@ -830,7 +830,7 @@ dissect_http2_header_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ht proto_tree *flags_tree; guint8 flags; - ti_flags = proto_tree_add_item(http2_tree, hf_http2_flags, tvb, offset, 1, ENC_NA); + ti_flags = proto_tree_add_item(http2_tree, hf_http2_flags, tvb, offset, 1, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(ti_flags, ett_http2_flags); flags = tvb_get_guint8(tvb, offset); @@ -838,31 +838,31 @@ dissect_http2_header_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ht case HTTP2_DATA: proto_tree_add_item(flags_tree, hf_http2_flags_end_stream, tvb, offset, 1, ENC_NA); proto_tree_add_item(flags_tree, hf_http2_flags_padded, tvb, offset, 1, ENC_NA); - proto_tree_add_item(flags_tree, hf_http2_flags_unused_data, tvb, offset, 1, ENC_NA); + proto_tree_add_item(flags_tree, hf_http2_flags_unused_data, tvb, offset, 1, ENC_BIG_ENDIAN); break; case HTTP2_HEADERS: proto_tree_add_item(flags_tree, hf_http2_flags_end_stream, tvb, offset, 1, ENC_NA); proto_tree_add_item(flags_tree, hf_http2_flags_end_headers, tvb, offset, 1, ENC_NA); proto_tree_add_item(flags_tree, hf_http2_flags_padded, tvb, offset, 1, ENC_NA); proto_tree_add_item(flags_tree, hf_http2_flags_priority, tvb, offset, 1, ENC_NA); - proto_tree_add_item(flags_tree, hf_http2_flags_unused_headers, tvb, offset, 1, ENC_NA); + proto_tree_add_item(flags_tree, hf_http2_flags_unused_headers, tvb, offset, 1, ENC_BIG_ENDIAN); break; case HTTP2_SETTINGS: proto_tree_add_item(flags_tree, hf_http2_flags_settings_ack, tvb, offset, 1, ENC_NA); - proto_tree_add_item(flags_tree, hf_http2_flags_unused_settings, tvb, offset, 1, ENC_NA); + proto_tree_add_item(flags_tree, hf_http2_flags_unused_settings, tvb, offset, 1, ENC_BIG_ENDIAN); break; case HTTP2_PUSH_PROMISE: proto_tree_add_item(flags_tree, hf_http2_flags_end_headers, tvb, offset, 1, ENC_NA); proto_tree_add_item(flags_tree, hf_http2_flags_padded, tvb, offset, 1, ENC_NA); - proto_tree_add_item(flags_tree, hf_http2_flags_unused_push_promise, tvb, offset, 1, ENC_NA); + proto_tree_add_item(flags_tree, hf_http2_flags_unused_push_promise, tvb, offset, 1, ENC_BIG_ENDIAN); break; case HTTP2_CONTINUATION: proto_tree_add_item(flags_tree, hf_http2_flags_end_headers, tvb, offset, 1, ENC_NA); - proto_tree_add_item(flags_tree, hf_http2_flags_unused_continuation, tvb, offset, 1, ENC_NA); + proto_tree_add_item(flags_tree, hf_http2_flags_unused_continuation, tvb, offset, 1, ENC_BIG_ENDIAN); break; case HTTP2_PING: proto_tree_add_item(flags_tree, hf_http2_flags_ping_ack, tvb, offset, 1, ENC_NA); - proto_tree_add_item(flags_tree, hf_http2_flags_unused_ping, tvb, offset, 1, ENC_NA); + proto_tree_add_item(flags_tree, hf_http2_flags_unused_ping, tvb, offset, 1, ENC_BIG_ENDIAN); break; case HTTP2_PRIORITY: case HTTP2_RST_STREAM: @@ -872,7 +872,7 @@ dissect_http2_header_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ht case HTTP2_BLOCKED: default: /* Does not define any flags */ - proto_tree_add_item(flags_tree, hf_http2_flags_unused, tvb, offset, 1, ENC_NA); + proto_tree_add_item(flags_tree, hf_http2_flags_unused, tvb, offset, 1, ENC_BIG_ENDIAN); break; } @@ -893,7 +893,7 @@ dissect_frame_padding(tvbuff_t *tvb, guint16 *padding, proto_tree *http2_tree, if(flags & HTTP2_FLAGS_PADDED) { *padding = tvb_get_guint8(tvb, offset); /* read a single octet */ - proto_tree_add_item(http2_tree, hf_http2_padding, tvb, offset, 1, ENC_NA); + proto_tree_add_item(http2_tree, hf_http2_padding, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; pad_len ++; } @@ -916,7 +916,7 @@ dissect_frame_prio(tvbuff_t *tvb, proto_tree *http2_tree, guint offset, guint8 f proto_tree_add_item(http2_tree, hf_http2_excl_dependency, tvb, offset, 4, ENC_NA); proto_tree_add_item(http2_tree, hf_http2_stream_dependency, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(http2_tree, hf_http2_weight, tvb, offset, 1, ENC_NA); + proto_tree_add_item(http2_tree, hf_http2_weight, tvb, offset, 1, ENC_BIG_ENDIAN); weight = tvb_get_guint8(tvb, offset); /* 6.2: Weight: An 8-bit weight for the stream; Add one to the value to obtain a weight between 1 and 256 */ ti = proto_tree_add_uint(http2_tree, hf_http2_weight_real, tvb, offset, 1, weight+1); @@ -1017,7 +1017,7 @@ dissect_http2_settings(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *http2_ ti_settings = proto_tree_add_item(http2_tree, hf_http2_settings, tvb, offset, 5, ENC_NA); settings_tree = proto_item_add_subtree(ti_settings, ett_http2_settings); - proto_tree_add_item(settings_tree, hf_http2_settings_identifier, tvb, offset, 2, ENC_NA); + proto_tree_add_item(settings_tree, hf_http2_settings_identifier, tvb, offset, 2, ENC_BIG_ENDIAN); settingsid = tvb_get_ntohs(tvb, offset); proto_item_append_text(ti_settings, " - %s", val_to_str( settingsid, http2_settings_vals, "Unknown (%u)") ); @@ -1203,14 +1203,14 @@ dissect_http2_altsvc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *http2_tr proto_tree_add_item(http2_tree, hf_http2_altsvc_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(http2_tree, hf_http2_altsvc_proto_len, tvb, offset, 1, ENC_NA); + proto_tree_add_item(http2_tree, hf_http2_altsvc_proto_len, tvb, offset, 1, ENC_BIG_ENDIAN); pidlen = tvb_get_guint8(tvb, offset); offset ++; proto_tree_add_item(http2_tree, hf_http2_altsvc_protocol, tvb, offset, pidlen, ENC_ASCII|ENC_NA); offset += pidlen; - proto_tree_add_item(http2_tree, hf_http2_altsvc_host_len, tvb, offset, 1, ENC_NA); + proto_tree_add_item(http2_tree, hf_http2_altsvc_host_len, tvb, offset, 1, ENC_BIG_ENDIAN); hostlen = tvb_get_guint8(tvb, offset); offset ++; @@ -1293,7 +1293,7 @@ dissect_http2_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat length = tvb_get_ntoh24(tvb, offset); offset += 3; - proto_tree_add_item(http2_tree, hf_http2_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(http2_tree, hf_http2_type, tvb, offset, 1, ENC_BIG_ENDIAN); type = tvb_get_guint8(tvb, offset); col_append_sep_fstr( pinfo->cinfo, COL_INFO, ", ", "%s", val_to_str(type, http2_type_vals, "Unknown type (%d)")); @@ -1657,7 +1657,7 @@ proto_register_http2(void) }, { &hf_http2_settings_identifier, { "Settings Identifier", "http2.settings.id", - FT_UINT8, BASE_DEC, VALS(http2_settings_vals), 0x0, + FT_UINT16, BASE_DEC, VALS(http2_settings_vals), 0x0, NULL, HFILL } }, { &hf_http2_settings_header_table_size, diff --git a/epan/dissectors/packet-iapp.c b/epan/dissectors/packet-iapp.c index 0357a98292..6efb4eeb4a 100644 --- a/epan/dissectors/packet-iapp.c +++ b/epan/dissectors/packet-iapp.c @@ -376,8 +376,8 @@ dissect_iapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* common header for all IAPP frames */ - proto_tree_add_item(iapp_tree, hf_iapp_version, tvb, 0, 1, ENC_NA); - proto_tree_add_item(iapp_tree, hf_iapp_type, tvb, 1, 1, ENC_NA); + proto_tree_add_item(iapp_tree, hf_iapp_version, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(iapp_tree, hf_iapp_type, tvb, 1, 1, ENC_BIG_ENDIAN); pdutree = proto_tree_add_subtree(iapp_tree, tvb, 2, -1, ett_iapp_pdu, &pduitem, "Protocol data units"); diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c index 968aba7f29..756d3a5536 100644 --- a/epan/dissectors/packet-igmp.c +++ b/epan/dissectors/packet-igmp.c @@ -344,7 +344,7 @@ dissect_igmp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int* of PROTO_ITEM_SET_GENERATED(ti); /* type of command */ - proto_tree_add_item(igmp_tree, hf_type, tvb, 0, 1, ENC_NA); + proto_tree_add_item(igmp_tree, hf_type, tvb, 0, 1, ENC_BIG_ENDIAN); *offset = 1; return igmp_tree; diff --git a/epan/dissectors/packet-igrp.c b/epan/dissectors/packet-igrp.c index 2a91314e73..f158de5178 100644 --- a/epan/dissectors/packet-igrp.c +++ b/epan/dissectors/packet-igrp.c @@ -106,10 +106,10 @@ static void dissect_igrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) version = (ver_and_opcode&0xf0)>>4 ; /* version is the fist half of the byte */ opcode = ver_and_opcode&0x0f ; /* opcode is the last half of the byte */ - ti = proto_tree_add_item(igrp_tree, hf_igrp_version, tvb, 0, 1, ENC_NA); + ti = proto_tree_add_item(igrp_tree, hf_igrp_version, tvb, 0, 1, ENC_BIG_ENDIAN); if (version != 1) expert_add_info(pinfo, ti, &ei_igrp_version); - ti = proto_tree_add_item(igrp_tree, hf_igrp_command, tvb, 0, 1, ENC_NA); + ti = proto_tree_add_item(igrp_tree, hf_igrp_command, tvb, 0, 1, ENC_BIG_ENDIAN); if (opcode==1) proto_item_append_text(ti, " (Response)"); else @@ -175,9 +175,9 @@ static void dissect_vektor_igrp (tvbuff_t *tvb, proto_tree *igrp_vektor_tree, gu proto_tree_add_item(igrp_vektor_tree, hf_igrp_delay, tvb, 3, 3, ENC_BIG_ENDIAN); proto_tree_add_item(igrp_vektor_tree, hf_igrp_bandwidth, tvb, 6, 3, ENC_BIG_ENDIAN); proto_tree_add_uint_format_value(igrp_vektor_tree, hf_igrp_mtu, tvb, 9, 2, tvb_get_ntohs(tvb,9), "%d bytes", tvb_get_ntohs(tvb,9)); - proto_tree_add_item(igrp_vektor_tree, hf_igrp_reliability, tvb, 11, 1, ENC_NA); - proto_tree_add_item(igrp_vektor_tree, hf_igrp_load, tvb, 12, 1, ENC_NA); - proto_tree_add_item(igrp_vektor_tree, hf_igrp_hop_count, tvb, 13, 1, ENC_NA); + proto_tree_add_item(igrp_vektor_tree, hf_igrp_reliability, tvb, 11, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(igrp_vektor_tree, hf_igrp_load, tvb, 12, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(igrp_vektor_tree, hf_igrp_hop_count, tvb, 13, 1, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index 492b9983cb..a8e53f6e0c 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.c @@ -571,7 +571,7 @@ add_integer_value(const gchar *tag_desc, proto_tree *tree, tvbuff_t *tvb, case TAG_BOOLEAN: if (value_length == 1) { - proto_tree_add_item(tree, hf_ipp_bool_value, tvb, offset, value_length, ENC_NA); + proto_tree_add_item(tree, hf_ipp_bool_value, tvb, offset, value_length, ENC_BIG_ENDIAN); } break; diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 06374589a6..cb525f7533 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -791,10 +791,10 @@ dissect_routing6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data rthdr_tree = proto_item_add_subtree(ti, ett_ipv6); proto_tree_add_item(rthdr_tree, hf_ipv6_routing_hdr_nxt, tvb, - offset + (int)offsetof(struct ip6_rthdr, ip6r_nxt), 1, ENC_NA); + offset + (int)offsetof(struct ip6_rthdr, ip6r_nxt), 1, ENC_BIG_ENDIAN); ti_len = proto_tree_add_item(rthdr_tree, hf_ipv6_routing_hdr_length, tvb, - offset + (int)offsetof(struct ip6_rthdr, ip6r_len), 1, ENC_NA); + offset + (int)offsetof(struct ip6_rthdr, ip6r_len), 1, ENC_BIG_ENDIAN); proto_item_append_text(ti_len, " (%d byte%s)", len, plurality(len, "", "s")); proto_tree_add_item(rthdr_tree, hf_ipv6_routing_hdr_type, tvb, @@ -1048,10 +1048,10 @@ dissect_unknown_option(tvbuff_t *tvb, int offset, proto_tree *tree) unkopt_tree = proto_item_add_subtree(ti, ett_ipv6); - proto_tree_add_item(unkopt_tree, hf_ipv6_nxt, tvb, offset, 1, ENC_NA); + proto_tree_add_item(unkopt_tree, hf_ipv6_nxt, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - ti_len = proto_tree_add_item(unkopt_tree, hf_ipv6_opt_length, tvb, offset, 1, ENC_NA); + ti_len = proto_tree_add_item(unkopt_tree, hf_ipv6_opt_length, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(ti_len, " (%d byte%s)", len, plurality(len, "", "s")); /* offset += 1; */ } @@ -1076,10 +1076,10 @@ dissect_opts(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info * pinfo, c dstopt_tree = proto_item_add_subtree(ti, ett_ipv6); - proto_tree_add_item(dstopt_tree, hf_ipv6_nxt, tvb, offset, 1, ENC_NA); + proto_tree_add_item(dstopt_tree, hf_ipv6_nxt, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - ti_len = proto_tree_add_item(dstopt_tree, hf_ipv6_opt_length, tvb, offset, 1, ENC_NA); + ti_len = proto_tree_add_item(dstopt_tree, hf_ipv6_opt_length, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(ti_len, " (%d byte%s)", len, plurality(len, "", "s")); offset += 1; @@ -1195,12 +1195,12 @@ dissect_opts(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info * pinfo, c guint8 rate = command & QS_RATE_MASK; guint8 ttl_diff; - proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_func, tvb, offset, 1, ENC_NA); + proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_func, tvb, offset, 1, ENC_BIG_ENDIAN); if (function == QS_RATE_REQUEST) { - proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_rate, tvb, offset, 1, ENC_NA); + proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_rate, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_ttl, tvb, offset, 1, ENC_NA); + proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_ttl, tvb, offset, 1, ENC_BIG_ENDIAN); ttl_diff = (iph->ip_ttl - tvb_get_guint8(tvb, offset) % 256); ti = proto_tree_add_uint(opt_tree, hf_ipv6_opt_qs_ttl_diff, tvb, offset, 1, ttl_diff); @@ -1213,11 +1213,11 @@ dissect_opts(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info * pinfo, c proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_reserved, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else if (function == QS_RATE_REPORT) { - proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_rate, tvb, offset, 1, ENC_NA); + proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_rate, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_item_append_text(ti_opt, ", %s", val_to_str_ext(rate, &qs_rate_vals_ext, "Unknown (%u)")); - proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_unused, tvb, offset, 1, ENC_NA); + proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_unused, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_nonce, tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_reserved, tvb, offset, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c index f1082c93ba..d732010517 100644 --- a/epan/dissectors/packet-isis-hello.c +++ b/epan/dissectors/packet-isis-hello.c @@ -233,9 +233,9 @@ dissect_hello_mt_port_cap_spb_digest_clv(tvbuff_t *tvb, packet_info* pinfo, subtree = proto_tree_add_subtree_format( tree, tvb, offset-2, sublen+2, ett_isis_hello_clv_mt_port_cap_spb_digest, NULL, "SPB Digest: Type: 0x%02x, Length: %d", subtype, sublen); - proto_tree_add_item( subtree, hf_isis_hello_digest_v, tvb, offset, 1, ENC_NA); - proto_tree_add_item( subtree, hf_isis_hello_digest_a, tvb, offset, 1, ENC_NA); - proto_tree_add_item( subtree, hf_isis_hello_digest_d, tvb, offset, 1, ENC_NA); + proto_tree_add_item( subtree, hf_isis_hello_digest_v, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item( subtree, hf_isis_hello_digest_a, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item( subtree, hf_isis_hello_digest_d, tvb, offset, 1, ENC_BIG_ENDIAN); ++offset; /* Digest: */ @@ -389,7 +389,7 @@ dissect_hello_mt_port_cap_port_trill_ver_clv(tvbuff_t *tvb, packet_info* pinfo _ subtree = proto_tree_add_subtree_format( tree, tvb, offset-2, sublen+2, ett_isis_hello_clv_mt_port_cap_port_trill_ver, NULL, "Port TRILL Version (t=%u, l=%u)", subtype, sublen); - proto_tree_add_item(subtree, hf_isis_hello_trill_version, tvb, offset, 1, ENC_NA); + proto_tree_add_item(subtree, hf_isis_hello_trill_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -730,7 +730,7 @@ dissect_hello_trill_neighbor_clv(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree_add_item(tree, hf_isis_hello_trill_neighbor_sf, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_isis_hello_trill_neighbor_lf, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_isis_hello_trill_neighbor_size, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_isis_hello_trill_neighbor_size, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -738,7 +738,7 @@ dissect_hello_trill_neighbor_clv(tvbuff_t *tvb, packet_info* pinfo _U_, while(length>=(size+3)) { proto_tree_add_item(tree, hf_isis_hello_trill_neighbor_ff, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_isis_hello_trill_neighbor_of, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_isis_hello_trill_neighbor_reserved, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_isis_hello_trill_neighbor_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -857,19 +857,19 @@ dissect_hello_ptp_adj_clv(tvbuff_t *tvb, packet_info* pinfo, switch(length) { case 1: - proto_tree_add_item(tree, hf_isis_hello_adjacency_state, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_isis_hello_adjacency_state, tvb, offset, 1, ENC_BIG_ENDIAN); break; case 5: - proto_tree_add_item(tree, hf_isis_hello_adjacency_state, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_isis_hello_adjacency_state, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_isis_hello_extended_local_circuit_id, tvb, offset+1, 4, ENC_BIG_ENDIAN); break; case 11: - proto_tree_add_item(tree, hf_isis_hello_adjacency_state, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_isis_hello_adjacency_state, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_isis_hello_extended_local_circuit_id, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_isis_hello_neighbor_systemid, tvb, offset+5, id_length, ENC_NA); break; case 15: - proto_tree_add_item(tree, hf_isis_hello_adjacency_state, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_isis_hello_adjacency_state, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_isis_hello_extended_local_circuit_id, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_isis_hello_neighbor_systemid, tvb, offset+5, id_length, ENC_NA); proto_tree_add_item(tree, hf_isis_hello_neighbor_extended_local_circuit_id, tvb, offset+5+id_length, 4, ENC_BIG_ENDIAN); @@ -1205,8 +1205,8 @@ dissect_isis_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs ti = proto_tree_add_item(tree, proto_isis_hello, tvb, offset, -1, ENC_NA); hello_tree = proto_item_add_subtree(ti, ett_isis_hello); - proto_tree_add_item(hello_tree, hf_isis_hello_circuit, tvb, offset, 1, ENC_NA); - proto_tree_add_item(hello_tree, hf_isis_hello_circuit_reserved, tvb, offset, 1, ENC_NA); + proto_tree_add_item(hello_tree, hf_isis_hello_circuit, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(hello_tree, hf_isis_hello_circuit_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(hello_tree, hf_isis_hello_source_id, tvb, offset, id_length, ENC_NA); @@ -1228,8 +1228,8 @@ dissect_isis_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs offset, 1, ENC_BIG_ENDIAN ); offset += 1; } else { - proto_tree_add_item(hello_tree, hf_isis_hello_priority, tvb, offset, 1, ENC_NA); - proto_tree_add_item(hello_tree, hf_isis_hello_priority_reserved, tvb, offset, 1, ENC_NA); + proto_tree_add_item(hello_tree, hf_isis_hello_priority, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(hello_tree, hf_isis_hello_priority_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(hello_tree, hf_isis_hello_lan_id, tvb, offset, id_length + 1, ENC_NA); diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c index 1d7917baac..461021efa3 100644 --- a/epan/dissectors/packet-isis-lsp.c +++ b/epan/dissectors/packet-isis-lsp.c @@ -476,19 +476,19 @@ dissect_lsp_ip_reachability_clv(tvbuff_t *tvb, packet_info* pinfo, proto_tree *t ntree = proto_item_add_subtree(ti, ett_isis_lsp_clv_ip_reachability); - proto_tree_add_item(ntree, hf_isis_lsp_ip_reachability_default_metric, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ntree, hf_isis_lsp_ip_reachability_default_metric, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ntree, hf_isis_lsp_ip_reachability_default_metric_ie, tvb, offset, 1, ENC_NA); proto_tree_add_item(ntree, hf_isis_lsp_ip_reachability_distribution, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ntree, hf_isis_lsp_ip_reachability_delay_metric, tvb, offset+1, 1, ENC_NA); + proto_tree_add_item(ntree, hf_isis_lsp_ip_reachability_delay_metric, tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ntree, hf_isis_lsp_ip_reachability_delay_metric_support, tvb, offset+1, 1, ENC_NA); proto_tree_add_item(ntree, hf_isis_lsp_ip_reachability_delay_metric_ie, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(ntree, hf_isis_lsp_ip_reachability_expense_metric, tvb, offset+2, 1, ENC_NA); + proto_tree_add_item(ntree, hf_isis_lsp_ip_reachability_expense_metric, tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ntree, hf_isis_lsp_ip_reachability_expense_metric_support, tvb, offset+2, 1, ENC_NA); proto_tree_add_item(ntree, hf_isis_lsp_ip_reachability_expense_metric_ie, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(ntree, hf_isis_lsp_ip_reachability_error_metric, tvb, offset+3, 1, ENC_NA); + proto_tree_add_item(ntree, hf_isis_lsp_ip_reachability_error_metric, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ntree, hf_isis_lsp_ip_reachability_error_metric_support, tvb, offset+3, 1, ENC_NA); proto_tree_add_item(ntree, hf_isis_lsp_ip_reachability_error_metric_ie, tvb, offset+3, 1, ENC_NA); } @@ -675,7 +675,7 @@ dissect_isis_grp_address_clv(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree * offset++; len=tvb_get_guint8(tvb, offset);/* 1 byte fetched displays the length*/ - proto_tree_add_item(rt_tree, hf_isis_lsp_grp_macaddr_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rt_tree, hf_isis_lsp_grp_macaddr_length, tvb, offset, 1, ENC_BIG_ENDIAN); if(len < 5) { length -= len; @@ -698,7 +698,7 @@ dissect_isis_grp_address_clv(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree * offset += 2; len -= 2; - proto_tree_add_item(rt_tree, hf_isis_lsp_grp_macaddr_number_of_records, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rt_tree, hf_isis_lsp_grp_macaddr_number_of_records, tvb, offset, 1, ENC_BIG_ENDIAN); length--; offset++; @@ -707,7 +707,7 @@ dissect_isis_grp_address_clv(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree * while(len > 0) { source_num=tvb_get_guint8(tvb, offset); - proto_tree_add_item(rt_tree, hf_isis_lsp_grp_macaddr_number_of_sources, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rt_tree, hf_isis_lsp_grp_macaddr_number_of_sources, tvb, offset, 1, ENC_BIG_ENDIAN); length--; offset++; @@ -740,7 +740,7 @@ dissect_isis_grp_address_clv(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree * offset++; len=tvb_get_guint8(tvb, offset);/* 1 byte fetched displays the length*/ - proto_tree_add_item(rt_tree, hf_isis_lsp_grp_ipv4addr_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rt_tree, hf_isis_lsp_grp_ipv4addr_length, tvb, offset, 1, ENC_BIG_ENDIAN); if(len < 5) { length -= len; @@ -763,7 +763,7 @@ dissect_isis_grp_address_clv(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree * offset += 2; len -= 2; - proto_tree_add_item(rt_tree, hf_isis_lsp_grp_ipv4addr_number_of_records, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rt_tree, hf_isis_lsp_grp_ipv4addr_number_of_records, tvb, offset, 1, ENC_BIG_ENDIAN); length--; offset++; @@ -772,7 +772,7 @@ dissect_isis_grp_address_clv(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree * while(len > 0) { source_num=tvb_get_guint8(tvb, offset); - proto_tree_add_item(rt_tree, hf_isis_lsp_grp_ipv4addr_number_of_sources, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rt_tree, hf_isis_lsp_grp_ipv4addr_number_of_sources, tvb, offset, 1, ENC_BIG_ENDIAN); length--; offset++; @@ -805,7 +805,7 @@ dissect_isis_grp_address_clv(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree * offset++; len=tvb_get_guint8(tvb, offset);/* 1 byte fetched displays the length*/ - proto_tree_add_item(rt_tree, hf_isis_lsp_grp_ipv6addr_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rt_tree, hf_isis_lsp_grp_ipv6addr_length, tvb, offset, 1, ENC_BIG_ENDIAN); if(len < 5) { length -= len; @@ -828,7 +828,7 @@ dissect_isis_grp_address_clv(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree * offset += 2; len -= 2; - proto_tree_add_item(rt_tree, hf_isis_lsp_grp_ipv6addr_number_of_records, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rt_tree, hf_isis_lsp_grp_ipv6addr_number_of_records, tvb, offset, 1, ENC_BIG_ENDIAN); length--; offset++; @@ -837,7 +837,7 @@ dissect_isis_grp_address_clv(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree * while(len > 0) { source_num=tvb_get_guint8(tvb, offset); - proto_tree_add_item(rt_tree, hf_isis_lsp_grp_ipv6addr_number_of_sources, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rt_tree, hf_isis_lsp_grp_ipv6addr_number_of_sources, tvb, offset, 1, ENC_BIG_ENDIAN); length--; offset++; @@ -907,7 +907,7 @@ dissect_isis_trill_clv(tvbuff_t *tvb, packet_info* pinfo _U_, rt_tree = proto_tree_add_subtree_format(tree, tvb, offset-2, sublen+2, ett_isis_lsp_clv_trill_version, NULL, "TRILL version (t=%u, l=%u)", subtype, sublen); - proto_tree_add_item(rt_tree, hf_isis_lsp_rt_capable_trill_maximum_version, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rt_tree, hf_isis_lsp_rt_capable_trill_maximum_version, tvb, offset, 1, ENC_BIG_ENDIAN); if ( sublen == 5 ) { offset++; @@ -955,7 +955,7 @@ dissect_isis_trill_clv(tvbuff_t *tvb, packet_info* pinfo _U_, ett_isis_lsp_clv_nickname, NULL, "Nickname (t=%u, l=%u)", subtype, sublen); while (sublen>=5) { - proto_tree_add_item(rt_tree, hf_isis_lsp_rt_capable_nickname_nickname_priority, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rt_tree, hf_isis_lsp_rt_capable_nickname_nickname_priority, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rt_tree, hf_isis_lsp_rt_capable_nickname_tree_root_priority, tvb, offset+1, 2, ENC_BIG_ENDIAN); proto_tree_add_item(rt_tree, hf_isis_lsp_rt_capable_nickname_nickname, tvb, offset+3, 2, ENC_BIG_ENDIAN); sublen -= 5; @@ -1157,7 +1157,7 @@ dissect_lsp_ipv6_reachability_clv(tvbuff_t *tvb, packet_info* pinfo, proto_tree proto_tree_add_item(subtree, hf_isis_lsp_ipv6_reachability_distribution_internal, tvb, offset+4, 1, ENC_NA); if ((ctrl_info & 0x1f) != 0) { - proto_tree_add_item(subtree, hf_isis_lsp_ipv6_reachability_reserved_bits, tvb, offset+4, 1, ENC_NA); + proto_tree_add_item(subtree, hf_isis_lsp_ipv6_reachability_reserved_bits, tvb, offset+4, 1, ENC_BIG_ENDIAN); } len = 6 + byte_length; @@ -1729,7 +1729,7 @@ dissect_lsp_eis_neighbors_clv_inner(tvbuff_t *tvb, packet_info *pinfo, proto_tre proto_tree_add_text ( tree, tvb, offset, 1, tvb_get_guint8(tvb, offset) ? "IsVirtual" : "IsNotVirtual" ); } else { - proto_tree_add_item(tree, hf_isis_lsp_eis_neighbors_reserved, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_isis_lsp_eis_neighbors_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); } } offset++; @@ -1753,19 +1753,19 @@ dissect_lsp_eis_neighbors_clv_inner(tvbuff_t *tvb, packet_info *pinfo, proto_tre ntree = proto_tree_add_subtree(tree, tvb, offset, tlen, ett_isis_lsp_clv_is_neighbors, &ti, "IS Neighbor"); } - proto_tree_add_item(ntree, hf_isis_lsp_eis_neighbors_default_metric, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ntree, hf_isis_lsp_eis_neighbors_default_metric, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ntree, hf_isis_lsp_eis_neighbors_default_metric_ie, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ntree, hf_isis_lsp_eis_neighbors_delay_metric, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ntree, hf_isis_lsp_eis_neighbors_delay_metric, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ntree, hf_isis_lsp_eis_neighbors_delay_metric_supported, tvb, offset, 1, ENC_NA); proto_tree_add_item(ntree, hf_isis_lsp_eis_neighbors_delay_metric_ie, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(ntree, hf_isis_lsp_eis_neighbors_expense_metric, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ntree, hf_isis_lsp_eis_neighbors_expense_metric, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ntree, hf_isis_lsp_eis_neighbors_expense_metric_supported, tvb, offset, 1, ENC_NA); proto_tree_add_item(ntree, hf_isis_lsp_eis_neighbors_expense_metric_ie, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(ntree, hf_isis_lsp_eis_neighbors_error_metric, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ntree, hf_isis_lsp_eis_neighbors_error_metric, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ntree, hf_isis_lsp_eis_neighbors_error_metric_supported, tvb, offset, 1, ENC_NA); proto_tree_add_item(ntree, hf_isis_lsp_eis_neighbors_error_metric_ie, tvb, offset+3, 1, ENC_NA); proto_tree_add_item(ntree, is_eis ? hf_isis_lsp_eis_neighbors_es_neighbor_id : hf_isis_lsp_eis_neighbors_is_neighbor_id, diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c index d59521b3d4..1ab900934d 100644 --- a/epan/dissectors/packet-isl.c +++ b/epan/dissectors/packet-isl.c @@ -232,9 +232,9 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len) if (tree) { /* This part looks sort of like a SNAP-encapsulated LLC header... */ - proto_tree_add_item(fh_tree, hf_isl_dsap, payload_tvb, 0, 1, ENC_NA); - proto_tree_add_item(fh_tree, hf_isl_ssap, payload_tvb, 1, 1, ENC_NA); - proto_tree_add_item(fh_tree, hf_isl_control, payload_tvb, 2, 1, ENC_NA); + proto_tree_add_item(fh_tree, hf_isl_dsap, payload_tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(fh_tree, hf_isl_ssap, payload_tvb, 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(fh_tree, hf_isl_control, payload_tvb, 2, 1, ENC_BIG_ENDIAN); /* ...but this is the manufacturer's ID portion of the source address field (which is, admittedly, an OUI). */ diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c index 5bc9ec5a33..25a7c2f05d 100644 --- a/epan/dissectors/packet-kink.c +++ b/epan/dissectors/packet-kink.c @@ -225,7 +225,7 @@ dissect_kink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){ proto_tree_add_uint(kink_tree, hf_kink_type, tvb, offset, 1, type); offset++; - proto_tree_add_item(kink_tree, hf_kink_version, tvb, offset, 1, ENC_NA); + proto_tree_add_item(kink_tree, hf_kink_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(kink_tree, hf_kink_length, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -616,7 +616,7 @@ dissect_payload_kink_isakmp(packet_info *pinfo, tvbuff_t *tvb, int offset, proto proto_tree_add_uint(payload_kink_isakmp_tree, hf_kink_inner_next_pload, tvb, offset, 1, inner_next_pload); offset += 1; - proto_tree_add_item(payload_kink_isakmp_tree, hf_kink_qmversion, tvb, offset, 1, ENC_NA); + proto_tree_add_item(payload_kink_isakmp_tree, hf_kink_qmversion, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(payload_kink_isakmp_tree, hf_kink_reserved16, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-knxnetip.c b/epan/dissectors/packet-knxnetip.c index 4bfdca7021..4e6ea980ff 100644 --- a/epan/dissectors/packet-knxnetip.c +++ b/epan/dissectors/packet-knxnetip.c @@ -990,7 +990,7 @@ static void dissect_apci(tvbuff_t *tvb, guint32 *offset, proto_tree *insert_tree break; case(A_AUTHORIZE_RES): case(A_KEY_RES): - proto_tree_add_item(insert_tree, hf_knxnetip_cemi_apci_level, tvb, *offset, 1, ENC_NA); + proto_tree_add_item(insert_tree, hf_knxnetip_cemi_apci_level, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset+=1; break; case(A_PROPVALUE_RED): diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index f3a4f40c1d..0d9d42af3b 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -1644,11 +1644,11 @@ static void process_control_avps(tvbuff_t *tvb, case PROTOCOL_VERSION: if (avp_len < 1) break; - proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_protocol_version, tvb, idx, 1, ENC_NA); + proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_protocol_version, tvb, idx, 1, ENC_BIG_ENDIAN); idx += 1; avp_len -= 1; - proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_protocol_revision, tvb, idx, 1, ENC_NA); + proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_protocol_revision, tvb, idx, 1, ENC_BIG_ENDIAN); break; case FRAMING_CAPABILITIES: @@ -1703,7 +1703,7 @@ static void process_control_avps(tvbuff_t *tvb, if (avp_len < 1) break; - proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_cause_msg, tvb, idx, 1, ENC_NA); + proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_cause_msg, tvb, idx, 1, ENC_BIG_ENDIAN); idx += 1; avp_len -= 1; @@ -1807,7 +1807,7 @@ static void process_control_avps(tvbuff_t *tvb, break; case PROXY_AUTHEN_ID: - proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_proxy_authen_id, tvb, idx + 1, 1, ENC_NA); + proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_proxy_authen_id, tvb, idx + 1, 1, ENC_BIG_ENDIAN); break; case PROXY_AUTHEN_RESPONSE: @@ -1903,7 +1903,7 @@ static void process_control_avps(tvbuff_t *tvb, if (avp_len < 1) break; - proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_cause_code_direction, tvb, idx, 1, ENC_NA); + proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_cause_code_direction, tvb, idx, 1, ENC_BIG_ENDIAN); idx += 1; avp_len -= 1; diff --git a/epan/dissectors/packet-lacp.c b/epan/dissectors/packet-lacp.c index 343ae4d1a9..f174ef1142 100644 --- a/epan/dissectors/packet-lacp.c +++ b/epan/dissectors/packet-lacp.c @@ -163,13 +163,13 @@ dissect_lacp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Actor Type */ proto_tree_add_item(lacpdu_tree, hf_lacp_actor_type, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Actor Info Length */ proto_tree_add_item(lacpdu_tree, hf_lacp_actor_info_len, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Actor System Priority */ @@ -285,13 +285,13 @@ dissect_lacp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Partner Type */ proto_tree_add_item(lacpdu_tree, hf_lacp_partner_type, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Partner Info Length */ proto_tree_add_item(lacpdu_tree, hf_lacp_partner_info_len, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Partner System Priority */ @@ -407,13 +407,13 @@ dissect_lacp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Collector Type */ proto_tree_add_item(lacpdu_tree, hf_lacp_coll_type, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Collector Info Length */ proto_tree_add_item(lacpdu_tree, hf_lacp_coll_info_len, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Collector Max Delay */ @@ -431,13 +431,13 @@ dissect_lacp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Terminator Type */ proto_tree_add_item(lacpdu_tree, hf_lacp_term_type, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Terminator Info Length */ proto_tree_add_item(lacpdu_tree, hf_lacp_term_len, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Terminator Reserved */ diff --git a/epan/dissectors/packet-lisp-tcp.c b/epan/dissectors/packet-lisp-tcp.c index 546046d3a6..ddf631c9b9 100644 --- a/epan/dissectors/packet-lisp-tcp.c +++ b/epan/dissectors/packet-lisp-tcp.c @@ -140,7 +140,7 @@ dissect_lisp_tcp_membership_message(tvbuff_t *tvb, packet_info *pinfo, proto_tre if (type == MEMBERSHIP_BASE + 2) { /* Error code (1 byte) */ err = tvb_get_guint8(tvb, offset); - proto_tree_add_item(message_tree, hf_lisp_tcp_message_err, tvb, offset, 1, ENC_NA); + proto_tree_add_item(message_tree, hf_lisp_tcp_message_err, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; data_len -= 1; proto_item_append_text(tim, ", Error code: %s", diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c index def732f215..f957df4e68 100644 --- a/epan/dissectors/packet-lisp.c +++ b/epan/dissectors/packet-lisp.c @@ -704,7 +704,7 @@ dissect_lcaf_rle_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 3; /* Level Value (1 byte) */ - proto_tree_add_item(entry_tree, hf_lisp_lcaf_rle_entry_level, tvb, offset, 1, ENC_NA); + proto_tree_add_item(entry_tree, hf_lisp_lcaf_rle_entry_level, tvb, offset, 1, ENC_BIG_ENDIAN); level = tvb_get_guint8(tvb, offset); offset += 1; @@ -1003,7 +1003,7 @@ dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse offset += 2; /* Minutes (1 byte) */ - proto_tree_add_item(lat_tree, hf_lisp_lcaf_geo_lat_min, tvb, offset, 1, ENC_NA); + proto_tree_add_item(lat_tree, hf_lisp_lcaf_geo_lat_min, tvb, offset, 1, ENC_BIG_ENDIAN); min = tvb_get_guint8(tvb, offset); if (min > 60) expert_add_info_format(pinfo, tree, &ei_lisp_invalid_field, @@ -1011,7 +1011,7 @@ dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse offset += 1; /* Seconds (1 byte) */ - proto_tree_add_item(lat_tree, hf_lisp_lcaf_geo_lat_sec, tvb, offset, 1, ENC_NA); + proto_tree_add_item(lat_tree, hf_lisp_lcaf_geo_lat_sec, tvb, offset, 1, ENC_BIG_ENDIAN); sec = tvb_get_guint8(tvb, offset); if (sec > 60) expert_add_info_format(pinfo, tree, &ei_lisp_invalid_field, @@ -1040,7 +1040,7 @@ dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse offset += 2; /* Minutes (1 byte) */ - proto_tree_add_item(lon_tree, hf_lisp_lcaf_geo_lon_min, tvb, offset, 1, ENC_NA); + proto_tree_add_item(lon_tree, hf_lisp_lcaf_geo_lon_min, tvb, offset, 1, ENC_BIG_ENDIAN); min = tvb_get_guint8(tvb, offset); if (min > 60) expert_add_info_format(pinfo, tree, &ei_lisp_invalid_field, @@ -1048,7 +1048,7 @@ dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse offset += 1; /* Seconds (1 byte) */ - proto_tree_add_item(lon_tree, hf_lisp_lcaf_geo_lon_sec, tvb, offset, 1, ENC_NA); + proto_tree_add_item(lon_tree, hf_lisp_lcaf_geo_lon_sec, tvb, offset, 1, ENC_BIG_ENDIAN); sec = tvb_get_guint8(tvb, offset); if (sec > 60) expert_add_info_format(pinfo, tree, &ei_lisp_invalid_field, @@ -1207,7 +1207,7 @@ dissect_lcaf_nonce_loc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint guint16 afi, addr_len = 0; /* Reserved (1 byte) */ - proto_tree_add_item(tree, hf_lisp_lcaf_nonce_loc_res, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_lisp_lcaf_nonce_loc_res, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(tip, ": %d", tvb_get_ntohl(tvb, offset)); offset += 1; @@ -1297,12 +1297,12 @@ dissect_lcaf_mcast_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 2; /* Source Mask Length (1 byte) */ - proto_tree_add_item(tree, hf_lisp_lcaf_mcinfo_src_masklen, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_lisp_lcaf_mcinfo_src_masklen, tvb, offset, 1, ENC_BIG_ENDIAN); src_masklen = tvb_get_guint8(tvb, offset); offset += 1; /* Group Mask Length (1 byte) */ - proto_tree_add_item(tree, hf_lisp_lcaf_mcinfo_grp_masklen, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_lisp_lcaf_mcinfo_grp_masklen, tvb, offset, 1, ENC_BIG_ENDIAN); grp_masklen = tvb_get_guint8(tvb, offset); offset += 1; @@ -1452,12 +1452,12 @@ dissect_lcaf_src_dst_key(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 2; /* Source Prefix Mask Length (1 byte) */ - proto_tree_add_item(tree, hf_lisp_lcaf_srcdst_src_masklen, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_lisp_lcaf_srcdst_src_masklen, tvb, offset, 1, ENC_BIG_ENDIAN); src_masklen = tvb_get_guint8(tvb, offset); offset += 1; /* Destination Prefix Mask Length (1 byte) */ - proto_tree_add_item(tree, hf_lisp_lcaf_srcdst_dst_masklen, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_lisp_lcaf_srcdst_dst_masklen, tvb, offset, 1, ENC_BIG_ENDIAN); dst_masklen = tvb_get_guint8(tvb, offset); offset += 1; @@ -1749,11 +1749,11 @@ dissect_lcaf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, p offset += 1; if (lcaf_type == LCAF_MCAST_INFO) { - ti_flags = proto_tree_add_item(lcaf_header_tree, hf_lisp_lcaf_mcinfo_flags, tvb, offset, 1, ENC_NA); + ti_flags = proto_tree_add_item(lcaf_header_tree, hf_lisp_lcaf_mcinfo_flags, tvb, offset, 1, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(ti_flags, ett_lisp_lcaf_mcinfo_flags); /* Reserved (5 bits) */ - proto_tree_add_item(flags_tree, hf_lisp_lcaf_mcinfo_flags_res, tvb, offset, 1, ENC_NA); + proto_tree_add_item(flags_tree, hf_lisp_lcaf_mcinfo_flags_res, tvb, offset, 1, ENC_BIG_ENDIAN); /* Flags (3 bits) */ proto_tree_add_item(flags_tree, hf_lisp_lcaf_mcinfo_flags_rp, tvb, offset, 1, ENC_NA); @@ -1761,7 +1761,7 @@ dissect_lcaf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, p proto_tree_add_item(flags_tree, hf_lisp_lcaf_mcinfo_flags_join, tvb, offset, 1, ENC_NA); } else { /* Reserved (8 bits) */ - proto_tree_add_item(lcaf_header_tree, hf_lisp_lcaf_res2, tvb, offset, 1, ENC_NA); + proto_tree_add_item(lcaf_header_tree, hf_lisp_lcaf_res2, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; @@ -2263,10 +2263,10 @@ dissect_lisp_map_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tre col_append_fstr(pinfo->cinfo, COL_INFO, " for %s/%d", prefix, prefix_mask); lisp_record_tree = proto_item_add_subtree(tir, ett_lisp_record); - proto_tree_add_item(lisp_record_tree, hf_lisp_mreq_record_res, tvb, offset, 1, ENC_NA); + proto_tree_add_item(lisp_record_tree, hf_lisp_mreq_record_res, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(lisp_record_tree, hf_lisp_mreq_record_prefix_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(lisp_record_tree, hf_lisp_mreq_record_prefix_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(lisp_record_tree, hf_lisp_mreq_record_prefix_afi, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -2779,7 +2779,7 @@ dissect_lisp_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree) ti_prefix = proto_tree_add_item(lisp_tree, hf_lisp_info_prefix, tvb, offset, 3, ENC_ASCII|ENC_NA); prefix_tree = proto_item_add_subtree(ti_prefix, ett_lisp_info_prefix); - proto_tree_add_item(prefix_tree, hf_lisp_info_prefix_masklen, tvb, offset, 1, ENC_NA); + proto_tree_add_item(prefix_tree, hf_lisp_info_prefix_masklen, tvb, offset, 1, ENC_BIG_ENDIAN); prefix_mask = tvb_get_guint8(tvb, offset); offset += 1; proto_tree_add_item(prefix_tree, hf_lisp_info_prefix_afi, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-llrp.c b/epan/dissectors/packet-llrp.c index 5a4fc0e56c..8bbbb9910a 100644 --- a/epan/dissectors/packet-llrp.c +++ b/epan/dissectors/packet-llrp.c @@ -2332,7 +2332,7 @@ dissect_llrp_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, param_tree = proto_item_add_subtree(ti, ett_llrp_param); proto_tree_add_item(param_tree, hf_llrp_tv_type, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); offset++; suboffset = offset; @@ -2416,7 +2416,7 @@ dissect_llrp_impinj_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, col_append_fstr(pinfo->cinfo, COL_INFO, " (Impinj - %s)", val_to_str_ext(subtype, &impinj_msg_subtype_ext, "Unknown Type: %d")); - proto_tree_add_item(tree, hf_llrp_impinj_msg_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_llrp_impinj_msg_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; switch(subtype) { @@ -2513,7 +2513,7 @@ dissect_llrp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 4; break; case LLRP_TYPE_GET_READER_CAPABILITIES: - proto_tree_add_item(tree, hf_llrp_req_cap, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_llrp_req_cap, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; ends_with_parameters = TRUE; break; @@ -2530,7 +2530,7 @@ dissect_llrp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, requested_data = tvb_get_guint8(tvb, offset); request_item = proto_tree_add_item(tree, hf_llrp_req_conf, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); offset++; gpi_port = tvb_get_ntohs(tvb, offset); @@ -2608,12 +2608,12 @@ dissect_llrp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ends_with_parameters = TRUE; break; case LLRP_TYPE_SET_PROTOCOL_VERSION: - proto_tree_add_item(tree, hf_llrp_version, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_llrp_version, tvb, offset, 1, ENC_BIG_ENDIAN); break; case LLRP_TYPE_GET_SUPPORTED_VERSION_RESPONSE: - proto_tree_add_item(tree, hf_llrp_cur_ver, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_llrp_cur_ver, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_llrp_sup_ver, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_llrp_sup_ver, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; ends_with_parameters = TRUE; break; @@ -2679,7 +2679,7 @@ dissect_llrp_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d ti = proto_tree_add_item(tree, proto_llrp, tvb, offset, -1, ENC_NA); llrp_tree = proto_item_add_subtree(ti, ett_llrp); - proto_tree_add_item(llrp_tree, hf_llrp_version, tvb, offset, 1, ENC_NA); + proto_tree_add_item(llrp_tree, hf_llrp_version, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(llrp_tree, hf_llrp_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index 4a30f7f613..be4618952a 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -741,7 +741,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) lmp_tree, tvb, offset, 12, lmp_subtree[LMP_TREE_HEADER], NULL, "LMP Header. %s", val_to_str(message_type, message_type_vals, "Unknown Message (%u). ")); - proto_tree_add_item(lmp_header_tree, hf_lmp_version, tvb, offset, 1, ENC_NA); + proto_tree_add_item(lmp_header_tree, hf_lmp_version, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(lmp_header_tree, tvb, offset+2, hf_lmp_header_flags, lmp_subtree[LMP_TREE_HEADER_FLAGS], header_flags, ENC_NA); msg_item = proto_tree_add_uint(lmp_header_tree, hf_lmp_filter[LMPF_MSG], tvb, @@ -820,7 +820,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) proto_tree_add_item(lmp_object_header_tree, hf_lmp_negotiable, tvb, offset, 1, ENC_NA); proto_tree_add_item(lmp_object_header_tree, hf_lmp_object_length, tvb, offset+2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(lmp_object_header_tree, hf_lmp_object_class, tvb, offset+1, 1, ENC_NA); + proto_tree_add_item(lmp_object_header_tree, hf_lmp_object_class, tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(lmp_object_header_tree, hf_lmp_filter[LMPF_VAL_CTYPE], tvb, offset, 1, type); offset2 = offset+4; @@ -1221,9 +1221,9 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) tvb, offset2+l, mylen, ENC_NA); lmp_subobj_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_DATA_LINK_SUBOBJ]); - proto_tree_add_item(lmp_subobj_tree, hf_lmp_subobject_type, tvb, offset2+l, 1, ENC_NA); + proto_tree_add_item(lmp_subobj_tree, hf_lmp_subobject_type, tvb, offset2+l, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(lmp_subobj_tree, hf_lmp_subobject_length, tvb, offset2+l+1, 1, ENC_NA); + proto_tree_add_item(lmp_subobj_tree, hf_lmp_subobject_length, tvb, offset2+l+1, 1, ENC_BIG_ENDIAN); switch(tvb_get_guint8(tvb, offset2+l)) { case 1: @@ -1566,7 +1566,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) (l & 0x02) ? "LDP-based UNI signaling supported " : ""); /* UNI version */ - proto_tree_add_item(lmp_object_tree, hf_lmp_uni_version, tvb, offset2+1, 1, ENC_NA); + proto_tree_add_item(lmp_object_tree, hf_lmp_uni_version, tvb, offset2+1, 1, ENC_BIG_ENDIAN); } break; @@ -1587,7 +1587,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) /* Client Port-Level Service Attributes Object */ /* Link Type */ - proto_tree_add_item(lmp_object_tree, hf_lmp_link_type, tvb, offset2, 1, ENC_NA); + proto_tree_add_item(lmp_object_tree, hf_lmp_link_type, tvb, offset2, 1, ENC_BIG_ENDIAN); proto_item_append_text(lmp_object_tree, "%s", val_to_str(tvb_get_guint8(tvb, offset2), @@ -1598,7 +1598,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) /* Signal type for SDH */ if (l == LMP_CLASS_SERVICE_CONFIG_CPSA_SIGNAL_TYPES_SDH) { /* Signal types for an SDH link */ - proto_tree_add_item(lmp_object_tree, hf_lmp_signal_types_sdh, tvb, offset2+1, 1, ENC_NA); + proto_tree_add_item(lmp_object_tree, hf_lmp_signal_types_sdh, tvb, offset2+1, 1, ENC_BIG_ENDIAN); proto_item_append_text(lmp_object_tree, "%s", val_to_str(tvb_get_guint8(tvb, offset2+1), @@ -1608,7 +1608,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) if (l == LMP_CLASS_SERVICE_CONFIG_CPSA_SIGNAL_TYPES_SONET) { /* Signal types for a SONET link */ - proto_tree_add_item(lmp_object_tree, hf_lmp_signal_types_sonet, tvb, offset2+1, 1, ENC_NA); + proto_tree_add_item(lmp_object_tree, hf_lmp_signal_types_sonet, tvb, offset2+1, 1, ENC_BIG_ENDIAN); proto_item_append_text(lmp_object_tree, "%s", val_to_str(tvb_get_guint8(tvb, offset2+1), @@ -1775,7 +1775,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) tvb, offset2+l, mylen, ENC_NA); lmp_subobj_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_LAD_INFO_SUBOBJ]); - proto_tree_add_item(lmp_subobj_tree, hf_lmp_subobject_type, tvb, offset2+l, 1, ENC_NA); + proto_tree_add_item(lmp_subobj_tree, hf_lmp_subobject_type, tvb, offset2+l, 1, ENC_BIG_ENDIAN); if (mylen == 0 || l + mylen > obj_length - 4) { proto_tree_add_uint_format_value(lmp_object_tree, hf_lmp_subobject_length, tvb, offset2+l+1, 1, @@ -1783,7 +1783,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) break; } else - proto_tree_add_item(lmp_subobj_tree, hf_lmp_subobject_length, tvb, offset2+l+1, 1, ENC_NA); + proto_tree_add_item(lmp_subobj_tree, hf_lmp_subobject_length, tvb, offset2+l+1, 1, ENC_BIG_ENDIAN); switch(tvb_get_guint8(tvb, offset2+l)) { diff --git a/epan/dissectors/packet-lon.c b/epan/dissectors/packet-lon.c index ef3bad3c1c..a4e28cf751 100644 --- a/epan/dissectors/packet-lon.c +++ b/epan/dissectors/packet-lon.c @@ -252,43 +252,43 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { case 0: /* Broadcast */ ti = proto_tree_add_subtree(lon_tree, tvb, offset, 3, ett_address, NULL, "Address type 0 (broadcast)"); - proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_dstsub, tvb, offset+2, 1, ENC_NA); + proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_dstsub, tvb, offset+2, 1, ENC_BIG_ENDIAN); offset += 3; break; case 1: /* Multicast */ ti = proto_tree_add_subtree(lon_tree, tvb, offset, 3, ett_address, NULL, "Address type 1 (multicast)"); - proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_dstgrp, tvb, offset+2, 1, ENC_NA); + proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_dstgrp, tvb, offset+2, 1, ENC_BIG_ENDIAN); offset += 3; break; case 2: /* Unicast/Multicast */ addr_a = tvb_get_guint8(tvb, offset+1) >> 7; if (addr_a) { /* Type 2a */ ti = proto_tree_add_subtree(lon_tree, tvb, offset, 4, ett_address, NULL, "Address type 2a (unicast)"); - proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_dstsub, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_dstnode, tvb, offset+3, 1, ENC_NA); + proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_dstsub, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_dstnode, tvb, offset+3, 1, ENC_BIG_ENDIAN); offset += 4; } else { /* Type 2b */ ti = proto_tree_add_subtree(lon_tree, tvb, offset, 6, ett_address, NULL, "Address type 2b (multicast)"); - proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_dstgrp, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_dstnode, tvb, offset+3, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_grp, tvb, offset+4, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_grpmem, tvb, offset+5, 1, ENC_NA); + proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_dstgrp, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_dstnode, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_grp, tvb, offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_grpmem, tvb, offset+5, 1, ENC_BIG_ENDIAN); offset += 6; } break; case 3: /* UID */ ti = proto_tree_add_subtree(lon_tree, tvb, offset, 9, ett_address, NULL, "Address type 3 (UID)"); - proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_dstsub, tvb, offset+2, 1, ENC_NA); + proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_dstsub, tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ti, hf_lon_addr_uid, tvb, offset+3, 6, ENC_NA); offset += 9; break; @@ -340,17 +340,17 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) break; case 4: /* REMINDER */ length = tvb_get_guint8(tvb, offset); - proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_NA); + proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(lon_tree, hf_lon_mlist, tvb, offset, length, ENC_NA); + proto_tree_add_item(lon_tree, hf_lon_mlist, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; break; case 5: /* REM/MSG */ length = tvb_get_guint8(tvb, offset); - proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_NA); + proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (length > 0) - proto_tree_add_item(lon_tree, hf_lon_mlist, tvb, offset, length, ENC_NA); + proto_tree_add_item(lon_tree, hf_lon_mlist, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; offset += dissect_apdu(lon_tree, pinfo, tvb, offset); break; @@ -382,17 +382,17 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) break; case 4: /* REMINDER */ length = tvb_get_guint8(tvb, offset); - proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_NA); + proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(lon_tree, hf_lon_mlist, tvb, offset, length, ENC_NA); + proto_tree_add_item(lon_tree, hf_lon_mlist, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; break; case 5: /* REM/MSG */ length = tvb_get_guint8(tvb, offset); - proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_NA); + proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (length > 0) - proto_tree_add_item(lon_tree, hf_lon_mlist, tvb, offset, length, ENC_NA); + proto_tree_add_item(lon_tree, hf_lon_mlist, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; offset += dissect_apdu(lon_tree, pinfo, tvb, offset); break; diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c index ca0bbd4251..e252e1b048 100644 --- a/epan/dissectors/packet-maccontrol.c +++ b/epan/dissectors/packet-maccontrol.c @@ -176,11 +176,11 @@ dissect_macctrl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case MACCTRL_REGISTER_REQ: /* Flags */ proto_tree_add_item(macctrl_tree, hf_reg_flags, tvb, - 6, 1, ENC_NA); + 6, 1, ENC_BIG_ENDIAN); /* Pending Grants */ proto_tree_add_item(macctrl_tree, hf_reg_req_grants, tvb, - 7, 1, ENC_NA); + 7, 1, ENC_BIG_ENDIAN); break; case MACCTRL_REGISTER: @@ -191,21 +191,21 @@ dissect_macctrl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Flags */ proto_tree_add_item(macctrl_tree, hf_reg_flags, tvb, - 8, 1, ENC_NA); + 8, 1, ENC_BIG_ENDIAN); /* Synch Time */ proto_tree_add_item(macctrl_tree, hf_reg_time, tvb, 9, 2, ENC_BIG_ENDIAN); /* Echoed Pending Grants */ proto_tree_add_item(macctrl_tree, hf_reg_grants, tvb, - 11, 1, ENC_NA); + 11, 1, ENC_BIG_ENDIAN); break; case MACCTRL_REGISTER_ACK: /* Flags */ proto_tree_add_item(macctrl_tree, hf_reg_flags, tvb, - 6, 1, ENC_NA); + 6, 1, ENC_BIG_ENDIAN); /* Echoed Assigned Port */ proto_tree_add_item(macctrl_tree, hf_reg_ack_port, tvb, diff --git a/epan/dissectors/packet-macsec.c b/epan/dissectors/packet-macsec.c index bbd61b9b36..6d084bde5b 100644 --- a/epan/dissectors/packet-macsec.c +++ b/epan/dissectors/packet-macsec.c @@ -116,14 +116,14 @@ static int dissect_macsec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v (TCI_AN_MASK & tci_an_field)); tci_tree = proto_item_add_subtree(tci_item, ett_macsec_tci); - proto_tree_add_item(tci_tree, hf_macsec_TCI_V, tvb, sectag_offset, 1, ENC_NA); - proto_tree_add_item(tci_tree, hf_macsec_TCI_ES, tvb, sectag_offset, 1, ENC_NA); - proto_tree_add_item(tci_tree, hf_macsec_TCI_SC, tvb, sectag_offset, 1, ENC_NA); - proto_tree_add_item(tci_tree, hf_macsec_TCI_SCB, tvb, sectag_offset, 1, ENC_NA); - proto_tree_add_item(tci_tree, hf_macsec_TCI_E, tvb, sectag_offset, 1, ENC_NA); - proto_tree_add_item(tci_tree, hf_macsec_TCI_C, tvb, sectag_offset, 1, ENC_NA); - proto_tree_add_item(tci_tree, hf_macsec_AN, tvb, sectag_offset, 1, ENC_NA); - proto_tree_add_item(macsec_tree, hf_macsec_SL, tvb, sectag_offset + 1, 1, ENC_NA); + proto_tree_add_item(tci_tree, hf_macsec_TCI_V, tvb, sectag_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tci_tree, hf_macsec_TCI_ES, tvb, sectag_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tci_tree, hf_macsec_TCI_SC, tvb, sectag_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tci_tree, hf_macsec_TCI_SCB, tvb, sectag_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tci_tree, hf_macsec_TCI_E, tvb, sectag_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tci_tree, hf_macsec_TCI_C, tvb, sectag_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tci_tree, hf_macsec_AN, tvb, sectag_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(macsec_tree, hf_macsec_SL, tvb, sectag_offset + 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(macsec_tree, hf_macsec_PN, tvb, sectag_offset + 2, 4, ENC_BIG_ENDIAN); if (sectag_length == 14) { diff --git a/epan/dissectors/packet-marker.c b/epan/dissectors/packet-marker.c index 6fca165f67..bd8e828c29 100644 --- a/epan/dissectors/packet-marker.c +++ b/epan/dissectors/packet-marker.c @@ -99,7 +99,7 @@ dissect_marker(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Version Number */ proto_tree_add_item(marker_tree, hf_marker_version_number, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); offset += 1; while (1) @@ -116,7 +116,7 @@ dissect_marker(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* TLV Length */ proto_tree_add_item(marker_tree, hf_marker_tlv_length, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Requester Port */ diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c index 06beba3401..e2fed3cf37 100644 --- a/epan/dissectors/packet-mikey.c +++ b/epan/dissectors/packet-mikey.c @@ -935,8 +935,8 @@ dissect_payload_idr(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo _U_, p type = tvb_get_guint8(tvb, offset+2); length = tvb_get_ntohs(tvb, offset+3); if (tree) { - proto_tree_add_item(tree, hf_mikey[POS_ID_ROLE], tvb, 1, 1, ENC_NA); - proto_tree_add_item(tree, hf_mikey[POS_ID_TYPE], tvb, 2, 1, ENC_NA); + proto_tree_add_item(tree, hf_mikey[POS_ID_ROLE], tvb, 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_mikey[POS_ID_TYPE], tvb, 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_mikey[POS_ID_LEN], tvb, 3, 2, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c index 8c872a07b3..f89f58b08b 100644 --- a/epan/dissectors/packet-mpeg-descriptor.c +++ b/epan/dissectors/packet-mpeg-descriptor.c @@ -1669,7 +1669,7 @@ proto_mpeg_descriptor_dissect_parental_rating(tvbuff_t *tvb, guint offset, proto proto_tree_add_item(tree, hf_mpeg_descr_parental_rating_country_code, tvb, offset, 3, ENC_ASCII|ENC_NA); offset += 3; - proto_tree_add_item(tree, hf_mpeg_descr_parental_rating_rating, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_mpeg_descr_parental_rating_rating, tvb, offset, 1, ENC_BIG_ENDIAN); } /* 0x56 Teletext Descriptor */ diff --git a/epan/dissectors/packet-mpls-pm.c b/epan/dissectors/packet-mpls-pm.c index e149d92c2d..1d1c18a55b 100644 --- a/epan/dissectors/packet-mpls-pm.c +++ b/epan/dissectors/packet-mpls-pm.c @@ -509,12 +509,12 @@ dissect_mpls_pm_loss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pm_tree = proto_item_add_subtree(ti, ett_mpls_pm); /* add version to the subtree */ - proto_tree_add_item(pm_tree, hf_mpls_pm_version, tvb, offset, 1, ENC_NA); + proto_tree_add_item(pm_tree, hf_mpls_pm_version, tvb, offset, 1, ENC_BIG_ENDIAN); /* ctrl flags subtree */ ti = proto_tree_add_item(pm_tree, hf_mpls_pm_flags, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); pm_tree_flags = proto_item_add_subtree(ti, ett_mpls_pm_flags); proto_tree_add_item(pm_tree_flags, hf_mpls_pm_flags_r, tvb, offset, 1, ENC_NA); @@ -526,10 +526,10 @@ dissect_mpls_pm_loss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (query) { proto_tree_add_item(pm_tree, hf_mpls_pm_query_ctrl_code, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); } else { proto_tree_add_item(pm_tree, hf_mpls_pm_response_ctrl_code, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; @@ -539,7 +539,7 @@ dissect_mpls_pm_loss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* data flags subtree */ ti = proto_tree_add_item(pm_tree, hf_mpls_pm_dflags, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); pm_tree_dflags = proto_item_add_subtree(ti, ett_mpls_pm_dflags); proto_tree_add_item(pm_tree_dflags, hf_mpls_pm_dflags_x, tvb, offset, 1, ENC_NA); @@ -560,7 +560,7 @@ dissect_mpls_pm_loss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_uint(pm_tree, hf_mpls_pm_session_id, tvb, offset, 4, sid); if (class_specific) { - proto_tree_add_item(pm_tree, hf_mpls_pm_ds, tvb, offset + 3, 1, ENC_NA); + proto_tree_add_item(pm_tree, hf_mpls_pm_ds, tvb, offset + 3, 1, ENC_BIG_ENDIAN); } offset += 4; @@ -643,10 +643,10 @@ dissect_mpls_pm_delay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pm_tree = proto_item_add_subtree(ti, ett_mpls_pm); /* add version to the subtree */ - proto_tree_add_item(pm_tree, hf_mpls_pm_version, tvb, offset, 1, ENC_NA); + proto_tree_add_item(pm_tree, hf_mpls_pm_version, tvb, offset, 1, ENC_BIG_ENDIAN); /* ctrl flags subtree */ - ti = proto_tree_add_item(pm_tree, hf_mpls_pm_flags, tvb, offset, 1, ENC_NA); + ti = proto_tree_add_item(pm_tree, hf_mpls_pm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); pm_tree_flags = proto_item_add_subtree(ti, ett_mpls_pm_flags); proto_tree_add_item(pm_tree_flags, hf_mpls_pm_flags_r, tvb, offset, 1, ENC_NA); @@ -658,10 +658,10 @@ dissect_mpls_pm_delay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (query) { proto_tree_add_item(pm_tree, hf_mpls_pm_query_ctrl_code, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); } else { proto_tree_add_item(pm_tree, hf_mpls_pm_response_ctrl_code, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; @@ -689,7 +689,7 @@ dissect_mpls_pm_delay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(pm_tree, hf_mpls_pm_session_id, tvb, offset, 4, sid); if (class_specific) { - proto_tree_add_item(pm_tree, hf_mpls_pm_ds, tvb, offset + 3, 1, ENC_NA); + proto_tree_add_item(pm_tree, hf_mpls_pm_ds, tvb, offset + 3, 1, ENC_BIG_ENDIAN); } offset += 4; @@ -739,10 +739,10 @@ dissect_mpls_pm_combined(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pm_tree = proto_item_add_subtree(ti, ett_mpls_pm); /* add version to the subtree */ - proto_tree_add_item(pm_tree, hf_mpls_pm_version, tvb, offset, 1, ENC_NA); + proto_tree_add_item(pm_tree, hf_mpls_pm_version, tvb, offset, 1, ENC_BIG_ENDIAN); /* ctrl flags subtree */ - ti = proto_tree_add_item(pm_tree, hf_mpls_pm_flags, tvb, offset, 1, ENC_NA); + ti = proto_tree_add_item(pm_tree, hf_mpls_pm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); pm_tree_flags = proto_item_add_subtree(ti, ett_mpls_pm_flags); proto_tree_add_item(pm_tree_flags, hf_mpls_pm_flags_r, tvb, offset, 1, ENC_NA); @@ -754,10 +754,10 @@ dissect_mpls_pm_combined(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (query) { proto_tree_add_item(pm_tree, hf_mpls_pm_query_ctrl_code, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); } else { proto_tree_add_item(pm_tree, hf_mpls_pm_response_ctrl_code, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; @@ -767,7 +767,7 @@ dissect_mpls_pm_combined(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* data flags subtree */ ti = proto_tree_add_item(pm_tree, hf_mpls_pm_dflags, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); pm_tree_dflags = proto_item_add_subtree(ti, ett_mpls_pm_dflags); proto_tree_add_item(pm_tree_dflags, hf_mpls_pm_dflags_x, tvb, offset, 1, ENC_NA); @@ -801,7 +801,7 @@ dissect_mpls_pm_combined(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_uint(pm_tree, hf_mpls_pm_session_id, tvb, offset, 4, sid); if (class_specific) { - proto_tree_add_item(pm_tree, hf_mpls_pm_ds, tvb, offset + 3, 1, ENC_NA); + proto_tree_add_item(pm_tree, hf_mpls_pm_ds, tvb, offset + 3, 1, ENC_BIG_ENDIAN); } offset += 4; diff --git a/epan/dissectors/packet-mpls-psc.c b/epan/dissectors/packet-mpls-psc.c index c087ece2a1..841941b7d9 100644 --- a/epan/dissectors/packet-mpls-psc.c +++ b/epan/dissectors/packet-mpls-psc.c @@ -142,21 +142,21 @@ dissect_mpls_psc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_mpls_psc, tvb, 0, -1, ENC_NA); psc_tree = proto_item_add_subtree(ti, ett_mpls_psc); /* version */ - proto_tree_add_item(psc_tree, hf_mpls_psc_ver, tvb, offset, 1, ENC_NA); + proto_tree_add_item(psc_tree, hf_mpls_psc_ver, tvb, offset, 1, ENC_BIG_ENDIAN); /* request */ - proto_tree_add_item(psc_tree, hf_mpls_psc_req, tvb, offset, 1, ENC_NA); + proto_tree_add_item(psc_tree, hf_mpls_psc_req, tvb, offset, 1, ENC_BIG_ENDIAN); /* prot type */ - proto_tree_add_item(psc_tree, hf_mpls_psc_pt, tvb, offset, 1, ENC_NA); + proto_tree_add_item(psc_tree, hf_mpls_psc_pt, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* prot type */ - proto_tree_add_item(psc_tree, hf_mpls_psc_rev, tvb, offset, 1, ENC_NA); + proto_tree_add_item(psc_tree, hf_mpls_psc_rev, tvb, offset, 1, ENC_BIG_ENDIAN); /* skip reserved1 */ offset += 1; /* fpath */ - proto_tree_add_item(psc_tree, hf_mpls_psc_fpath, tvb, offset, 1, ENC_NA); + proto_tree_add_item(psc_tree, hf_mpls_psc_fpath, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* path */ - proto_tree_add_item(psc_tree, hf_mpls_psc_dpath, tvb, offset, 1, ENC_NA); + proto_tree_add_item(psc_tree, hf_mpls_psc_dpath, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* tlv len */ proto_tree_add_item(psc_tree, hf_mpls_psc_tlvlen, tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c index aca719243d..e1fbd841c3 100644 --- a/epan/dissectors/packet-nbns.c +++ b/epan/dissectors/packet-nbns.c @@ -752,7 +752,7 @@ dissect_nbns_answer(tvbuff_t *tvb, packet_info *pinfo, int offset, int nbns_data } num_names = tvb_get_guint8(tvb, cur_offset); - proto_tree_add_item(rr_tree, hf_nbns_number_of_names, tvb, cur_offset, 1, ENC_NA); + proto_tree_add_item(rr_tree, hf_nbns_number_of_names, tvb, cur_offset, 1, ENC_BIG_ENDIAN); cur_offset += 1; while (num_names != 0) { @@ -800,7 +800,7 @@ dissect_nbns_answer(tvbuff_t *tvb, packet_info *pinfo, int offset, int nbns_data break; } - proto_tree_add_item(rr_tree, hf_nbns_jumpers, tvb, cur_offset, 1, ENC_NA); + proto_tree_add_item(rr_tree, hf_nbns_jumpers, tvb, cur_offset, 1, ENC_BIG_ENDIAN); cur_offset += 1; data_len -= 1; @@ -809,7 +809,7 @@ dissect_nbns_answer(tvbuff_t *tvb, packet_info *pinfo, int offset, int nbns_data break; } - proto_tree_add_item(rr_tree, hf_nbns_test_result, tvb, cur_offset, 1, ENC_NA); + proto_tree_add_item(rr_tree, hf_nbns_test_result, tvb, cur_offset, 1, ENC_BIG_ENDIAN); cur_offset += 1; data_len -= 1; @@ -1291,7 +1291,7 @@ dissect_nbdgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case NBDS_ERROR: if (tree) { proto_tree_add_item(nbdgm_tree, hf_nbdgm_error_code, tvb, offset, - 1, ENC_NA); + 1, ENC_BIG_ENDIAN); } offset += 1; if (ti != NULL) @@ -1393,7 +1393,7 @@ dissect_nbss_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ti = proto_tree_add_item(tree, proto_nbss, tvb, offset, -1, ENC_NA); nbss_tree = proto_item_add_subtree(ti, ett_nbss); - proto_tree_add_item(nbss_tree, hf_nbss_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(nbss_tree, hf_nbss_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index b71514cc59..e53ca78f80 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -487,7 +487,7 @@ static void dissect_cie_list(tvbuff_t *tvb, col_append_fstr(pinfo->cinfo, COL_INFO, ", Code=%s", val_to_str(code, nhrp_cie_code_vals, "Unknown (%u)")); } - proto_tree_add_item(cie_tree, hf_nhrp_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(cie_tree, hf_nhrp_code, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c index cc97cba9bc..39265448c0 100644 --- a/epan/dissectors/packet-nlsp.c +++ b/epan/dissectors/packet-nlsp.c @@ -476,11 +476,11 @@ nlsp_dissect_nlsp_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 1; if (hello_type == NLSP_TYPE_WAN_HELLO) { - proto_tree_add_item(tree, hf_nlsp_hello_local_wan_circuit_id, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_nlsp_hello_local_wan_circuit_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } else { proto_tree_add_item(tree, hf_nlsp_hello_designated_router_system_id, tvb, offset, 6, ENC_NA); - proto_tree_add_item(tree, hf_nlsp_hello_designated_router_pseudonode_id, tvb, offset+6, 1, ENC_NA); + proto_tree_add_item(tree, hf_nlsp_hello_designated_router_pseudonode_id, tvb, offset+6, 1, ENC_BIG_ENDIAN); offset += 7; } @@ -545,7 +545,7 @@ dissect_lsp_mgt_info_clv(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, in return; } - proto_tree_add_item(tree, hf_nlsp_mgt_info_ipx_version_number, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_nlsp_mgt_info_ipx_version_number, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -555,7 +555,7 @@ dissect_lsp_mgt_info_clv(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, in return; } name_length = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_nlsp_mgt_info_name_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_nlsp_mgt_info_name_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -663,7 +663,7 @@ dissect_lsp_link_info_clv(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, i } proto_tree_add_item(tree, hf_nlsp_link_info_router_system_id, tvb, offset, 6, ENC_NA); - proto_tree_add_item(tree, hf_nlsp_link_info_router_pseudonode_id, tvb, offset+6, 1, ENC_NA); + proto_tree_add_item(tree, hf_nlsp_link_info_router_pseudonode_id, tvb, offset+6, 1, ENC_BIG_ENDIAN); offset += 7; length -= 7; @@ -729,7 +729,7 @@ dissect_lsp_svcs_info_clv(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, i return; } - proto_tree_add_item(tree, hf_nlsp_svcs_info_hops_to_reach_the_service, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_nlsp_svcs_info_hops_to_reach_the_service, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -805,7 +805,7 @@ dissect_lsp_ext_routes_clv(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, return; } - proto_tree_add_item(tree, hf_nlsp_ext_routes_hops, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_nlsp_ext_routes_hops, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -930,10 +930,10 @@ nlsp_dissect_nlsp_lsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 6; /* XXX - append the pseudonode ID */ - proto_tree_add_item(tree, hf_nlsp_lsp_id_pseudonode_id, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_nlsp_lsp_id_pseudonode_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_nlsp_lsp_id_lsp_number, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_nlsp_lsp_id_lsp_number, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; sequence_number = tvb_get_ntohl(tvb, offset); @@ -1020,8 +1020,8 @@ dissect_csnp_lsp_entries(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, in tvb_get_ntohs(tvb, offset+14)); proto_tree_add_item(subtree, hf_nlsp_csnp_lsp_id_source_id, tvb, offset+2, 6, ENC_NA); - proto_tree_add_item(subtree, hf_nlsp_csnp_lsp_id_pseudonode_id, tvb, offset+8, 1, ENC_NA); - proto_tree_add_item(subtree, hf_nlsp_csnp_lsp_id_lsp_number, tvb, offset+9, 1, ENC_NA); + proto_tree_add_item(subtree, hf_nlsp_csnp_lsp_id_pseudonode_id, tvb, offset+8, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_nlsp_csnp_lsp_id_lsp_number, tvb, offset+9, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_nlsp_csnp_lsp_sequence_number, tvb, offset+10, 4, ENC_BIG_ENDIAN); @@ -1056,8 +1056,8 @@ dissect_psnp_lsp_entries(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, in tvb_get_ntohs(tvb, offset+14)); proto_tree_add_item(subtree, hf_nlsp_psnp_lsp_id_source_id, tvb, offset+2, 6, ENC_NA); - proto_tree_add_item(subtree, hf_nlsp_psnp_lsp_id_pseudonode_id, tvb, offset+8, 1, ENC_NA); - proto_tree_add_item(subtree, hf_nlsp_psnp_lsp_id_lsp_number, tvb, offset+9, 1, ENC_NA); + proto_tree_add_item(subtree, hf_nlsp_psnp_lsp_id_pseudonode_id, tvb, offset+8, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_nlsp_psnp_lsp_id_lsp_number, tvb, offset+9, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_nlsp_psnp_lsp_sequence_number, tvb, offset+10, 4, ENC_BIG_ENDIAN); @@ -1118,7 +1118,7 @@ nlsp_dissect_nlsp_csnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb_ether_to_str(tvb, offset)); proto_tree_add_item(tree, hf_nlsp_csnp_source_id_system_id, tvb, offset, 6, ENC_NA); offset += 6; - proto_tree_add_item(tree, hf_nlsp_csnp_source_id_pseudonode_id, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_nlsp_csnp_source_id_pseudonode_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; col_append_fstr(pinfo->cinfo, COL_INFO, ", Start LSP ID: %s", @@ -1126,10 +1126,10 @@ nlsp_dissect_nlsp_csnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(tree, hf_nlsp_csnp_start_lsp_id_source_id, tvb, offset, 6, ENC_NA); offset += 6; /* XXX - append the pseudonode ID */ - proto_tree_add_item(tree, hf_nlsp_csnp_start_lsp_id_pseudonode_id, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_nlsp_csnp_start_lsp_id_pseudonode_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_nlsp_csnp_start_lsp_id_lsp_number, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_nlsp_csnp_start_lsp_id_lsp_number, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; col_append_fstr(pinfo->cinfo, COL_INFO, ", End LSP ID: %s", @@ -1137,9 +1137,9 @@ nlsp_dissect_nlsp_csnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(tree, hf_nlsp_csnp_end_lsp_id_source_id, tvb, offset, 6, ENC_NA); offset += 6; /* XXX - append the pseudonode ID */ - proto_tree_add_item(tree, hf_nlsp_csnp_end_lsp_id_pseudonode_id, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_nlsp_csnp_end_lsp_id_pseudonode_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_nlsp_csnp_end_lsp_id_lsp_number, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_nlsp_csnp_end_lsp_id_lsp_number, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len = packet_length - header_length; @@ -1200,7 +1200,7 @@ nlsp_dissect_nlsp_psnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(tree, hf_nlsp_psnp_source_id_system_id, tvb, offset, 6, ENC_NA); offset += 6; /* XXX - add the pseudonode ID */ - proto_tree_add_item(tree, hf_nlsp_psnp_source_id_pseudonode_id, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_nlsp_psnp_source_id_pseudonode_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len = packet_length - header_length; diff --git a/epan/dissectors/packet-noe.c b/epan/dissectors/packet-noe.c index 5cbed09b3c..40cc37f6bd 100644 --- a/epan/dissectors/packet-noe.c +++ b/epan/dissectors/packet-noe.c @@ -915,7 +915,7 @@ static void decode_evt_error(proto_tree *tree, offset += 1; length -= 1; - proto_tree_add_item(tree, hf_noe_aindx, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_noe_aindx, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -961,7 +961,7 @@ static void decode_tlv(proto_tree *tree, if (property_type >= P_ARRAY) { - proto_tree_add_item(property_tree, hf_noe_aindx, tvb, offset, 1, ENC_NA); + proto_tree_add_item(property_tree, hf_noe_aindx, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; } @@ -1050,7 +1050,7 @@ static void decode_getproperty_tlv(proto_tree *tree, if (body_type >= P_ARRAY) { - proto_tree_add_item(body_tree, hf_noe_aindx, tvb, offset, 1, ENC_NA); + proto_tree_add_item(body_tree, hf_noe_aindx, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; } @@ -1162,7 +1162,7 @@ static void decode_evt(proto_tree *tree, offset += 2; /*length -= 2;*/ - proto_tree_add_item(tree, hf_noe_bonded, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_noe_bonded, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /*length -= 1;*/ diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c index 10dcd10013..319406f6d9 100644 --- a/epan/dissectors/packet-nsip.c +++ b/epan/dissectors/packet-nsip.c @@ -964,7 +964,7 @@ dissect_nsip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { bi.ti = proto_tree_add_item(tree, proto_nsip, tvb, 0, -1, ENC_NA); nsip_tree = proto_item_add_subtree(bi.ti, ett_nsip); - proto_tree_add_item(nsip_tree, hf_nsip_pdu_type, tvb, 0, 1, ENC_NA); + proto_tree_add_item(nsip_tree, hf_nsip_pdu_type, tvb, 0, 1, ENC_BIG_ENDIAN); proto_item_append_text(bi.ti, ", PDU type: %s", val_to_str_const(pdu_type, tab_nsip_pdu_types, "Unknown")); bi.nsip_tree = nsip_tree; diff --git a/epan/dissectors/packet-nt-tpcp.c b/epan/dissectors/packet-nt-tpcp.c index 4b61dec857..c68485f0cb 100644 --- a/epan/dissectors/packet-nt-tpcp.c +++ b/epan/dissectors/packet-nt-tpcp.c @@ -134,9 +134,9 @@ dissect_tpcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ tpcp_tree = proto_item_add_subtree(ti, ett_tpcp); - proto_tree_add_item(tpcp_tree, hf_tpcp_version, tvb, 0, 1, ENC_NA); + proto_tree_add_item(tpcp_tree, hf_tpcp_version, tvb, 0, 1, ENC_BIG_ENDIAN); type = tvb_get_guint8(tvb, 1); - proto_tree_add_item(tpcp_tree, hf_tpcp_type, tvb, 1, 1, ENC_NA); + proto_tree_add_item(tpcp_tree, hf_tpcp_type, tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tpcp_tree, tvb, 2, hf_tpcp_flags, ett_tpcp_flags, tpcp_flags, ENC_NA); diff --git a/epan/dissectors/packet-osi-options.c b/epan/dissectors/packet-osi-options.c index b8839bc5da..4ae49af7b6 100644 --- a/epan/dissectors/packet-osi-options.c +++ b/epan/dissectors/packet-osi-options.c @@ -278,7 +278,7 @@ dissect_option_qos(const guint8 qos, proto_tree *tree, tvbuff_t *tvb, int offset proto_item *ti; proto_tree *osi_qos_tree; - ti = proto_tree_add_item(tree, hf_osi_options_qos_maintenance, tvb, offset, 1, ENC_NA); + ti = proto_tree_add_item(tree, hf_osi_options_qos_maintenance, tvb, offset, 1, ENC_BIG_ENDIAN); osi_qos_tree = proto_item_add_subtree(ti, ott_osi_qos); if ( ((qos & OSI_OPT_QOS_MASK) >> 6) == OSI_OPT_QOS_GLOBAL_UNIQUE) { /* Analye BIT field to get all Values */ @@ -364,34 +364,34 @@ static void dissect_option_rfd(const guchar error, const guchar field, int offset, guchar len, tvbuff_t *tvb, proto_tree *tree ) { - proto_tree_add_item(tree, hf_osi_options_rfd_error_class, tvb, offset + field, 1, ENC_NA); + proto_tree_add_item(tree, hf_osi_options_rfd_error_class, tvb, offset + field, 1, ENC_BIG_ENDIAN); switch ((error & OSI_OPT_RFD_MASK) >> 4) { case OSI_OPT_RFD_GENERAL: - proto_tree_add_item(tree, hf_osi_options_rtd_general, tvb, offset + field, 1, ENC_NA); + proto_tree_add_item(tree, hf_osi_options_rtd_general, tvb, offset + field, 1, ENC_BIG_ENDIAN); break; case OSI_OPT_RFD_ADDRESS: - proto_tree_add_item(tree, hf_osi_options_rtd_address, tvb, offset + field, 1, ENC_NA); + proto_tree_add_item(tree, hf_osi_options_rtd_address, tvb, offset + field, 1, ENC_BIG_ENDIAN); break; case OSI_OPT_RFD_SOURCE_ROUTING: - proto_tree_add_item(tree, hf_osi_options_rtd_source_routing, tvb, offset + field, 1, ENC_NA); + proto_tree_add_item(tree, hf_osi_options_rtd_source_routing, tvb, offset + field, 1, ENC_BIG_ENDIAN); break; case OSI_OPT_RFD_LIFETIME: - proto_tree_add_item(tree, hf_osi_options_rtd_lifetime, tvb, offset + field, 1, ENC_NA); + proto_tree_add_item(tree, hf_osi_options_rtd_lifetime, tvb, offset + field, 1, ENC_BIG_ENDIAN); break; case OSI_OPT_RFD_PDU_DISCARDED: - proto_tree_add_item(tree, hf_osi_options_rtd_pdu_discarded, tvb, offset + field, 1, ENC_NA); + proto_tree_add_item(tree, hf_osi_options_rtd_pdu_discarded, tvb, offset + field, 1, ENC_BIG_ENDIAN); break; case OSI_OPT_RFD_REASSEMBLY: - proto_tree_add_item(tree, hf_osi_options_rtd_reassembly, tvb, offset + field, 1, ENC_NA); + proto_tree_add_item(tree, hf_osi_options_rtd_reassembly, tvb, offset + field, 1, ENC_BIG_ENDIAN); break; default: proto_tree_add_text(tree, tvb, offset, len, "Reason for discard: UNKNOWN Error Class"); } - proto_tree_add_item(tree, hf_osi_options_rfd_field, tvb, offset + 1, 1, ENC_NA); + proto_tree_add_item(tree, hf_osi_options_rfd_field, tvb, offset + 1, 1, ENC_BIG_ENDIAN); } /* dissect ATN security label used for policy based interdomain routing.*/ @@ -533,7 +533,7 @@ dissect_osi_options(guchar opt_len, tvbuff_t *tvb, int offset, proto_tree *tree) dissect_option_atn_security_label(octet,parm_len,tvb, offset, osi_option_tree); } else { - ti = proto_tree_add_item(osi_option_tree, hf_osi_options_security_type, tvb, offset, 1, ENC_NA); + ti = proto_tree_add_item(osi_option_tree, hf_osi_options_security_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_set_len(ti, parm_len); } break; @@ -541,7 +541,7 @@ dissect_osi_options(guchar opt_len, tvbuff_t *tvb, int offset, proto_tree *tree) case OSI_OPT_PRIORITY: octet = tvb_get_guint8(tvb, offset); if ( OSI_OPT_MAX_PRIORITY >= octet ) { - ti = proto_tree_add_item(osi_option_tree, hf_osi_options_priority, tvb, offset, 1, ENC_NA); + ti = proto_tree_add_item(osi_option_tree, hf_osi_options_priority, tvb, offset, 1, ENC_BIG_ENDIAN); } else { ti = proto_tree_add_uint_format_value(osi_option_tree, hf_osi_options_priority, tvb, offset, 1, octet, "%u ( Invalid )", octet); diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index d79df6c235..85d7d13f06 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -1066,7 +1066,7 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(ospf_tree, hf_ospf_header, tvb, 0, ospf_header_length, ENC_NA); ospf_header_tree = proto_item_add_subtree(ti, ett_ospf_hdr); - proto_tree_add_item(ospf_header_tree, hf_ospf_header_version, tvb, 0, 1, ENC_NA); + proto_tree_add_item(ospf_header_tree, hf_ospf_header_version, tvb, 0, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ospf_header_tree, hf_ospf_header_msg_type, tvb, 1, 1, ENC_BIG_ENDIAN); if (ospf_msg_type_to_filter(packet_type) != -1) { @@ -1164,9 +1164,9 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case OSPF_AUTH_CRYPT: - proto_tree_add_item(ospf_header_tree, hf_ospf_header_auth_crypt_key_id, tvb, 18, 1, ENC_NA); + proto_tree_add_item(ospf_header_tree, hf_ospf_header_auth_crypt_key_id, tvb, 18, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(ospf_header_tree, hf_ospf_header_auth_crypt_data_length, tvb, 19, 1, ENC_NA); + proto_tree_add_item(ospf_header_tree, hf_ospf_header_auth_crypt_data_length, tvb, 19, 1, ENC_BIG_ENDIAN); crypto_len = tvb_get_guint8(tvb, 19); proto_tree_add_item(ospf_header_tree, hf_ospf_header_auth_crypt_seq_nbr, tvb, 20, 4, ENC_BIG_ENDIAN); @@ -1188,7 +1188,7 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case OSPF_VERSION_3: /* Instance ID and "reserved" is OSPFv3-only */ - proto_tree_add_item(ospf_header_tree, hf_ospf_header_instance_id, tvb, 14, 1, ENC_NA); + proto_tree_add_item(ospf_header_tree, hf_ospf_header_instance_id, tvb, 14, 1, ENC_BIG_ENDIAN); instance_id = tvb_get_guint8(tvb, 14); /* By default set address_family to OSPF_AF_6 */ address_family = OSPF_AF_6; @@ -1481,7 +1481,7 @@ dissect_ospf_hello(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 version, proto_tree_add_item(ospf_hello_tree, hf_ospf_hello_network_mask, tvb, offset, 4, ENC_NA); proto_tree_add_item(ospf_hello_tree, hf_ospf_hello_hello_interval, tvb, offset + 4, 2, ENC_BIG_ENDIAN); dissect_ospf_bitfield(ospf_hello_tree, tvb, offset + 6, &bfinfo_v2_options); - proto_tree_add_item(ospf_hello_tree, hf_ospf_hello_router_priority, tvb, offset + 7, 1, ENC_NA); + proto_tree_add_item(ospf_hello_tree, hf_ospf_hello_router_priority, tvb, offset + 7, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ospf_hello_tree, hf_ospf_hello_router_dead_interval, tvb, offset + 8, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ospf_hello_tree, hf_ospf_hello_designated_router, tvb, offset + 12, 4, ENC_NA); proto_tree_add_item(ospf_hello_tree, hf_ospf_hello_backup_designated_router, tvb, offset + 16, 4, ENC_NA); @@ -1494,7 +1494,7 @@ dissect_ospf_hello(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 version, break; case OSPF_VERSION_3: proto_tree_add_item(ospf_hello_tree, hf_ospf_hello_interface_id, tvb, offset, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(ospf_hello_tree, hf_ospf_hello_router_priority, tvb, offset + 4, 1, ENC_NA); + proto_tree_add_item(ospf_hello_tree, hf_ospf_hello_router_priority, tvb, offset + 4, 1, ENC_BIG_ENDIAN); dissect_ospf_bitfield(ospf_hello_tree, tvb, offset + 5, &bfinfo_v3_options); proto_tree_add_item(ospf_hello_tree, hf_ospf_hello_hello_interval, tvb, offset + 8, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ospf_hello_tree, hf_ospf_hello_router_dead_interval, tvb, offset + 10, 2, ENC_BIG_ENDIAN); @@ -2008,8 +2008,8 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree stlv_type, "%u: %s", stlv_type, stlv_name); proto_tree_add_item(stlv_tree, hf_ospf_tlv_length, tvb, stlv_offset+2, 2, ENC_BIG_ENDIAN); switch_cap = tvb_get_guint8 (tvb, stlv_offset+4); - proto_tree_add_item(stlv_tree, hf_ospf_mpls_switching_type, tvb, stlv_offset+4, 1, ENC_NA); - proto_tree_add_item(stlv_tree, hf_ospf_mpls_encoding, tvb, stlv_offset+5, 1, ENC_NA); + proto_tree_add_item(stlv_tree, hf_ospf_mpls_switching_type, tvb, stlv_offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(stlv_tree, hf_ospf_mpls_encoding, tvb, stlv_offset+5, 1, ENC_BIG_ENDIAN); for (i = 0; i < 8; i++) { proto_tree_add_text(stlv_tree, tvb, stlv_offset+8+(i*4), 4, "Pri %d: %.10g bytes/s (%.0f bits/s)", i, @@ -2041,7 +2041,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree proto_tree_add_uint_format_value(stlv_tree, hf_ospf_tlv_type, tvb, stlv_offset, 2, stlv_type, "%u: %s", stlv_type, stlv_name); proto_tree_add_item(stlv_tree, hf_ospf_tlv_length, tvb, stlv_offset+2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(stlv_tree, hf_ospf_mpls_protection_capability, tvb, stlv_offset+4, 1, ENC_NA); + proto_tree_add_item(stlv_tree, hf_ospf_mpls_protection_capability, tvb, stlv_offset+4, 1, ENC_BIG_ENDIAN); break; case MPLS_LINK_SHARED_RISK_GROUP: @@ -2084,8 +2084,8 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree proto_tree_add_uint_format_value(stlv_tree, hf_ospf_tlv_type, tvb, stlv_offset, 2, stlv_type, "%u: %s", stlv_type, stlv_name); proto_tree_add_item(stlv_tree, hf_ospf_tlv_length, tvb, stlv_offset+2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(stlv_tree, hf_ospf_oif_switching_cap, tvb, stlv_offset+4, 1, ENC_NA); - proto_tree_add_item(stlv_tree, hf_ospf_oif_encoding, tvb, stlv_offset+5, 1, ENC_NA); + proto_tree_add_item(stlv_tree, hf_ospf_oif_switching_cap, tvb, stlv_offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(stlv_tree, hf_ospf_oif_encoding, tvb, stlv_offset+5, 1, ENC_BIG_ENDIAN); for (i = 0; i < (stlv_len - 4) / 4; i++) { proto_tree_add_text(stlv_tree, tvb, stlv_offset+8+(i*4), 4, "%s: %d free timeslots", @@ -2144,7 +2144,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree proto_tree_add_uint_format_value(stlv_tree, hf_ospf_tlv_type, tvb, stlv_offset, 2, stlv_type, "%u: %s (IPv4)", stlv_type, stlv_name); proto_tree_add_item(stlv_tree, hf_ospf_tlv_length, tvb, stlv_offset+2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(stlv_tree, hf_ospf_oif_tna_addr_length, tvb, stlv_offset+4, 1, ENC_NA); + proto_tree_add_item(stlv_tree, hf_ospf_oif_tna_addr_length, tvb, stlv_offset+4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(stlv_tree, hf_ospf_oif_tna_addr_ipv4, tvb, stlv_offset+8, stlv_len - 4, ENC_BIG_ENDIAN); break; @@ -2155,7 +2155,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree proto_tree_add_uint_format_value(stlv_tree, hf_ospf_tlv_type, tvb, stlv_offset, 2, stlv_type, "%u: %s (IPv6)", stlv_type, stlv_name); proto_tree_add_item(stlv_tree, hf_ospf_tlv_length, tvb, stlv_offset+2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(stlv_tree, hf_ospf_oif_tna_addr_length, tvb, stlv_offset+4, 1, ENC_NA); + proto_tree_add_item(stlv_tree, hf_ospf_oif_tna_addr_length, tvb, stlv_offset+4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(stlv_tree, hf_ospf_tna_addr_ipv6, tvb, stlv_offset+8, stlv_len - 4, ENC_NA); break; @@ -2166,7 +2166,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree proto_tree_add_uint_format_value(stlv_tree, hf_ospf_tlv_type, tvb, stlv_offset, 2, stlv_type, "%u: %s (NSAP)", stlv_type, stlv_name); proto_tree_add_item(stlv_tree, hf_ospf_tlv_length, tvb, stlv_offset+2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(stlv_tree, hf_ospf_oif_tna_addr_length, tvb, stlv_offset+4, 1, ENC_NA); + proto_tree_add_item(stlv_tree, hf_ospf_oif_tna_addr_length, tvb, stlv_offset+4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(stlv_tree, hf_ospf_tna_addr, tvb, stlv_offset+8, stlv_len - 4, ENC_NA); break; @@ -2459,7 +2459,7 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *t switch (ls_id_type) { case OSPF_LSA_MPLS_TE: - proto_tree_add_item(ospf_lsa_tree, hf_ospf_ls_id_te_lsa_reserved, tvb, offset + 5, 1, ENC_NA); + proto_tree_add_item(ospf_lsa_tree, hf_ospf_ls_id_te_lsa_reserved, tvb, offset + 5, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ospf_lsa_tree, hf_ospf_ls_mpls_te_instance, tvb, offset + 6, 2, ENC_BIG_ENDIAN); break; @@ -2767,7 +2767,7 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *t /* maybe we should put each of the links into its own subtree ??? */ while (ls_length > 0 ) { - proto_tree_add_item(ospf_lsa_tree, hf_ospf_v3_lsa_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ospf_lsa_tree, hf_ospf_v3_lsa_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* reserved field */ reserved = tvb_get_guint8(tvb, offset+1); @@ -2829,7 +2829,7 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *t /* prefix length */ prefix_length=tvb_get_guint8(tvb, offset+4); - proto_tree_add_item(ospf_lsa_tree, hf_ospf_prefix_length, tvb, offset+4, 1, ENC_NA); + proto_tree_add_item(ospf_lsa_tree, hf_ospf_prefix_length, tvb, offset+4, 1, ENC_BIG_ENDIAN); /* prefix options */ dissect_ospf_bitfield(ospf_lsa_tree, tvb, offset+5, &bfinfo_v3_prefix_options); @@ -2889,7 +2889,7 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *t /* prefix length */ prefix_length=tvb_get_guint8(tvb, offset+4); - proto_tree_add_item(ospf_lsa_tree, hf_ospf_prefix_length, tvb, offset+4, 1, ENC_NA); + proto_tree_add_item(ospf_lsa_tree, hf_ospf_prefix_length, tvb, offset+4, 1, ENC_BIG_ENDIAN); /* prefix options */ dissect_ospf_bitfield(ospf_lsa_tree, tvb, offset+5, &bfinfo_v3_prefix_options); @@ -2934,7 +2934,7 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *t case OSPF_V3_LSTYPE_LINK: /* router priority */ - proto_tree_add_item(ospf_lsa_tree, hf_ospf_v3_lsa_router_priority, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ospf_lsa_tree, hf_ospf_v3_lsa_router_priority, tvb, offset, 1, ENC_BIG_ENDIAN); /* options field in an link-lsa */ dissect_ospf_bitfield(ospf_lsa_tree, tvb, offset + 1, &bfinfo_v3_options); @@ -2956,7 +2956,7 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *t /* prefix length */ prefix_length=tvb_get_guint8(tvb, offset); - proto_tree_add_item(ospf_lsa_tree, hf_ospf_prefix_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ospf_lsa_tree, hf_ospf_prefix_length, tvb, offset, 1, ENC_BIG_ENDIAN); /* prefix options */ dissect_ospf_bitfield(ospf_lsa_tree, tvb, offset+1, &bfinfo_v3_prefix_options); @@ -3000,7 +3000,7 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *t /* prefix length */ prefix_length=tvb_get_guint8(tvb, offset); - proto_tree_add_item(ospf_lsa_tree, hf_ospf_prefix_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ospf_lsa_tree, hf_ospf_prefix_length, tvb, offset, 1, ENC_BIG_ENDIAN); /* prefix options */ dissect_ospf_bitfield(ospf_lsa_tree, tvb, offset+1, &bfinfo_v3_prefix_options); diff --git a/epan/dissectors/packet-packetbb.c b/epan/dissectors/packet-packetbb.c index 6684f8a345..7a79fb7919 100644 --- a/epan/dissectors/packet-packetbb.c +++ b/epan/dissectors/packet-packetbb.c @@ -672,7 +672,7 @@ static int dissect_pbb_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre proto_tree_add_uint(header_tree, hf_packetbb_version, tvb, 0, 1, packet_flags >> 4); /* flags */ - headerFlags_item = proto_tree_add_item(header_tree, hf_packetbb_header_flags, tvb, 0, 1, ENC_NA); + headerFlags_item = proto_tree_add_item(header_tree, hf_packetbb_header_flags, tvb, 0, 1, ENC_BIG_ENDIAN); headerFlags_tree = proto_item_add_subtree(headerFlags_item, ett_packetbb_header_flags); proto_tree_add_item(headerFlags_tree, hf_packetbb_header_flags_phasseqnum, tvb, 0, 1, ENC_NA); diff --git a/epan/dissectors/packet-pathport.c b/epan/dissectors/packet-pathport.c index 29fdd3a464..3606f1dd1e 100644 --- a/epan/dissectors/packet-pathport.c +++ b/epan/dissectors/packet-pathport.c @@ -442,7 +442,7 @@ dissect_data_payload(tvbuff_t *tvb, proto_item *tree, guint offset, guint len) offset += 2; proto_tree_add_item(data_tree, hf_pp_reserved, tvb, offset++, 1, ENC_NA); stc = tvb_get_guint8(tvb, offset); - proto_tree_add_item(data_tree, hf_pp_data_start_code, tvb, offset++, 1, ENC_NA); + proto_tree_add_item(data_tree, hf_pp_data_start_code, tvb, offset++, 1, ENC_BIG_ENDIAN); xdmx = tvb_get_ntohs(tvb, offset); proto_tree_add_item(data_tree, hf_pp_data_dst, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -460,10 +460,10 @@ dissect_arp_reply(tvbuff_t *tvb, proto_tree *tree, guint offset, guint len) offset += 4; proto_tree_add_item(tree, hf_pp_arp_ip, tvb, offset, 4, ENC_NA); offset += 4; - proto_tree_add_item(tree, hf_pp_arp_manuf, tvb, offset++, 1, ENC_NA); - proto_tree_add_item(tree, hf_pp_arp_class, tvb, offset++, 1, ENC_NA); - proto_tree_add_item(tree, hf_pp_arp_type, tvb, offset++, 1, ENC_NA); - proto_tree_add_item(tree, hf_pp_arp_numdmx, tvb, offset++, 1, ENC_NA); + proto_tree_add_item(tree, hf_pp_arp_manuf, tvb, offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_pp_arp_class, tvb, offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_pp_arp_type, tvb, offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_pp_arp_numdmx, tvb, offset++, 1, ENC_BIG_ENDIAN); return len; } diff --git a/epan/dissectors/packet-pdc.c b/epan/dissectors/packet-pdc.c index 22d1fe7d3a..2e42bcb7e9 100644 --- a/epan/dissectors/packet-pdc.c +++ b/epan/dissectors/packet-pdc.c @@ -179,24 +179,24 @@ static int dissect_simpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset, guint { /*Get the parameter code*/ paramCode = tvb_get_guint8(tvb, offset + bytesProcessed); - simpduItem = proto_tree_add_item (simpduVarTree, hf_pdc_simpdu_param, tvb, offset + bytesProcessed, 1, ENC_NA); + simpduItem = proto_tree_add_item (simpduVarTree, hf_pdc_simpdu_param, tvb, offset + bytesProcessed, 1, ENC_BIG_ENDIAN); simpduVarTree1 = proto_item_add_subtree (simpduItem, ett_pdc_simpdu_var); bytesProcessed += 1; switch (paramCode) { case PARAM_CODE_VERSION: - proto_tree_add_item(simpduVarTree1, hf_pdc_simpdu_var_len, tvb, offset + bytesProcessed, 1, ENC_NA); - proto_tree_add_item(simpduVarTree1, hf_pdc_simpdu_var_version, tvb, offset + bytesProcessed + 1, 1, ENC_NA); + proto_tree_add_item(simpduVarTree1, hf_pdc_simpdu_var_len, tvb, offset + bytesProcessed, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(simpduVarTree1, hf_pdc_simpdu_var_version, tvb, offset + bytesProcessed + 1, 1, ENC_BIG_ENDIAN); bytesProcessed += 2; break; case PARAM_CODE_REFERENCES: - proto_tree_add_item(simpduVarTree1, hf_pdc_simpdu_var_len, tvb, offset + bytesProcessed, 1, ENC_NA); + proto_tree_add_item(simpduVarTree1, hf_pdc_simpdu_var_len, tvb, offset + bytesProcessed, 1, ENC_BIG_ENDIAN); proto_tree_add_item(simpduVarTree1, hf_pdc_simpdu_var_REFSRC, tvb, offset + bytesProcessed + 1, 2, ENC_BIG_ENDIAN); proto_tree_add_item(simpduVarTree1, hf_pdc_simpdu_var_REFDEST, tvb, offset + bytesProcessed + 3, 2, ENC_BIG_ENDIAN); bytesProcessed += 5; break; case PARAM_CODE_TRANSPORT: - proto_tree_add_item(simpduVarTree1, hf_pdc_simpdu_var_len, tvb, offset + bytesProcessed, 1, ENC_NA); + proto_tree_add_item(simpduVarTree1, hf_pdc_simpdu_var_len, tvb, offset + bytesProcessed, 1, ENC_BIG_ENDIAN); proto_tree_add_item(simpduVarTree1, hf_pdc_simpdu_var_TSEL, tvb, offset + bytesProcessed + 1, 2, ENC_BIG_ENDIAN); bytesProcessed += 3; break; @@ -214,10 +214,10 @@ static int dissect_rsmpdu(void) static int dissect_drmpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset) { /*DR-MPDU*/ - proto_tree_add_item(tree, hf_pdc_drmpdu_abort, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_pdc_drmpdu_mode, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_pdc_drmpdu_init, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_pdc_drmpdu_reason, tvb, offset + 1, 1, ENC_NA); + proto_tree_add_item(tree, hf_pdc_drmpdu_abort, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_pdc_drmpdu_mode, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_pdc_drmpdu_init, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_pdc_drmpdu_reason, tvb, offset + 1, 1, ENC_BIG_ENDIAN); return (2); } diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c index 03698720c6..4788f68f85 100644 --- a/epan/dissectors/packet-pgsql.c +++ b/epan/dissectors/packet-pgsql.c @@ -448,7 +448,7 @@ static void dissect_pgsql_be_msg(guchar type, guint length, tvbuff_t *tvb, /* Ready */ case 'Z': - proto_tree_add_item(tree, hf_status, tvb, n, 1, ENC_NA); + proto_tree_add_item(tree, hf_status, tvb, n, 1, ENC_BIG_ENDIAN); break; /* Error, Notice */ diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c index a9d17333d1..5027f0d27e 100644 --- a/epan/dissectors/packet-pktc.c +++ b/epan/dissectors/packet-pktc.c @@ -601,8 +601,8 @@ dissect_pktc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) version=tvb_get_guint8(tvb, offset); version_tree = proto_tree_add_subtree_format(pktc_tree, tvb, offset, 1, ett_pktc_version, NULL, "Version: %d.%d", (version>>4)&0x0f, (version)&0x0f); - proto_tree_add_item(version_tree, hf_pktc_version_major, tvb, offset, 1, ENC_NA); - proto_tree_add_item(version_tree, hf_pktc_version_minor, tvb, offset, 1, ENC_NA); + proto_tree_add_item(version_tree, hf_pktc_version_major, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(version_tree, hf_pktc_version_minor, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; /* fill COL_INFO */ diff --git a/epan/dissectors/packet-q2931.c b/epan/dissectors/packet-q2931.c index 0a7e3e132e..d06e2c31d6 100644 --- a/epan/dissectors/packet-q2931.c +++ b/epan/dissectors/packet-q2931.c @@ -444,7 +444,7 @@ dissect_q2931_aal_parameters_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; aal_type = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_q2931_aal_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_aal_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -747,22 +747,22 @@ dissect_q2931_bband_bearer_cap_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; octet = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_q2931_bearer_class, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_bearer_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; if (len == 0) return; if (!(octet & Q2931_IE_EXTENSION)) { - proto_tree_add_item(tree, hf_q2931_atm_transfer_capability, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_atm_transfer_capability, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; } if (len == 0) return; - proto_tree_add_item(tree, hf_q2931_susceptibility_to_clipping, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q2931_user_plane_connection_configuration, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_susceptibility_to_clipping, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q2931_user_plane_connection_configuration, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -783,7 +783,7 @@ dissect_q2931_bband_hi_layer_info_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; - proto_tree_add_item(tree, hf_q2931_high_layer_information_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_high_layer_information_type, tvb, offset, 1, ENC_BIG_ENDIAN); /*offset += 1; */ /* len -= 1; */ } @@ -862,7 +862,7 @@ dissect_q2931_bband_low_layer_info_ie(tvbuff_t *tvb, int offset, int len, /* * Layer 1 information. */ - proto_tree_add_item(tree, hf_q2931_bband_low_layer_info_user_info_l1_proto, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_bband_low_layer_info_user_info_l1_proto, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; } @@ -875,7 +875,7 @@ dissect_q2931_bband_low_layer_info_ie(tvbuff_t *tvb, int offset, int len, * Layer 2 information. */ uil2_protocol = octet & 0x1F; - proto_tree_add_item(tree, hf_q2931_bband_low_layer_info_user_info_l2_proto, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_bband_low_layer_info_user_info_l2_proto, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -885,9 +885,9 @@ dissect_q2931_bband_low_layer_info_ie(tvbuff_t *tvb, int offset, int len, return; octet = tvb_get_guint8(tvb, offset); if (uil2_protocol == Q2931_UIL2_USER_SPEC) { - proto_tree_add_item(tree, hf_q2931_bband_low_layer_info_user_specified_l2_proto, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_bband_low_layer_info_user_specified_l2_proto, tvb, offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_q2931_bband_low_layer_info_mode, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_bband_low_layer_info_mode, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; len -= 1; @@ -913,7 +913,7 @@ l2_done: * Layer 3 information. */ uil3_protocol = octet & 0x1F; - proto_tree_add_item(tree, hf_q2931_bband_low_layer_info_user_info_l3_proto, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_bband_low_layer_info_user_info_l3_proto, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -931,7 +931,7 @@ l2_done: case Q2931_UIL3_X25_PL: case Q2931_UIL3_ISO_8208: case Q2931_UIL3_X223: - proto_tree_add_item(tree, hf_q2931_bband_low_layer_info_mode, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_bband_low_layer_info_mode, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -940,7 +940,7 @@ l2_done: if (len == 0) return; octet = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_q2931_bband_low_layer_info_default_packet_size, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_bband_low_layer_info_default_packet_size, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -948,7 +948,7 @@ l2_done: goto l3_done; if (len == 0) return; - proto_tree_add_item(tree, hf_q2931_bband_low_layer_info_packet_window_size, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_bband_low_layer_info_packet_window_size, tvb, offset, 1, ENC_BIG_ENDIAN); /*offset += 1;*/ /*len -= 1;*/ break; @@ -1152,7 +1152,7 @@ dissect_q2931_cause_ie(tvbuff_t *tvb, packet_info* pinfo, int offset, int len, if (len == 0) return; - proto_tree_add_item(tree, hf_q2931_cause_location, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_cause_location, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -1160,7 +1160,7 @@ dissect_q2931_cause_ie(tvbuff_t *tvb, packet_info* pinfo, int offset, int len, return; octet = tvb_get_guint8(tvb, offset); cause_value = octet & 0x7F; - proto_tree_add_item(tree, hf_q2931_cause_value, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_cause_value, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -1186,8 +1186,8 @@ dissect_q2931_cause_ie(tvbuff_t *tvb, packet_info* pinfo, int offset, int len, case Q2931_CAUSE_CALL_REJECTED: rejection_reason = octet & 0x7C; - proto_tree_add_item(tree, hf_q2931_cause_rejection_reason, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q2931_cause_rejection_condition, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_cause_rejection_reason, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q2931_cause_rejection_condition, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -1200,11 +1200,11 @@ dissect_q2931_cause_ie(tvbuff_t *tvb, packet_info* pinfo, int offset, int len, break; case Q2931_REJ_IE_MISSING: - proto_tree_add_item(tree, hf_q2931_cause_rejection_missing_information_element, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_cause_rejection_missing_information_element, tvb, offset, 1, ENC_BIG_ENDIAN); break; case Q2931_REJ_IE_INSUFFICIENT: - proto_tree_add_item(tree, hf_q2931_cause_rejection_insufficient_information_element, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_cause_rejection_insufficient_information_element, tvb, offset, 1, ENC_BIG_ENDIAN); break; default: @@ -1232,7 +1232,7 @@ dissect_q2931_cause_ie(tvbuff_t *tvb, packet_info* pinfo, int offset, int len, case Q2931_CAUSE_IE_NONEX_OR_UNIMPL: case Q2931_CAUSE_INVALID_IE_CONTENTS: do { - proto_tree_add_item(tree, hf_q2931_cause_information_element, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_cause_information_element, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; } while (len >= 0); @@ -1240,7 +1240,7 @@ dissect_q2931_cause_ie(tvbuff_t *tvb, packet_info* pinfo, int offset, int len, case Q2931_CAUSE_CELL_RATE_UNAVAIL: do { - proto_tree_add_item(tree, hf_q2931_cause_cell_rate_subfield_identifier, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_cause_cell_rate_subfield_identifier, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; } while (len >= 0); @@ -1260,7 +1260,7 @@ dissect_q2931_cause_ie(tvbuff_t *tvb, packet_info* pinfo, int offset, int len, case Q2931_CAUSE_MT_NONEX_OR_UNIMPL: case Q2931_CAUSE_MSG_INCOMPAT_W_CS: - proto_tree_add_item(tree, hf_q2931_cause_message_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_cause_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); break; case Q2931_CAUSE_REC_TIMER_EXP: @@ -1306,7 +1306,7 @@ dissect_q2931_call_state_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; - proto_tree_add_item(tree, hf_q2931_call_state, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_call_state, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -1359,9 +1359,9 @@ dissect_q2931_number_ie(tvbuff_t *tvb, packet_info* pinfo, int offset, int len, if (len == 0) return; octet = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_q2931_number_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_number_type, tvb, offset, 1, ENC_BIG_ENDIAN); numbering_plan = octet & 0x0F; - proto_tree_add_item(tree, hf_q2931_number_plan, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_number_plan, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -1369,8 +1369,8 @@ dissect_q2931_number_ie(tvbuff_t *tvb, packet_info* pinfo, int offset, int len, if (len == 0) return; - proto_tree_add_item(tree, hf_q2931_number_presentation_indicator, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q2931_number_screening_indicator, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_number_presentation_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q2931_number_screening_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; } @@ -1423,8 +1423,8 @@ dissect_q2931_party_subaddr_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; - proto_tree_add_item(tree, hf_q2931_party_subaddr_type_of_subaddress, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q2931_party_subaddr_odd_even_indicator, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_party_subaddr_type_of_subaddress, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q2931_party_subaddr_odd_even_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -1456,8 +1456,8 @@ dissect_q2931_connection_identifier_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; - proto_tree_add_item(tree, hf_q2931_conn_id_vp_associated_signalling, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q2931_conn_id_preferred_exclusive, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_conn_id_vp_associated_signalling, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q2931_conn_id_preferred_exclusive, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -1527,13 +1527,13 @@ dissect_q2931_qos_parameter_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; - proto_tree_add_item(tree, hf_q2931_qos_class_forward, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_qos_class_forward, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; if (len == 0) return; - proto_tree_add_item(tree, hf_q2931_qos_class_backward, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_qos_class_backward, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -1551,7 +1551,7 @@ dissect_q2931_bband_rpt_indicator(tvbuff_t *tvb, int offset, int len, if (len == 0) return; - proto_tree_add_item(tree, hf_q2931_broadband_repeat_indicator, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_broadband_repeat_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -1571,7 +1571,7 @@ dissect_q2931_restart_indicator(tvbuff_t *tvb, int offset, int len, if (len == 0) return; - proto_tree_add_item(tree, hf_q2931_restart_indicator, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_restart_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -1627,8 +1627,8 @@ dissect_q2931_transit_network_sel_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; - proto_tree_add_item(tree, hf_q2931_transit_network_sel_type, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q2931_transit_network_sel_plan, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_transit_network_sel_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q2931_transit_network_sel_plan, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -1675,19 +1675,19 @@ dissect_q2931_oam_traffic_descriptor_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; octet = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_q2931_oam_traffic_descriptor_shaping_indicator, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_oam_traffic_descriptor_shaping_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_text(tree, tvb, offset, 1, "Use of end-to-end OAM F5 flow is %s", (octet & 0x10) ? "mandatory" : "optional"); - proto_tree_add_item(tree, hf_q2931_oam_traffic_descriptor_management_indicator, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_oam_traffic_descriptor_management_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; if (len == 0) return; - proto_tree_add_item(tree, hf_q2931_oam_traffic_descriptor_forward_f5_flow_indicator, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q2931_oam_traffic_descriptor_backward_f5_flow_indicator, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_oam_traffic_descriptor_forward_f5_flow_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q2931_oam_traffic_descriptor_backward_f5_flow_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -1707,7 +1707,7 @@ dissect_q2931_endpoint_reference_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; - proto_tree_add_item(tree, hf_q2931_endpoint_reference_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_endpoint_reference_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -1741,7 +1741,7 @@ dissect_q2931_endpoint_state_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; - proto_tree_add_item(tree, hf_q2931_endpoint_state, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q2931_endpoint_state, tvb, offset, 1, ENC_BIG_ENDIAN); } static void diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index a74d04ed42..96436f2170 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -906,7 +906,7 @@ dissect_q931_bearer_capability_ie(tvbuff_t *tvb, int offset, int len, if (it_rate == Q931_IT_RATE_MULTIRATE) { if (len == 0) return; - proto_tree_add_item(tree, hf_q931_bearer_capability_rate_multiplier, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_bearer_capability_rate_multiplier, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; } @@ -931,7 +931,7 @@ dissect_q931_bearer_capability_ie(tvbuff_t *tvb, int offset, int len, octet = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_q931_layer_1, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_q931_layer_1_in_band_negotiation, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q931_bearer_capability_user_rate, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_bearer_capability_user_rate, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -940,7 +940,7 @@ dissect_q931_bearer_capability_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; octet = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_q931_bearer_capability_intermediate_rate, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_bearer_capability_intermediate_rate, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_q931_send_data_net_independent_clock, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_q931_accept_data_net_independent_clock, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_q931_send_data_flow_control, tvb, offset, 1, ENC_NA); @@ -969,14 +969,14 @@ dissect_q931_bearer_capability_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; octet = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_q931_bearer_capability_stop_bits, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q931_bearer_capability_data_bits, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q931_bearer_capability_parity, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_bearer_capability_stop_bits, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q931_bearer_capability_data_bits, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q931_bearer_capability_parity, tvb, offset, 1, ENC_BIG_ENDIAN); if (octet & Q931_IE_VL_EXTENSION) goto l1_done; proto_tree_add_item(tree, hf_q931_bearer_capability_duplex, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q931_bearer_capability_modem_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_bearer_capability_modem_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; } @@ -993,7 +993,7 @@ l1_done: proto_tree_add_boolean(tree, hf_q931_extension_ind, tvb, offset, 1, octet); proto_tree_add_uint(tree, hf_q931_layer_ident, tvb, offset, 1, octet); uil2_protocol = octet & 0x1F; - proto_tree_add_item(tree, hf_q931_uil2, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_uil2, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -1006,9 +1006,9 @@ l1_done: return; octet = tvb_get_guint8(tvb, offset); if (uil2_protocol == Q931_UIL2_USER_SPEC) { - proto_tree_add_item(tree, hf_q931_uil2_info, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_uil2_info, tvb, offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_q931_bearer_capability_mode, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_bearer_capability_mode, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; len -= 1; @@ -1036,7 +1036,7 @@ l2_done: proto_tree_add_boolean(tree, hf_q931_extension_ind, tvb, offset, 1, octet); proto_tree_add_uint(tree, hf_q931_layer_ident, tvb, offset, 1, octet); uil3_protocol = octet & 0x1F; - proto_tree_add_item(tree, hf_q931_uil3, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_uil3, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -1054,7 +1054,7 @@ l2_done: case Q931_UIL3_X25_PL: case Q931_UIL3_ISO_8208: case Q931_UIL3_X223: - proto_tree_add_item(tree, hf_q931_bearer_capability_mode, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_bearer_capability_mode, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -1063,7 +1063,7 @@ l2_done: if (len == 0) return; octet = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_q931_bearer_capability_default_packet_size, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_bearer_capability_default_packet_size, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -1071,7 +1071,7 @@ l2_done: goto l3_done; if (len == 0) return; - proto_tree_add_item(tree, hf_q931_bearer_capability_packet_window_size, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_bearer_capability_packet_window_size, tvb, offset, 1, ENC_BIG_ENDIAN); /*offset += 1;*/ /*len -= 1;*/ break; @@ -1307,7 +1307,7 @@ dissect_q931_cause_ie_unsafe(tvbuff_t *tvb, int offset, int len, if (len == 0) return; octet = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_q931_cause_recommendation, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_cause_recommendation, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_boolean(tree, hf_q931_extension_ind, tvb, offset, 1, octet); offset += 1; len -= 1; @@ -1336,13 +1336,13 @@ dissect_q931_cause_ie_unsafe(tvbuff_t *tvb, int offset, int len, case Q931_CAUSE_QOS_UNAVAILABLE: proto_tree_add_item(tree, hf_q931_network_service, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_q931_extension_condition_type, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q931_extension_condition, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_extension_condition, tvb, offset, 1, ENC_BIG_ENDIAN); break; case Q931_CAUSE_CALL_REJECTED: rejection_reason = octet & 0x7C; - proto_tree_add_item(tree, hf_q931_cause_call_rejection_reason, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q931_cause_call_condition, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_cause_call_rejection_reason, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q931_cause_call_condition, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -1391,7 +1391,7 @@ dissect_q931_cause_ie_unsafe(tvbuff_t *tvb, int offset, int len, case Q931_CAUSE_MT_NONEX_OR_UNIMPL: case Q931_CAUSE_MSG_INCOMPAT_W_CS: - proto_tree_add_item(tree, hf_q931_cause_call_message_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_cause_call_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); break; case Q931_CAUSE_REC_TIMER_EXP: @@ -1489,7 +1489,7 @@ dissect_q931_call_state_ie(tvbuff_t *tvb, int offset, int len, proto_tree_add_item(tree, hf_q931_call_state_data, tvb, offset, len, ENC_NA); return; } - proto_tree_add_item(tree, hf_q931_call_state, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_call_state, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -1594,7 +1594,7 @@ dissect_q931_channel_identification_ie(tvbuff_t *tvb, int offset, int len, if (octet & Q931_IS_SLOT_MAP) { while (len) { - proto_tree_add_item(tree, hf_q931_channel_slot_map, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_channel_slot_map, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; } @@ -1649,14 +1649,14 @@ dissect_q931_progress_indicator_ie(tvbuff_t *tvb, int offset, int len, proto_tree_add_item(tree, hf_q931_progress_indicator_data, tvb, offset, len, ENC_NA); return; } - proto_tree_add_item(tree, hf_q931_progress_indicator_location, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_progress_indicator_location, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; if (len == 0) return; - proto_tree_add_item(tree, hf_q931_progress_indicator_description, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_progress_indicator_description, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -1688,14 +1688,14 @@ dissect_q931_ns_facilities_ie(tvbuff_t *tvb, int offset, int len, return; octet = tvb_get_guint8(tvb, offset); netid_len = octet & 0x7F; - proto_tree_add_item(tree, hf_q931_netid_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_netid_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; if (netid_len != 0) { if (len == 0) return; - proto_tree_add_item(tree, hf_q931_netid_type, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q931_netid_plan, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_netid_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q931_netid_plan, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; netid_len--; @@ -1737,7 +1737,7 @@ dissect_q931_notification_indicator_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; - proto_tree_add_item(tree, hf_q931_notification_description, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_notification_description, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -1804,7 +1804,7 @@ dissect_q931_signal_ie(tvbuff_t *tvb, packet_info *pinfo, int offset, int len, "Signal: length is %d, should be 1", len); return; } - proto_tree_add_item(tree, hf_q931_signal, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_signal, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -1835,10 +1835,10 @@ dissect_q931_information_rate_ie(tvbuff_t *tvb, packet_info *pinfo, int offset, "Information rate: length is %d, should be 4", len); return; } - proto_tree_add_item(tree, hf_q931_information_rate_incoming, tvb, offset + 0, 1, ENC_NA); - proto_tree_add_item(tree, hf_q931_information_rate_outgoing, tvb, offset + 1, 1, ENC_NA); - proto_tree_add_item(tree, hf_q931_information_rate_minimum_incoming, tvb, offset + 2, 1, ENC_NA); - proto_tree_add_item(tree, hf_q931_information_rate_minimum_outgoing, tvb, offset + 3, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_information_rate_incoming, tvb, offset + 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q931_information_rate_outgoing, tvb, offset + 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q931_information_rate_minimum_incoming, tvb, offset + 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q931_information_rate_minimum_outgoing, tvb, offset + 3, 1, ENC_BIG_ENDIAN); } static int @@ -1981,7 +1981,7 @@ dissect_q931_pl_binary_parameters_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; octet = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_q931_fast_select, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_fast_select, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_text(tree, tvb, offset, 1, "%s", (octet & 0x04) ? "No request/request denied" : "Request indicated/request accepted"); @@ -2000,13 +2000,13 @@ dissect_q931_pl_window_size_ie(tvbuff_t *tvb, int offset, int len, { if (len == 0) return; - proto_tree_add_item(tree, hf_q931_pl_window_size_forward_value, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_pl_window_size_forward_value, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; if (len == 0) return; - proto_tree_add_item(tree, hf_q931_pl_window_size_backward_value, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_pl_window_size_backward_value, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -2018,13 +2018,13 @@ dissect_q931_packet_size_ie(tvbuff_t *tvb, int offset, int len, { if (len == 0) return; - proto_tree_add_item(tree, hf_q931_packet_size_forward_value, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_packet_size_forward_value, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; if (len == 0) return; - proto_tree_add_item(tree, hf_q931_packet_size_backward_value, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_packet_size_backward_value, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -2041,7 +2041,7 @@ dissect_q931_cug_ie(tvbuff_t *tvb, int offset, int len, proto_tree *tree) { if (len == 0) return; - proto_tree_add_item(tree, hf_q931_cug_indication, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_cug_indication, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -2064,7 +2064,7 @@ dissect_q931_reverse_charge_ind_ie(tvbuff_t *tvb, int offset, int len, { if (len == 0) return; - proto_tree_add_item(tree, hf_q931_reverse_charging_ind, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_reverse_charging_ind, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -2152,7 +2152,7 @@ dissect_q931_number_ie(tvbuff_t *tvb, int offset, int len, if (!(octet & Q931_IE_VL_EXTENSION)) { if (len == 0) return; - proto_tree_add_item(tree, hf_q931_extension_reason, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_extension_reason, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; } @@ -2200,8 +2200,8 @@ dissect_q931_party_subaddr_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; - proto_tree_add_item(tree, hf_q931_party_subaddr_type, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q931_party_subaddr_odd_even_indicator, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_party_subaddr_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q931_party_subaddr_odd_even_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -2229,7 +2229,7 @@ dissect_q931_restart_indicator_ie(tvbuff_t *tvb, packet_info *pinfo, int offset, "Restart indicator: length is %d, should be 1", len); return; } - proto_tree_add_item(tree, hf_q931_restart_indicator, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_restart_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -2397,7 +2397,7 @@ dissect_q931_user_user_ie(tvbuff_t *tvb, packet_info *pinfo, int offset, int len if (len == 0) return; octet = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_q931_user_protocol_discriminator, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_user_protocol_discriminator, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -2438,7 +2438,7 @@ dissect_q931_party_category_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; - proto_tree_add_item(tree, hf_q931_party_category, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q931_party_category, tvb, offset, 1, ENC_BIG_ENDIAN); /*offset += 1; len -= 1; @@ -2691,11 +2691,11 @@ dissect_q931_IEs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root_tree, break; case CS0 | Q931_IE_CONGESTION_LEVEL: - proto_tree_add_item(q931_tree, hf_q931_congestion_level, tvb, offset, 1, ENC_NA); + proto_tree_add_item(q931_tree, hf_q931_congestion_level, tvb, offset, 1, ENC_BIG_ENDIAN); break; case CS0 | Q931_IE_REPEAT_INDICATOR: - proto_tree_add_item(q931_tree, hf_q931_repeat_indicator, tvb, offset, 1, ENC_NA); + proto_tree_add_item(q931_tree, hf_q931_repeat_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); break; default: diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c index c7e29aacc9..a4fcf2c43a 100644 --- a/epan/dissectors/packet-q933.c +++ b/epan/dissectors/packet-q933.c @@ -377,7 +377,7 @@ dissect_q933_segmented_message_ie(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree_add_uint_format_value(tree, hf_q933_not_first_segment, tvb, offset, 1, octet & 0x7F, "%u segments remaining", octet & 0x7F); } - proto_tree_add_item(tree, hf_q933_segmented_message_type, tvb, offset + 1, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_segmented_message_type, tvb, offset + 1, 1, ENC_BIG_ENDIAN); } /* @@ -614,7 +614,7 @@ dissect_q933_bearer_capability_ie(tvbuff_t *tvb, int offset, int len, return; octet = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_q933_layer_1, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q933_user_rate, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_user_rate, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -634,9 +634,9 @@ dissect_q933_bearer_capability_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; octet = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_q933_stop_bits, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q933_data_bits, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q933_parity, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_stop_bits, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q933_data_bits, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q933_parity, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -645,7 +645,7 @@ dissect_q933_bearer_capability_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; proto_tree_add_item(tree, hf_q933_duplex, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q933_modem_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_modem_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; } @@ -660,7 +660,7 @@ l1_done: * Layer 2 information. */ uil2_protocol = octet & 0x1F; - proto_tree_add_item(tree, hf_q933_user_information_layer_2_protocol, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_user_information_layer_2_protocol, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -672,9 +672,9 @@ l1_done: if (len == 0) return; if (uil2_protocol == Q933_UIL2_USER_SPEC) { - proto_tree_add_item(tree, hf_q933_user_specified_layer_2_protocol_information, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_user_specified_layer_2_protocol_information, tvb, offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_q933_address_inclusion, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_address_inclusion, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; len -= 1; @@ -690,7 +690,7 @@ l2_done: * Layer 3 information. */ uil3_protocol = octet & 0x1F; - proto_tree_add_item(tree, hf_q933_user_information_layer_3_protocol, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_user_information_layer_3_protocol, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -708,7 +708,7 @@ l2_done: case Q933_UIL3_X25_PL: case Q933_UIL3_ISO_8208: case Q933_UIL3_X223: - proto_tree_add_item(tree, hf_q933_mode, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_mode, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -717,7 +717,7 @@ l2_done: if (len == 0) return; octet = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_q933_default_packet_size_0F, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_default_packet_size_0F, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -725,7 +725,7 @@ l2_done: goto l3_done; if (len == 0) return; - proto_tree_add_item(tree, hf_q933_packet_window_size, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_packet_window_size, tvb, offset, 1, ENC_BIG_ENDIAN); /*offset += 1;*/ /*len -= 1;*/ break; @@ -948,7 +948,7 @@ dissect_q933_cause_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; octet = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_q933_recommendation, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_recommendation, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_boolean(tree, hf_q933_extension_ind, tvb, offset, 1, octet); offset += 1; len -= 1; @@ -972,13 +972,13 @@ dissect_q933_cause_ie(tvbuff_t *tvb, int offset, int len, case Q933_CAUSE_QOS_UNAVAILABLE: proto_tree_add_item(tree, hf_q933_network_service, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_q933_condition_normal, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q933_condition, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_condition, tvb, offset, 1, ENC_BIG_ENDIAN); break; case Q933_CAUSE_CALL_REJECTED: rejection_reason = octet & 0x7C; - proto_tree_add_item(tree, hf_q933_rejection_reason, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q933_condition, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_rejection_reason, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q933_condition, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -991,11 +991,11 @@ dissect_q933_cause_ie(tvbuff_t *tvb, int offset, int len, break; case Q933_REJ_IE_MISSING: - proto_tree_add_item(tree, hf_q933_missing_information_element, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_missing_information_element, tvb, offset, 1, ENC_BIG_ENDIAN); break; case Q933_REJ_IE_INSUFFICIENT: - proto_tree_add_item(tree, hf_q933_insufficient_information_element, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_insufficient_information_element, tvb, offset, 1, ENC_BIG_ENDIAN); break; default: @@ -1010,7 +1010,7 @@ dissect_q933_cause_ie(tvbuff_t *tvb, int offset, int len, case Q933_CAUSE_IE_NONEX_OR_UNIMPL: case Q933_CAUSE_INVALID_IE_CONTENTS: do { - proto_tree_add_item(tree, hf_q933_information_element, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_information_element, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; } while (len != 0); @@ -1018,7 +1018,7 @@ dissect_q933_cause_ie(tvbuff_t *tvb, int offset, int len, case Q933_CAUSE_MT_NONEX_OR_UNIMPL: case Q933_CAUSE_MSG_INCOMPAT_W_CS: - proto_tree_add_item(tree, hf_q933_message_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); break; case Q933_CAUSE_REC_TIMER_EXP: @@ -1078,7 +1078,7 @@ dissect_q933_call_state_ie(tvbuff_t *tvb, int offset, int len, proto_tree_add_item(tree, hf_q933_data, tvb, offset, len, ENC_NA); return; } - proto_tree_add_item(tree, hf_q933_call_state, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_call_state, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -1163,7 +1163,7 @@ dissect_q933_pvc_status_ie(tvbuff_t *tvb, int offset, int len, } proto_tree_add_uint(tree, hf_q933_dlci, tvb, offset, dlci_len, dlci); - proto_tree_add_item(tree, hf_q933_status, tvb, offset+dlci_len, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_status, tvb, offset+dlci_len, 1, ENC_BIG_ENDIAN); } /* @@ -1221,9 +1221,9 @@ dissect_q933_channel_identification_ie(tvbuff_t *tvb, int offset, int len, proto_tree_add_item(tree, hf_q933_indicated_channel_required, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_q933_indicated_channel_d_channel, tvb, offset, 1, ENC_NA); if (octet & Q933_NOT_BASIC_CHANNEL) { - proto_tree_add_item(tree, hf_q933_not_channel_selection, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_not_channel_selection, tvb, offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_q933_channel_selection, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_channel_selection, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; len -= 1; @@ -1306,13 +1306,13 @@ dissect_q933_progress_indicator_ie(tvbuff_t *tvb, int offset, int len, proto_tree_add_item(tree, hf_q933_data, tvb, offset, len, ENC_NA); return; } - proto_tree_add_item(tree, hf_q933_location, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_location, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; if (len == 0) return; - proto_tree_add_item(tree, hf_q933_progress_description, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_progress_description, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -1344,14 +1344,14 @@ dissect_q933_ns_facilities_ie(tvbuff_t *tvb, int offset, int len, return; octet = tvb_get_guint8(tvb, offset); netid_len = octet & 0x7F; - proto_tree_add_item(tree, hf_q933_network_identification_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_network_identification_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; if (netid_len != 0) { if (len == 0) return; - proto_tree_add_item(tree, hf_q933_type_of_network_identification, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q933_network_identification_plan, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_type_of_network_identification, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q933_network_identification_plan, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; netid_len--; @@ -1522,7 +1522,7 @@ dissect_q933_reverse_charge_ind_ie(tvbuff_t *tvb, int offset, int len, { if (len == 0) return; - proto_tree_add_item(tree, hf_q933_reverse_charging_indication, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_reverse_charging_indication, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -1607,7 +1607,7 @@ dissect_q933_number_ie(tvbuff_t *tvb, int offset, int len, if (!(octet & Q933_IE_VL_EXTENSION)) { if (len == 0) return; - proto_tree_add_item(tree, hf_q933_reason_for_redirection, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_reason_for_redirection, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; } @@ -1639,8 +1639,8 @@ dissect_q933_party_subaddr_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; - proto_tree_add_item(tree, hf_q933_type_of_subaddress, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_q933_odd_even_indicator, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_type_of_subaddress, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q933_odd_even_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -1709,7 +1709,7 @@ dissect_q933_high_layer_compat_ie(tvbuff_t *tvb, int offset, int len, return; octet = tvb_get_guint8(tvb, offset); characteristics = octet & 0x7F; - proto_tree_add_item(tree, hf_q933_high_layer_characteristics_identification, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_high_layer_characteristics_identification, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -1717,9 +1717,9 @@ dissect_q933_high_layer_compat_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; if (characteristics == Q933_AUDIOVISUAL) { - proto_tree_add_item(tree, hf_q933_extended_audiovisual_characteristics_id, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_extended_audiovisual_characteristics_id, tvb, offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_q933_extended_high_layer_characteristics_id, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_extended_high_layer_characteristics_id, tvb, offset, 1, ENC_BIG_ENDIAN); } } } @@ -1751,7 +1751,7 @@ dissect_q933_user_user_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; octet = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_q933_protocol_discriminator, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_q933_protocol_discriminator, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -1861,7 +1861,7 @@ dissect_q933(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch ((codeset << 8) | (info_element & Q933_IE_SO_IDENTIFIER_MASK)) { case CS0 | Q933_IE_REPEAT_INDICATOR: - proto_tree_add_item(q933_tree, hf_q933_repeat_indicator, tvb, offset, 1, ENC_NA); + proto_tree_add_item(q933_tree, hf_q933_repeat_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); break; default: @@ -1885,7 +1885,7 @@ dissect_q933(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Unknown information element (0x%02X)")); proto_tree_add_uint_format_value(ie_tree, hf_q933_information_element, tvb, offset, 1, info_element, "%s", val_to_str(info_element, q933_info_element_vals[codeset], "Unknown (0x%02X)")); - proto_tree_add_item(ie_tree, hf_q933_length, tvb, offset + 1, 1, ENC_NA); + proto_tree_add_item(ie_tree, hf_q933_length, tvb, offset + 1, 1, ENC_BIG_ENDIAN); switch ((codeset << 8) | info_element) { diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index 3296897a03..c5f8d73a96 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -344,7 +344,7 @@ static const gchar *dissect_chap_password(proto_tree* tree, tvbuff_t* tvb, packe ti = proto_tree_add_item(tree, hf_radius_chap_password, tvb, 0, len, ENC_NA); chap_tree = proto_item_add_subtree(ti, ett_chap); - proto_tree_add_item(chap_tree, hf_radius_chap_ident, tvb, 0, 1, ENC_NA); + proto_tree_add_item(chap_tree, hf_radius_chap_ident, tvb, 0, 1, ENC_BIG_ENDIAN); proto_tree_add_item(chap_tree, hf_radius_chap_string, tvb, 1, 16, ENC_NA); return (tvb_bytes_to_ep_str(tvb, 0, len)); } diff --git a/epan/dissectors/packet-radius_packetcable.c b/epan/dissectors/packet-radius_packetcable.c index 14ef0b7f20..8b4e74983d 100644 --- a/epan/dissectors/packet-radius_packetcable.c +++ b/epan/dissectors/packet-radius_packetcable.c @@ -273,7 +273,7 @@ static void decode_packetcable_bcid (tvbuff_t *tvb, proto_tree *tree, int offset proto_tree_add_item(tree, hf_packetcable_bcid_timestamp, tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_packetcable_bcid_element_id, tvb, offset + 4, 8, ENC_ASCII|ENC_NA); - proto_tree_add_item(tree, hf_packetcable_bcid_time_zone_dst, tvb, offset + 12, 1, ENC_NA); + proto_tree_add_item(tree, hf_packetcable_bcid_time_zone_dst, tvb, offset + 12, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_packetcable_bcid_time_zone_offset, tvb, offset + 13, 7, ENC_ASCII|ENC_NA); proto_tree_add_item(tree, hf_packetcable_bcid_event_counter, tvb, offset + 20, 4, ENC_BIG_ENDIAN); } @@ -289,7 +289,7 @@ static const gchar* dissect_packetcable_em_hdr(proto_tree* tree, tvbuff_t* tvb, proto_tree_add_item(tree, hf_packetcable_em_header_event_message_type, tvb, 26, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_packetcable_em_header_element_type, tvb, 28, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_packetcable_em_header_element_id, tvb, 30, 8, ENC_ASCII|ENC_NA); - proto_tree_add_item(tree, hf_packetcable_em_header_time_zone_dst, tvb, 38, 1, ENC_NA); + proto_tree_add_item(tree, hf_packetcable_em_header_time_zone_dst, tvb, 38, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_packetcable_em_header_time_zone_offset, tvb, 39, 7, ENC_ASCII|ENC_NA); proto_tree_add_item(tree, hf_packetcable_em_header_sequence_number, tvb, 46, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_packetcable_em_header_event_time, tvb, 50, 18, ENC_ASCII|ENC_NA); diff --git a/epan/dissectors/packet-rfid-felica.c b/epan/dissectors/packet-rfid-felica.c index af5d497cb2..f678314adc 100644 --- a/epan/dissectors/packet-rfid-felica.c +++ b/epan/dissectors/packet-rfid-felica.c @@ -248,7 +248,7 @@ static void dissect_felica(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val_to_str_const(opcode, felica_opcodes, "Unknown")); if (tree) { - proto_tree_add_item(felica_tree, hf_felica_opcode, tvb, 0, 1, ENC_NA); + proto_tree_add_item(felica_tree, hf_felica_opcode, tvb, 0, 1, ENC_BIG_ENDIAN); } switch (opcode) { diff --git a/epan/dissectors/packet-rfid-mifare.c b/epan/dissectors/packet-rfid-mifare.c index dfd9e9e371..95d010714e 100644 --- a/epan/dissectors/packet-rfid-mifare.c +++ b/epan/dissectors/packet-rfid-mifare.c @@ -91,7 +91,7 @@ dissect_mifare(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) item = proto_tree_add_item(tree, proto_mifare, tvb, 0, -1, ENC_NA); mifare_tree = proto_item_add_subtree(item, ett_mifare); - proto_tree_add_item(mifare_tree, hf_mifare_command, tvb, 0, 1, ENC_NA); + proto_tree_add_item(mifare_tree, hf_mifare_command, tvb, 0, 1, ENC_BIG_ENDIAN); cmd = tvb_get_guint8(tvb, 0); switch (cmd) { diff --git a/epan/dissectors/packet-rfid-pn532-hci.c b/epan/dissectors/packet-rfid-pn532-hci.c index 1f444552a2..733a16bf24 100644 --- a/epan/dissectors/packet-rfid-pn532-hci.c +++ b/epan/dissectors/packet-rfid-pn532-hci.c @@ -119,7 +119,7 @@ dissect_pn532_hci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat proto_tree_add_item(main_tree, hf_packet_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(main_tree, hf_specific_application_level_error_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(main_tree, hf_specific_application_level_error_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } else if (packet_code == 0xFFFF) { /* Extended Information Frame */ col_set_str(pinfo->cinfo, COL_INFO, "Extended Information Frame"); @@ -128,7 +128,7 @@ dissect_pn532_hci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat length = tvb_get_ntohs(tvb, offset); offset += 2; - proto_tree_add_item(main_tree, hf_length_checksum, tvb, offset, 1, ENC_NA); + proto_tree_add_item(main_tree, hf_length_checksum, tvb, offset, 1, ENC_BIG_ENDIAN); checksum = (length >> 8) + (length & 0xFF) + tvb_get_guint8(tvb, offset); if (checksum != 0) { proto_tree_add_expert(main_tree, pinfo, &ei_invalid_length_checksum, tvb, offset, 1); @@ -139,7 +139,7 @@ dissect_pn532_hci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat call_dissector_with_data(pn532_handle, next_tvb, pinfo, tree, usb_conv_info); offset += length; - proto_tree_add_item(main_tree, hf_data_checksum, tvb, offset, 1, ENC_NA); + proto_tree_add_item(main_tree, hf_data_checksum, tvb, offset, 1, ENC_BIG_ENDIAN); checksum = tvb_get_guint8(tvb, offset); while (length) { checksum += tvb_get_guint8(tvb, offset - length); @@ -152,11 +152,11 @@ dissect_pn532_hci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat } else { /* Normal Information Frame */ col_set_str(pinfo->cinfo, COL_INFO, "Normal Information Frame"); - proto_tree_add_item(main_tree, hf_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(main_tree, hf_length, tvb, offset, 1, ENC_BIG_ENDIAN); length = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(main_tree, hf_length_checksum, tvb, offset, 1, ENC_NA); + proto_tree_add_item(main_tree, hf_length_checksum, tvb, offset, 1, ENC_BIG_ENDIAN); checksum = length + tvb_get_guint8(tvb, offset); if (checksum != 0) proto_tree_add_expert(main_tree, pinfo, &ei_invalid_length_checksum, tvb, offset, 1); @@ -166,7 +166,7 @@ dissect_pn532_hci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat call_dissector_with_data(pn532_handle, next_tvb, pinfo, tree, usb_conv_info); offset += length; - proto_tree_add_item(main_tree, hf_data_checksum, tvb, offset, 1, ENC_NA); + proto_tree_add_item(main_tree, hf_data_checksum, tvb, offset, 1, ENC_BIG_ENDIAN); checksum = tvb_get_guint8(tvb, offset); while (length) { checksum += tvb_get_guint8(tvb, offset - length); diff --git a/epan/dissectors/packet-rmt-lct.c b/epan/dissectors/packet-rmt-lct.c index f5fb43c836..7cdb0721f2 100644 --- a/epan/dissectors/packet-rmt-lct.c +++ b/epan/dissectors/packet-rmt-lct.c @@ -217,8 +217,8 @@ int lct_ext_decode(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, guint of case 3: /* EXT_CC RATE */ proto_tree_add_item(ext_tree, hf_cc_sequence, tvb, offset+2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(ext_tree, hf_cc_flags, tvb, offset+4, 1, ENC_NA); - proto_tree_add_item(ext_tree, hf_cc_rtt, tvb, offset+5, 1, ENC_NA); + proto_tree_add_item(ext_tree, hf_cc_flags, tvb, offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ext_tree, hf_cc_rtt, tvb, offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_double(ext_tree, hf_cc_loss, tvb, offset+6, 2, tvb_get_ntohs(tvb, offset+6)/65535.0); proto_tree_add_item(ext_tree, hf_cc_rate, tvb, offset+8, 2, ENC_BIG_ENDIAN); break; diff --git a/epan/dissectors/packet-rpki-rtr.c b/epan/dissectors/packet-rpki-rtr.c index 2846b70c01..a58d849c90 100644 --- a/epan/dissectors/packet-rpki-rtr.c +++ b/epan/dissectors/packet-rpki-rtr.c @@ -196,7 +196,7 @@ static int dissect_rpkirtr_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_length, tvb, offset, 4, ENC_BIG_ENDIAN); /* TODO: Add check length ? */ offset += 4; - ti_flags = proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_flags, tvb, offset, 1, ENC_NA); + ti_flags = proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_flags, tvb, offset, 1, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(ti_flags, ett_flags); proto_tree_add_item(flags_tree, hf_rpkirtr_flags_aw, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -217,7 +217,7 @@ static int dissect_rpkirtr_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_length, tvb, offset, 4, ENC_BIG_ENDIAN); /* TODO: Add check length ? */ offset += 4; - ti_flags = proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_flags, tvb, offset, 1, ENC_NA); + ti_flags = proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_flags, tvb, offset, 1, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(ti_flags, ett_flags); proto_tree_add_item(flags_tree, hf_rpkirtr_flags_aw, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -260,7 +260,7 @@ static int dissect_rpkirtr_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr } else { asn1_ctx_t asn1_ctx; - ti_flags = proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_flags, tvb, offset, 1, ENC_NA); + ti_flags = proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_flags, tvb, offset, 1, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(ti_flags, ett_flags_nd); proto_tree_add_item(flags_tree, hf_rpkirtr_flags_rk, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index c0b4f271a0..21913d085e 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -357,11 +357,11 @@ dissect_rtspinterleaved(tvbuff_t *tvb, int offset, packet_info *pinfo, rf_chan, rf_len); rtspframe_tree = proto_item_add_subtree(ti, ett_rtspframe); - proto_tree_add_item(rtspframe_tree, hf_rtsp_magic, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rtspframe_tree, hf_rtsp_magic, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(rtspframe_tree, hf_rtsp_channel, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rtspframe_tree, hf_rtsp_channel, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; diff --git a/epan/dissectors/packet-sap.c b/epan/dissectors/packet-sap.c index 86fc326f4d..cbdb24f1ff 100644 --- a/epan/dissectors/packet-sap.c +++ b/epan/dissectors/packet-sap.c @@ -148,9 +148,9 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) si = proto_tree_add_item(tree, proto_sap, tvb, offset, -1, ENC_NA); sap_tree = proto_item_add_subtree(si, ett_sap); - sif = proto_tree_add_item(sap_tree, hf_sap_flags, tvb, offset, 1, ENC_NA); + sif = proto_tree_add_item(sap_tree, hf_sap_flags, tvb, offset, 1, ENC_BIG_ENDIAN); sap_flags_tree = proto_item_add_subtree(sif, ett_sap_flags); - proto_tree_add_item(sap_flags_tree, hf_sap_flags_v, tvb, offset, 1, ENC_NA); + proto_tree_add_item(sap_flags_tree, hf_sap_flags_v, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(sap_flags_tree, hf_sap_flags_a, tvb, offset, 1, ENC_NA); proto_tree_add_item(sap_flags_tree, hf_sap_flags_r, tvb, offset, 1, ENC_NA); proto_tree_add_item(sap_flags_tree, hf_sap_flags_t, tvb, offset, 1, ENC_NA); @@ -161,7 +161,7 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; auth_len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(sap_tree, hf_sap_auth_len, tvb, offset, 1, ENC_NA); + proto_tree_add_item(sap_tree, hf_sap_auth_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(sap_tree, hf_sap_message_identifier_hash, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -187,11 +187,11 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sa_tree = proto_item_add_subtree(sdi, ett_sap_auth); auth_flags = tvb_get_guint8(tvb, offset); - sai = proto_tree_add_item(sa_tree, hf_auth_flags, tvb, offset, 1, ENC_NA); + sai = proto_tree_add_item(sa_tree, hf_auth_flags, tvb, offset, 1, ENC_BIG_ENDIAN); saf_tree = proto_item_add_subtree(sai, ett_sap_authf); - proto_tree_add_item(saf_tree, hf_auth_flags_v, tvb, offset, 1, ENC_NA); + proto_tree_add_item(saf_tree, hf_auth_flags_v, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(saf_tree, hf_auth_flags_p, tvb, offset, 1, ENC_NA); - proto_tree_add_item(saf_tree, hf_auth_flags_t, tvb, offset, 1, ENC_NA); + proto_tree_add_item(saf_tree, hf_auth_flags_t, tvb, offset, 1, ENC_BIG_ENDIAN); has_pad = auth_flags&MCAST_SAP_AUTH_BIT_P; if (has_pad) { @@ -207,7 +207,7 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(sa_tree, hf_sap_auth_subheader, tvb, offset+1, auth_data_len-pad_len-1, ENC_NA); if (has_pad) { - proto_tree_add_item(sa_tree, hf_sap_auth_data_padding_len, tvb, offset+auth_data_len-1, 1, ENC_NA); + proto_tree_add_item(sa_tree, hf_sap_auth_data_padding_len, tvb, offset+auth_data_len-1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(sa_tree, hf_sap_auth_data_padding, tvb, offset+auth_data_len-pad_len, pad_len, ENC_NA); } diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c index 4d82517ae8..791db7aae4 100644 --- a/epan/dissectors/packet-scsi-mmc.c +++ b/epan/dissectors/packet-scsi-mmc.c @@ -745,14 +745,14 @@ dissect_mmc4_readdiscstructure (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre { if (tree && isreq && iscdb) { proto_tree_add_item(tree, hf_scsi_mmc_read_dvd_address, tvb, offset+1, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_scsi_mmc_read_dvd_layer_number, tvb, offset+5, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_mmc_read_dvd_layer_number, tvb, offset+5, 1, ENC_BIG_ENDIAN); cdata->itlq->flags=tvb_get_guint8 (tvb, offset+6); proto_tree_add_uint (tree, hf_scsi_mmc_read_dvd_format, tvb, offset+6, 1, cdata->itlq->flags); proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+7, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_scsi_mmc_read_dvd_agid, tvb, offset+9, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_mmc_read_dvd_agid, tvb, offset+9, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+10, hf_scsi_control, ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); @@ -845,11 +845,11 @@ proto_tree *tree, { if (tree && isreq && iscdb) { - proto_tree_add_item(tree, hf_scsi_mmc_getperformance_data_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_mmc_getperformance_data_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_mmc_getperformance_starting_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_mmc_getperformance_max_num_descriptors, tvb, offset+7, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_scsi_mmc_getperformance_type, tvb, offset+9, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_mmc_getperformance_type, tvb, offset+9, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+10, hf_scsi_control, ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-scsi-smc.c b/epan/dissectors/packet-scsi-smc.c index d479b972e5..8c86ffced2 100644 --- a/epan/dissectors/packet-scsi-smc.c +++ b/epan/dissectors/packet-scsi-smc.c @@ -342,7 +342,7 @@ dissect_scsi_smc_element (tvbuff_t *tvb, packet_info *pinfo _U_, case DT_ELEM: flags = tvb_get_guint8 (tvb, offset); if (flags & LU_VALID) { - proto_tree_add_item(tree, hf_scsi_smc_lun, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_smc_lun, tvb, offset, 1, ENC_BIG_ENDIAN); } proto_tree_add_item(tree, hf_scsi_smc_not_bus, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_smc_id_valid, tvb, offset, 1, ENC_NA); @@ -350,7 +350,7 @@ dissect_scsi_smc_element (tvbuff_t *tvb, packet_info *pinfo _U_, offset += 1; if (flags & ID_VALID) { - proto_tree_add_item(tree, hf_scsi_smc_scsi_bus_address, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_smc_scsi_bus_address, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; offset += 1; /* reserved */ @@ -396,13 +396,13 @@ dissect_scsi_smc_element (tvbuff_t *tvb, packet_info *pinfo _U_, if (elem_bytecnt < 1) return; - proto_tree_add_item(tree, hf_scsi_smc_code_set, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_smc_code_set, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; elem_bytecnt -= 1; if (elem_bytecnt < 1) return; - proto_tree_add_item(tree, hf_scsi_smc_identifier_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_smc_identifier_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; elem_bytecnt -= 1; @@ -414,7 +414,7 @@ dissect_scsi_smc_element (tvbuff_t *tvb, packet_info *pinfo _U_, if (elem_bytecnt < 1) return; ident_len = tvb_get_guint8 (tvb, offset); - proto_tree_add_item(tree, hf_scsi_smc_identifier_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_smc_identifier_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; elem_bytecnt -= 1; @@ -472,7 +472,7 @@ dissect_smc_readelementstatus (tvbuff_t *tvb, packet_info *pinfo, if (isreq && iscdb) { proto_tree_add_item(tree, hf_scsi_smc_voltag, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_smc_element_type_code_0F, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_smc_element_type_code_0F, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_smc_starting_element_address, tvb, offset+1, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_smc_number_of_elements, tvb, offset+3, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_smc_curdata, tvb, offset+4, 1, ENC_NA); @@ -494,7 +494,7 @@ dissect_smc_readelementstatus (tvbuff_t *tvb, packet_info *pinfo, if (bytecnt < 1) break; elem_type = tvb_get_guint8 (tvb, offset); - proto_tree_add_item(tree, hf_scsi_smc_element_type_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_smc_element_type_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; bytecnt -= 1; diff --git a/epan/dissectors/packet-scsi-ssc.c b/epan/dissectors/packet-scsi-ssc.c index eb30e3c730..f54baa5a4a 100644 --- a/epan/dissectors/packet-scsi-ssc.c +++ b/epan/dissectors/packet-scsi-ssc.c @@ -619,8 +619,8 @@ dissect_ssc_erase6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (!tree) return; - proto_tree_add_item(tree, hf_scsi_ssc_erase6_immed, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_ssc_erase6_long, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_ssc_erase6_immed, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_ssc_erase6_long, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); @@ -751,7 +751,7 @@ dissect_ssc_readposition (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre if (isreq && iscdb) { service_action = tvb_get_guint8 (tvb, offset) & 0x1F; - proto_tree_add_item(tree, hf_scsi_ssc_readposition_service_action, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_ssc_readposition_service_action, tvb, offset, 1, ENC_BIG_ENDIAN); /* Remember the service action so we can decode the reply */ if (cdata != NULL) { cdata->itlq->flags = service_action; diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index f310750a27..40d980b0f1 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -2700,13 +2700,13 @@ dissect_scsi_evpd(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, 1, ENC_BIG_ENDIAN); proto_tree_add_item(evpd_tree, hf_scsi_inq_devtype, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(evpd_tree, hf_scsi_inquiry_evpd_page, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(evpd_tree, hf_scsi_inq_evpd_page_length, tvb, offset+3, 1, ENC_NA); + proto_tree_add_item(evpd_tree, hf_scsi_inquiry_evpd_page, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(evpd_tree, hf_scsi_inq_evpd_page_length, tvb, offset+3, 1, ENC_BIG_ENDIAN); offset += 4; switch (pcode) { case SCSI_EVPD_SUPPPG: for (i = 0; i < plen; i++) { - proto_tree_add_item(evpd_tree, hf_scsi_inq_evpd_supported_page, tvb, offset+i, 1, ENC_NA); + proto_tree_add_item(evpd_tree, hf_scsi_inq_evpd_supported_page, tvb, offset+i, 1, ENC_BIG_ENDIAN); } break; case SCSI_EVPD_DEVID: @@ -2716,7 +2716,7 @@ dissect_scsi_evpd(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, codeset = tvb_get_guint8(tvb, offset) & 0x0F; ti = proto_tree_add_uint(evpd_tree, hf_scsi_inq_evpd_identifier_number, tvb, offset, 0, i); PROTO_ITEM_SET_GENERATED(ti); - ti = proto_tree_add_item(evpd_tree, hf_scsi_inq_evpd_devid_code_set, tvb, offset, 1, ENC_NA); + ti = proto_tree_add_item(evpd_tree, hf_scsi_inq_evpd_devid_code_set, tvb, offset, 1, ENC_BIG_ENDIAN); plen -= 1; offset += 1; @@ -2725,9 +2725,9 @@ dissect_scsi_evpd(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, break; } - proto_tree_add_item(evpd_tree, hf_scsi_inq_evpd_devid_association, tvb, offset, 1, ENC_NA); + proto_tree_add_item(evpd_tree, hf_scsi_inq_evpd_devid_association, tvb, offset, 1, ENC_BIG_ENDIAN); identifier_type = tvb_get_guint8(tvb, offset); - ti = proto_tree_add_item(evpd_tree, hf_scsi_inq_evpd_devid_identifier_type, tvb, offset, 1, ENC_NA); + ti = proto_tree_add_item(evpd_tree, hf_scsi_inq_evpd_devid_identifier_type, tvb, offset, 1, ENC_BIG_ENDIAN); plen -= 1; offset += 1; @@ -2744,7 +2744,7 @@ dissect_scsi_evpd(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, break; } idlen = tvb_get_guint8(tvb, offset); - ti = proto_tree_add_item(evpd_tree, hf_scsi_inq_evpd_devid_identifier_length, tvb, offset, 1, ENC_NA); + ti = proto_tree_add_item(evpd_tree, hf_scsi_inq_evpd_devid_identifier_length, tvb, offset, 1, ENC_BIG_ENDIAN); plen -= 1; offset += 1; @@ -2806,7 +2806,7 @@ dissect_scsi_evpd(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item(evpd_tree, hf_scsi_block_limits_wsnz, tvb, offset, 1, ENC_NA); offset += 1; - proto_tree_add_item(evpd_tree, hf_scsi_block_limits_mcawl, tvb, offset, 1, ENC_NA); + proto_tree_add_item(evpd_tree, hf_scsi_block_limits_mcawl, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(evpd_tree, hf_scsi_block_limits_otlg, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -2873,9 +2873,9 @@ dissect_scsi_cmddt(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, 1, ENC_BIG_ENDIAN); proto_tree_add_item(cmdt_tree, hf_scsi_inq_devtype, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(cmdt_tree, hf_scsi_inq_cmddt_support, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(cmdt_tree, hf_scsi_inq_cmddt_version, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(cmdt_tree, hf_scsi_inq_cmddt_cdb_size, tvb, offset+5, 1, ENC_NA); + proto_tree_add_item(cmdt_tree, hf_scsi_inq_cmddt_support, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cmdt_tree, hf_scsi_inq_cmddt_version, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cmdt_tree, hf_scsi_inq_cmddt_cdb_size, tvb, offset+5, 1, ENC_BIG_ENDIAN); } } @@ -3333,7 +3333,7 @@ dissect_spc_extcopy(tvbuff_t *tvb, packet_info *pinfo _U_, *seg_tree = NULL, *seg_param_tree = NULL, *cscd_desc_tree; if (isreq && iscdb) { - proto_tree_add_item(tree, hf_scsi_spc_xcopy_service, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_spc_xcopy_service, tvb, offset, 1, ENC_BIG_ENDIAN); serv_action = tvb_get_guint8(tvb, offset) & 0x1F; if (cdata) { cdata->itlq->flags = serv_action; @@ -3346,7 +3346,7 @@ dissect_spc_extcopy(tvbuff_t *tvb, packet_info *pinfo _U_, /*param_list_len = tvb_get_ntohl(tvb, offset); */ offset += 4; - proto_tree_add_item(tree, hf_scsi_reserved_8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_reserved_8, tvb, offset, 1, ENC_BIG_ENDIAN); offset+= 1; proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_control, ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); @@ -3360,7 +3360,7 @@ dissect_spc_extcopy(tvbuff_t *tvb, packet_info *pinfo _U_, return; } if (serv_action == XCOPY_LID1){ - proto_tree_add_item(tree, hf_scsi_spc_xcopy_list_id, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_spc_xcopy_list_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_spc_xcopy_param_byte, ett_xcopy_param_byte, xcopy_param_list_bits, ENC_NA); offset += 1; @@ -3387,7 +3387,7 @@ dissect_spc_extcopy(tvbuff_t *tvb, packet_info *pinfo _U_, cscd_tree = proto_tree_add_subtree_format(cscds_tree, tvb, offset, 32, ett_scsi_xcopy_cscd, NULL, "CSCD descriptor #%u", i); } i++; - proto_tree_add_item(cscd_tree, hf_scsi_spc_xcopy_cscd_desc_type_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(cscd_tree, hf_scsi_spc_xcopy_cscd_desc_type_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_bitmask(cscd_tree, tvb, offset, hf_scsi_spc_xcopy_per_dev_type_byte, ett_xcopy_per_dev_type, per_dev_type_bitmask_fields, ENC_NA); dev_type = tvb_get_guint8(tvb, offset) & 0x1F; @@ -3395,16 +3395,16 @@ dissect_spc_extcopy(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item(cscd_tree, hf_scsi_spc_xcopy_rel_init_port_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; cscd_desc_tree = proto_tree_add_subtree(cscd_tree, tvb, offset, 24, ett_scsi_cscd_desc, NULL, "CSCD descriptor parameters"); - proto_tree_add_item(cscd_desc_tree, hf_scsi_spc_xcopy_cscd_desc_code_set, tvb, offset, 1, ENC_NA); + proto_tree_add_item(cscd_desc_tree, hf_scsi_spc_xcopy_cscd_desc_code_set, tvb, offset, 1, ENC_BIG_ENDIAN); code_set = tvb_get_guint8(tvb, offset) & 0x0F; offset += 1; - proto_tree_add_item(cscd_desc_tree, hf_scsi_spc_xcopy_cscd_desc_assoc, tvb, offset, 1, ENC_NA); - proto_tree_add_item(cscd_desc_tree, hf_scsi_spc_xcopy_cscd_desc_des_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(cscd_desc_tree, hf_scsi_spc_xcopy_cscd_desc_assoc, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cscd_desc_tree, hf_scsi_spc_xcopy_cscd_desc_des_type, tvb, offset, 1, ENC_BIG_ENDIAN); des_type = tvb_get_guint8(tvb, offset) & 0x0F; offset += 1; - proto_tree_add_item(cscd_desc_tree, hf_scsi_reserved_8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(cscd_desc_tree, hf_scsi_reserved_8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cscd_desc_tree, hf_scsi_spc_xcopy_cscd_desc_des_len, tvb, offset, 1, ENC_NA); + proto_tree_add_item(cscd_desc_tree, hf_scsi_spc_xcopy_cscd_desc_des_len, tvb, offset, 1, ENC_BIG_ENDIAN); des_len = tvb_get_guint8(tvb, offset); offset += 1; proto_tree_add_bytes_format(cscd_desc_tree, hf_scsi_designator, tvb, offset, 20, NULL, "Designator (20 bytes, zero padded, used length %u)", des_len); @@ -3414,7 +3414,7 @@ dissect_spc_extcopy(tvbuff_t *tvb, packet_info *pinfo _U_, offset += 20; dev_tree = proto_tree_add_subtree(cscd_tree, tvb, offset, 4, ett_scsi_xcopy_dev_params, NULL, "Device type specific parameters"); if (dev_type == BLOCK_DEV_0 || dev_type == BLOCK_DEV_4 || dev_type == BLOCK_DEV_5 || dev_type == BLOCK_DEV_7 || dev_type == BLOCK_DEV_E) { - proto_tree_add_item(dev_tree, hf_scsi_reserved_8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(dev_tree, hf_scsi_reserved_8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /*TODO: dissect this byte */ proto_tree_add_item(dev_tree, hf_scsi_spc_xcopy_disk_block_len, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; @@ -3437,11 +3437,11 @@ dissect_spc_extcopy(tvbuff_t *tvb, packet_info *pinfo _U_, seg_tree = proto_tree_add_subtree_format(segs_tree, tvb, offset, seg_desc_len + 4, ett_scsi_xcopy_seg, NULL, "Segment descriptor #%u", i); i++; - proto_tree_add_item(seg_tree, hf_scsi_spc_xcopy_seg_desc_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_scsi_spc_xcopy_seg_desc_type, tvb, offset, 1, ENC_BIG_ENDIAN); seg_type = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(seg_tree, hf_scsi_spc_xcopy_seg_desc_dc, tvb, offset, 1, ENC_NA); - proto_tree_add_item(seg_tree, hf_scsi_spc_xcopy_seg_desc_cat, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_scsi_spc_xcopy_seg_desc_dc, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(seg_tree, hf_scsi_spc_xcopy_seg_desc_cat, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(seg_tree, hf_scsi_segment_descriptor_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -3471,13 +3471,13 @@ dissect_spc_extcopy(tvbuff_t *tvb, packet_info *pinfo _U_, /*offset += inline_data_len;*/ } } else if (serv_action == XCOPY_LID4) { - proto_tree_add_item(tree, hf_scsi_spc_xcopy_param_list_format, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_spc_xcopy_param_list_format, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_spc_xcopy_param_byte, ett_xcopy_param_byte, xcopy_param_list_bits, ENC_NA); offset += 1; proto_tree_add_item(tree, hf_scsi_spc_xcopy_head_cscd_desc_list_len, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_scsi_spc_xcopy_head_cscd_desc_type_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_spc_xcopy_head_cscd_desc_type_code, tvb, offset, 1, ENC_BIG_ENDIAN); /*offset += 1;*/ } } @@ -3493,7 +3493,7 @@ void dissect_spc_recvcopy(tvbuff_t *tvb _U_, packet_info *pinfo _U_, guint8 imp_desc_list_len; if (isreq && iscdb) { - proto_tree_add_item(tree, hf_scsi_spc_recv_copy_service, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_spc_recv_copy_service, tvb, offset, 1, ENC_BIG_ENDIAN); serv_action = tvb_get_guint8(tvb, offset) & 0x1F; if (cdata) { cdata->itlq->flags = serv_action; @@ -3503,7 +3503,7 @@ void dissect_spc_recvcopy(tvbuff_t *tvb _U_, packet_info *pinfo _U_, offset += 8; proto_tree_add_item(tree, hf_scsi_alloclen32, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_scsi_reserved_8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_reserved_8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_control, ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); @@ -3519,7 +3519,7 @@ void dissect_spc_recvcopy(tvbuff_t *tvb _U_, packet_info *pinfo _U_, if (serv_action == RECV_COPY_PARAMS) { proto_tree_add_item(tree, hf_scsi_recv_copy_avail_data, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_scsi_recv_copy_snlid, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_recv_copy_snlid, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_scsi_reserved_24, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; @@ -3541,21 +3541,21 @@ void dissect_spc_recvcopy(tvbuff_t *tvb _U_, packet_info *pinfo _U_, offset += 2; proto_tree_add_item(tree, hf_scsi_recv_copy_total_con_copies, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_scsi_recv_copy_max_con_copies, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_recv_copy_max_con_copies, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_scsi_recv_copy_data_seg_gran, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_recv_copy_data_seg_gran, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_scsi_recv_copy_inline_data_gran, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_recv_copy_inline_data_gran, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_scsi_recv_copy_held_data_gran, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_recv_copy_held_data_gran, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_scsi_reserved_24, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; - proto_tree_add_item(tree, hf_scsi_recv_copy_implemented_desc_list_len, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_recv_copy_implemented_desc_list_len, tvb, offset, 1, ENC_BIG_ENDIAN); imp_desc_list_len = tvb_get_guint8(tvb, offset); offset += 1; while (imp_desc_list_len > 0) { - proto_tree_add_item(tree, hf_scsi_spc_xcopy_cscd_desc_type_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_spc_xcopy_cscd_desc_type_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; imp_desc_list_len--; } @@ -3773,7 +3773,7 @@ dissect_scsi_blockdescs(tvbuff_t *tvb, packet_info *pinfo _U_, if (tvb_length_remaining(tvb, offset)<1) return; - proto_tree_add_item(scsi_tree, hf_scsi_blockdescs_density_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(scsi_tree, hf_scsi_blockdescs_density_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* 3 reserved bytes */ @@ -3799,7 +3799,7 @@ dissect_scsi_blockdescs(tvbuff_t *tvb, packet_info *pinfo _U_, } else { if (tvb_length_remaining(tvb, offset)<1) return; - proto_tree_add_item(scsi_tree, hf_scsi_blockdescs_density_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(scsi_tree, hf_scsi_blockdescs_density_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (tvb_length_remaining(tvb, offset)<3) @@ -3837,7 +3837,7 @@ dissect_scsi_spc_modepage(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_scsi_modesns_rac, tvb, offset+4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_modesns_tas, tvb, offset+4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_spc_modepage_swp, tvb, offset+4, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_spc_modepage_autoload_mode, tvb, offset+5, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_spc_modepage_autoload_mode, tvb, offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_spc_modepage_ready_aer_holdoff_period, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_uint(tree, hf_scsi_spc_modepage_busy_timeout_period, tvb, offset+8, 2, tvb_get_ntohs(tvb, offset+8)*100); @@ -3864,8 +3864,8 @@ dissect_scsi_spc_modepage(tvbuff_t *tvb, packet_info *pinfo _U_, } break; case SCSI_SPC_MODEPAGE_DISCON: - proto_tree_add_item(tree, hf_scsi_spc_modepage_buffer_full_ratio, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_spc_modepage_buffer_empty_ratio, tvb, offset+3, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_spc_modepage_buffer_full_ratio, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_spc_modepage_buffer_empty_ratio, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_spc_modepage_bus_inactivity_limit, tvb, offset+4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_spc_modepage_disconnect_time_limit, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_spc_modepage_connect_time_limit, tvb, offset+8, 2, ENC_BIG_ENDIAN); @@ -3920,8 +3920,8 @@ dissect_scsi_spc_modepage(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_scsi_spc_modepage_alwi, tvb, offset+3, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_spc_modepage_dtipe, tvb, offset+3, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_spc_modepage_dtoli, tvb, offset+3, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_spc_modepage_rr_tov_units, tvb, offset+6, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_spc_modepage_rr_tov, tvb, offset+7, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_spc_modepage_rr_tov_units, tvb, offset+6, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_spc_modepage_rr_tov, tvb, offset+7, 1, ENC_BIG_ENDIAN); } else if (proto == SCSI_PROTO_iSCSI) { return FALSE; @@ -3967,21 +3967,21 @@ dissect_scsi_sbc_modepage(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_scsi_sbc_modepage_per, tvb, offset+2, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_sbc_modepage_dte, tvb, offset+2, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_sbc_modepage_dcr, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_sbc_modepage_read_retry_count, tvb, offset+3, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_sbc_modepage_correction_span, tvb, offset+4, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_sbc_modepage_head_offset_count, tvb, offset+5, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_sbc_modepage_data_strobe_offset_count, tvb, offset+6, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_sbc_modepage_write_retry_count, tvb, offset+8, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_sbc_modepage_read_retry_count, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_sbc_modepage_correction_span, tvb, offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_sbc_modepage_head_offset_count, tvb, offset+5, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_sbc_modepage_data_strobe_offset_count, tvb, offset+6, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_sbc_modepage_write_retry_count, tvb, offset+8, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_sbc_modepage_recovery_time_limit, tvb, offset+10, 2, ENC_BIG_ENDIAN); break; case SCSI_SBC_MODEPAGE_DISKGEOM: proto_tree_add_item(tree, hf_scsi_sbc_modepage_number_of_cylinders, tvb, offset+2, 3, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_scsi_sbc_modepage_number_of_heads, tvb, offset+5, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_sbc_modepage_number_of_heads, tvb, offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_sbc_modepage_starting_cyl_pre_compensation, tvb, offset+6, 3, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_sbc_modepage_starting_cyl_reduced_write_current, tvb, offset+9, 3, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_sbc_modepage_device_step_rate, tvb, offset+12, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_sbc_modepage_landing_zone_cyl, tvb, offset+14, 3, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_scsi_sbc_modepage_rotational_offset, tvb, offset+18, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_sbc_modepage_rotational_offset, tvb, offset+18, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_sbc_modepage_medium_rotation_rate, tvb, offset+20, 2, ENC_BIG_ENDIAN); break; case SCSI_SBC_MODEPAGE_FLEXDISK: @@ -3997,8 +3997,8 @@ dissect_scsi_sbc_modepage(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_scsi_sbc_modepage_wce, tvb, offset+2, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_sbc_modepage_mf, tvb, offset+2, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_sbc_modepage_rcd, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_sbc_modepage_demand_read_retention_priority, tvb, offset+3, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_sbc_modepage_write_retention_priority, tvb, offset+3, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_sbc_modepage_demand_read_retention_priority, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_sbc_modepage_write_retention_priority, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_sbc_modepage_disable_pre_fetch_xfer_len, tvb, offset+4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_sbc_modepage_minimum_pre_fetch, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_sbc_modepage_maximum_pre_fetch, tvb, offset+8, 2, ENC_BIG_ENDIAN); @@ -4006,8 +4006,8 @@ dissect_scsi_sbc_modepage(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_scsi_sbc_modepage_fsw, tvb, offset+12, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_sbc_modepage_lbcss, tvb, offset+12, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_sbc_modepage_dra, tvb, offset+12, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_sbc_modepage_vendor_specific, tvb, offset+12, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_sbc_modepage_number_of_cache_segments, tvb, offset+13, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_sbc_modepage_vendor_specific, tvb, offset+12, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_sbc_modepage_number_of_cache_segments, tvb, offset+13, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_sbc_modepage_cache_segment_size, tvb, offset+14, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_sbc_modepage_non_cache_segment_size, tvb, offset+17, 3, ENC_BIG_ENDIAN); break; @@ -4045,16 +4045,16 @@ dissect_scsi_ssc2_modepage(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_scsi_ssc2_modepage_dce, tvb, offset+2, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_dcc, tvb, offset+2, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_dde, tvb, offset+3, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_ssc2_modepage_red, tvb, offset+3, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_ssc2_modepage_red, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_compression_algorithm, tvb, offset+4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_decompression_algorithm, tvb, offset+8, 4, ENC_BIG_ENDIAN); break; case SCSI_SSC2_MODEPAGE_DEVCONF: proto_tree_add_item(tree, hf_scsi_ssc2_modepage_caf, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_ssc2_modepage_active_format, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_ssc2_modepage_active_partition, tvb, offset+3, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_ssc2_modepage_write_object_buffer_full_ratio, tvb, offset+4, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_ssc2_modepage_read_object_buffer_empty_ratio, tvb, offset+5, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_ssc2_modepage_active_format, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_ssc2_modepage_active_partition, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_ssc2_modepage_write_object_buffer_full_ratio, tvb, offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_ssc2_modepage_read_object_buffer_empty_ratio, tvb, offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_uint_format_value(tree, hf_scsi_ssc2_modepage_write_delay_time, tvb, offset+6, 2, tvb_get_ntohs(tvb, offset+6), "%u 100ms", tvb_get_ntohs(tvb, offset+6)); @@ -4062,36 +4062,36 @@ dissect_scsi_ssc2_modepage(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_scsi_ssc2_modepage_lois, tvb, offset+8, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_rsmk, tvb, offset+8, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_avc, tvb, offset+8, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_ssc2_modepage_socf, tvb, offset+8, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_ssc2_modepage_socf, tvb, offset+8, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_robo, tvb, offset+8, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_rew, tvb, offset+8, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_ssc2_modepage_gap_size, tvb, offset+9, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_ssc2_modepage_eod_defined, tvb, offset+10, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_ssc2_modepage_gap_size, tvb, offset+9, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_ssc2_modepage_eod_defined, tvb, offset+10, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_eeg, tvb, offset+10, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_sew, tvb, offset+10, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_swp, tvb, offset+10, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_baml, tvb, offset+10, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_bam, tvb, offset+10, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_object_buffer_size_at_early_warning, tvb, offset+11, 3, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_scsi_ssc2_modepage_select_data_compression_algorithm, tvb, offset+14, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_ssc2_modepage_select_data_compression_algorithm, tvb, offset+14, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_oir, tvb, offset+15, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_ssc2_modepage_rewind_on_reset, tvb, offset+15, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_ssc2_modepage_rewind_on_reset, tvb, offset+15, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_asocwp, tvb, offset+15, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_perswp, tvb, offset+15, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_prmwp, tvb, offset+15, 1, ENC_NA); break; case SCSI_SSC2_MODEPAGE_MEDPAR1: - proto_tree_add_item(tree, hf_scsi_ssc2_modepage_maximum_additional_partitions, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_ssc2_modepage_additional_partitions_defined, tvb, offset+3, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_ssc2_modepage_maximum_additional_partitions, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_ssc2_modepage_additional_partitions_defined, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_fdp, tvb, offset+4, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_dsp, tvb, offset+4, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_idp, tvb, offset+4, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_ssc2_modepage_psum, tvb, offset+4, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_ssc2_modepage_psum, tvb, offset+4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_pofm, tvb, offset+4, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_clear, tvb, offset+4, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_addp, tvb, offset+4, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_ssc2_modepage_media_format_recognition, tvb, offset+5, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_ssc2_modepage_partition_units, tvb, offset+6, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_ssc2_modepage_media_format_recognition, tvb, offset+5, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_ssc2_modepage_partition_units, tvb, offset+6, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_ssc2_modepage_partition_size, tvb, offset+8, 2, ENC_BIG_ENDIAN); break; case SCSI_SSC2_MODEPAGE_MEDPAR2: @@ -4115,21 +4115,21 @@ dissect_scsi_mmc5_modepage(tvbuff_t *tvb _U_, packet_info *pinfo _U_, switch (pcode) { case SCSI_MMC5_MODEPAGE_MRW: - proto_tree_add_item(tree, hf_scsi_mmc5_modepage_lba_space, tvb, offset+3, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_mmc5_modepage_lba_space, tvb, offset+3, 1, ENC_BIG_ENDIAN); break; case SCSI_MMC5_MODEPAGE_WRPARAM: proto_tree_add_item(tree, hf_scsi_mmc5_modepage_bufe, tvb, offset+2, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_ls_v, tvb, offset+2, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_wrparam_test_write, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_mmc5_modepage_write_type, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_mmc5_modepage_wrparam_multi_session, tvb, offset+3, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_mmc5_modepage_write_type, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_mmc5_modepage_wrparam_multi_session, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_fp, tvb, offset+3, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_copy, tvb, offset+3, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_mmc5_modepage_track_mode, tvb, offset+3, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_mmc5_modepage_data_block_type, tvb, offset+4, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_mmc5_modepage_link_size, tvb, offset+5, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_mmc5_modepage_initiator_application_code, tvb, offset+7, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_mmc5_modepage_session_format, tvb, offset+8, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_mmc5_modepage_track_mode, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_mmc5_modepage_data_block_type, tvb, offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_mmc5_modepage_link_size, tvb, offset+5, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_mmc5_modepage_initiator_application_code, tvb, offset+7, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_mmc5_modepage_session_format, tvb, offset+8, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_packet_size, tvb, offset+10, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_audio_pause_length, tvb, offset+14, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_media_catalog_number, tvb, offset+16, 16, ENC_NA|ENC_ASCII); @@ -4171,7 +4171,7 @@ dissect_scsi_mmc5_modepage(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_scsi_mmc5_modepage_rw_supported, tvb, offset+5, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_cd_da_stream_is_accurate, tvb, offset+5, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_cd_da_cmds_supported, tvb, offset+5, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_mmc5_modepage_loading_mechanism_type, tvb, offset+6, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_mmc5_modepage_loading_mechanism_type, tvb, offset+6, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_eject, tvb, offset+6, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_prevent_jumper, tvb, offset+6, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_lock_state, tvb, offset+6, 1, ENC_NA); @@ -4184,12 +4184,12 @@ dissect_scsi_mmc5_modepage(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_scsi_mmc5_modepage_separate_volume_levels, tvb, offset+7, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_number_of_volume_levels_supported, tvb, offset+10, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_buffer_size_supported, tvb, offset+12, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_scsi_mmc5_modepage_length, tvb, offset+17, 1, ENC_NA); - proto_tree_add_item(tree, hf_scsi_mmc5_modepage_lsbf, tvb, offset+17, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_mmc5_modepage_length, tvb, offset+17, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_mmc5_modepage_lsbf, tvb, offset+17, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_rck, tvb, offset+17, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_bckf, tvb, offset+17, 1, ENC_NA); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_copy_management_revision_support, tvb, offset+22, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_scsi_mmc5_modepage_rotation_control_selected, tvb, offset+27, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_mmc5_modepage_rotation_control_selected, tvb, offset+27, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_current_write_speed_selected, tvb, offset+28, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_num_write_speed_performance, tvb, offset+30, 2, ENC_BIG_ENDIAN); break; @@ -4418,7 +4418,7 @@ dissect_spc_modeselect6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, */ if (payload_len < 1) return; - proto_tree_add_item(tree, hf_scsi_modesel_mode_data_length8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_modesel_mode_data_length8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; payload_len -= 1; /* The mode data length is reserved for MODE SELECT, so we just @@ -4429,11 +4429,11 @@ dissect_spc_modeselect6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, switch (cdata->itl->cmdset&SCSI_CMDSET_MASK) { case SCSI_DEV_SBC: - proto_tree_add_item(tree, hf_scsi_modesel_dev_sbc_medium_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_modesel_dev_sbc_medium_type, tvb, offset, 1, ENC_BIG_ENDIAN); break; default: - proto_tree_add_item(tree, hf_scsi_modesel_medium_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_modesel_medium_type, tvb, offset, 1, ENC_BIG_ENDIAN); break; } offset += 1; @@ -4441,14 +4441,14 @@ dissect_spc_modeselect6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (payload_len < 1) return; - proto_tree_add_item(tree, hf_scsi_modesel_device_specific_parameter, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_modesel_device_specific_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; payload_len -= 1; if (payload_len < 1) return; desclen = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_scsi_modesel_block_descriptor_length8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_modesel_block_descriptor_length8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; payload_len -= 1; @@ -4516,11 +4516,11 @@ dissect_spc_modeselect10(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, switch (cdata->itl->cmdset&SCSI_CMDSET_MASK) { case SCSI_DEV_SBC: - proto_tree_add_item(tree, hf_scsi_modesel_dev_sbc_medium_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_modesel_dev_sbc_medium_type, tvb, offset, 1, ENC_BIG_ENDIAN); break; default: - proto_tree_add_item(tree, hf_scsi_modesel_medium_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_modesel_medium_type, tvb, offset, 1, ENC_BIG_ENDIAN); break; } offset += 1; @@ -4528,14 +4528,14 @@ dissect_spc_modeselect10(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (payload_len < 1) return; - proto_tree_add_item(tree, hf_scsi_modesel_device_specific_parameter, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_modesel_device_specific_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; payload_len -= 1; if (payload_len < 1) return; longlba = tvb_get_guint8(tvb, offset) & 0x1; - proto_tree_add_item(tree, hf_scsi_modesel_longlba, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_modesel_longlba, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 2; /* skip LongLBA byte and reserved byte */ payload_len -= 2; @@ -4643,7 +4643,7 @@ dissect_spc_modesense6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * - Page code, Page length, Page Parameters */ tot_len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_scsi_modesel_mode_data_length8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_modesel_mode_data_length8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* The actual payload is the min of the length in the response & the @@ -4658,20 +4658,20 @@ dissect_spc_modesense6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tot_len < 1) return; - proto_tree_add_item(tree, hf_scsi_modesel_medium_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_modesel_medium_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; tot_len -= 1; if (tot_len < 1) return; - proto_tree_add_item(tree, hf_scsi_modesel_device_specific_parameter, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_modesel_device_specific_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; tot_len -= 1; if (tot_len < 1) return; desclen = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_scsi_modesel_block_descriptor_length8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_modesel_block_descriptor_length8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; tot_len -= 1; @@ -4742,27 +4742,27 @@ dissect_spc_modesense10(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tot_len < 1) return; - proto_tree_add_item(tree, hf_scsi_modesel_medium_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_modesel_medium_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; tot_len -= 1; if (tot_len < 1) return; - proto_tree_add_item(tree, hf_scsi_modesel_device_specific_parameter, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_modesel_device_specific_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; tot_len -= 1; if (tot_len < 1) return; longlba = tvb_get_guint8(tvb, offset) & 0x1; - proto_tree_add_item(tree, hf_scsi_modesel_longlba, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_modesel_longlba, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 2; /* skip LongLBA byte and reserved byte */ tot_len -= 2; if (tot_len < 1) return; desclen = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_scsi_modesel_block_descriptor_length8, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_scsi_modesel_block_descriptor_length8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 2; tot_len -= 2; @@ -5248,7 +5248,7 @@ dissect_scsi_fix_snsinfo(tvbuff_t *tvb, proto_tree *sns_tree, guint offset) { proto_item *hidden_item; guint8 flags; - proto_tree_add_item(sns_tree, hf_scsi_sns_valid, tvb, offset, 1, ENC_NA); + proto_tree_add_item(sns_tree, hf_scsi_sns_valid, tvb, offset, 1, ENC_BIG_ENDIAN); flags = tvb_get_guint8(tvb, offset+2); proto_tree_add_item(sns_tree, hf_scsi_sns_filemark, tvb, offset+2, 1, ENC_NA); diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index 3f5068b3cd..02e6bf32d7 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.c @@ -671,7 +671,7 @@ PICS. */ break; } - proto_tree_add_item(param_tree, hf_ses_reason_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_ses_reason_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; param_len--; if (param_len != 0) @@ -761,7 +761,7 @@ dissect_parameter_group(tvbuff_t *tvb, int offset, proto_tree *tree, ett_ses_param, &ti, val_to_str_ext(param_type, ¶m_vals_ext, "Unknown parameter type (0x%02x)")); param_str = val_to_str_ext_const(param_type, ¶m_vals_ext, "Unknown"); - proto_tree_add_item(param_tree, hf_ses_parameter_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_ses_parameter_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; pg_len--; param_len = get_item_len(tvb, offset, &len_len); @@ -831,7 +831,7 @@ dissect_parameters(tvbuff_t *tvb, int offset, guint16 len, proto_tree *tree, val_to_str_ext(param_type, ¶m_vals_ext, "Unknown parameter type (0x%02x)")); param_str = val_to_str_ext_const(param_type, ¶m_vals_ext, "Unknown"); - proto_tree_add_item(param_tree, hf_ses_parameter_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_ses_parameter_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; len--; param_len = get_item_len(tvb, offset, &len_len); diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index 654cd1e0a6..47759b58ad 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -1021,7 +1021,7 @@ dissect_sflow_5_ipv4(tvbuff_t *tvb, proto_tree *tree, gint offset) { offset += 4; /* 7 bits for type of service, plus 1 reserved bit */ - proto_tree_add_item(tree, hf_sflow_245_ipv4_precedence_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_sflow_245_ipv4_precedence_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_sflow_245_ipv4_delay, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_sflow_245_ipv4_throughput, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_sflow_245_ipv4_reliability, tvb, offset, 1, ENC_NA); @@ -1277,7 +1277,7 @@ dissect_sflow_5_extended_80211_payload(tvbuff_t *tvb, proto_tree *tree, gint off if (OUI == 0x000FAC) { proto_tree_add_uint_format_value(tree, hf_sflow_5_extended_80211_oui, tvb, offset, 3, OUI, "Default (0x%X)", OUI); offset += 3; - proto_tree_add_item(tree, hf_sflow_5_extended_80211_suite_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_sflow_5_extended_80211_suite_type, tvb, offset, 1, ENC_BIG_ENDIAN); } else { proto_tree_add_uint_format_value(tree, hf_sflow_5_extended_80211_oui, tvb, offset, 3, OUI, "Other vender (0x%X)", OUI); offset += 3; diff --git a/epan/dissectors/packet-sgsap.c b/epan/dissectors/packet-sgsap.c index 2e82c13991..7751d9a4a2 100644 --- a/epan/dissectors/packet-sgsap.c +++ b/epan/dissectors/packet-sgsap.c @@ -1464,7 +1464,7 @@ dissect_sgsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (msg_str) { col_add_fstr(pinfo->cinfo, COL_INFO, "%s", msg_str); }else{ - proto_tree_add_item(tree, hf_sgsap_unknown_msg, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_sgsap_unknown_msg, tvb, offset, 1, ENC_BIG_ENDIAN); return; } diff --git a/epan/dissectors/packet-skype.c b/epan/dissectors/packet-skype.c index 8ee2c4a2d4..97d1e6774e 100644 --- a/epan/dissectors/packet-skype.c +++ b/epan/dissectors/packet-skype.c @@ -208,9 +208,9 @@ dissect_skype_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(skype_tree, hf_skype_som_unk, tvb, offset, 1, - ENC_NA); + ENC_BIG_ENDIAN); proto_tree_add_item(skype_tree, hf_skype_som_type, tvb, offset, 1, - ENC_NA); + ENC_BIG_ENDIAN); offset += 1; /* Body dissection */ @@ -234,7 +234,7 @@ dissect_skype_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case SKYPE_TYPE_FFR: proto_tree_add_item(skype_tree, hf_skype_ffr_num, tvb, offset, 1, - ENC_NA); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(skype_tree, hf_skype_ffr_unk1, tvb, offset, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-smcr.c b/epan/dissectors/packet-smcr.c index 98debe280c..073e9bebdc 100644 --- a/epan/dissectors/packet-smcr.c +++ b/epan/dissectors/packet-smcr.c @@ -283,7 +283,7 @@ disect_smcr_proposal(tvbuff_t *tvb, proto_tree *tree) proto_tree *proposal_flag_tree; offset = CLC_MSG_START_OFFSET; - proposal_flag_item = proto_tree_add_item(tree, hf_smcr_proposal_flags, tvb, offset, FLAG_BYTE_LEN, ENC_NA); + proposal_flag_item = proto_tree_add_item(tree, hf_smcr_proposal_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); proposal_flag_tree = proto_item_add_subtree(proposal_flag_item, ett_proposal_flag); proto_tree_add_item(proposal_flag_tree, hf_proposal_smc_version, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); offset += FLAG_BYTE_LEN; @@ -330,7 +330,7 @@ disect_smcr_accept(tvbuff_t *tvb, proto_tree *tree) proto_tree *accept_flag2_tree; offset = CLC_MSG_START_OFFSET; - accept_flag_item = proto_tree_add_item(tree, hf_smcr_accept_flags, tvb, offset, FLAG_BYTE_LEN, ENC_NA); + accept_flag_item = proto_tree_add_item(tree, hf_smcr_accept_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); accept_flag_tree = proto_item_add_subtree(accept_flag_item, ett_accept_flag); proto_tree_add_item(accept_flag_tree, hf_accept_smc_version, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(accept_flag_tree, hf_accept_first_contact, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); @@ -356,7 +356,7 @@ disect_smcr_accept(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_smcr_accept_server_rmb_element_alert_token, tvb, offset, ALERT_TOKEN_LEN, ENC_BIG_ENDIAN); offset += ALERT_TOKEN_LEN; - accept_flag2_item = proto_tree_add_item(tree, hf_smcr_accept_flags2, tvb, offset, FLAG_BYTE_LEN, ENC_NA); + accept_flag2_item = proto_tree_add_item(tree, hf_smcr_accept_flags2, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); accept_flag2_tree = proto_item_add_subtree(accept_flag2_item, ett_accept_flag2); proto_tree_add_item(accept_flag2_tree, hf_accept_rmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(accept_flag2_tree, hf_accept_qp_mtu_value, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); @@ -382,7 +382,7 @@ disect_smcr_confirm(tvbuff_t *tvb, proto_tree *tree) proto_tree *confirm_flag2_tree; offset = CLC_MSG_START_OFFSET; - confirm_flag_item = proto_tree_add_item(tree, hf_smcr_confirm_flags, tvb, offset, FLAG_BYTE_LEN, ENC_NA); + confirm_flag_item = proto_tree_add_item(tree, hf_smcr_confirm_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); confirm_flag_tree = proto_item_add_subtree(confirm_flag_item, ett_confirm_flag); proto_tree_add_item(confirm_flag_tree, hf_confirm_smc_version, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); offset += FLAG_BYTE_LEN; @@ -407,7 +407,7 @@ disect_smcr_confirm(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_smcr_confirm_client_rmb_element_alert_token, tvb, offset, ALERT_TOKEN_LEN, ENC_BIG_ENDIAN); offset += ALERT_TOKEN_LEN; - confirm_flag2_item = proto_tree_add_item(tree, hf_smcr_confirm_flags2, tvb, offset, FLAG_BYTE_LEN, ENC_NA); + confirm_flag2_item = proto_tree_add_item(tree, hf_smcr_confirm_flags2, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); confirm_flag2_tree = proto_item_add_subtree(confirm_flag2_item, ett_confirm_flag2); proto_tree_add_item(confirm_flag2_tree, hf_confirm_rmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(confirm_flag2_tree, hf_confirm_qp_mtu_value, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); @@ -447,7 +447,7 @@ disect_smcr_confirm_link(tvbuff_t *tvb, proto_tree *tree) proto_tree *confirm_flag_tree; offset = LLC_MSG_START_OFFSET; - confirm_flag_item = proto_tree_add_item(tree, hf_smcr_confirm_link_flags, tvb, offset, FLAG_BYTE_LEN, ENC_NA); + confirm_flag_item = proto_tree_add_item(tree, hf_smcr_confirm_link_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); confirm_flag_tree = proto_item_add_subtree(confirm_flag_item, ett_confirm_link_flag); proto_tree_add_item(confirm_flag_tree, hf_smcr_confirm_link_response, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); @@ -481,7 +481,7 @@ disect_smcr_add_link(tvbuff_t *tvb, proto_tree *tree) proto_tree *add_link_flag2_tree; offset = LLC_MSG_START_OFFSET; - add_link_flag_item = proto_tree_add_item(tree, hf_smcr_add_link_flags, tvb, offset, FLAG_BYTE_LEN, ENC_NA); + add_link_flag_item = proto_tree_add_item(tree, hf_smcr_add_link_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); add_link_flag_tree = proto_item_add_subtree(add_link_flag_item, ett_add_link_flag); proto_tree_add_item(add_link_flag_tree, hf_smcr_add_link_response, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(add_link_flag_tree, hf_smcr_add_link_response_rejected, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); @@ -500,7 +500,7 @@ disect_smcr_add_link(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_smcr_add_link_number, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - add_link_flag2_item = proto_tree_add_item(tree, hf_smcr_add_link_flags2, tvb, offset, 1, ENC_NA); + add_link_flag2_item = proto_tree_add_item(tree, hf_smcr_add_link_flags2, tvb, offset, 1, ENC_BIG_ENDIAN); add_link_flag2_tree = proto_item_add_subtree(add_link_flag2_item, ett_add_link_flag2); proto_tree_add_item(add_link_flag2_tree, hf_smcr_add_link_qp_mtu_value, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -517,7 +517,7 @@ disect_smcr_add_continuation(tvbuff_t *tvb, proto_tree *tree) proto_tree *add_link_flag_tree; offset = LLC_MSG_START_OFFSET; - add_link_flag_item = proto_tree_add_item(tree, hf_smcr_add_link_cont_flags, tvb, offset, FLAG_BYTE_LEN, ENC_NA); + add_link_flag_item = proto_tree_add_item(tree, hf_smcr_add_link_cont_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); add_link_flag_tree = proto_item_add_subtree(add_link_flag_item, ett_add_link_cont_flag); proto_tree_add_item(add_link_flag_tree, hf_smcr_add_link_cont_response, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); offset += FLAG_BYTE_LEN; @@ -561,7 +561,7 @@ disect_smcr_delete_link(tvbuff_t *tvb, proto_tree *tree) proto_tree *delete_link_flag_tree; offset = LLC_MSG_START_OFFSET; - delete_link_flag_item = proto_tree_add_item(tree, hf_smcr_delete_link_flags, tvb, offset, FLAG_BYTE_LEN, ENC_NA); + delete_link_flag_item = proto_tree_add_item(tree, hf_smcr_delete_link_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); delete_link_flag_tree = proto_item_add_subtree(delete_link_flag_item, ett_delete_link_flag); proto_tree_add_item(delete_link_flag_tree, hf_smcr_delete_link_response, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(delete_link_flag_tree, hf_smcr_delete_link_all, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); @@ -583,7 +583,7 @@ disect_smcr_confirm_rkey(tvbuff_t *tvb, proto_tree *tree) proto_tree *confirm_rkey_flag_tree; offset = LLC_MSG_START_OFFSET; - confirm_rkey_flag_item = proto_tree_add_item(tree, hf_smcr_confirm_rkey_flags, tvb, offset, FLAG_BYTE_LEN, ENC_NA); + confirm_rkey_flag_item = proto_tree_add_item(tree, hf_smcr_confirm_rkey_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); confirm_rkey_flag_tree = proto_item_add_subtree(confirm_rkey_flag_item, ett_confirm_rkey_flag); proto_tree_add_item(confirm_rkey_flag_tree, hf_smcr_confirm_rkey_response, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(confirm_rkey_flag_tree, hf_smcr_confirm_rkey_negative_response, @@ -627,7 +627,7 @@ disect_smcr_confirm_rkey_cont(tvbuff_t *tvb, proto_tree *tree) guint8 num_entries; offset = LLC_MSG_START_OFFSET; - confirm_rkey_flag_item = proto_tree_add_item(tree, hf_smcr_confirm_rkey_flags, tvb, offset, FLAG_BYTE_LEN, ENC_NA); + confirm_rkey_flag_item = proto_tree_add_item(tree, hf_smcr_confirm_rkey_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); confirm_rkey_flag_tree = proto_item_add_subtree(confirm_rkey_flag_item, ett_confirm_rkey_flag); proto_tree_add_item(confirm_rkey_flag_tree, hf_smcr_confirm_rkey_response, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(confirm_rkey_flag_tree, hf_smcr_confirm_rkey_negative_response, @@ -664,7 +664,7 @@ disect_smcr_delete_rkey(tvbuff_t *tvb, proto_tree *tree) proto_tree *delete_rkey_flag_tree; offset = LLC_MSG_START_OFFSET; - delete_rkey_flag_item = proto_tree_add_item(tree, hf_smcr_delete_rkey_flags, tvb, offset, FLAG_BYTE_LEN, ENC_NA); + delete_rkey_flag_item = proto_tree_add_item(tree, hf_smcr_delete_rkey_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); delete_rkey_flag_tree = proto_item_add_subtree(delete_rkey_flag_item, ett_delete_rkey_flag); proto_tree_add_item(delete_rkey_flag_tree, hf_smcr_delete_rkey_response, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(delete_rkey_flag_tree, hf_smcr_delete_rkey_negative_response, @@ -688,7 +688,7 @@ disect_smcr_test_link(tvbuff_t *tvb, proto_tree *tree) proto_tree *test_link_flag_tree; offset = LLC_MSG_START_OFFSET; - test_link_flag_item = proto_tree_add_item(tree, hf_smcr_test_link_flags, tvb, offset, FLAG_BYTE_LEN, ENC_NA); + test_link_flag_item = proto_tree_add_item(tree, hf_smcr_test_link_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); test_link_flag_tree = proto_item_add_subtree(test_link_flag_item, ett_test_link_flag); proto_tree_add_item(test_link_flag_tree, hf_smcr_test_link_response, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); } @@ -719,7 +719,7 @@ disect_smcr_rmbe_ctrl(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_smcr_rmbe_ctrl_peer_cons_curs, tvb, offset, CURSOR_LEN, ENC_BIG_ENDIAN); offset += CURSOR_LEN; rmbe_ctrl_rw_status_flag_item = - proto_tree_add_item(tree, hf_smcr_rmbe_ctrl_conn_rw_status_flags, tvb, offset, FLAG_BYTE_LEN, ENC_NA); + proto_tree_add_item(tree, hf_smcr_rmbe_ctrl_conn_rw_status_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); rmbe_ctrl_rw_status_flag_tree = proto_item_add_subtree(rmbe_ctrl_rw_status_flag_item, ett_rmbe_ctrl_rw_status_flag); proto_tree_add_item(rmbe_ctrl_rw_status_flag_tree, hf_smcr_rmbe_ctrl_write_blocked, @@ -732,7 +732,7 @@ disect_smcr_rmbe_ctrl(tvbuff_t *tvb, proto_tree *tree) tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); offset += FLAG_BYTE_LEN; rmbe_ctrl_peer_conn_state_flag_item = - proto_tree_add_item(tree, hf_smcr_rmbe_ctrl_peer_conn_state_flags, tvb, offset, FLAG_BYTE_LEN, ENC_NA); + proto_tree_add_item(tree, hf_smcr_rmbe_ctrl_peer_conn_state_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); rmbe_ctrl_peer_conn_state_flag_tree = proto_item_add_subtree(rmbe_ctrl_peer_conn_state_flag_item, ett_rmbe_ctrl_peer_conn_state_flag); proto_tree_add_item(rmbe_ctrl_peer_conn_state_flag_tree, hf_smcr_rmbe_ctrl_peer_sending_done, diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index e685dcd881..81f45e3147 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -256,7 +256,7 @@ static int display_address(tvbuff_t *tvb, int offset, proto_tree *tree) { int a_type = tvb_get_guint8(tvb, offset); - proto_tree_add_item( tree, hf_socks_address_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item( tree, hf_socks_address_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; switch (a_type) @@ -357,7 +357,7 @@ socks_udp_dissector(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_item(socks_tree, hf_socks_reserved2, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(socks_tree, hf_socks_fragment_number, tvb, offset, 1, ENC_NA); + proto_tree_add_item(socks_tree, hf_socks_fragment_number, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; offset = display_address( tvb, offset, socks_tree); @@ -445,7 +445,7 @@ display_socks_v4(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item( tree, hf_socks_cmd, tvb, offset, 1, ENC_NA); + proto_tree_add_item( tree, hf_socks_cmd, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Do remote port */ @@ -528,7 +528,7 @@ client_display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, num_auth_methods = tvb_get_guint8(tvb, offset); proto_item_set_len(ti, num_auth_methods+1); - proto_tree_add_item( AuthTree, hf_client_auth_method_count, tvb, offset, 1, ENC_NA); + proto_tree_add_item( AuthTree, hf_client_auth_method_count, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; for( i = 0; i < num_auth_methods; ++i) { @@ -550,10 +550,10 @@ client_display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, } else if (state_info->client == clientV5Command) { - proto_tree_add_item( tree, hf_socks_cmd, tvb, offset, 1, ENC_NA); + proto_tree_add_item( tree, hf_socks_cmd, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item( tree, hf_socks_reserved, tvb, offset, 1, ENC_NA); + proto_tree_add_item( tree, hf_socks_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; offset = display_address(tvb, offset, tree); @@ -627,7 +627,7 @@ server_display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, case serverUserReply: auth_status = tvb_get_guint8(tvb, offset); - ti = proto_tree_add_item(tree, hf_server_auth_status, tvb, offset, 1, ENC_NA); + ti = proto_tree_add_item(tree, hf_server_auth_status, tvb, offset, 1, ENC_BIG_ENDIAN); if(auth_status != 0) proto_item_append_text(ti, " (failure)"); else diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c index d2aee32869..427f35c578 100644 --- a/epan/dissectors/packet-spdy.c +++ b/epan/dissectors/packet-spdy.c @@ -1402,7 +1402,7 @@ static int dissect_spdy_settings_payload( /* Set flags. */ if (setting_tree) { - ti = proto_tree_add_item(setting_tree, hf_spdy_flags, tvb, offset, 1, ENC_NA); + ti = proto_tree_add_item(setting_tree, hf_spdy_flags, tvb, offset, 1, ENC_BIG_ENDIAN); /* TODO(hkhalil): Prettier output for flags sub-tree description. */ flags_tree = proto_item_add_subtree(ti, ett_spdy_flags); diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index b52f0c6bb3..77fbc645d6 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -563,7 +563,7 @@ ssh_dissect_ssh1(tvbuff_t *tvb, packet_info *pinfo, ((peer_data->frame_key_start >= pinfo->fd->num) && (pinfo->fd->num <= peer_data->frame_key_end))) { msg_code = tvb_get_guint8(tvb, offset); - proto_tree_add_item(ssh1_tree, hf_ssh_msg_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ssh1_tree, hf_ssh_msg_code, tvb, offset, 1, ENC_BIG_ENDIAN); col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, val_to_str(msg_code, ssh1_msg_vals, "Unknown (%u)")); offset += 1; @@ -703,7 +703,7 @@ ssh_dissect_key_exchange(tvbuff_t *tvb, packet_info *pinfo, if (msg_code >= 30 && msg_code < 40) { offset = global_data->kex_specific_dissector(msg_code, tvb, pinfo, offset, key_ex_tree); } else { - proto_tree_add_item(key_ex_tree, hf_ssh2_msg_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(key_ex_tree, hf_ssh2_msg_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, @@ -767,7 +767,7 @@ ssh_dissect_key_exchange(tvbuff_t *tvb, packet_info *pinfo, static int ssh_dissect_kex_dh(guint8 msg_code, tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_ssh2_kex_dh_msg_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ssh2_kex_dh_msg_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, @@ -791,7 +791,7 @@ static int ssh_dissect_kex_dh(guint8 msg_code, tvbuff_t *tvb, static int ssh_dissect_kex_dh_gex(guint8 msg_code, tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_ssh2_kex_dh_gex_msg_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ssh2_kex_dh_gex_msg_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 3c0dd5f05a..c0d748e8df 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -2218,7 +2218,7 @@ dissect_ssl3_hnd_encrypted_exts(tvbuff_t *tvb, proto_tree *tree, selected_protocol_len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_ssl_handshake_npn_selected_protocol_len, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(tree, hf_ssl_handshake_npn_selected_protocol, tvb, offset, selected_protocol_len, ENC_ASCII|ENC_NA); @@ -2226,7 +2226,7 @@ dissect_ssl3_hnd_encrypted_exts(tvbuff_t *tvb, proto_tree *tree, padding_len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_ssl_handshake_npn_padding_len, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(tree, hf_ssl_handshake_npn_padding, tvb, offset, padding_len, ENC_NA); diff --git a/epan/dissectors/packet-stanag4607.c b/epan/dissectors/packet-stanag4607.c index f7a65ca32e..d6ec05b70b 100644 --- a/epan/dissectors/packet-stanag4607.c +++ b/epan/dissectors/packet-stanag4607.c @@ -504,15 +504,15 @@ dissect_mission(tvbuff_t *tvb, proto_tree *seg_tree, gint offset) offset += 12; proto_tree_add_item(seg_tree, hf_4607_mission_flight_plan, tvb, offset, 12, ENC_ASCII|ENC_NA); offset += 12; - proto_tree_add_item(seg_tree, hf_4607_mission_platform, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_mission_platform, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(seg_tree, hf_4607_mission_platform_config, tvb, offset, 10, ENC_ASCII|ENC_NA); offset += 10; proto_tree_add_item(seg_tree, hf_4607_mission_time_year, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(seg_tree, hf_4607_mission_time_month, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_mission_time_month, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(seg_tree, hf_4607_mission_time_day, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_mission_time_day, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; return offset; @@ -585,15 +585,15 @@ dissect_target(tvbuff_t *tvb, proto_tree *seg_tree, gint offset, guint64 mask) offset += 2; } if (SET(mask, D32_9)) { - proto_tree_add_item(rpt_tree, hf_4607_dwell_report_snr, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rpt_tree, hf_4607_dwell_report_snr, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } if (SET(mask, D32_10)) { - proto_tree_add_item(rpt_tree, hf_4607_dwell_report_class, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rpt_tree, hf_4607_dwell_report_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } if (SET(mask, D32_11)) { - proto_tree_add_item(rpt_tree, hf_4607_dwell_report_prob, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rpt_tree, hf_4607_dwell_report_prob, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } if (SET(mask, D32_12)) { @@ -601,19 +601,19 @@ dissect_target(tvbuff_t *tvb, proto_tree *seg_tree, gint offset, guint64 mask) offset += 2; proto_tree_add_item(rpt_tree, hf_4607_dwell_report_unc_cross, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(rpt_tree, hf_4607_dwell_report_unc_height, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rpt_tree, hf_4607_dwell_report_unc_height, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(rpt_tree, hf_4607_dwell_report_unc_radial, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } if (SET(mask, D32_16)) { - proto_tree_add_item(rpt_tree, hf_4607_dwell_report_tag_app, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rpt_tree, hf_4607_dwell_report_tag_app, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(rpt_tree, hf_4607_dwell_report_tag_entity, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } if (SET(mask, D32_18)) { - proto_tree_add_item(rpt_tree, hf_4607_dwell_report_section, tvb, offset, 1, ENC_NA); + proto_tree_add_item(rpt_tree, hf_4607_dwell_report_section, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } @@ -635,7 +635,7 @@ dissect_dwell(tvbuff_t *tvb, proto_tree *seg_tree, gint offset) offset += 2; proto_tree_add_item(seg_tree, hf_4607_dwell_dwell_index, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(seg_tree, hf_4607_dwell_last_dwell, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_dwell_last_dwell, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* count of target reports */ @@ -670,11 +670,11 @@ dissect_dwell(tvbuff_t *tvb, proto_tree *seg_tree, gint offset) offset += 2; proto_tree_add_item(seg_tree, hf_4607_dwell_speed, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(seg_tree, hf_4607_dwell_vert_velocity, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_dwell_vert_velocity, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } if (SET(mask, D18)) { - proto_tree_add_item(seg_tree, hf_4607_dwell_track_unc, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_dwell_track_unc, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(seg_tree, hf_4607_dwell_speed_unc, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -709,7 +709,7 @@ dissect_dwell(tvbuff_t *tvb, proto_tree *seg_tree, gint offset) offset += 2; } if (SET(mask, D31)) { - proto_tree_add_item(seg_tree, hf_4607_dwell_mdv, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_dwell_mdv, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } @@ -726,13 +726,13 @@ dissect_jobdef(tvbuff_t *tvb, proto_tree *seg_tree, gint offset) { proto_tree_add_item(seg_tree, hf_4607_jobdef_job_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(seg_tree, hf_4607_jobdef_sensor_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_jobdef_sensor_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(seg_tree, hf_4607_jobdef_sensor_model, tvb, offset, 6, ENC_ASCII|ENC_NA); offset += 6; - proto_tree_add_item(seg_tree, hf_4607_jobdef_filter, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_jobdef_filter, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(seg_tree, hf_4607_jobdef_priority, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_jobdef_priority, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(seg_tree, hf_4607_jobdef_ba_lat_a, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -750,7 +750,7 @@ dissect_jobdef(tvbuff_t *tvb, proto_tree *seg_tree, gint offset) offset += 4; proto_tree_add_item(seg_tree, hf_4607_jobdef_ba_lon_d, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(seg_tree, hf_4607_jobdef_radar_mode, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_jobdef_radar_mode, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(seg_tree, hf_4607_jobdef_revisit_interval, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -760,7 +760,7 @@ dissect_jobdef(tvbuff_t *tvb, proto_tree *seg_tree, gint offset) offset += 2; proto_tree_add_item(seg_tree, hf_4607_jobdef_unc_alt, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(seg_tree, hf_4607_jobdef_unc_heading, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_jobdef_unc_heading, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(seg_tree, hf_4607_jobdef_unc_speed, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -770,15 +770,15 @@ dissect_jobdef(tvbuff_t *tvb, proto_tree *seg_tree, gint offset) offset += 2; proto_tree_add_item(seg_tree, hf_4607_jobdef_sense_vlos, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(seg_tree, hf_4607_jobdef_sense_mdv, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_jobdef_sense_mdv, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(seg_tree, hf_4607_jobdef_sense_prob, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_jobdef_sense_prob, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(seg_tree, hf_4607_jobdef_sense_alarm, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_jobdef_sense_alarm, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(seg_tree, hf_4607_jobdef_terrain_model, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_jobdef_terrain_model, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(seg_tree, hf_4607_jobdef_geoid_model, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_jobdef_geoid_model, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; return offset; @@ -799,7 +799,7 @@ dissect_platform_location(tvbuff_t *tvb, proto_tree *seg_tree, gint offset) offset += 2; proto_tree_add_item(seg_tree, hf_4607_platloc_speed, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(seg_tree, hf_4607_platloc_vertical_velocity, tvb, offset, 1, ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_platloc_vertical_velocity, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; return offset; } @@ -864,10 +864,10 @@ dissect_stanag4607(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(hdr_tree, hf_4607_version, tvb, 0, 2, ENC_ASCII|ENC_NA); ti = proto_tree_add_item(hdr_tree, hf_4607_packet_size, tvb, 2, 4, ENC_BIG_ENDIAN); proto_tree_add_item(hdr_tree, hf_4607_nationality, tvb, 6, 2, ENC_ASCII|ENC_NA); - proto_tree_add_item(hdr_tree, hf_4607_sec_class, tvb, 8, 1, ENC_NA); + proto_tree_add_item(hdr_tree, hf_4607_sec_class, tvb, 8, 1, ENC_BIG_ENDIAN); proto_tree_add_item(hdr_tree, hf_4607_sec_system, tvb, 9, 2, ENC_ASCII|ENC_NA); proto_tree_add_item(hdr_tree, hf_4607_sec_code, tvb, 11, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(hdr_tree, hf_4607_exercise_indicator, tvb, 13, 1, ENC_NA); + proto_tree_add_item(hdr_tree, hf_4607_exercise_indicator, tvb, 13, 1, ENC_BIG_ENDIAN); proto_tree_add_item(hdr_tree, hf_4607_platform_id, tvb, 14, 10, ENC_ASCII|ENC_NA); proto_tree_add_item(hdr_tree, hf_4607_mission_id, tvb, 24, 4, ENC_BIG_ENDIAN); proto_tree_add_item(hdr_tree, hf_4607_job_id, tvb, 28, 4, ENC_BIG_ENDIAN); @@ -889,7 +889,7 @@ dissect_stanag4607(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item * pi; /* Segment header */ - seg_type = proto_tree_add_item(hdr_tree, hf_4607_segment_type, tvb, offset, 1, ENC_NA); + seg_type = proto_tree_add_item(hdr_tree, hf_4607_segment_type, tvb, offset, 1, ENC_BIG_ENDIAN); seg_id = tvb_get_guint8(tvb, offset); offset += 1; diff --git a/epan/dissectors/packet-swipe.c b/epan/dissectors/packet-swipe.c index 962734e003..1c892227da 100644 --- a/epan/dissectors/packet-swipe.c +++ b/epan/dissectors/packet-swipe.c @@ -73,10 +73,10 @@ dissect_swipe(tvbuff_t *tvb, packet_info * pinfo, proto_tree *tree, void* data _ swipe_tree = proto_item_add_subtree(ti, ett_swipe); /* Packet Type */ - proto_tree_add_item(swipe_tree, hf_swipe_packet_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(swipe_tree, hf_swipe_packet_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* Header Length */ - proto_tree_add_item(swipe_tree, hf_swipe_len, tvb, offset + 1, 1, ENC_NA); + proto_tree_add_item(swipe_tree, hf_swipe_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN); /* Policy ID */ proto_tree_add_item(swipe_tree, hf_swipe_policy_id, tvb, offset + 2, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index 4e913bb7ab..18505839cd 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -424,15 +424,15 @@ proto_tree_add_tacplus_common_fields( tvbuff_t *tvb, proto_tree *tree, int offs { int val; /* priv_lvl */ - proto_tree_add_item(tree, hf_tacplus_privilege_level, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_tacplus_privilege_level, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* authen_type */ - proto_tree_add_item(tree, hf_tacplus_authentication_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_tacplus_authentication_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* service */ - proto_tree_add_item(tree, hf_tacplus_service, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_tacplus_service, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* user_len && user */ @@ -474,25 +474,25 @@ dissect_tacplus_body_authen_req_login( tvbuff_t* tvb, proto_tree *tree, int var_ switch ( tvb_get_guint8(tvb, AUTHEN_S_AUTHEN_TYPE_OFF ) ) { /* authen_type */ case TAC_PLUS_AUTHEN_TYPE_ASCII: - proto_tree_add_item(tree, hf_tacplus_ascii_length, tvb, AUTHEN_S_DATA_LEN_OFF, 1, ENC_NA); + proto_tree_add_item(tree, hf_tacplus_ascii_length, tvb, AUTHEN_S_DATA_LEN_OFF, 1, ENC_BIG_ENDIAN); if( val ) proto_tree_add_item( tree, hf_tacplus_data, tvb, var_off, val, ENC_NA); break; case TAC_PLUS_AUTHEN_TYPE_PAP: - proto_tree_add_item(tree, hf_tacplus_password_length, tvb, AUTHEN_S_DATA_LEN_OFF, 1, ENC_NA); + proto_tree_add_item(tree, hf_tacplus_password_length, tvb, AUTHEN_S_DATA_LEN_OFF, 1, ENC_BIG_ENDIAN); if( val ) { proto_tree_add_item(tree, hf_tacplus_auth_password, tvb, var_off, val, ENC_ASCII|ENC_NA); } break; case TAC_PLUS_AUTHEN_TYPE_CHAP: - proto_tree_add_item(tree, hf_tacplus_chap_data_length, tvb, AUTHEN_S_DATA_LEN_OFF, 1, ENC_NA); + proto_tree_add_item(tree, hf_tacplus_chap_data_length, tvb, AUTHEN_S_DATA_LEN_OFF, 1, ENC_BIG_ENDIAN); if( val ) { proto_tree *pt; guint8 chal_len=val-(1+16); /* Response field alwayes 16 octets */ pt = proto_tree_add_subtree(tree, tvb, var_off, val, ett_tacplus_body_chap, NULL, "CHAP Data" ); - proto_tree_add_item(pt, hf_tacplus_chap_id, tvb, var_off, 1, ENC_NA); + proto_tree_add_item(pt, hf_tacplus_chap_id, tvb, var_off, 1, ENC_BIG_ENDIAN); var_off++; proto_tree_add_item(pt, hf_tacplus_chap_challenge, tvb, var_off, chal_len, ENC_ASCII|ENC_NA); var_off+=chal_len; @@ -500,12 +500,12 @@ dissect_tacplus_body_authen_req_login( tvbuff_t* tvb, proto_tree *tree, int var_ } break; case TAC_PLUS_AUTHEN_TYPE_MSCHAP: - proto_tree_add_item(tree, hf_tacplus_mschap_data_length, tvb, AUTHEN_S_DATA_LEN_OFF, 1, ENC_NA); + proto_tree_add_item(tree, hf_tacplus_mschap_data_length, tvb, AUTHEN_S_DATA_LEN_OFF, 1, ENC_BIG_ENDIAN); if( val ) { proto_tree *pt; guint8 chal_len=val-(1+49); /* Response field alwayes 49 octets */ pt = proto_tree_add_subtree(tree, tvb, var_off, val, ett_tacplus_body_chap, NULL, "MSCHAP Data" ); - proto_tree_add_item(pt, hf_tacplus_mschap_id, tvb, var_off, 1, ENC_NA); + proto_tree_add_item(pt, hf_tacplus_mschap_id, tvb, var_off, 1, ENC_BIG_ENDIAN); var_off++; proto_tree_add_item(pt, hf_tacplus_mschap_challenge, tvb, var_off, chal_len, ENC_ASCII|ENC_NA); var_off+=chal_len; @@ -513,7 +513,7 @@ dissect_tacplus_body_authen_req_login( tvbuff_t* tvb, proto_tree *tree, int var_ } break; case TAC_PLUS_AUTHEN_TYPE_ARAP: - proto_tree_add_item(tree, hf_tacplus_arap_data_length, tvb, AUTHEN_S_DATA_LEN_OFF, 1, ENC_NA); + proto_tree_add_item(tree, hf_tacplus_arap_data_length, tvb, AUTHEN_S_DATA_LEN_OFF, 1, ENC_BIG_ENDIAN); if( val ) { proto_tree *pt; pt = proto_tree_add_subtree(tree, tvb, var_off, val, ett_tacplus_body_chap, NULL, "ARAP Data" ); @@ -526,7 +526,7 @@ dissect_tacplus_body_authen_req_login( tvbuff_t* tvb, proto_tree *tree, int var_ break; default: /* Should not be reached */ - proto_tree_add_item(tree, hf_tacplus_data_length, tvb, AUTHEN_S_DATA_LEN_OFF, 1, ENC_NA); + proto_tree_add_item(tree, hf_tacplus_data_length, tvb, AUTHEN_S_DATA_LEN_OFF, 1, ENC_BIG_ENDIAN); if( val ){ proto_tree_add_item( tree, hf_tacplus_data, tvb, var_off, val, ENC_NA); } @@ -541,7 +541,7 @@ dissect_tacplus_body_authen_req( tvbuff_t* tvb, proto_tree *tree ) /* Action */ val=tvb_get_guint8( tvb, AUTHEN_S_ACTION_OFF ); - proto_tree_add_item(tree, hf_tacplus_authen_action, tvb, AUTHEN_S_ACTION_OFF, 1, ENC_NA); + proto_tree_add_item(tree, hf_tacplus_authen_action, tvb, AUTHEN_S_ACTION_OFF, 1, ENC_BIG_ENDIAN); var_off=proto_tree_add_tacplus_common_fields( tvb, tree , AUTHEN_S_PRIV_LVL_OFF, AUTHEN_S_VARDATA_OFF ); switch( val ) { @@ -561,7 +561,7 @@ dissect_tacplus_body_authen_req_cont( tvbuff_t *tvb, proto_tree *tree ) proto_item* ti; val=tvb_get_guint8( tvb, AUTHEN_C_FLAGS_OFF ); - ti = proto_tree_add_item(tree, hf_tacplus_body_authen_req_cont_flags, tvb, AUTHEN_C_FLAGS_OFF, 1, ENC_NA); + ti = proto_tree_add_item(tree, hf_tacplus_body_authen_req_cont_flags, tvb, AUTHEN_C_FLAGS_OFF, 1, ENC_BIG_ENDIAN); if (val&TAC_PLUS_CONTINUE_FLAG_ABORT) proto_item_append_text(ti, "(Abort)"); @@ -588,10 +588,10 @@ dissect_tacplus_body_authen_rep( tvbuff_t *tvb, proto_tree *tree ) int var_off=AUTHEN_R_VARDATA_OFF; proto_item* ti; - proto_tree_add_item(tree, hf_tacplus_body_authen_rep_status, tvb, AUTHEN_R_STATUS_OFF, 1, ENC_NA); + proto_tree_add_item(tree, hf_tacplus_body_authen_rep_status, tvb, AUTHEN_R_STATUS_OFF, 1, ENC_BIG_ENDIAN); val=tvb_get_guint8( tvb, AUTHEN_R_FLAGS_OFF ); - ti = proto_tree_add_item(tree, hf_tacplus_body_authen_rep_flags, tvb, AUTHEN_R_FLAGS_OFF, 1, ENC_NA); + ti = proto_tree_add_item(tree, hf_tacplus_body_authen_rep_flags, tvb, AUTHEN_R_FLAGS_OFF, 1, ENC_BIG_ENDIAN); if (val&TAC_PLUS_REPLY_FLAG_NOECHO) proto_item_append_text(ti, "(NoEcho)"); @@ -616,14 +616,14 @@ dissect_tacplus_body_author_req( tvbuff_t* tvb, proto_tree *tree ) int val; int var_off; - proto_tree_add_item(tree, hf_tacplus_body_author_req_auth_method, tvb, AUTHOR_Q_AUTH_METH_OFF, 1, ENC_NA); + proto_tree_add_item(tree, hf_tacplus_body_author_req_auth_method, tvb, AUTHOR_Q_AUTH_METH_OFF, 1, ENC_BIG_ENDIAN); val = tvb_get_guint8( tvb, AUTHOR_Q_ARGC_OFF ); var_off=proto_tree_add_tacplus_common_fields( tvb, tree , AUTHOR_Q_PRIV_LVL_OFF, AUTHOR_Q_VARDATA_OFF + val); - proto_tree_add_item(tree, hf_tacplus_body_author_req_arg_count, tvb, AUTHOR_Q_ARGC_OFF, 1, ENC_NA); + proto_tree_add_item(tree, hf_tacplus_body_author_req_arg_count, tvb, AUTHOR_Q_ARGC_OFF, 1, ENC_BIG_ENDIAN); /* var_off points after rem_addr */ @@ -636,7 +636,7 @@ dissect_tacplus_body_author_rep( tvbuff_t* tvb, proto_tree *tree ) int offset=AUTHOR_R_VARDATA_OFF; int val; - proto_tree_add_item(tree, hf_tacplus_body_author_rep_auth_status, tvb, AUTHOR_R_STATUS_OFF, 1, ENC_NA); + proto_tree_add_item(tree, hf_tacplus_body_author_rep_auth_status, tvb, AUTHOR_R_STATUS_OFF, 1, ENC_BIG_ENDIAN); val=tvb_get_ntohs( tvb, AUTHOR_R_SRV_MSG_LEN_OFF ); offset+=val; @@ -648,7 +648,7 @@ dissect_tacplus_body_author_rep( tvbuff_t* tvb, proto_tree *tree ) val=tvb_get_guint8( tvb, AUTHOR_R_ARGC_OFF); offset+=val; - proto_tree_add_item(tree, hf_tacplus_body_author_rep_arg_count, tvb, AUTHOR_R_ARGC_OFF, 1, ENC_NA); + proto_tree_add_item(tree, hf_tacplus_body_author_rep_arg_count, tvb, AUTHOR_R_ARGC_OFF, 1, ENC_BIG_ENDIAN); dissect_tacplus_args_list( tvb, tree, offset, AUTHOR_R_VARDATA_OFF, val ); } diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 0668b4542f..347bdb9698 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -2600,14 +2600,14 @@ dissect_tcpopt_wscale(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, wscale_tree = proto_tree_add_subtree(opt_tree, tvb, offset, 3, ett_tcp_option_wscale, &wscale_pi, "Window scale: "); - proto_tree_add_item(wscale_tree, hf_tcp_option_kind, tvb, offset, 1, ENC_NA); + proto_tree_add_item(wscale_tree, hf_tcp_option_kind, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(wscale_tree, hf_tcp_option_len, tvb, offset, 1, ENC_NA); + proto_tree_add_item(wscale_tree, hf_tcp_option_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; shift_pi = proto_tree_add_item(wscale_tree, hf_tcp_option_wscale_shift, tvb, - offset, 1, ENC_NA); + offset, 1, ENC_BIG_ENDIAN); shift = tvb_get_guint8(tvb, offset); if (shift > 14) { /* RFC 1323: "If a Window Scale option is received with a shift.cnt @@ -2748,10 +2748,10 @@ dissect_tcpopt_timestamp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, ts_tree = proto_tree_add_subtree(opt_tree, tvb, offset, 10, ett_tcp_option_timestamp, &ti, "Timestamps: "); - proto_tree_add_item(ts_tree, hf_tcp_option_kind, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ts_tree, hf_tcp_option_kind, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(ts_tree, hf_tcp_option_len, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ts_tree, hf_tcp_option_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(ts_tree, hf_tcp_option_timestamp_tsval, tvb, offset, @@ -3520,7 +3520,7 @@ dissect_tcpopt_rvbd_probe(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, if (type == PROBE_INTERNAL) return; - proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_reserved, tvb, offset + PROBE_V1_RESERVED_OFFSET, 1, ENC_NA); + proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_reserved, tvb, offset + PROBE_V1_RESERVED_OFFSET, 1, ENC_BIG_ENDIAN); ip = tvb_get_ipv4(tvb, offset + PROBE_V1_PROBER_OFFSET); proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_prober, tvb, diff --git a/epan/dissectors/packet-tdmoe.c b/epan/dissectors/packet-tdmoe.c index 799ba8119e..c209257f09 100644 --- a/epan/dissectors/packet-tdmoe.c +++ b/epan/dissectors/packet-tdmoe.c @@ -92,7 +92,7 @@ dissect_tdmoe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U offset+=2; /* Samples (1 byte) */ - proto_tree_add_item(tdmoe_tree, hf_tdmoe_samples, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tdmoe_tree, hf_tdmoe_samples, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Yellow alarm & "Sig bits present" bits (1 byte) */ diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c index af69968a8c..97ea944f28 100644 --- a/epan/dissectors/packet-telnet.c +++ b/epan/dissectors/packet-telnet.c @@ -398,7 +398,7 @@ dissect_tn3270e_subopt(packet_info *pinfo _U_, const char *optname _U_, tvbuff_t while (len > 0) { cmd = tvb_get_guint8(tvb, offset); - proto_tree_add_item( tree, hf_tn3270_subopt, tvb, offset, 1, ENC_NA ); + proto_tree_add_item( tree, hf_tn3270_subopt, tvb, offset, 1, ENC_BIG_ENDIAN ); switch (cmd) { case TN3270_CONNECT: proto_tree_add_item( tree, hf_tn3270_connect, tvb, offset + 1, len, ENC_NA|ENC_ASCII ); @@ -424,7 +424,7 @@ dissect_tn3270e_subopt(packet_info *pinfo _U_, const char *optname _U_, tvbuff_t case TN3270_REASON: offset++; len--; - proto_tree_add_item( tree, hf_tn3270_reason, tvb, offset, 1, ENC_NA ); + proto_tree_add_item( tree, hf_tn3270_reason, tvb, offset, 1, ENC_BIG_ENDIAN ); break; case TN3270_REQUEST: add_tn3270_conversation(pinfo, 1, 0); @@ -436,7 +436,7 @@ dissect_tn3270e_subopt(packet_info *pinfo _U_, const char *optname _U_, tvbuff_t }else if (device_type == TN3270_FUNCTIONS) { while (len > 0) { rsn = tvb_get_guint8(tvb, offset); - proto_tree_add_item( tree, hf_tn3270_request, tvb, offset, 1, ENC_NA ); + proto_tree_add_item( tree, hf_tn3270_request, tvb, offset, 1, ENC_BIG_ENDIAN ); if (try_val_to_str(rsn, tn3270_request_vals) == NULL) break; @@ -470,7 +470,7 @@ dissect_outmark_subopt(packet_info *pinfo _U_, const char *optname _U_, tvbuff_t int gs_offset, datalen; while (len > 0) { - proto_tree_add_item(tree, hf_telnet_outmark_subopt_cmd, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_telnet_outmark_subopt_cmd, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; len--; @@ -985,7 +985,7 @@ dissect_authentication_type_pair(packet_info *pinfo _U_, tvbuff_t *tvb, int offs { guint8 mod; - proto_tree_add_item(tree, hf_telnet_auth_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_telnet_auth_type, tvb, offset, 1, ENC_BIG_ENDIAN); mod=tvb_get_guint8(tvb, offset+1); proto_tree_add_uint(tree, hf_telnet_auth_mod_enc, tvb, offset+1, 1, mod); @@ -1678,7 +1678,7 @@ telnet_command(packet_info *pinfo, proto_tree *telnet_tree, tvbuff_t *tvb, int s optcode = tvb_get_guint8(tvb, offset); cmd_tree = proto_tree_add_subtree(telnet_tree, tvb, start_offset, 2, ett_telnet_cmd, &cmd_item, "Command header"); - proto_tree_add_item(cmd_tree, hf_telnet_cmd, tvb, offset, 1, ENC_NA); + proto_tree_add_item(cmd_tree, hf_telnet_cmd, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; switch(optcode) { diff --git a/epan/dissectors/packet-trmac.c b/epan/dissectors/packet-trmac.c index df29d28572..be98474d54 100644 --- a/epan/dissectors/packet-trmac.c +++ b/epan/dissectors/packet-trmac.c @@ -178,7 +178,7 @@ sv_text(tvbuff_t *tvb, int svoff, packet_info *pinfo, proto_tree *tree) sv_tree = proto_tree_add_subtree(tree, tvb, svoff+0, 1, ett_tr_sv, &sv_item, "Subvector"); sv_length = tvb_get_guint8(tvb, svoff+0); - len_item = proto_tree_add_item(sv_tree, hf_trmac_sv_len, tvb, svoff+0, 1, ENC_NA); + len_item = proto_tree_add_item(sv_tree, hf_trmac_sv_len, tvb, svoff+0, 1, ENC_BIG_ENDIAN); /* Check the SV length; it must be at least 2, to include the subvector length and indicator. */ @@ -189,7 +189,7 @@ sv_text(tvbuff_t *tvb, int svoff, packet_info *pinfo, proto_tree *tree) } sv_id = tvb_get_guint8(tvb, svoff+1); - proto_tree_add_item(sv_tree, hf_trmac_sv_id, tvb, svoff+1, 1, ENC_NA); + proto_tree_add_item(sv_tree, hf_trmac_sv_id, tvb, svoff+1, 1, ENC_BIG_ENDIAN); proto_item_append_text(sv_item, " (%s)", val_to_str_ext(sv_id, &subvector_vs_ext, "Unknown subvector ID 0x%02X")); switch(sv_id) { diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c index ac8467c4ef..819122cc37 100644 --- a/epan/dissectors/packet-tzsp.c +++ b/epan/dissectors/packet-tzsp.c @@ -180,10 +180,10 @@ add_option_info(tvbuff_t *tvb, int pos, proto_tree *tree, proto_item *ti) length = 0; } - proto_tree_add_item(tag_tree, hf_option_tag, tvb, pos, 1, ENC_NA); + proto_tree_add_item(tag_tree, hf_option_tag, tvb, pos, 1, ENC_BIG_ENDIAN); pos++; if ((tag != TZSP_HDR_PAD) && (tag != TZSP_HDR_END)) { - proto_tree_add_item(tag_tree, hf_option_length, tvb, pos, 1, ENC_NA); + proto_tree_add_item(tag_tree, hf_option_length, tvb, pos, 1, ENC_BIG_ENDIAN); pos++; } @@ -203,15 +203,15 @@ add_option_info(tvbuff_t *tvb, int pos, proto_tree *tree, proto_item *ti) break; case WLAN_RADIO_HDR_SIGNAL: - proto_tree_add_item(tag_tree, hf_signal, tvb, pos, 1, ENC_NA); + proto_tree_add_item(tag_tree, hf_signal, tvb, pos, 1, ENC_BIG_ENDIAN); break; case WLAN_RADIO_HDR_NOISE: - proto_tree_add_item(tag_tree, hf_silence, tvb, pos, 1, ENC_NA); + proto_tree_add_item(tag_tree, hf_silence, tvb, pos, 1, ENC_BIG_ENDIAN); break; case WLAN_RADIO_HDR_RATE: - proto_tree_add_item(tag_tree, hf_rate, tvb, pos, 1, ENC_NA); + proto_tree_add_item(tag_tree, hf_rate, tvb, pos, 1, ENC_BIG_ENDIAN); break; case WLAN_RADIO_HDR_TIMESTAMP: @@ -219,7 +219,7 @@ add_option_info(tvbuff_t *tvb, int pos, proto_tree *tree, proto_item *ti) break; case WLAN_RADIO_HDR_MSG_TYPE: - proto_tree_add_item(tag_tree, hf_status_msg_type, tvb, pos, 1, ENC_NA); + proto_tree_add_item(tag_tree, hf_status_msg_type, tvb, pos, 1, ENC_BIG_ENDIAN); break; case WLAN_RADIO_HDR_CF: @@ -238,7 +238,7 @@ add_option_info(tvbuff_t *tvb, int pos, proto_tree *tree, proto_item *ti) break; case WLAN_RADIO_HDR_CHANNEL: - proto_tree_add_item(tag_tree, hf_channel, tvb, pos, 1, ENC_NA); + proto_tree_add_item(tag_tree, hf_channel, tvb, pos, 1, ENC_BIG_ENDIAN); break; case TZSP_HDR_SENSOR: diff --git a/epan/dissectors/packet-ua3g.c b/epan/dissectors/packet-ua3g.c index c6f6c302fd..884fdf8cf4 100644 --- a/epan/dissectors/packet-ua3g.c +++ b/epan/dissectors/packet-ua3g.c @@ -664,8 +664,8 @@ static void decode_subdevice_escape(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, guint offset, guint length) { - proto_tree_add_item(tree, hf_ua3g_subdevice_address, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ua3g_subdevice_opcode, tvb, offset+1, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_subdevice_address, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ua3g_subdevice_opcode, tvb, offset+1, 1, ENC_BIG_ENDIAN); if (length > 2) { proto_tree_add_item(tree, hf_ua3g_subdevice_parameter_bytes, tvb, offset+2, length-2, ENC_NA); } @@ -688,7 +688,7 @@ decode_software_reset(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, if (length == 0) return; - proto_tree_add_item(tree, hf_ua3g_software_reset, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_software_reset, tvb, offset, 1, ENC_BIG_ENDIAN); } @@ -708,7 +708,7 @@ decode_ip_phone_warmstart(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U if (length == 0) return; - proto_tree_add_item(tree, hf_ua3g_ip_phone_warmstart, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_ip_phone_warmstart, tvb, offset, 1, ENC_BIG_ENDIAN); } @@ -766,7 +766,7 @@ decode_segment_msg(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, val = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_ua3g_segment_msg_segment, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ua3g_segment_msg_num_remaining, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_segment_msg_num_remaining, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -1004,7 +1004,7 @@ decode_ip_device_routing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, if (!ua3g_body_tree) return; - proto_tree_add_item(ua3g_body_tree, hf_ua3g_ip, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_ip, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -1020,11 +1020,11 @@ decode_ip_device_routing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, val_to_str_const(parameter_id, ip_device_routing_cmd_reset_vals, "Unknown")); ua3g_param_tree = proto_item_add_subtree(ua3g_param_item, ett_ua3g_param); - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_reset_parameter, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_reset_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_reset_parameter_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_reset_parameter_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -1035,7 +1035,7 @@ decode_ip_device_routing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, param = tvb_get_guint8(tvb, offset); if ((param & 0x80) == 0x00) { - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_reset_parameter_noe_update, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_reset_parameter_noe_update, tvb, offset, 1, ENC_BIG_ENDIAN); ua3g_param_subtree = proto_item_add_subtree(ua3g_param_item, ett_ua3g_param_sub); proto_tree_add_item(ua3g_param_subtree, hf_ua3g_ip_device_routing_reset_parameter_noe_update_bootloader, tvb, offset, 1, ENC_NA); @@ -1051,7 +1051,7 @@ decode_ip_device_routing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, break; case 0x01: /* Bad_Sec_Mode */ - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_reset_parameter_bad_sec_mode, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_reset_parameter_bad_sec_mode, tvb, offset, 1, ENC_BIG_ENDIAN); break; case 0x02: /* Cust_Name */ proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_reset_parameter_cust_name, tvb, offset, parameter_length, ENC_NA|ENC_ASCII); @@ -1072,7 +1072,7 @@ decode_ip_device_routing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, } case 0x01: /* START RTP */ { - proto_tree_add_item(ua3g_body_tree, hf_ua3g_ip_device_routing_start_rtp_direction, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_ip_device_routing_start_rtp_direction, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -1085,11 +1085,11 @@ decode_ip_device_routing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, val_to_str_ext_const(parameter_id, &ip_device_routing_cmd_start_rtp_vals_ext, "Unknown")); ua3g_param_tree = proto_item_add_subtree(ua3g_param_item, ett_ua3g_param); - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_start_rtp_parameter, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_start_rtp_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_start_rtp_parameter_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_start_rtp_parameter_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -1193,11 +1193,11 @@ decode_ip_device_routing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, val_to_str_const(parameter_id, ip_device_routing_cmd_stop_rtp_vals, "Unknown")); ua3g_param_tree = proto_item_add_subtree(ua3g_param_item, ett_ua3g_param); - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_stop_rtp_parameter, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_stop_rtp_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_stop_rtp_parameter_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_stop_rtp_parameter_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -1223,11 +1223,11 @@ decode_ip_device_routing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, "%s", val_to_str_const(parameter_id, ip_device_routing_cmd_redirect_vals, "Unknown")); ua3g_param_tree = proto_item_add_subtree(ua3g_param_item, ett_ua3g_param); - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_redirect_parameter, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_redirect_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_redirect_parameter_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_redirect_parameter_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -1260,7 +1260,7 @@ decode_ip_device_routing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, tone_nb_entries = tvb_get_guint8(tvb, offset); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_ip_device_routing_def_tones_num_entries, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_ip_device_routing_def_tones_num_entries, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -1304,8 +1304,8 @@ decode_ip_device_routing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, tone_nb_entries = tvb_get_guint8(tvb, offset); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_ip_device_routing_start_tone_direction, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_ip_device_routing_start_tone_num_entries, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_ip_device_routing_start_tone_direction, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_ip_device_routing_start_tone_num_entries, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -1326,7 +1326,7 @@ decode_ip_device_routing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, ett_ua3g_param, NULL, "Tone Pair %d: Id: %d, Duration: %d ms", ii+1, tone_id, tone_duration); - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_start_tone_identification, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_start_tone_identification, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -1360,11 +1360,11 @@ decode_ip_device_routing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, val_to_str_const(parameter_id, ip_device_routing_cmd_listen_rtp_vals, "Unknown")); ua3g_param_tree = proto_item_add_subtree(ua3g_param_item, ett_ua3g_param); - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_listen_rtp_parameter, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_listen_rtp_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_listen_rtp_parameter_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_listen_rtp_parameter_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -1393,7 +1393,7 @@ decode_ip_device_routing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, break; case 0x09: /* GET_PARAM_REQ */ while (length > 0) { - proto_tree_add_item(ua3g_body_tree, hf_ua3g_ip_device_routing_get_param_req_parameter, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_ip_device_routing_get_param_req_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; } @@ -1410,18 +1410,18 @@ decode_ip_device_routing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, val_to_str_ext_const(parameter_id, &ip_device_routing_cmd_set_param_req_vals_ext, "Unknown")); ua3g_param_tree = proto_item_add_subtree(ua3g_param_item, ett_ua3g_param); - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_set_param_req_parameter, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_set_param_req_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_set_param_req_parameter_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_set_param_req_parameter_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; if (parameter_length > 0) { switch (parameter_id) { case 0x06: /* Compressor */ - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_set_param_req_parameter_compressor, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_set_param_req_parameter_compressor, tvb, offset, 1, ENC_BIG_ENDIAN); break; case 0x07: /* ERR STRING NET DOWN */ case 0x08: /* ERR STRING CABLE PB */ @@ -1435,10 +1435,10 @@ decode_ip_device_routing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_set_param_req_parameter_tftp_backup_ip, tvb, offset, 4, ENC_BIG_ENDIAN); break; case 0x11: /* Set PC Port status */ - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_set_param_req_parameter_set_pc_port_status, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_set_param_req_parameter_set_pc_port_status, tvb, offset, 1, ENC_BIG_ENDIAN); break; case 0x12: /* Record RTP Authorization */ - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_set_param_req_parameter_record_rtp_auth, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_set_param_req_parameter_record_rtp_auth, tvb, offset, 1, ENC_BIG_ENDIAN); break; case 0x13: /* Security Flags */ proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_set_param_req_parameter_security_flag_filter, tvb, offset, 1, ENC_NA); @@ -1471,7 +1471,7 @@ decode_ip_device_routing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, break; } case 0x0B: /* SEND_DIGIT */ - proto_tree_add_item(ua3g_body_tree, hf_ua3g_ip_device_routing_digit_value, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_ip_device_routing_digit_value, tvb, offset, 1, ENC_BIG_ENDIAN); break; case 0x0C: /* PAUSE_RTP */ @@ -1485,11 +1485,11 @@ decode_ip_device_routing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, val_to_str_const(parameter_id, ip_device_routing_cmd_pause_restart_vals, "Unknown")); ua3g_param_tree = proto_item_add_subtree(ua3g_param_item, ett_ua3g_param); - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_pause_restart_rtp_parameter, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_pause_restart_rtp_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_pause_restart_rtp_parameter_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_pause_restart_rtp_parameter_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -1517,11 +1517,11 @@ decode_ip_device_routing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, val_to_str_const(parameter_id, ip_device_routing_cmd_record_rtp_vals, "Unknown")); ua3g_param_tree = proto_item_add_subtree(ua3g_param_item, ett_ua3g_param); - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_start_stop_record_rtp_parameter, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_start_stop_record_rtp_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; - proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_start_stop_record_rtp_parameter_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_start_stop_record_rtp_parameter_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -1603,10 +1603,10 @@ decode_led_command(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, if (!tree) return; - proto_tree_add_item(tree, hf_ua3g_command_led, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_command_led, tvb, offset, 1, ENC_BIG_ENDIAN); if ((command >= 0) && (command < 7)) { - proto_tree_add_item(tree, hf_ua3g_command_led_number, tvb, offset+1, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_command_led_number, tvb, offset+1, 1, ENC_BIG_ENDIAN); } } @@ -1658,11 +1658,11 @@ decode_lcd_line_cmd(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, length, ett_ua3g_param, NULL, "%s %d: %s", command_str, column_n, wmem_strbuf_get_str(strbuf)); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_command_lcd_line, tvb, offset, 1, ENC_NA); - ua3g_option_item = proto_tree_add_item(ua3g_param_tree, hf_ua3g_lcd_line_cmd_lcd_options, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_command_lcd_line, tvb, offset, 1, ENC_BIG_ENDIAN); + ua3g_option_item = proto_tree_add_item(ua3g_param_tree, hf_ua3g_lcd_line_cmd_lcd_options, tvb, offset, 1, ENC_BIG_ENDIAN); ua3g_option_tree = proto_item_add_subtree(ua3g_option_item, ett_ua3g_option); - proto_tree_add_item(ua3g_option_tree, hf_ua3g_lcd_line_cmd_lcd_options_call_timer, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_option_tree, hf_ua3g_lcd_line_cmd_lcd_options_call_timer, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ua3g_option_tree, hf_ua3g_lcd_line_cmd_lcd_options_blink, tvb, offset, 1, ENC_NA); proto_tree_add_item(ua3g_option_tree, hf_ua3g_lcd_line_cmd_lcd_options_call_timer_control, tvb, offset, 1, ENC_NA); proto_tree_add_item(ua3g_option_tree, hf_ua3g_lcd_line_cmd_lcd_options_call_timer_display, tvb, offset, 1, ENC_NA); @@ -1673,7 +1673,7 @@ decode_lcd_line_cmd(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, length--; if (command != 3) - proto_tree_add_item(ua3g_param_tree, hf_ua3g_lcd_line_cmd_starting_column, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_lcd_line_cmd_starting_column, tvb, offset, 1, ENC_BIG_ENDIAN); else proto_tree_add_text(ua3g_param_tree, tvb, offset, 1, "Unused"); @@ -1728,18 +1728,18 @@ decode_main_voice_mode(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, if (!ua3g_body_tree) return; - proto_tree_add_item(ua3g_body_tree, hf_ua3g_main_voice_mode, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_main_voice_mode, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; switch (mode) { case 0x06: /* Ringing */ { - proto_tree_add_item(ua3g_body_tree, hf_ua3g_main_voice_mode_tune, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_main_voice_mode_tune, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; - proto_tree_add_item(ua3g_body_tree, hf_ua3g_main_voice_mode_cadence, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_main_voice_mode_cadence, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; } @@ -1749,12 +1749,12 @@ decode_main_voice_mode(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, case 0x04: /* Handsfree */ case 0x05: /* Announce Loudspeaker */ { - proto_tree_add_item(ua3g_body_tree, hf_ua3g_main_voice_mode_speaker_volume, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_main_voice_mode_speaker_volume, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; if (length > 0) { - proto_tree_add_item(ua3g_body_tree, hf_ua3g_main_voice_mode_microphone_volume, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_main_voice_mode_microphone_volume, tvb, offset, 1, ENC_BIG_ENDIAN); } break; } @@ -1816,8 +1816,8 @@ static void decode_subdevice_metastate(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, guint offset) { - proto_tree_add_item(tree, hf_ua3g_subdevice_metastate_subchannel_address, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ua3g_subdevice_metastate_new_metastate, tvb, offset+1, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_subdevice_metastate_subchannel_address, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ua3g_subdevice_metastate_new_metastate, tvb, offset+1, 1, ENC_BIG_ENDIAN); } @@ -1834,12 +1834,12 @@ static void decode_dwl_dtmf_clck_format(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, guint offset, guint length) { - proto_tree_add_item(tree, hf_ua3g_dwl_dtmf_clck_format_minimum_on_time, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ua3g_dwl_dtmf_clck_format_inter_digit_pause_time, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(tree, hf_ua3g_dwl_dtmf_clck_format_clock_time_format, tvb, offset+2, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_dwl_dtmf_clck_format_minimum_on_time, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ua3g_dwl_dtmf_clck_format_inter_digit_pause_time, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ua3g_dwl_dtmf_clck_format_clock_time_format, tvb, offset+2, 1, ENC_BIG_ENDIAN); if (length > 2) - proto_tree_add_item(tree, hf_ua3g_dwl_dtmf_clck_format_dtmf_country_adaptation, tvb, offset+3, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_dwl_dtmf_clck_format_dtmf_country_adaptation, tvb, offset+3, 1, ENC_BIG_ENDIAN); } @@ -1870,7 +1870,7 @@ decode_set_clck(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, /* add text to the frame "INFO" column */ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", val_to_str_const(command, str_command_set_clck, "Unknown")); - proto_tree_add_item(tree, hf_ua3g_command_set_clck, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_command_set_clck, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; call_timer = 0; @@ -1931,13 +1931,13 @@ decode_voice_channel(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_ua3g_voice_channel_codec, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_ua3g_voice_channel_voice_channel, tvb, offset, 1, ENC_NA); } else if (length == 2) { - proto_tree_add_item(tree, hf_ua3g_voice_channel_main_voice, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ua3g_voice_channel_announce, tvb, offset+1, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_voice_channel_main_voice, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ua3g_voice_channel_announce, tvb, offset+1, 1, ENC_BIG_ENDIAN); } else if (length == 4) { - proto_tree_add_item(tree, hf_ua3g_voice_channel_b_general, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ua3g_voice_channel_b_loud_speaker, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(tree, hf_ua3g_voice_channel_b_ear_piece, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(tree, hf_ua3g_voice_channel_b_microphones, tvb, offset+3, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_voice_channel_b_general, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ua3g_voice_channel_b_loud_speaker, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ua3g_voice_channel_b_ear_piece, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ua3g_voice_channel_b_microphones, tvb, offset+3, 1, ENC_BIG_ENDIAN); } } @@ -1963,7 +1963,7 @@ decode_external_ringing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, /* add text to the frame "INFO" column */ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", val_to_str_const(command, str_ext_ring_cmd, "Unknown")); - proto_tree_add_item(tree, hf_ua3g_external_ringing_command, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_external_ringing_command, tvb, offset, 1, ENC_BIG_ENDIAN); } @@ -1978,7 +1978,7 @@ decode_lcd_cursor(proto_tree *tree _U_, tvbuff_t *tvb, packet_info *pinfo, guint /* add text to the frame "INFO" column */ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", str_on_off_val); - proto_tree_add_item(tree, hf_ua3g_lcd_cursor_line_number, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_lcd_cursor_line_number, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_ua3g_lcd_cursor, tvb, offset+1, 1, ENC_NA); } @@ -1993,11 +1993,11 @@ decode_dwl_special_char(proto_tree *tree, tvbuff_t *tvb, int i; while (length > 0) { - proto_tree_add_item(tree, hf_ua3g_dwl_special_char_character_number, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_dwl_special_char_character_number, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; for (i = 1; i <= 8; i++) { - proto_tree_add_item(tree, hf_ua3g_dwl_special_char_byte, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_dwl_special_char_byte, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; } @@ -2015,10 +2015,10 @@ decode_set_clck_timer_pos(proto_tree *tree, tvbuff_t *tvb, if (!tree) return; - proto_tree_add_item(tree, hf_ua3g_set_clck_timer_pos_clock_line_number, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ua3g_set_clck_timer_pos_clock_column_number, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(tree, hf_ua3g_set_clck_timer_pos_call_timer_line_number, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(tree, hf_ua3g_set_clck_timer_pos_call_timer_column_number, tvb, offset+3, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_set_clck_timer_pos_clock_line_number, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ua3g_set_clck_timer_pos_clock_column_number, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ua3g_set_clck_timer_pos_call_timer_line_number, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ua3g_set_clck_timer_pos_call_timer_column_number, tvb, offset+3, 1, ENC_BIG_ENDIAN); } @@ -2035,8 +2035,8 @@ static void decode_set_lcd_contrast(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, guint offset) { - proto_tree_add_item(tree, hf_ua3g_set_lcd_contrast_driver_number, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ua3g_set_lcd_contrast_contrast_value, tvb, offset+1, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_set_lcd_contrast_driver_number, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ua3g_set_lcd_contrast_contrast_value, tvb, offset+1, 1, ENC_BIG_ENDIAN); } @@ -2098,7 +2098,7 @@ decode_beep(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, /* add text to the frame "INFO" column */ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", val_to_str_const(command, str_command_beep, "Unknown")); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_command_beep, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_command_beep, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -2108,7 +2108,7 @@ decode_beep(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, { int i = 0; - proto_tree_add_item(ua3g_body_tree, hf_ua3g_beep_destination, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_beep_destination, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -2144,7 +2144,7 @@ decode_beep(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, "Destination: %s", wmem_strbuf_get_str(strbuf)); offset++; - proto_tree_add_item(ua3g_body_tree, hf_ua3g_beep_beep_number, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_beep_beep_number, tvb, offset, 1, ENC_BIG_ENDIAN); break; } case 0x05: @@ -2152,7 +2152,7 @@ decode_beep(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int i, nb_of_notes, beep_number; beep_number = tvb_get_guint8(tvb, offset); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_beep_beep_number, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_beep_beep_number, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -2162,7 +2162,7 @@ decode_beep(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, beep_number = 0xFF; nb_of_notes = tvb_get_guint8(tvb, offset); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_beep_number_of_notes, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_beep_number_of_notes, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -2183,7 +2183,7 @@ decode_beep(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, offset++; length--; } - proto_tree_add_item(ua3g_body_tree, hf_ua3g_beep_terminator, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_beep_terminator, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; } @@ -2239,7 +2239,7 @@ decode_ringing_cadence(proto_tree *tree, tvbuff_t *tvb, if (!tree) return; - proto_tree_add_item(tree, hf_ua3g_ringing_cadence_cadence, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_ringing_cadence_cadence, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -2327,7 +2327,7 @@ decode_r_w_peripheral(proto_tree *tree, tvbuff_t *tvb, proto_tree_add_item(tree, hf_ua3g_r_w_peripheral_address, tvb, offset, 2, ENC_BIG_ENDIAN); if (length > 2) { - proto_tree_add_item(tree, hf_ua3g_r_w_peripheral_content, tvb, offset+2, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_r_w_peripheral_content, tvb, offset+2, 1, ENC_BIG_ENDIAN); } } @@ -2352,7 +2352,7 @@ decode_icon_cmd(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, guint o if (!tree) return; - proto_tree_add_item(tree, hf_ua3g_icon_cmd_icon_number, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_icon_cmd_icon_number, tvb, offset, 1, ENC_BIG_ENDIAN); byte0 = tvb_get_guint8(tvb, offset+1); byte1 = tvb_get_guint8(tvb, offset+2); @@ -2414,22 +2414,22 @@ decode_audio_config(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, if (!ua3g_body_tree) return; - proto_tree_add_item(ua3g_body_tree, hf_ua3g_command_audio_config, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_command_audio_config, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; switch (command) { case 0x00: /* Audio Coding */ - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_ignored, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_law, tvb, offset+1, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_ignored, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_law, tvb, offset+1, 1, ENC_BIG_ENDIAN); break; case 0x01: /* DPI Channel Allocations */ - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_dpi_chan_ua_tx1, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_dpi_chan_ua_tx2, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_dpi_chan_gci_tx1, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_dpi_chan_gci_tx2, tvb, offset+3, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_dpi_chan_cod_tx, tvb, offset+4, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_dpi_chan_ua_tx1, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_dpi_chan_ua_tx2, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_dpi_chan_gci_tx1, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_dpi_chan_gci_tx2, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_dpi_chan_cod_tx, tvb, offset+4, 1, ENC_BIG_ENDIAN); break; case 0x02: /* Loudspeaker Volume Adjust */ { @@ -2445,33 +2445,33 @@ decode_audio_config(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, } case 0x03: /* Audio Circuit Configuration */ - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_dth, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_dtr, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_dtf, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_str, tvb, offset+3, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_ahp1, tvb, offset+4, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_ahp2, tvb, offset+5, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_ath, tvb, offset+6, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_atr, tvb, offset+7, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_atf, tvb, offset+8, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_alm, tvb, offset+9, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_dth, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_dtr, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_dtf, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_str, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_ahp1, tvb, offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_ahp2, tvb, offset+5, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_ath, tvb, offset+6, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_atr, tvb, offset+7, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_atf, tvb, offset+8, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_audio_circuit_alm, tvb, offset+9, 1, ENC_BIG_ENDIAN); break; case 0x04: /* Handsfree Parameters */ proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_handsfree_return, tvb, offset, 1, ENC_NA); proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_handsfree_handsfree, tvb, offset, 1, ENC_NA); break; case 0x05: /* Loudspeaker Acoustic Parameters */ - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_group_listen, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_attenuation, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_stay_in_send, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_shift_right_mtx, tvb, offset+3, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_shift_right_mrc, tvb, offset+4, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_idle_trans_threshold, tvb, offset+5, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_low_trans_threshold, tvb, offset+6, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_idle_recv_threshold, tvb, offset+7, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_low_recv_threshold, tvb, offset+8, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_med_recv_threshold, tvb, offset+9, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_high_recv_threshold, tvb, offset+10, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_group_listen, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_attenuation, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_stay_in_send, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_shift_right_mtx, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_shift_right_mrc, tvb, offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_idle_trans_threshold, tvb, offset+5, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_low_trans_threshold, tvb, offset+6, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_idle_recv_threshold, tvb, offset+7, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_low_recv_threshold, tvb, offset+8, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_med_recv_threshold, tvb, offset+9, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_high_recv_threshold, tvb, offset+10, 1, ENC_BIG_ENDIAN); break; case 0x06: /* Device Configuration */ { @@ -2530,8 +2530,8 @@ static void decode_audio_padded_path(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, guint offset) { - proto_tree_add_item(tree, hf_ua3g_audio_padded_path_emission_padded_level, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ua3g_audio_padded_path_reception_padded_level, tvb, offset+1, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_audio_padded_path_emission_padded_level, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ua3g_audio_padded_path_reception_padded_level, tvb, offset+1, 1, ENC_BIG_ENDIAN); } @@ -2558,7 +2558,7 @@ decode_on_off_level(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, if (length > 1) { if (command == 0x01) { - proto_tree_add_item(tree, hf_ua3g_on_off_level_level_on_loudspeaker, tvb, offset+1, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_on_off_level_level_on_loudspeaker, tvb, offset+1, 1, ENC_BIG_ENDIAN); } } } @@ -2585,12 +2585,12 @@ decode_ring(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, guint offset) proto_tree_add_item(tree, hf_ua3g_command_ring, tvb, offset, 1, ENC_NA); if (command == 0x01) { - proto_tree_add_item(tree, hf_ua3g_ring_melody, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(tree, hf_ua3g_ring_cadence, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(tree, hf_ua3g_ring_speaker_level, tvb, offset+3, 1, ENC_NA); - proto_tree_add_item(tree, hf_ua3g_ring_beep_number, tvb, offset+4, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_ring_melody, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ua3g_ring_cadence, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ua3g_ring_speaker_level, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ua3g_ring_beep_number, tvb, offset+4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_ua3g_ring_silent, tvb, offset+5, 1, ENC_NA); - proto_tree_add_item(tree, hf_ua3g_ring_progressive, tvb, offset+5, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_ring_progressive, tvb, offset+5, 1, ENC_BIG_ENDIAN); } } @@ -2695,15 +2695,15 @@ decode_ua_dwl_protocol(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, /* add text to the frame "INFO" column */ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", val_to_str_const(command, str_command_ua_dwl_protocol, "Unknown")); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_command_ua_dwl_protocol, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_command_ua_dwl_protocol, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; switch (command) { case 0x00: /* Downloading Suggest (MESSAGE FROM THE TERMINAL) */ - proto_tree_add_item(ua3g_body_tree, hf_ua3g_ua_dwl_protocol_item_identifier, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_ua_dwl_protocol_item_identifier, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ua3g_body_tree, hf_ua3g_ua_dwl_protocol_item_version_nc, tvb, offset+1, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_ua_dwl_protocol_cause, tvb, offset+3, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_ua_dwl_protocol_cause, tvb, offset+3, 1, ENC_BIG_ENDIAN); break; case 0x01: /* Downloading Request (MESSAGE FROM THE SYSTEM) */ { @@ -2713,12 +2713,12 @@ decode_ua_dwl_protocol(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, }; if (length > 7) { /* Not R1 */ - proto_tree_add_item(ua3g_body_tree, hf_ua3g_ua_dwl_protocol_force_mode, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_ua_dwl_protocol_force_mode, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; } - proto_tree_add_item(ua3g_body_tree, hf_ua3g_ua_dwl_protocol_item_identifier, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_ua_dwl_protocol_item_identifier, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -2747,7 +2747,7 @@ decode_ua_dwl_protocol(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(ua3g_param_tree, hf_ua3g_ua_dwl_protocol_model_selection_c, tvb, offset, 1, ENC_NA); proto_tree_add_item(ua3g_param_tree, hf_ua3g_ua_dwl_protocol_model_selection_country_ver, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; ua3g_param_tree = proto_tree_add_subtree(ua3g_body_tree, tvb, offset, 1, ett_ua3g_param, NULL, "Hardware Selection"); @@ -2760,9 +2760,9 @@ decode_ua_dwl_protocol(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, ua3g_param_tree = proto_tree_add_subtree(ua3g_body_tree, tvb, offset, 1, ett_ua3g_param, NULL, "Memory Sizes Required"); proto_tree_add_item(ua3g_param_tree, hf_ua3g_ua_dwl_protocol_memory_sizes_flash, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ua3g_param_tree, hf_ua3g_ua_dwl_protocol_memory_sizes_ext_ram, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; } else { /* R1 */ @@ -2778,7 +2778,7 @@ decode_ua_dwl_protocol(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, } case 0x02: /* Downloading Acknowledge (MESSAGE FROM THE TERMINAL) */ proto_tree_add_item(ua3g_body_tree, hf_ua3g_ua_dwl_protocol_packet_number, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_ua_dwl_protocol_download_ack_status, tvb, offset+2, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_ua_dwl_protocol_download_ack_status, tvb, offset+2, 1, ENC_BIG_ENDIAN); break; case 0x03: /* Downloading Data (MESSAGE FROM THE SYSTEM) */ { @@ -2798,13 +2798,13 @@ decode_ua_dwl_protocol(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, break; } case 0x05: /* Downloading End Acknowledge (MESSAGE FROM THE TERMINAL) */ - proto_tree_add_item(ua3g_body_tree, hf_ua3g_ua_dwl_protocol_packet_download_end_ack_ok_status, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_ua_dwl_protocol_packet_download_end_ack_ok_status, tvb, offset, 1, ENC_BIG_ENDIAN); break; case 0x06: /* Downloading Iso Checksum (MESSAGE FROM THE SYSTEM) */ proto_tree_add_item(ua3g_body_tree, hf_ua3g_ua_dwl_protocol_checksum, tvb, offset, 4, ENC_BIG_ENDIAN); break; case 0x07: /* Downloading ISO Checksum Acknowledge (MESSAGE FROM THE TERMINAL) */ - proto_tree_add_item(ua3g_body_tree, hf_ua3g_ua_dwl_protocol_acknowledge, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_ua_dwl_protocol_acknowledge, tvb, offset, 1, ENC_BIG_ENDIAN); break; case 0x04: /* Downloading End (MESSAGE FROM THE SYSTEM) */ default: @@ -2819,7 +2819,7 @@ decode_ua_dwl_protocol(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, static void decode_digit_dialed(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, guint offset) { - proto_tree_add_item(tree, hf_ua3g_digit_dialed_digit_value, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_digit_dialed_digit_value, tvb, offset, 1, ENC_BIG_ENDIAN); } @@ -2833,10 +2833,10 @@ decode_subdevice_msg(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, if (!tree) return; - proto_tree_add_item(tree, hf_ua3g_subdevice_msg_subdev_type, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_ua3g_subdevice_msg_subdev_address, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_subdevice_msg_subdev_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ua3g_subdevice_msg_subdev_address, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_ua3g_subdevice_msg_subdevice_opcode, tvb, offset+1, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_subdevice_msg_subdevice_opcode, tvb, offset+1, 1, ENC_BIG_ENDIAN); if (length > 2) { proto_tree_add_item(tree, hf_ua3g_subdevice_msg_parameter_bytes, tvb, offset+2, length-2, ENC_NA); @@ -3033,20 +3033,20 @@ decode_cs_ip_device_routing(proto_tree *tree _U_, tvbuff_t *tvb, if (!ua3g_body_tree) return; - proto_tree_add_item(ua3g_body_tree, hf_ua3g_ip_cs, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_ip_cs, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; switch (command) { case 0x00: - proto_tree_add_item(ua3g_body_tree, hf_ua3g_cs_ip_device_routing_cmd00_vta_type, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_cs_ip_device_routing_cmd00_characteristic_number, tvb, offset+1, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_cs_ip_device_routing_cmd00_vta_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_cs_ip_device_routing_cmd00_characteristic_number, tvb, offset+1, 1, ENC_BIG_ENDIAN); break; case 0x01: { int j = 0; if (length == 1) { - proto_tree_add_item(ua3g_body_tree, hf_ua3g_cs_ip_device_routing_cmd01_incident_0, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_cs_ip_device_routing_cmd01_incident_0, tvb, offset, 1, ENC_BIG_ENDIAN); } else { while (length >0) { j++; @@ -3069,11 +3069,11 @@ decode_cs_ip_device_routing(proto_tree *tree _U_, tvbuff_t *tvb, "%s", val_to_str_const(parameter_id, ip_device_routing_cmd_get_param_req_vals, "Unknown")); ua3g_param_tree = proto_item_add_subtree(ua3g_param_item, ett_ua3g_param); - proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd02_parameter, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd02_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; - proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd02_parameter_length, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd02_parameter_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -3103,13 +3103,13 @@ decode_cs_ip_device_routing(proto_tree *tree _U_, tvbuff_t *tvb, case 0x09: /* Ethernet Drivers Config */ { if (parameter_length == 2) { - proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_lan_speed, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_lan_duplex, tvb, offset+1, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_lan_speed, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_lan_duplex, tvb, offset+1, 1, ENC_BIG_ENDIAN); } else if (parameter_length == 4) { - proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_lan_speed, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_lan_duplex, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_pc_speed, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_pc_duplex, tvb, offset+3, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_lan_speed, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_lan_duplex, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_pc_speed, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_pc_duplex, tvb, offset+3, 1, ENC_BIG_ENDIAN); } else { proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd02_parameter_value, tvb, offset, parameter_length, ENC_NA); } @@ -3145,7 +3145,7 @@ decode_cs_ip_device_routing(proto_tree *tree _U_, tvbuff_t *tvb, val_to_str_const(parameter_id, cs_ip_device_routing_03_parameter_id_tab_vals, "Unknown")); ua3g_param_tree = proto_item_add_subtree(ua3g_param_item, ett_ua3g_param); - proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd03_parameter, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd03_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -3156,7 +3156,7 @@ decode_cs_ip_device_routing(proto_tree *tree _U_, tvbuff_t *tvb, if (parameter_length > 0) { switch (parameter_id) { case 0x06: /* Type Of Equipment */ - proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd03_parameter_type_of_equip1, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd03_parameter_type_of_equip1, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd03_parameter_type_of_equip2, tvb, offset, 2, ENC_BIG_ENDIAN); break; case 0x08: /* Local IP Address */ @@ -3216,13 +3216,13 @@ decode_cs_ip_device_routing(proto_tree *tree _U_, tvbuff_t *tvb, proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd03_parameter_8021Q_used, tvb, offset, 1, ENC_NA); break; case 0x2F: /* 802.1p Priority */ - proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd03_parameter_8021P_priority, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd03_parameter_8021P_priority, tvb, offset, 1, ENC_BIG_ENDIAN); break; case 0x30: /* VLAN Id */ proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd03_parameter_vlan_id, tvb, offset, 2, ENC_BIG_ENDIAN); break; case 0x31: /* DiffServ */ - proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd03_parameter_diffserv, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_param_tree, hf_ua3g_cs_ip_device_routing_cmd03_parameter_diffserv, tvb, offset, 1, ENC_BIG_ENDIAN); break; case 0x3D: /* 200 ms BFI Distribution */ for (i = 0; i < parameter_length; i += 2) { @@ -3388,7 +3388,7 @@ decode_unsolicited_msg(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, /* add text to the frame "INFO" column */ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", val_to_str_const(command, str_command_unsolicited_msg, "Unknown")); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_command_unsolicited_msg, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_command_unsolicited_msg, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; } else { @@ -3403,7 +3403,7 @@ decode_unsolicited_msg(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, { int link, vta_type; - proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_device_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_device_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -3412,14 +3412,14 @@ decode_unsolicited_msg(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, length -= 2; if (opcode != 0x21) { - proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_self_test_result, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_self_test_result, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; } vta_type = tvb_get_guint8(tvb, offset); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_vta_type, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_vta_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -3431,24 +3431,24 @@ decode_unsolicited_msg(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, { ua3g_param_tree = proto_tree_add_subtree(ua3g_body_tree, tvb, offset, 1, ett_ua3g_param, NULL, "Characteristic Number"); proto_tree_add_item(ua3g_param_tree, hf_ua3g_unsolicited_msg_char_num_vta_subtype, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ua3g_param_tree, hf_ua3g_unsolicited_msg_char_num_generation, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ua3g_param_tree, hf_ua3g_unsolicited_msg_char_num_design, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; - proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_other_information, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_other_information, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; ua3g_param_tree = proto_tree_add_subtree(ua3g_body_tree, tvb, offset, 1, ett_ua3g_param, NULL, "Hardware Configuration"); proto_tree_add_item(ua3g_param_tree, hf_ua3g_unsolicited_msg_hardware_config_vta_type, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ua3g_param_tree, hf_ua3g_unsolicited_msg_hardware_config_design, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ua3g_param_tree, hf_ua3g_unsolicited_msg_hardware_config_subtype, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; @@ -3469,31 +3469,31 @@ decode_unsolicited_msg(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, default: { link = tvb_get_guint8(tvb, offset); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_other_information_1, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_other_information_1, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; if (link == 0x00) { - proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_hardware_version, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_hardware_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; ua3g_param_tree = proto_tree_add_subtree(ua3g_body_tree, tvb, offset, 1, ett_ua3g_param, NULL, "Hardware Configuration"); proto_tree_add_item(ua3g_param_tree, hf_ua3g_unsolicited_msg_hardware_config_hard_config_chip, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ua3g_param_tree, hf_ua3g_unsolicited_msg_hardware_config_hard_config_flash, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ua3g_param_tree, hf_ua3g_unsolicited_msg_hardware_config_config_ram, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; } else { - proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_other_information_2, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_other_information_2, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_hardware_config_hard_config_ip, - tvb, offset, 1, ENC_NA); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; length--; } @@ -3529,7 +3529,7 @@ decode_unsolicited_msg(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, } case 0x02: /* Illegal Command Received */ { - proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_opcode_of_bad_command, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_opcode_of_bad_command, tvb, offset, 1, ENC_BIG_ENDIAN); if (length > 1) { proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_next_byte_of_bad_command, tvb, offset+1, length-1, ENC_NA); @@ -3538,7 +3538,7 @@ decode_unsolicited_msg(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, } case 0x05: /* Subdevice Down */ { - proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_subdevice_address, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_subdevice_address, tvb, offset, 1, ENC_BIG_ENDIAN); break; } case 0x06: /* Segment Failure */ @@ -3547,13 +3547,13 @@ decode_unsolicited_msg(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_segment_failure_num, tvb, offset, 1, ENC_NA); proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_segment_failure_s, tvb, offset, 1, ENC_NA); proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_segment_failure_l, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_opcode_bad_segment, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_next_byte_of_bad_segment, tvb, offset+2, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_opcode_bad_segment, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_next_byte_of_bad_segment, tvb, offset+2, 1, ENC_BIG_ENDIAN); break; } case 0x07: /* UA Device Event */ { - proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_device_event, tvb, offset, 1, ENC_NA); + proto_tree_add_item(ua3g_body_tree, hf_ua3g_unsolicited_msg_device_event, tvb, offset, 1, ENC_BIG_ENDIAN); break; } default: @@ -3602,7 +3602,7 @@ decode_key_number(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, static void decode_i_m_here(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, guint offset) { - proto_tree_add_item(tree, hf_ua3g_i_m_here_id_code, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_ua3g_i_m_here_id_code, tvb, offset, 1, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-v120.c b/epan/dissectors/packet-v120.c index 454d43560a..e8aea853f7 100644 --- a/epan/dissectors/packet-v120.c +++ b/epan/dissectors/packet-v120.c @@ -187,12 +187,12 @@ dissect_v120_header(tvbuff_t *tvb, int offset, proto_tree *tree) byte0 = tvb_get_guint8(tvb, offset); if (byte0 & 0x80) { header_len = 1; - tc = proto_tree_add_item(tree, hf_v120_header8, tvb, 0, 1, ENC_NA); + tc = proto_tree_add_item(tree, hf_v120_header8, tvb, 0, 1, ENC_BIG_ENDIAN); h_tree = proto_item_add_subtree(tc, ett_v120_header); proto_tree_add_item(h_tree, hf_v120_header_ext8, tvb, 0, 1, ENC_NA); proto_tree_add_item(h_tree, hf_v120_header_break8, tvb, 0, 1, ENC_NA); - proto_tree_add_item(h_tree, hf_v120_header_error_control8, tvb, 0, 1, ENC_NA); + proto_tree_add_item(h_tree, hf_v120_header_error_control8, tvb, 0, 1, ENC_BIG_ENDIAN); proto_tree_add_item(h_tree, hf_v120_header_segb8, tvb, 0, 1, ENC_NA); proto_tree_add_item(h_tree, hf_v120_header_segf8, tvb, 0, 1, ENC_NA); } else { diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 18d568598b..0e3db7872d 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -2825,7 +2825,7 @@ vnc_fence(tvbuff_t *tvb, packet_info *pinfo, gint *offset, *offset += 4; proto_tree_add_item(tree, hf_vnc_fence_payload_length, - tvb, *offset, 1, ENC_NA); + tvb, *offset, 1, ENC_BIG_ENDIAN); *offset += 1; diff --git a/epan/dissectors/packet-websocket.c b/epan/dissectors/packet-websocket.c index fe3f7d05c7..9b6a3d26cc 100644 --- a/epan/dissectors/packet-websocket.c +++ b/epan/dissectors/packet-websocket.c @@ -375,10 +375,10 @@ dissect_websocket(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat /* Flags */ proto_tree_add_item(ws_tree, hf_ws_fin, tvb, 0, 1, ENC_NA); fin = (tvb_get_guint8(tvb, 0) & MASK_WS_FIN) >> 4; - proto_tree_add_item(ws_tree, hf_ws_reserved, tvb, 0, 1, ENC_NA); + proto_tree_add_item(ws_tree, hf_ws_reserved, tvb, 0, 1, ENC_BIG_ENDIAN); /* Opcode */ - proto_tree_add_item(ws_tree, hf_ws_opcode, tvb, 0, 1, ENC_NA); + proto_tree_add_item(ws_tree, hf_ws_opcode, tvb, 0, 1, ENC_BIG_ENDIAN); opcode = tvb_get_guint8(tvb, 0) & MASK_WS_OPCODE; col_append_fstr(pinfo->cinfo, COL_INFO, " %s", val_to_str_const(opcode, ws_opcode_vals, "Unknown Opcode")); col_append_str(pinfo->cinfo, COL_INFO, fin ? " [FIN]" : " "); @@ -388,7 +388,7 @@ dissect_websocket(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat col_append_str(pinfo->cinfo, COL_INFO, mask ? " [MASKED]" : " "); /* (Extended) Payload Length */ - ti_len = proto_tree_add_item(ws_tree, hf_ws_payload_length, tvb, 1, 1, ENC_NA); + ti_len = proto_tree_add_item(ws_tree, hf_ws_payload_length, tvb, 1, 1, ENC_BIG_ENDIAN); if (short_length == 126) { proto_item_append_text(ti_len, " Extended Payload Length (16 bits)"); proto_tree_add_item(ws_tree, hf_ws_payload_length_ext_16, tvb, 2, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index fbefdb5bc0..7788f31c78 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.c @@ -706,7 +706,7 @@ dump_facilities(proto_tree *tree, int *offset, tvbuff_t *tvb, packet_info *pinfo if (len && tree) { facilities_tree = proto_tree_add_subtree(tree, tvb, *offset, len + 1, ett_x25_facilities, NULL, "Facilities"); - proto_tree_add_item(facilities_tree, hf_x25_facilities_length, tvb, *offset, 1, ENC_NA); + proto_tree_add_item(facilities_tree, hf_x25_facilities_length, tvb, *offset, 1, ENC_BIG_ENDIAN); } (*offset)++; @@ -719,44 +719,44 @@ dump_facilities(proto_tree *tree, int *offset, tvbuff_t *tvb, packet_info *pinfo proto_item_append_text(ti, ": %s", val_to_str(fac, x25_facilities_classA_vals, "Unknown (0x%02X)")); facility_tree = proto_item_add_subtree(ti, ett_x25_facility); - proto_tree_add_item(facility_tree, hf_x25_facility_class, tvb, *offset, 1, ENC_NA); - proto_tree_add_item(facility_tree, hf_x25_facility_classA, tvb, *offset, 1, ENC_NA); + proto_tree_add_item(facility_tree, hf_x25_facility_class, tvb, *offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(facility_tree, hf_x25_facility_classA, tvb, *offset, 1, ENC_BIG_ENDIAN); if (facility_tree) { switch (fac) { case X25_FAC_COMP_MARK: - proto_tree_add_item(facility_tree, hf_x25_facility_classA_comp_mark, tvb, *offset+1, 1, ENC_NA); + proto_tree_add_item(facility_tree, hf_x25_facility_classA_comp_mark, tvb, *offset+1, 1, ENC_BIG_ENDIAN); break; case X25_FAC_REVERSE: - proto_tree_add_item(facility_tree, hf_x25_facility_classA_reverse, tvb, *offset+1, 1, ENC_NA); + proto_tree_add_item(facility_tree, hf_x25_facility_classA_reverse, tvb, *offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(facility_tree, hf_x25_fast_select, tvb, *offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(facility_tree, hf_x25_icrd, tvb, *offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(facility_tree, hf_x25_facility_reverse_charging, tvb, *offset+1, 1, ENC_BIG_ENDIAN); break; case X25_FAC_CHARGING_INFO: - proto_tree_add_item(facility_tree, hf_x25_facility_classA_charging_info, tvb, *offset+1, 1, ENC_NA); + proto_tree_add_item(facility_tree, hf_x25_facility_classA_charging_info, tvb, *offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(facility_tree, hf_x25_facility_charging_info, tvb, *offset+1, 1, ENC_NA); break; case X25_FAC_THROUGHPUT: - proto_tree_add_item(facility_tree, hf_x25_facility_throughput_called_dte, tvb, *offset+1, 1, ENC_NA); - proto_tree_add_item(facility_tree, hf_x25_throughput_called_dte, tvb, *offset+1, 1, ENC_NA); + proto_tree_add_item(facility_tree, hf_x25_facility_throughput_called_dte, tvb, *offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(facility_tree, hf_x25_throughput_called_dte, tvb, *offset+1, 1, ENC_BIG_ENDIAN); break; case X25_FAC_CUG: - proto_tree_add_item(facility_tree, hf_x25_facility_classA_cug, tvb, *offset+1, 1, ENC_NA); + proto_tree_add_item(facility_tree, hf_x25_facility_classA_cug, tvb, *offset+1, 1, ENC_BIG_ENDIAN); break; case X25_FAC_CALLED_MODIF: - proto_tree_add_item(facility_tree, hf_x25_facility_classA_called_motif, tvb, *offset+1, 1, ENC_NA); + proto_tree_add_item(facility_tree, hf_x25_facility_classA_called_motif, tvb, *offset+1, 1, ENC_BIG_ENDIAN); break; case X25_FAC_CUG_OUTGOING_ACC: - proto_tree_add_item(facility_tree, hf_x25_facility_classA_cug_outgoing_acc, tvb, *offset+1, 1, ENC_NA); + proto_tree_add_item(facility_tree, hf_x25_facility_classA_cug_outgoing_acc, tvb, *offset+1, 1, ENC_BIG_ENDIAN); break; case X25_FAC_THROUGHPUT_MIN: - proto_tree_add_item(facility_tree, hf_x25_facility_classA_throughput_min, tvb, *offset+1, 1, ENC_NA); + proto_tree_add_item(facility_tree, hf_x25_facility_classA_throughput_min, tvb, *offset+1, 1, ENC_BIG_ENDIAN); break; case X25_FAC_EXPRESS_DATA: - proto_tree_add_item(facility_tree, hf_x25_facility_classA_express_data, tvb, *offset+1, 1, ENC_NA); + proto_tree_add_item(facility_tree, hf_x25_facility_classA_express_data, tvb, *offset+1, 1, ENC_BIG_ENDIAN); break; default: - proto_tree_add_item(facility_tree, hf_x25_facility_classA_unknown, tvb, *offset+1, 1, ENC_NA); + proto_tree_add_item(facility_tree, hf_x25_facility_classA_unknown, tvb, *offset+1, 1, ENC_BIG_ENDIAN); break; } } @@ -768,8 +768,8 @@ dump_facilities(proto_tree *tree, int *offset, tvbuff_t *tvb, packet_info *pinfo proto_item_append_text(ti, ": %s", val_to_str(fac, x25_facilities_classB_vals, "Unknown (0x%02X)")); facility_tree = proto_item_add_subtree(ti, ett_x25_facility); - proto_tree_add_item(facility_tree, hf_x25_facility_class, tvb, *offset, 1, ENC_NA); - proto_tree_add_item(facility_tree, hf_x25_facility_classB, tvb, *offset, 1, ENC_NA); + proto_tree_add_item(facility_tree, hf_x25_facility_class, tvb, *offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(facility_tree, hf_x25_facility_classB, tvb, *offset, 1, ENC_BIG_ENDIAN); if (facility_tree) { switch (fac) { case X25_FAC_BILATERAL_CUG: @@ -780,8 +780,8 @@ dump_facilities(proto_tree *tree, int *offset, tvbuff_t *tvb, packet_info *pinfo proto_tree_add_item(facility_tree, hf_x25_facility_packet_size_calling_dte, tvb, *offset+2, 1, ENC_BIG_ENDIAN); break; case X25_FAC_WINDOW_SIZE: - proto_tree_add_item(facility_tree, hf_x25_window_size_called_dte, tvb, *offset+1, 1, ENC_NA); - proto_tree_add_item(facility_tree, hf_x25_window_size_calling_dte, tvb, *offset+2, 1, ENC_NA); + proto_tree_add_item(facility_tree, hf_x25_window_size_called_dte, tvb, *offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(facility_tree, hf_x25_window_size_calling_dte, tvb, *offset+2, 1, ENC_BIG_ENDIAN); break; case X25_FAC_RPOA_SELECTION: proto_tree_add_item(facility_tree, hf_x25_facility_data_network_id_code, tvb, *offset+1, 2, ENC_BIG_ENDIAN); @@ -808,8 +808,8 @@ dump_facilities(proto_tree *tree, int *offset, tvbuff_t *tvb, packet_info *pinfo proto_item_append_text(ti, ": %s", val_to_str(fac, x25_facilities_classC_vals, "Unknown (0x%02X)")); facility_tree = proto_item_add_subtree(ti, ett_x25_facility); - proto_tree_add_item(facility_tree, hf_x25_facility_class, tvb, *offset, 1, ENC_NA); - proto_tree_add_item(facility_tree, hf_x25_facility_classC, tvb, *offset, 1, ENC_NA); + proto_tree_add_item(facility_tree, hf_x25_facility_class, tvb, *offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(facility_tree, hf_x25_facility_classC, tvb, *offset, 1, ENC_BIG_ENDIAN); if (facility_tree) { proto_tree_add_item(facility_tree, hf_x25_facility_classC_unknown, tvb, *offset+1, 2, ENC_BIG_ENDIAN); } @@ -820,11 +820,11 @@ dump_facilities(proto_tree *tree, int *offset, tvbuff_t *tvb, packet_info *pinfo proto_item_append_text(ti, ": %s", val_to_str(fac, x25_facilities_classD_vals, "Unknown (0x%02X)")); facility_tree = proto_item_add_subtree(ti, ett_x25_facility); - proto_tree_add_item(facility_tree, hf_x25_facility_class, tvb, *offset, 1, ENC_NA); + proto_tree_add_item(facility_tree, hf_x25_facility_class, tvb, *offset, 1, ENC_BIG_ENDIAN); byte1 = tvb_get_guint8(tvb, *offset+1); proto_item_set_len(ti, byte1+2); - proto_tree_add_item(facility_tree, hf_x25_facility_classD, tvb, *offset, 1, ENC_NA); - proto_tree_add_item(facility_tree, hf_x25_facility_length, tvb, *offset+1, 1, ENC_NA); + proto_tree_add_item(facility_tree, hf_x25_facility_classD, tvb, *offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(facility_tree, hf_x25_facility_length, tvb, *offset+1, 1, ENC_BIG_ENDIAN); if (facility_tree) { switch (fac) { case X25_FAC_CALL_DURATION: @@ -1031,12 +1031,12 @@ x25_ntoa(proto_tree *tree, int *offset, tvbuff_t *tvb, if (tree) { if (is_registration) { - proto_tree_add_item(tree, hf_x25_dte_address_length, tvb, *offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_x25_dce_address_length, tvb, *offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_x25_dte_address_length, tvb, *offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_x25_dce_address_length, tvb, *offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_x25_calling_address_length, tvb, *offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_x25_called_address_length, tvb, *offset, 1, ENC_NA); + proto_tree_add_item(tree, hf_x25_calling_address_length, tvb, *offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_x25_called_address_length, tvb, *offset, 1, ENC_BIG_ENDIAN); } } (*offset)++; @@ -1536,13 +1536,13 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } else if (is_x_264) { /* It looks like an X.264 UN TPDU, so show it as such. */ if (userdata_tree) { - proto_tree_add_item( userdata_tree, hf_x264_length_indicator, tvb, localoffset, 1, ENC_NA); - proto_tree_add_item( userdata_tree, hf_x264_un_tpdu_id, tvb, localoffset+1, 1, ENC_NA); + proto_tree_add_item( userdata_tree, hf_x264_length_indicator, tvb, localoffset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item( userdata_tree, hf_x264_un_tpdu_id, tvb, localoffset+1, 1, ENC_BIG_ENDIAN); } prt_id = tvb_get_guint8(tvb, localoffset+2); if (userdata_tree) { - proto_tree_add_item( userdata_tree, hf_x264_protocol_id, tvb, localoffset+2, 1, ENC_NA); - proto_tree_add_item( userdata_tree, hf_x264_sharing_strategy, tvb, localoffset+3, 1, ENC_NA); + proto_tree_add_item( userdata_tree, hf_x264_protocol_id, tvb, localoffset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item( userdata_tree, hf_x264_sharing_strategy, tvb, localoffset+3, 1, ENC_BIG_ENDIAN); } /* XXX - dissect the variable part? */ @@ -1572,7 +1572,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ISO 9577 NLPIDs, as per Annex A of X.263/ISO 9577. */ if (userdata_tree) { - proto_tree_add_item( userdata_tree, hf_x263_sec_protocol_id, tvb, localoffset, 1, ENC_NA); + proto_tree_add_item( userdata_tree, hf_x263_sec_protocol_id, tvb, localoffset, 1, ENC_BIG_ENDIAN); } if (!pinfo->fd->flags.visited) { @@ -1702,7 +1702,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, long_name); proto_tree_add_text(x25_tree, tvb, 3, 1, "Cause: %s", clear_code(tvb_get_guint8(tvb, 3))); - proto_tree_add_item(x25_tree, hf_x25_diagnostic, tvb, 4, 1, ENC_NA); + proto_tree_add_item(x25_tree, hf_x25_diagnostic, tvb, 4, 1, ENC_BIG_ENDIAN); } localoffset = x25_pkt_len; break; @@ -1846,7 +1846,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (x25_tree) { if (localoffset < x25_pkt_len) - proto_tree_add_item( x25_tree, hf_x25_reg_request_length, tvb, localoffset, 1, ENC_NA); + proto_tree_add_item( x25_tree, hf_x25_reg_request_length, tvb, localoffset, 1, ENC_BIG_ENDIAN); if (localoffset+1 < x25_pkt_len) proto_tree_add_text(x25_tree, tvb, localoffset+1, tvb_get_guint8(tvb, localoffset) & 0x7F, @@ -1859,8 +1859,8 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (x25_tree) { proto_tree_add_uint(x25_tree, hf_x25_type, tvb, 2, 1, X25_REGISTRATION_CONFIRMATION); - proto_tree_add_item(x25_tree, hf_x25_reg_confirm_cause, tvb, 3, 1, ENC_NA); - proto_tree_add_item(x25_tree, hf_x25_reg_confirm_diagnostic, tvb, 4, 1, ENC_NA); + proto_tree_add_item(x25_tree, hf_x25_reg_confirm_cause, tvb, 3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(x25_tree, hf_x25_reg_confirm_diagnostic, tvb, 4, 1, ENC_BIG_ENDIAN); } localoffset = 5; if (localoffset < x25_pkt_len) @@ -1868,7 +1868,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (x25_tree) { if (localoffset < x25_pkt_len) - proto_tree_add_item( x25_tree, hf_x25_reg_confirm_length, tvb, localoffset, 1, ENC_NA); + proto_tree_add_item( x25_tree, hf_x25_reg_confirm_length, tvb, localoffset, 1, ENC_BIG_ENDIAN); if (localoffset+1 < x25_pkt_len) proto_tree_add_text(x25_tree, tvb, localoffset+1, tvb_get_guint8(tvb, localoffset) & 0x7F, @@ -1989,7 +1989,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_uint(x25_tree, hf_x25_p_r_mod8, tvb, localoffset, 1, pkt_type); proto_tree_add_item(x25_tree, hf_x25_type_fc_mod8, tvb, - localoffset, 1, ENC_NA); + localoffset, 1, ENC_BIG_ENDIAN); } col_add_fstr(pinfo->cinfo, COL_INFO, "%s VC:%d P(R):%d", val_to_str(PACKET_TYPE_FC(pkt_type), vals_x25_type, "Unknown (0x%02X)"), @@ -1998,9 +1998,9 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } else { if (x25_tree) { proto_tree_add_item(x25_tree, hf_x25_type, tvb, - localoffset, 1, ENC_NA); + localoffset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(x25_tree, hf_x25_p_r_mod128, tvb, - localoffset+1, 1, ENC_NA); + localoffset+1, 1, ENC_BIG_ENDIAN); } col_add_fstr(pinfo->cinfo, COL_INFO, "%s VC:%d P(R):%d", val_to_str(PACKET_TYPE_FC(pkt_type), vals_x25_type, "Unknown (0x%02X)"), diff --git a/epan/dissectors/packet-x29.c b/epan/dissectors/packet-x29.c index 62344e409f..57363248a4 100644 --- a/epan/dissectors/packet-x29.c +++ b/epan/dissectors/packet-x29.c @@ -137,9 +137,9 @@ dissect_x29(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) * XXX - dissect the references as per X.3. */ while (tvb_reported_length_remaining(tvb, offset) > 0) { - proto_tree_add_item(x29_tree, hf_x29_parameter, tvb, offset, 1, ENC_NA); + proto_tree_add_item(x29_tree, hf_x29_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(x29_tree, hf_x29_value, tvb, offset, 1, ENC_NA); + proto_tree_add_item(x29_tree, hf_x29_value, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } break; @@ -164,7 +164,7 @@ dissect_x29(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) case BREAK_IND_MSG: if (tvb_reported_length_remaining(tvb, offset) > 0) { type_ref = tvb_get_guint8(tvb, offset); - proto_tree_add_item(x29_tree, hf_x29_type_reference, tvb, offset, 1, ENC_NA); + proto_tree_add_item(x29_tree, hf_x29_type_reference, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; switch (type_ref) { @@ -172,17 +172,17 @@ dissect_x29(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) /* * XXX - dissect as per X.28. */ - proto_tree_add_item(x29_tree, hf_x29_type_of_aspect, tvb, offset, 1, ENC_NA); + proto_tree_add_item(x29_tree, hf_x29_type_of_aspect, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; break; case 0x08: /* break */ - proto_tree_add_item(x29_tree, hf_x29_break_value, tvb, offset, 1, ENC_NA); + proto_tree_add_item(x29_tree, hf_x29_break_value, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; break; default: - proto_tree_add_item(x29_tree, hf_x29_type_reference_value, tvb, offset, 1, ENC_NA); + proto_tree_add_item(x29_tree, hf_x29_type_reference_value, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; break; } |