diff options
48 files changed, 907 insertions, 907 deletions
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index 0988074b59..4b16c3f23d 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -820,7 +820,7 @@ dissect_6lowpan_ipv6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { /* Get and display the pattern. */ if (tree) { - proto_tree_add_bits_item(tree, hf_6lowpan_pattern, tvb, 0, LOWPAN_PATTERN_IPV6_BITS, FALSE); + proto_tree_add_bits_item(tree, hf_6lowpan_pattern, tvb, 0, LOWPAN_PATTERN_IPV6_BITS, ENC_BIG_ENDIAN); } /* Create a tvbuff subset for the ipv6 datagram. */ @@ -870,7 +870,7 @@ dissect_6lowpan_hc1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint dg hc_tree = proto_item_add_subtree(ti, ett_6lowpan_hc1); /* Get and display the pattern. */ - proto_tree_add_bits_item(hc_tree, hf_6lowpan_pattern, tvb, 0, LOWPAN_PATTERN_HC1_BITS, FALSE); + proto_tree_add_bits_item(hc_tree, hf_6lowpan_pattern, tvb, 0, LOWPAN_PATTERN_HC1_BITS, ENC_BIG_ENDIAN); } offset += sizeof(guint8); @@ -1008,7 +1008,7 @@ dissect_6lowpan_hc1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint dg bit_offset += LOWPAN_IPV6_TRAFFIC_CLASS_BITS; /* Parse the flow label. */ - ipv6.ip6_flow = tvb_get_bits32(tvb, bit_offset, LOWPAN_IPV6_FLOW_LABEL_BITS, FALSE); + ipv6.ip6_flow = tvb_get_bits32(tvb, bit_offset, LOWPAN_IPV6_FLOW_LABEL_BITS, ENC_BIG_ENDIAN); if (tree) { proto_tree_add_uint(tree, hf_6lowpan_flow_label, tvb, bit_offset>>3, BITS_TO_BYTE_LEN(bit_offset, LOWPAN_IPV6_FLOW_LABEL_BITS), ipv6.ip6_flow); @@ -1054,7 +1054,7 @@ dissect_6lowpan_hc1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint dg bit_offset += LOWPAN_UDP_PORT_COMPRESSED_BITS; } else { - udp.src_port = tvb_get_bits16(tvb, bit_offset, LOWPAN_UDP_PORT_BITS, FALSE); + udp.src_port = tvb_get_bits16(tvb, bit_offset, LOWPAN_UDP_PORT_BITS, ENC_BIG_ENDIAN); bit_offset += LOWPAN_UDP_PORT_BITS; } if (tree) { @@ -1070,7 +1070,7 @@ dissect_6lowpan_hc1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint dg bit_offset += LOWPAN_UDP_PORT_COMPRESSED_BITS; } else { - udp.dst_port = tvb_get_bits16(tvb, bit_offset, LOWPAN_UDP_PORT_BITS, FALSE); + udp.dst_port = tvb_get_bits16(tvb, bit_offset, LOWPAN_UDP_PORT_BITS, ENC_BIG_ENDIAN); bit_offset += LOWPAN_UDP_PORT_BITS; } if (tree) { @@ -1081,7 +1081,7 @@ dissect_6lowpan_hc1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint dg /* Parse the length, if present. */ if (!(hc_udp_encoding & LOWPAN_HC2_UDP_LENGTH)) { - udp.length = tvb_get_bits16(tvb, bit_offset, LOWPAN_UDP_LENGTH_BITS, FALSE); + udp.length = tvb_get_bits16(tvb, bit_offset, LOWPAN_UDP_LENGTH_BITS, ENC_BIG_ENDIAN); if (tree) { proto_tree_add_uint(tree, hf_6lowpan_udp_len, tvb, bit_offset>>3, BITS_TO_BYTE_LEN(bit_offset, LOWPAN_UDP_LENGTH_BITS), udp.length); @@ -1106,7 +1106,7 @@ dissect_6lowpan_hc1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint dg udp.length = g_ntohs(udp.length); /* Parse the checksum. */ - udp.checksum = tvb_get_bits16(tvb, bit_offset, LOWPAN_UDP_CHECKSUM_BITS, FALSE); + udp.checksum = tvb_get_bits16(tvb, bit_offset, LOWPAN_UDP_CHECKSUM_BITS, ENC_BIG_ENDIAN); if (tree) { proto_tree_add_uint(tree, hf_6lowpan_udp_checksum, tvb, bit_offset>>3, BITS_TO_BYTE_LEN(bit_offset, LOWPAN_UDP_CHECKSUM_BITS), udp.checksum); @@ -1205,7 +1205,7 @@ dissect_6lowpan_iphc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint d iphc_tree = proto_item_add_subtree(ti, ett_6lowpan_iphc); /* Display the pattern. */ - proto_tree_add_bits_item(iphc_tree, hf_6lowpan_pattern, tvb, 0, LOWPAN_PATTERN_IPHC_BITS, FALSE); + proto_tree_add_bits_item(iphc_tree, hf_6lowpan_pattern, tvb, 0, LOWPAN_PATTERN_IPHC_BITS, ENC_BIG_ENDIAN); } /*===================================================== @@ -1284,9 +1284,9 @@ dissect_6lowpan_iphc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint d if ((iphc_traffic == LOWPAN_IPHC_FLOW_CLASS_LABEL) || (iphc_traffic == LOWPAN_IPHC_FLOW_ECN_LABEL)) { /* Pad to 4-bits past the start of the byte. */ offset += ((4 - offset) & 0x7); - ipv6.ip6_flow = tvb_get_bits32(tvb, offset, LOWPAN_IPHC_LABEL_BITS, FALSE); + ipv6.ip6_flow = tvb_get_bits32(tvb, offset, LOWPAN_IPHC_LABEL_BITS, ENC_BIG_ENDIAN); if (tree) { - proto_tree_add_bits_item(tree, hf_6lowpan_flow_label, tvb, offset, LOWPAN_IPHC_LABEL_BITS, FALSE); + proto_tree_add_bits_item(tree, hf_6lowpan_flow_label, tvb, offset, LOWPAN_IPHC_LABEL_BITS, ENC_BIG_ENDIAN); } offset += LOWPAN_IPHC_LABEL_BITS; } @@ -1568,7 +1568,7 @@ dissect_6lowpan_iphc_nhc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gi ti = proto_tree_add_text(tree, tvb, offset, sizeof(guint16), "IPv6 extension header"); nhc_tree = proto_item_add_subtree(ti, ett_6lowpan_nhc_ext); /* Display the NHC-UDP pattern. */ - proto_tree_add_bits_item(nhc_tree, hf_6lowpan_nhc_pattern, tvb, offset<<3, LOWPAN_NHC_PATTERN_EXT_BITS, FALSE); + proto_tree_add_bits_item(nhc_tree, hf_6lowpan_nhc_pattern, tvb, offset<<3, LOWPAN_NHC_PATTERN_EXT_BITS, ENC_BIG_ENDIAN); } /* Get and display the extension header compression flags. */ @@ -1613,7 +1613,7 @@ dissect_6lowpan_iphc_nhc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gi ti = proto_tree_add_text(tree, tvb, offset, sizeof(guint16), "IPv6 extension header"); nhc_tree = proto_item_add_subtree(ti, ett_6lowpan_nhc_ext); /* Display the NHC-UDP pattern. */ - proto_tree_add_bits_item(nhc_tree, hf_6lowpan_nhc_pattern, tvb, offset<<3, LOWPAN_NHC_PATTERN_EXT_BITS, FALSE); + proto_tree_add_bits_item(nhc_tree, hf_6lowpan_nhc_pattern, tvb, offset<<3, LOWPAN_NHC_PATTERN_EXT_BITS, ENC_BIG_ENDIAN); } /* Get and display the extension header compression flags. */ @@ -1725,7 +1725,7 @@ dissect_6lowpan_iphc_nhc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gi ti = proto_tree_add_text(tree, tvb, 0, sizeof(guint8), "UDP header compression"); nhc_tree = proto_item_add_subtree(ti, ett_6lowpan_nhc_udp); /* Display the NHC-UDP pattern. */ - proto_tree_add_bits_item(nhc_tree, hf_6lowpan_nhc_pattern, tvb, offset<<3, LOWPAN_NHC_PATTERN_UDP_BITS, FALSE); + proto_tree_add_bits_item(nhc_tree, hf_6lowpan_nhc_pattern, tvb, offset<<3, LOWPAN_NHC_PATTERN_UDP_BITS, ENC_BIG_ENDIAN); } /* Get and display the UDP header compression options */ @@ -1892,7 +1892,7 @@ dissect_6lowpan_bc0(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) bcast_tree = proto_item_add_subtree(ti, ett_6lowpan_bcast); /* Get and display the pattern. */ - proto_tree_add_bits_item(bcast_tree, hf_6lowpan_pattern, tvb, 0, LOWPAN_PATTERN_BC0_BITS, FALSE); + proto_tree_add_bits_item(bcast_tree, hf_6lowpan_pattern, tvb, 0, LOWPAN_PATTERN_BC0_BITS, ENC_BIG_ENDIAN); /* Get and display the sequence number. */ seqnum = tvb_get_guint8(tvb, sizeof(guint8)); @@ -1944,7 +1944,7 @@ dissect_6lowpan_mesh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) flag_tree = proto_item_add_subtree(flag_item, ett_6lowpan_mesh); /* Add the mesh header fields. */ - proto_tree_add_bits_item(flag_tree, hf_6lowpan_pattern, tvb, offset * 8, LOWPAN_PATTERN_MESH_BITS, FALSE); + proto_tree_add_bits_item(flag_tree, hf_6lowpan_pattern, tvb, offset * 8, LOWPAN_PATTERN_MESH_BITS, ENC_BIG_ENDIAN); proto_tree_add_boolean(flag_tree, hf_6lowpan_mesh_v, tvb, offset, sizeof(guint8), mesh_header & LOWPAN_MESH_HEADER_V); proto_tree_add_boolean(flag_tree, hf_6lowpan_mesh_f, tvb, offset, sizeof(guint8), mesh_header & LOWPAN_MESH_HEADER_F); if ((mesh_header & LOWPAN_MESH_HEADER_HOPS)==15) @@ -2057,9 +2057,9 @@ dissect_6lowpan_frag_first(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } /* Get and display the pattern and datagram size. */ - dgram_size = tvb_get_bits16(tvb, (offset * 8) + LOWPAN_PATTERN_FRAG_BITS, LOWPAN_FRAG_DGRAM_SIZE_BITS, FALSE); + dgram_size = tvb_get_bits16(tvb, (offset * 8) + LOWPAN_PATTERN_FRAG_BITS, LOWPAN_FRAG_DGRAM_SIZE_BITS, ENC_BIG_ENDIAN); if (tree) { - proto_tree_add_bits_item(frag_tree, hf_6lowpan_pattern, tvb, offset * 8, LOWPAN_PATTERN_FRAG_BITS, FALSE); + proto_tree_add_bits_item(frag_tree, hf_6lowpan_pattern, tvb, offset * 8, LOWPAN_PATTERN_FRAG_BITS, ENC_BIG_ENDIAN); length_item = proto_tree_add_uint(frag_tree, hf_6lowpan_frag_dgram_size, tvb, offset, sizeof(guint16), dgram_size); } offset += sizeof(guint16); @@ -2183,9 +2183,9 @@ dissect_6lowpan_frag_middle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Get and display the pattern and datagram size. */ - dgram_size = tvb_get_bits16(tvb, (offset * 8) + LOWPAN_PATTERN_FRAG_BITS, LOWPAN_FRAG_DGRAM_SIZE_BITS, FALSE); + dgram_size = tvb_get_bits16(tvb, (offset * 8) + LOWPAN_PATTERN_FRAG_BITS, LOWPAN_FRAG_DGRAM_SIZE_BITS, ENC_BIG_ENDIAN); if (tree) { - proto_tree_add_bits_item(frag_tree, hf_6lowpan_pattern, tvb, offset * 8, LOWPAN_PATTERN_FRAG_BITS, FALSE); + proto_tree_add_bits_item(frag_tree, hf_6lowpan_pattern, tvb, offset * 8, LOWPAN_PATTERN_FRAG_BITS, ENC_BIG_ENDIAN); proto_tree_add_uint(frag_tree, hf_6lowpan_frag_dgram_size, tvb, offset, sizeof(guint16), dgram_size); } offset += sizeof(guint16); @@ -2257,7 +2257,7 @@ dissect_6lowpan_unknown(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Get and display the pattern. */ if (tree) { - proto_tree_add_bits_item(tree, hf_6lowpan_pattern, tvb, 0, 8, FALSE); + proto_tree_add_bits_item(tree, hf_6lowpan_pattern, tvb, 0, 8, ENC_BIG_ENDIAN); } /* Create a tvbuff subset for the remaining data. */ diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c index c371f4b172..9face06270 100644 --- a/epan/dissectors/packet-ansi_801.c +++ b/epan/dissectors/packet-ansi_801.c @@ -221,7 +221,7 @@ for_req_pseudo_meas(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) bit_offset = offset << 3; /* PREF_RESP_QUAL */ - proto_tree_add_bits_item(tree, hf_ansi_801_pref_resp_qual, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(tree, hf_ansi_801_pref_resp_qual, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; /* NUM_FIXES */ @@ -235,12 +235,12 @@ for_req_pseudo_meas(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) bit_offset += 8; /* OFFSET_REQ */ - proto_tree_add_bits_item(tree, hf_ansi_801_offset_req, tvb, bit_offset++, 1, FALSE); + proto_tree_add_bits_item(tree, hf_ansi_801_offset_req, tvb, bit_offset++, 1, ENC_BIG_ENDIAN); if(bit_offset & 0x07) { spare_bits = 8 - (bit_offset & 0x07); - proto_tree_add_bits_item(tree, hf_ansi_801_reserved_bits, tvb, bit_offset, spare_bits, FALSE); + proto_tree_add_bits_item(tree, hf_ansi_801_reserved_bits, tvb, bit_offset, spare_bits, ENC_BIG_ENDIAN); bit_offset += spare_bits; } @@ -756,20 +756,20 @@ pr_loc_response(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) bit_offset = offset << 3; /* TIME_REF_CDMA */ - value = tvb_get_bits16(tvb, bit_offset, 14, FALSE); + value = tvb_get_bits16(tvb, bit_offset, 14, ENC_BIG_ENDIAN); proto_tree_add_uint_bits_format_value(tree, hf_ansi_801_time_ref_cdma, tvb, bit_offset, 14, value * 50, "%u frames (0x%04x)", value * 50, value); bit_offset += 14; /* LAT */ - value = tvb_get_bits32(tvb, bit_offset, 25, FALSE); + value = tvb_get_bits32(tvb, bit_offset, 25, ENC_BIG_ENDIAN); fl_value = (float)(-90.0 + ((float)value * 180 / 33554432)); proto_tree_add_float_bits_format_value(tree, hf_ansi_801_lat, tvb, bit_offset, 25, fl_value, "%.5f degrees %s (0x%08x)", fabs(fl_value), fl_value < 0 ? "South" : "North", value); bit_offset += 25; /* LONG */ - value = tvb_get_bits32(tvb, bit_offset, 26, FALSE); + value = tvb_get_bits32(tvb, bit_offset, 26, ENC_BIG_ENDIAN); fl_value = (float)(-180.0 + ((float)value * 180 / 33554432)); proto_tree_add_float_bits_format_value(tree, hf_ansi_801_long, tvb, bit_offset, 26, fl_value, "%.5f degrees %s (0x%08x)", fabs(fl_value), fl_value < 0 ? "West" : "East", value); @@ -815,23 +815,23 @@ pr_loc_response(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) bit_offset += 5; /* FIX_TYPE */ - proto_tree_add_bits_ret_val(tree, hf_ansi_801_fix_type, tvb, bit_offset++, 1, &fix_type, FALSE); + proto_tree_add_bits_ret_val(tree, hf_ansi_801_fix_type, tvb, bit_offset++, 1, &fix_type, ENC_BIG_ENDIAN); /* VELOCITY_INCL */ - proto_tree_add_bits_ret_val(tree, hf_ansi_801_velocity_incl, tvb, bit_offset++, 1, &velocity_incl, FALSE); + proto_tree_add_bits_ret_val(tree, hf_ansi_801_velocity_incl, tvb, bit_offset++, 1, &velocity_incl, ENC_BIG_ENDIAN); if(velocity_incl) { /* VELOCITY_HOR */ - value = tvb_get_bits16(tvb, bit_offset, 9, FALSE); + value = tvb_get_bits16(tvb, bit_offset, 9, ENC_BIG_ENDIAN); fl_value = (float)(0.25 * value); proto_tree_add_float_bits_format_value(tree, hf_ansi_801_velocity_hor, tvb, bit_offset, 9, fl_value, "%.2f m/s (0x%04x)", fl_value, value); bit_offset += 9; /* HEADING */ - value = tvb_get_bits16(tvb, bit_offset, 10, FALSE); + value = tvb_get_bits16(tvb, bit_offset, 10, ENC_BIG_ENDIAN); fl_value = (float)value * 360 / 1024; proto_tree_add_float_bits_format_value(tree, hf_ansi_801_heading, tvb, bit_offset, 10, fl_value, "%.3f degrees (0x%04x)", fl_value, value); @@ -849,30 +849,30 @@ pr_loc_response(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) } /* CLOCK_INCL */ - proto_tree_add_bits_ret_val(tree, hf_ansi_801_clock_incl, tvb, bit_offset++, 1, &clock_incl, FALSE); + proto_tree_add_bits_ret_val(tree, hf_ansi_801_clock_incl, tvb, bit_offset++, 1, &clock_incl, ENC_BIG_ENDIAN); if(clock_incl) { /* CLOCK_BIAS */ - value = tvb_get_bits32(tvb, bit_offset, 18, FALSE); + value = tvb_get_bits32(tvb, bit_offset, 18, ENC_BIG_ENDIAN); proto_tree_add_int_bits_format_value(tree, hf_ansi_801_clock_bias, tvb, bit_offset, 18, (gint32)value - 13000, "%d ns (0x%06x)", (gint32)value - 13000, value); bit_offset += 18; /* CLOCK_DRIFT */ - value = tvb_get_bits16(tvb, bit_offset, 16, FALSE); + value = tvb_get_bits16(tvb, bit_offset, 16, ENC_BIG_ENDIAN); proto_tree_add_int_bits_format_value(tree, hf_ansi_801_clock_drift, tvb, bit_offset, 16, (gint16)value, "%d ppb (ns/s) (0x%04x)", (gint16)value, value); bit_offset += 16; } /* HEIGHT_INCL */ - proto_tree_add_bits_ret_val(tree, hf_ansi_801_height_incl, tvb, bit_offset++, 1, &height_incl, FALSE); + proto_tree_add_bits_ret_val(tree, hf_ansi_801_height_incl, tvb, bit_offset++, 1, &height_incl, ENC_BIG_ENDIAN); if(height_incl) { /* HEIGHT */ - value = tvb_get_bits16(tvb, bit_offset, 14, FALSE); + value = tvb_get_bits16(tvb, bit_offset, 14, ENC_BIG_ENDIAN); proto_tree_add_int_bits_format_value(tree, hf_ansi_801_height, tvb, bit_offset, 14, (gint32)value - 500, "%d m (0x%04x)", (gint32)value - 500, value); bit_offset += 14; @@ -897,7 +897,7 @@ pr_loc_response(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) if(bit_offset & 0x07) { spare_bits = 8 - (bit_offset & 0x07); - proto_tree_add_bits_item(tree, hf_ansi_801_reserved_bits, tvb, bit_offset, spare_bits, FALSE); + proto_tree_add_bits_item(tree, hf_ansi_801_reserved_bits, tvb, bit_offset, spare_bits, ENC_BIG_ENDIAN); bit_offset += spare_bits; } @@ -925,7 +925,7 @@ for_pr_gps_sat_health(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset bit_offset = offset << 3; /* BAD_SV_PRESENT */ - proto_tree_add_bits_ret_val(tree, hf_ansi_801_bad_sv_present, tvb, bit_offset++, 1, &bad_sv_present, FALSE); + proto_tree_add_bits_ret_val(tree, hf_ansi_801_bad_sv_present, tvb, bit_offset++, 1, &bad_sv_present, ENC_BIG_ENDIAN); if (bad_sv_present) { @@ -948,7 +948,7 @@ for_pr_gps_sat_health(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset if(bit_offset & 0x07) { spare_bits = 8 - (bit_offset & 0x07); - proto_tree_add_bits_item(tree, hf_ansi_801_reserved_bits, tvb, bit_offset, spare_bits, FALSE); + proto_tree_add_bits_item(tree, hf_ansi_801_reserved_bits, tvb, bit_offset, spare_bits, ENC_BIG_ENDIAN); bit_offset += spare_bits; } @@ -967,11 +967,11 @@ rev_req_gps_acq_ass(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) saved_offset = offset; bit_offset = offset << 3; - proto_tree_add_bits_item(tree, hf_ansi_801_dopp_req, tvb, bit_offset++, 1, FALSE); - proto_tree_add_bits_item(tree, hf_ansi_801_add_dopp_req, tvb, bit_offset++, 1, FALSE); - proto_tree_add_bits_item(tree, hf_ansi_801_code_ph_par_req, tvb, bit_offset++, 1, FALSE); - proto_tree_add_bits_item(tree, hf_ansi_801_az_el_req, tvb, bit_offset++, 1, FALSE); - proto_tree_add_bits_item(tree, hf_ansi_801_reserved_bits, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(tree, hf_ansi_801_dopp_req, tvb, bit_offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(tree, hf_ansi_801_add_dopp_req, tvb, bit_offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(tree, hf_ansi_801_code_ph_par_req, tvb, bit_offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(tree, hf_ansi_801_az_el_req, tvb, bit_offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(tree, hf_ansi_801_reserved_bits, tvb, bit_offset, 4, ENC_BIG_ENDIAN); offset++; EXTRANEOUS_DATA_CHECK(len, offset - saved_offset); diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c index 475ab95f8a..18141767de 100644 --- a/epan/dissectors/packet-assa_r3.c +++ b/epan/dissectors/packet-assa_r3.c @@ -4281,62 +4281,62 @@ static void dissect_r3_upstreammfgfield_dumpm41t81 (tvbuff_t *tvb, guint32 start tmp_tree [18] = proto_item_add_subtree (proto_tree_add_item (rtc_tree, hf_r3_dumpm41t81_reg12, tvb, start_offset + 18, 1, ENC_LITTLE_ENDIAN), ett_r3m41t81register); tmp_tree [19] = proto_item_add_subtree (proto_tree_add_item (rtc_tree, hf_r3_dumpm41t81_reg13, tvb, start_offset + 19, 1, ENC_LITTLE_ENDIAN), ett_r3m41t81register); - proto_tree_add_bits_item (tmp_tree [ 0], hf_r3_dumpm41t81_reg00_sec1, tvb, offset_in_bits, 4, TRUE); offset_in_bits += 4; - proto_tree_add_bits_item (tmp_tree [ 0], hf_r3_dumpm41t81_reg00_sec01, tvb, offset_in_bits, 4, TRUE); offset_in_bits += 4; - proto_tree_add_bits_item (tmp_tree [ 1], hf_r3_dumpm41t81_reg01_st, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [ 1], hf_r3_dumpm41t81_reg01_10sec, tvb, offset_in_bits, 3, TRUE); offset_in_bits += 3; - proto_tree_add_bits_item (tmp_tree [ 1], hf_r3_dumpm41t81_reg01_1sec, tvb, offset_in_bits, 4, TRUE); offset_in_bits += 4; - proto_tree_add_bits_item (tmp_tree [ 2], hf_r3_dumpm41t81_reg02_notused, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [ 2], hf_r3_dumpm41t81_reg02_10min, tvb, offset_in_bits, 3, TRUE); offset_in_bits += 3; - proto_tree_add_bits_item (tmp_tree [ 2], hf_r3_dumpm41t81_reg02_1min, tvb, offset_in_bits, 4, TRUE); offset_in_bits += 4; - proto_tree_add_bits_item (tmp_tree [ 3], hf_r3_dumpm41t81_reg03_cbe, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [ 3], hf_r3_dumpm41t81_reg03_cb, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [ 3], hf_r3_dumpm41t81_reg03_10hour, tvb, offset_in_bits, 2, TRUE); offset_in_bits += 2; - proto_tree_add_bits_item (tmp_tree [ 3], hf_r3_dumpm41t81_reg03_1hour, tvb, offset_in_bits, 4, TRUE); offset_in_bits += 4; - proto_tree_add_bits_item (tmp_tree [ 4], hf_r3_dumpm41t81_reg04_notused, tvb, offset_in_bits, 5, TRUE); offset_in_bits += 5; - proto_tree_add_bits_item (tmp_tree [ 4], hf_r3_dumpm41t81_reg04_dow, tvb, offset_in_bits, 3, TRUE); offset_in_bits += 3; - proto_tree_add_bits_item (tmp_tree [ 5], hf_r3_dumpm41t81_reg05_notused, tvb, offset_in_bits, 2, TRUE); offset_in_bits += 2; - proto_tree_add_bits_item (tmp_tree [ 5], hf_r3_dumpm41t81_reg05_10day, tvb, offset_in_bits, 2, TRUE); offset_in_bits += 2; - proto_tree_add_bits_item (tmp_tree [ 5], hf_r3_dumpm41t81_reg05_1day, tvb, offset_in_bits, 4, TRUE); offset_in_bits += 4; - proto_tree_add_bits_item (tmp_tree [ 6], hf_r3_dumpm41t81_reg06_notused, tvb, offset_in_bits, 3, TRUE); offset_in_bits += 3; - proto_tree_add_bits_item (tmp_tree [ 6], hf_r3_dumpm41t81_reg06_10month, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [ 6], hf_r3_dumpm41t81_reg06_1month, tvb, offset_in_bits, 4, TRUE); offset_in_bits += 4; - proto_tree_add_bits_item (tmp_tree [ 7], hf_r3_dumpm41t81_reg07_10year, tvb, offset_in_bits, 4, TRUE); offset_in_bits += 4; - proto_tree_add_bits_item (tmp_tree [ 7], hf_r3_dumpm41t81_reg07_1year, tvb, offset_in_bits, 4, TRUE); offset_in_bits += 4; - proto_tree_add_bits_item (tmp_tree [ 8], hf_r3_dumpm41t81_reg08_out, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [ 8], hf_r3_dumpm41t81_reg08_ft, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [ 8], hf_r3_dumpm41t81_reg08_s, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [ 8], hf_r3_dumpm41t81_reg08_cal, tvb, offset_in_bits, 5, TRUE); offset_in_bits += 5; - proto_tree_add_bits_item (tmp_tree [ 9], hf_r3_dumpm41t81_reg09_notused, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [ 9], hf_r3_dumpm41t81_reg09_bmb, tvb, offset_in_bits, 5, TRUE); offset_in_bits += 5; - proto_tree_add_bits_item (tmp_tree [ 9], hf_r3_dumpm41t81_reg09_rb, tvb, offset_in_bits, 2, TRUE); offset_in_bits += 2; - proto_tree_add_bits_item (tmp_tree [10], hf_r3_dumpm41t81_reg0a_afe, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [10], hf_r3_dumpm41t81_reg0a_sqwe, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [10], hf_r3_dumpm41t81_reg0a_abe, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [10], hf_r3_dumpm41t81_reg0a_10monthalm, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [10], hf_r3_dumpm41t81_reg0a_1monthalm, tvb, offset_in_bits, 4, TRUE); offset_in_bits += 4; - proto_tree_add_bits_item (tmp_tree [11], hf_r3_dumpm41t81_reg0b_rpt5, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [11], hf_r3_dumpm41t81_reg0b_rpt4, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [11], hf_r3_dumpm41t81_reg0b_10dayalm, tvb, offset_in_bits, 2, TRUE); offset_in_bits += 2; - proto_tree_add_bits_item (tmp_tree [11], hf_r3_dumpm41t81_reg0b_1dayalm, tvb, offset_in_bits, 4, TRUE); offset_in_bits += 4; - proto_tree_add_bits_item (tmp_tree [12], hf_r3_dumpm41t81_reg0c_rpt3, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [12], hf_r3_dumpm41t81_reg0c_ht, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [12], hf_r3_dumpm41t81_reg0c_10houralm, tvb, offset_in_bits, 2, TRUE); offset_in_bits += 2; - proto_tree_add_bits_item (tmp_tree [12], hf_r3_dumpm41t81_reg0c_1houralm, tvb, offset_in_bits, 4, TRUE); offset_in_bits += 4; - proto_tree_add_bits_item (tmp_tree [13], hf_r3_dumpm41t81_reg0d_rpt2, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [13], hf_r3_dumpm41t81_reg0d_10minalm, tvb, offset_in_bits, 3, TRUE); offset_in_bits += 3; - proto_tree_add_bits_item (tmp_tree [13], hf_r3_dumpm41t81_reg0d_1minalm, tvb, offset_in_bits, 4, TRUE); offset_in_bits += 4; - proto_tree_add_bits_item (tmp_tree [14], hf_r3_dumpm41t81_reg0e_rpt1, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [14], hf_r3_dumpm41t81_reg0e_10secalm, tvb, offset_in_bits, 3, TRUE); offset_in_bits += 3; - proto_tree_add_bits_item (tmp_tree [14], hf_r3_dumpm41t81_reg0e_1secalm, tvb, offset_in_bits, 4, TRUE); offset_in_bits += 4; - proto_tree_add_bits_item (tmp_tree [15], hf_r3_dumpm41t81_reg0f_wdf, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [15], hf_r3_dumpm41t81_reg0f_af, tvb, offset_in_bits, 1, TRUE); offset_in_bits += 1; - proto_tree_add_bits_item (tmp_tree [15], hf_r3_dumpm41t81_reg0f_notused, tvb, offset_in_bits, 6, TRUE); offset_in_bits += 6; - proto_tree_add_bits_item (tmp_tree [16], hf_r3_dumpm41t81_reg10_notused, tvb, offset_in_bits, 8, TRUE); offset_in_bits += 8; - proto_tree_add_bits_item (tmp_tree [17], hf_r3_dumpm41t81_reg11_notused, tvb, offset_in_bits, 8, TRUE); offset_in_bits += 8; - proto_tree_add_bits_item (tmp_tree [18], hf_r3_dumpm41t81_reg12_notused, tvb, offset_in_bits, 8, TRUE); offset_in_bits += 8; - proto_tree_add_bits_item (tmp_tree [19], hf_r3_dumpm41t81_reg13_rs, tvb, offset_in_bits - 8, 4, TRUE); offset_in_bits += 4; - proto_tree_add_bits_item (tmp_tree [19], hf_r3_dumpm41t81_reg13_notused, tvb, offset_in_bits - 8, 4, TRUE); + proto_tree_add_bits_item (tmp_tree [ 0], hf_r3_dumpm41t81_reg00_sec1, tvb, offset_in_bits, 4, ENC_LITTLE_ENDIAN); offset_in_bits += 4; + proto_tree_add_bits_item (tmp_tree [ 0], hf_r3_dumpm41t81_reg00_sec01, tvb, offset_in_bits, 4, ENC_LITTLE_ENDIAN); offset_in_bits += 4; + proto_tree_add_bits_item (tmp_tree [ 1], hf_r3_dumpm41t81_reg01_st, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [ 1], hf_r3_dumpm41t81_reg01_10sec, tvb, offset_in_bits, 3, ENC_LITTLE_ENDIAN); offset_in_bits += 3; + proto_tree_add_bits_item (tmp_tree [ 1], hf_r3_dumpm41t81_reg01_1sec, tvb, offset_in_bits, 4, ENC_LITTLE_ENDIAN); offset_in_bits += 4; + proto_tree_add_bits_item (tmp_tree [ 2], hf_r3_dumpm41t81_reg02_notused, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [ 2], hf_r3_dumpm41t81_reg02_10min, tvb, offset_in_bits, 3, ENC_LITTLE_ENDIAN); offset_in_bits += 3; + proto_tree_add_bits_item (tmp_tree [ 2], hf_r3_dumpm41t81_reg02_1min, tvb, offset_in_bits, 4, ENC_LITTLE_ENDIAN); offset_in_bits += 4; + proto_tree_add_bits_item (tmp_tree [ 3], hf_r3_dumpm41t81_reg03_cbe, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [ 3], hf_r3_dumpm41t81_reg03_cb, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [ 3], hf_r3_dumpm41t81_reg03_10hour, tvb, offset_in_bits, 2, ENC_LITTLE_ENDIAN); offset_in_bits += 2; + proto_tree_add_bits_item (tmp_tree [ 3], hf_r3_dumpm41t81_reg03_1hour, tvb, offset_in_bits, 4, ENC_LITTLE_ENDIAN); offset_in_bits += 4; + proto_tree_add_bits_item (tmp_tree [ 4], hf_r3_dumpm41t81_reg04_notused, tvb, offset_in_bits, 5, ENC_LITTLE_ENDIAN); offset_in_bits += 5; + proto_tree_add_bits_item (tmp_tree [ 4], hf_r3_dumpm41t81_reg04_dow, tvb, offset_in_bits, 3, ENC_LITTLE_ENDIAN); offset_in_bits += 3; + proto_tree_add_bits_item (tmp_tree [ 5], hf_r3_dumpm41t81_reg05_notused, tvb, offset_in_bits, 2, ENC_LITTLE_ENDIAN); offset_in_bits += 2; + proto_tree_add_bits_item (tmp_tree [ 5], hf_r3_dumpm41t81_reg05_10day, tvb, offset_in_bits, 2, ENC_LITTLE_ENDIAN); offset_in_bits += 2; + proto_tree_add_bits_item (tmp_tree [ 5], hf_r3_dumpm41t81_reg05_1day, tvb, offset_in_bits, 4, ENC_LITTLE_ENDIAN); offset_in_bits += 4; + proto_tree_add_bits_item (tmp_tree [ 6], hf_r3_dumpm41t81_reg06_notused, tvb, offset_in_bits, 3, ENC_LITTLE_ENDIAN); offset_in_bits += 3; + proto_tree_add_bits_item (tmp_tree [ 6], hf_r3_dumpm41t81_reg06_10month, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [ 6], hf_r3_dumpm41t81_reg06_1month, tvb, offset_in_bits, 4, ENC_LITTLE_ENDIAN); offset_in_bits += 4; + proto_tree_add_bits_item (tmp_tree [ 7], hf_r3_dumpm41t81_reg07_10year, tvb, offset_in_bits, 4, ENC_LITTLE_ENDIAN); offset_in_bits += 4; + proto_tree_add_bits_item (tmp_tree [ 7], hf_r3_dumpm41t81_reg07_1year, tvb, offset_in_bits, 4, ENC_LITTLE_ENDIAN); offset_in_bits += 4; + proto_tree_add_bits_item (tmp_tree [ 8], hf_r3_dumpm41t81_reg08_out, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [ 8], hf_r3_dumpm41t81_reg08_ft, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [ 8], hf_r3_dumpm41t81_reg08_s, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [ 8], hf_r3_dumpm41t81_reg08_cal, tvb, offset_in_bits, 5, ENC_LITTLE_ENDIAN); offset_in_bits += 5; + proto_tree_add_bits_item (tmp_tree [ 9], hf_r3_dumpm41t81_reg09_notused, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [ 9], hf_r3_dumpm41t81_reg09_bmb, tvb, offset_in_bits, 5, ENC_LITTLE_ENDIAN); offset_in_bits += 5; + proto_tree_add_bits_item (tmp_tree [ 9], hf_r3_dumpm41t81_reg09_rb, tvb, offset_in_bits, 2, ENC_LITTLE_ENDIAN); offset_in_bits += 2; + proto_tree_add_bits_item (tmp_tree [10], hf_r3_dumpm41t81_reg0a_afe, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [10], hf_r3_dumpm41t81_reg0a_sqwe, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [10], hf_r3_dumpm41t81_reg0a_abe, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [10], hf_r3_dumpm41t81_reg0a_10monthalm, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [10], hf_r3_dumpm41t81_reg0a_1monthalm, tvb, offset_in_bits, 4, ENC_LITTLE_ENDIAN); offset_in_bits += 4; + proto_tree_add_bits_item (tmp_tree [11], hf_r3_dumpm41t81_reg0b_rpt5, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [11], hf_r3_dumpm41t81_reg0b_rpt4, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [11], hf_r3_dumpm41t81_reg0b_10dayalm, tvb, offset_in_bits, 2, ENC_LITTLE_ENDIAN); offset_in_bits += 2; + proto_tree_add_bits_item (tmp_tree [11], hf_r3_dumpm41t81_reg0b_1dayalm, tvb, offset_in_bits, 4, ENC_LITTLE_ENDIAN); offset_in_bits += 4; + proto_tree_add_bits_item (tmp_tree [12], hf_r3_dumpm41t81_reg0c_rpt3, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [12], hf_r3_dumpm41t81_reg0c_ht, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [12], hf_r3_dumpm41t81_reg0c_10houralm, tvb, offset_in_bits, 2, ENC_LITTLE_ENDIAN); offset_in_bits += 2; + proto_tree_add_bits_item (tmp_tree [12], hf_r3_dumpm41t81_reg0c_1houralm, tvb, offset_in_bits, 4, ENC_LITTLE_ENDIAN); offset_in_bits += 4; + proto_tree_add_bits_item (tmp_tree [13], hf_r3_dumpm41t81_reg0d_rpt2, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [13], hf_r3_dumpm41t81_reg0d_10minalm, tvb, offset_in_bits, 3, ENC_LITTLE_ENDIAN); offset_in_bits += 3; + proto_tree_add_bits_item (tmp_tree [13], hf_r3_dumpm41t81_reg0d_1minalm, tvb, offset_in_bits, 4, ENC_LITTLE_ENDIAN); offset_in_bits += 4; + proto_tree_add_bits_item (tmp_tree [14], hf_r3_dumpm41t81_reg0e_rpt1, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [14], hf_r3_dumpm41t81_reg0e_10secalm, tvb, offset_in_bits, 3, ENC_LITTLE_ENDIAN); offset_in_bits += 3; + proto_tree_add_bits_item (tmp_tree [14], hf_r3_dumpm41t81_reg0e_1secalm, tvb, offset_in_bits, 4, ENC_LITTLE_ENDIAN); offset_in_bits += 4; + proto_tree_add_bits_item (tmp_tree [15], hf_r3_dumpm41t81_reg0f_wdf, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [15], hf_r3_dumpm41t81_reg0f_af, tvb, offset_in_bits, 1, ENC_LITTLE_ENDIAN); offset_in_bits += 1; + proto_tree_add_bits_item (tmp_tree [15], hf_r3_dumpm41t81_reg0f_notused, tvb, offset_in_bits, 6, ENC_LITTLE_ENDIAN); offset_in_bits += 6; + proto_tree_add_bits_item (tmp_tree [16], hf_r3_dumpm41t81_reg10_notused, tvb, offset_in_bits, 8, ENC_LITTLE_ENDIAN); offset_in_bits += 8; + proto_tree_add_bits_item (tmp_tree [17], hf_r3_dumpm41t81_reg11_notused, tvb, offset_in_bits, 8, ENC_LITTLE_ENDIAN); offset_in_bits += 8; + proto_tree_add_bits_item (tmp_tree [18], hf_r3_dumpm41t81_reg12_notused, tvb, offset_in_bits, 8, ENC_LITTLE_ENDIAN); offset_in_bits += 8; + proto_tree_add_bits_item (tmp_tree [19], hf_r3_dumpm41t81_reg13_rs, tvb, offset_in_bits - 8, 4, ENC_LITTLE_ENDIAN); offset_in_bits += 4; + proto_tree_add_bits_item (tmp_tree [19], hf_r3_dumpm41t81_reg13_notused, tvb, offset_in_bits - 8, 4, ENC_LITTLE_ENDIAN); } } diff --git a/epan/dissectors/packet-ayiya.c b/epan/dissectors/packet-ayiya.c index ef30817c20..212928245f 100644 --- a/epan/dissectors/packet-ayiya.c +++ b/epan/dissectors/packet-ayiya.c @@ -112,12 +112,12 @@ dissect_ayiya(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset, ayiya_len, "AYIYA" ); ayiya_tree = proto_item_add_subtree(ti, ett_ayiya); - proto_tree_add_bits_item(ayiya_tree, hf_id_len, tvb, 0, 4, FALSE); - proto_tree_add_bits_item(ayiya_tree, hf_id_type, tvb, 4, 4, FALSE); - proto_tree_add_bits_item(ayiya_tree, hf_sig_len, tvb, 8, 4, FALSE); - proto_tree_add_bits_item(ayiya_tree, hf_hash_method, tvb, 12, 4, FALSE); - proto_tree_add_bits_item(ayiya_tree, hf_auth_method, tvb, 16, 4, FALSE); - proto_tree_add_bits_item(ayiya_tree, hf_opcode, tvb, 20, 4, FALSE); + proto_tree_add_bits_item(ayiya_tree, hf_id_len, tvb, 0, 4, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(ayiya_tree, hf_id_type, tvb, 4, 4, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(ayiya_tree, hf_sig_len, tvb, 8, 4, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(ayiya_tree, hf_hash_method, tvb, 12, 4, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(ayiya_tree, hf_auth_method, tvb, 16, 4, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(ayiya_tree, hf_opcode, tvb, 20, 4, ENC_BIG_ENDIAN); proto_tree_add_uint_format(ayiya_tree, hf_next_header, tvb, 3, 1, next_header, "Next header: %s (0x%02x)", diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index 0796b93fa4..aa67cda207 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -1219,7 +1219,7 @@ dissect_capwap_header(tvbuff_t *tvb, proto_tree *capwap_control_tree, guint offs plen++; /* Flags : 9 Bits */ - flags = tvb_get_bits16(tvb, (offset+plen)*8+7, 9, 0); + flags = tvb_get_bits16(tvb, (offset+plen)*8+7, 9, ENC_BIG_ENDIAN); ti_flag = proto_tree_add_uint_format(capwap_header_tree, hf_capwap_header_flags, tvb, offset+plen, 1, 0, "Header flags"); capwap_header_flags_tree = proto_item_add_subtree(ti_flag, ett_capwap); @@ -1247,8 +1247,8 @@ dissect_capwap_header(tvbuff_t *tvb, proto_tree *capwap_control_tree, guint offs /* Fragment offset : 13 Bits */ /* FIXME: Use _item and mask in hf element */ - proto_tree_add_uint(capwap_header_tree, hf_capwap_header_fragment_offset, tvb, offset+plen, 2, tvb_get_bits16(tvb, (offset+plen)*8, 13, 0)); - *fragment_offset = 8 * (guint32)tvb_get_bits16(tvb, (offset+plen)*8, 13, 0); + proto_tree_add_uint(capwap_header_tree, hf_capwap_header_fragment_offset, tvb, offset+plen, 2, tvb_get_bits16(tvb, (offset+plen)*8, 13, ENC_BIG_ENDIAN)); + *fragment_offset = 8 * (guint32)tvb_get_bits16(tvb, (offset+plen)*8, 13, ENC_BIG_ENDIAN); /* Reserved 3 Bits */ /* FIXME: Use _item and mask in hf element */ diff --git a/epan/dissectors/packet-csn1.c b/epan/dissectors/packet-csn1.c index 32fe795f27..828e4a670b 100644 --- a/epan/dissectors/packet-csn1.c +++ b/epan/dissectors/packet-csn1.c @@ -231,21 +231,21 @@ csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pDescr, t guint8 ui8 = tvb_get_bits8(tvb, bit_offset, no_of_bits); pui8 = pui8DATA(data, pDescr->offset); *pui8 = ui8; - proto_tree_add_bits_item(tree, *(pDescr->serialize.hf_ptr), tvb, bit_offset, no_of_bits, FALSE); + proto_tree_add_bits_item(tree, *(pDescr->serialize.hf_ptr), tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); } else if (no_of_bits <= 16) { - guint16 ui16 = tvb_get_bits16(tvb, bit_offset, no_of_bits, FALSE); + guint16 ui16 = tvb_get_bits16(tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); pui16 = pui16DATA(data, pDescr->offset); *pui16 = ui16; - proto_tree_add_bits_item(tree, *(pDescr->serialize.hf_ptr), tvb, bit_offset, no_of_bits, FALSE); + proto_tree_add_bits_item(tree, *(pDescr->serialize.hf_ptr), tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); } else if (no_of_bits <= 32) { - guint32 ui32 = tvb_get_bits32(tvb, bit_offset, no_of_bits, FALSE); + guint32 ui32 = tvb_get_bits32(tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); pui32 = pui32DATA(data, pDescr->offset); *pui32 = ui32; - proto_tree_add_bits_item(tree, *(pDescr->serialize.hf_ptr), tvb, bit_offset, no_of_bits, FALSE); + proto_tree_add_bits_item(tree, *(pDescr->serialize.hf_ptr), tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); } else { @@ -282,7 +282,7 @@ csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pDescr, t } else if (no_of_bits <= 16) { - guint16 ui16 = tvb_get_bits16(tvb, bit_offset, no_of_bits, FALSE); + guint16 ui16 = tvb_get_bits16(tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); pui16 = pui16DATA(data, pDescr->offset); *pui16 = ui16 + (guint16)pDescr->descr.value; @@ -292,7 +292,7 @@ csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pDescr, t } else if (no_of_bits <= 32) { - guint32 ui32 = tvb_get_bits32(tvb, bit_offset, no_of_bits, FALSE); + guint32 ui32 = tvb_get_bits32(tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); pui32 = pui32DATA(data, pDescr->offset); *pui32 = ui32 + (guint16)pDescr->descr.value; @@ -328,7 +328,7 @@ csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pDescr, t guint8 ui8 = tvb_get_masked_bits8(tvb, bit_offset, no_of_bits); pui8 = pui8DATA(data, pDescr->offset); *pui8 = ui8; - proto_tree_add_bits_item(tree, *(pDescr->serialize.hf_ptr), tvb, bit_offset, no_of_bits, FALSE); + proto_tree_add_bits_item(tree, *(pDescr->serialize.hf_ptr), tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); } else @@ -458,13 +458,13 @@ csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pDescr, t if (no_of_bits <= 32) { proto_tree_add_text(tree, tvb, bit_offset>>3, (no_of_bits>>3)+1, "%s %s", - decode_bits_in_field(bit_offset, no_of_bits, tvb_get_bits32(tvb, bit_offset, no_of_bits, FALSE)), + decode_bits_in_field(bit_offset, no_of_bits, tvb_get_bits32(tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN)), pDescr->sz); } else if (no_of_bits <= 64) { proto_tree_add_text(tree, tvb, bit_offset>>3, (no_of_bits>>3)+1, "%s %s", - decode_bits_in_field(bit_offset, no_of_bits, tvb_get_bits64(tvb, bit_offset, no_of_bits, FALSE)), + decode_bits_in_field(bit_offset, no_of_bits, tvb_get_bits64(tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN)), pDescr->sz); } else @@ -697,22 +697,22 @@ csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pDescr, t guint8 ui8 = tvb_get_bits8(tvb, bit_offset, no_of_bits); pui8 = pui8DATA(data, pDescr->offset); *pui8 = ui8; - proto_tree_add_bits_item(tree, *(pDescr->serialize.hf_ptr), tvb, bit_offset, no_of_bits, FALSE); + proto_tree_add_bits_item(tree, *(pDescr->serialize.hf_ptr), tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); } else if (no_of_bits <= 16) { - guint16 ui16 = tvb_get_bits16(tvb, bit_offset, no_of_bits, FALSE); + guint16 ui16 = tvb_get_bits16(tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); pui16 = pui16DATA(data, pDescr->offset); *pui16 = ui16; - proto_tree_add_bits_item(tree, *(pDescr->serialize.hf_ptr), tvb, bit_offset, no_of_bits, FALSE); + proto_tree_add_bits_item(tree, *(pDescr->serialize.hf_ptr), tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); } else if (no_of_bits <= 32) { - guint32 ui32 = tvb_get_bits32(tvb, bit_offset, no_of_bits, FALSE); + guint32 ui32 = tvb_get_bits32(tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); pui32 = pui32DATA(data, pDescr->offset); *pui32 = ui32; - proto_tree_add_bits_item(tree, *(pDescr->serialize.hf_ptr), tvb, bit_offset, no_of_bits, FALSE); + proto_tree_add_bits_item(tree, *(pDescr->serialize.hf_ptr), tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); } else @@ -747,7 +747,7 @@ csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pDescr, t } else if (no_of_bits <= 16) { - guint16 ui16 = tvb_get_bits16(tvb, bit_offset, no_of_bits, FALSE); + guint16 ui16 = tvb_get_bits16(tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); pui16 = pui16DATA(data, pDescr->offset); *pui16 = ui16 + (guint16)pDescr->descr.value; proto_tree_add_text(tree, tvb, bit_offset>>3, (no_of_bits>>3)+1, "%s %s", @@ -756,7 +756,7 @@ csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pDescr, t } else if (no_of_bits <= 32) { - guint32 ui32 = tvb_get_bits32(tvb, bit_offset, no_of_bits, FALSE); + guint32 ui32 = tvb_get_bits32(tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); pui32 = pui32DATA(data, pDescr->offset); *pui32 = ui32 + (guint16)pDescr->descr.value; proto_tree_add_text(tree, tvb, bit_offset>>3, (no_of_bits>>3)+1, "%s %s", @@ -789,7 +789,7 @@ csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pDescr, t guint8 ui8 = tvb_get_masked_bits8(tvb, bit_offset, no_of_bits); pui8 = pui8DATA(data, pDescr->offset); *pui8 = ui8; - proto_tree_add_bits_item(tree, *(pDescr->serialize.hf_ptr), tvb, bit_offset, no_of_bits, FALSE); + proto_tree_add_bits_item(tree, *(pDescr->serialize.hf_ptr), tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); } else { /* Maybe we should support more than 8 bits ? */ @@ -842,7 +842,7 @@ csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pDescr, t while (nCount > 0) { - *pui16 = tvb_get_bits16(tvb, bit_offset, no_of_bits, FALSE); + *pui16 = tvb_get_bits16(tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); proto_tree_add_text(tree, tvb, bit_offset>>3, (no_of_bits>>3)+1, "%s %s[%d]", decode_bits_in_field(bit_offset, no_of_bits, *pui16), pDescr->sz, @@ -1179,13 +1179,13 @@ csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pDescr, t if (no_of_bits <= 32) { proto_tree_add_text(tree, tvb, bit_offset>>3, (no_of_bits>>3)+1, "%s %s", - decode_bits_in_field(bit_offset, no_of_bits, tvb_get_bits32(tvb, bit_offset, no_of_bits, FALSE)), + decode_bits_in_field(bit_offset, no_of_bits, tvb_get_bits32(tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN)), pDescr->sz); } else if (no_of_bits <= 64) { proto_tree_add_text(tree, tvb, bit_offset>>3, (no_of_bits>>3)+1, "%s %s", - decode_bits_in_field(bit_offset, no_of_bits, tvb_get_bits64(tvb, bit_offset, no_of_bits, FALSE)), + decode_bits_in_field(bit_offset, no_of_bits, tvb_get_bits64(tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN)), pDescr->sz); } else @@ -1436,11 +1436,11 @@ csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pDescr, t } else if (no_of_bits <= 16) { - ui32 = tvb_get_bits16(tvb, bit_offset, no_of_bits, FALSE); + ui32 = tvb_get_bits16(tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); } else if (no_of_bits <= 32) { - ui32 = tvb_get_bits32(tvb, bit_offset, no_of_bits, FALSE); + ui32 = tvb_get_bits32(tvb, bit_offset, no_of_bits, ENC_BIG_ENDIAN); } else { diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index fe80424352..c868243030 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -893,7 +893,7 @@ static void dissect_eigrp_peer_stubinfo (tvbuff_t *tvb, proto_tree *tree) { proto_tree_add_bitmask(tree, tvb, 0, hf_eigrp_stub_flags, ett_eigrp_stub_flags, - eigrp_stub_flag_fields, FALSE); + eigrp_stub_flag_fields, ENC_BIG_ENDIAN); } /** @@ -2509,7 +2509,7 @@ dissect_eigrp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Decode the EIGRP Flags Field */ proto_tree_add_bitmask(eigrp_tree, tvb, 4, hf_eigrp_flags, ett_eigrp_flags, - eigrp_flag_fields, FALSE); + eigrp_flag_fields, ENC_BIG_ENDIAN); proto_tree_add_item(eigrp_tree, hf_eigrp_sequence, tvb, 8, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index 945bc96aee..77ce232286 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -1186,7 +1186,7 @@ dissect_fcels_rec (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, offset+16, 4, ENC_BIG_ENDIAN); proto_tree_add_bitmask (rec_tree, tvb, offset+20, hf_fcels_estat, ett_fcels_estat, hf_fcels_estat_fields, - FALSE); + ENC_BIG_ENDIAN); } } } diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c index d108171788..6bcf4bd285 100644 --- a/epan/dissectors/packet-fip.c +++ b/epan/dissectors/packet-fip.c @@ -309,10 +309,10 @@ fip_desc_fc4f(tvbuff_t *tvb, proto_tree *tree, proto_item *item) */ offset = 4; proto_tree_add_bitmask(tree, tvb, offset, hf_fip_desc_fc4f_types, - ett_fip_dt_fc4f_types, types_word0, FALSE); + ett_fip_dt_fc4f_types, types_word0, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_bitmask(tree, tvb, offset, hf_fip_desc_fc4f_types, - ett_fip_dt_fc4f_types, types_word1, FALSE); + ett_fip_dt_fc4f_types, types_word1, ENC_BIG_ENDIAN); offset += 256 / 8 - 4; /* skip to end of bitmask (32 bytes) */ /* @@ -321,7 +321,7 @@ fip_desc_fc4f(tvbuff_t *tvb, proto_tree *tree, proto_item *item) */ offset += 8 / 2; /* skip first 8 types, 2 types per byte */ proto_tree_add_bitmask(tree, tvb, offset, hf_fip_desc_fcp_feat, - ett_fip_dt_fcp_feat, fcp_feat, FALSE); + ett_fip_dt_fcp_feat, fcp_feat, ENC_BIG_ENDIAN); mask = tvb_get_ntohl(tvb, offset); if (mask & 1) { proto_item_append_text(item, "FCP Target "); @@ -418,7 +418,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(fip_tree, hf_fip_dlen, tvb, 6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(fip_tree, tvb, 8, hf_fip_flags, - ett_fip_flags, hf_fip_flags_fields, FALSE); + ett_fip_flags, hf_fip_flags_fields, ENC_BIG_ENDIAN); desc_offset = FIP_HEADER_LEN; rlen *= FIP_BPW; diff --git a/epan/dissectors/packet-fp_hint.c b/epan/dissectors/packet-fp_hint.c index 66cb2c4830..8d55fb8d6d 100644 --- a/epan/dissectors/packet-fp_hint.c +++ b/epan/dissectors/packet-fp_hint.c @@ -215,8 +215,8 @@ static guint16 assign_rb_info(tvbuff_t *tvb, packet_info *pinfo, guint16 offset, if (urnti) proto_tree_add_uint(subtree, hf_fph_urnti, tvb, offset, 4, urnti); - proto_tree_add_bits_item(subtree, hf_fph_content, tvb, (offset+4)*8+4, 2, TRUE); - proto_tree_add_bits_item(subtree, hf_fph_rlcmode, tvb, (offset+4)*8+6, 2, TRUE); + proto_tree_add_bits_item(subtree, hf_fph_content, tvb, (offset+4)*8+4, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_bits_item(subtree, hf_fph_rlcmode, tvb, (offset+4)*8+6, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_fph_rbid, tvb, (offset+4), 2, ENC_LITTLE_ENDIAN); proto_tree_add_boolean(subtree, hf_fph_ctmux, tvb, offset+5, 1, ctmux); proto_tree_add_boolean(subtree, hf_fph_ciphered, tvb, offset+5, 1, ciphered); @@ -366,9 +366,9 @@ static void assign_fph_hsdsch(tvbuff_t *tvb, packet_info *pinfo, guint16 offset, if (tree) { proto_tree_add_bits_item(tree, hf_fph_macehs, tvb, - offset*8+4, 1, TRUE); + offset*8+4, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bits_item(tree, hf_fph_macdflowid, tvb, - offset*8+5, 3, TRUE); + offset*8+5, 3, ENC_LITTLE_ENDIAN); } offset++; diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index 6a025ba6f2..7da30ccb0f 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -3995,7 +3995,7 @@ static void dissect_giop_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree case 1: ti = proto_tree_add_bitmask(clnp_tree, giop_header_tvb, 6, hf_giop_message_flags, ett_giop_message_flags, - giop_message_flags, FALSE); + giop_message_flags, ENC_BIG_ENDIAN); if ((header.flags & GIOP_MESSAGE_FLAGS_ENDIANNESS) == 0) proto_item_append_text(ti, ", (Big Endian)"); /* hack to show "Big Endian" when endianness flag == 0 */ break; diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index 709075ed4e..def05fce9e 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -4051,9 +4051,9 @@ de_tp_epc_ue_tl_a_lb_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ while ((count < nb_lb) && (count < 8)){ item = proto_tree_add_text(tree, tvb, curr_offset, 3, "LB entity %d", count); lb_setup_tree = proto_item_add_subtree(item, ett_epc_ue_tl_a_lb_setup); - proto_tree_add_bits_item(lb_setup_tree, hf_gsm_a_dtap_epc_ue_tl_a_ul_sdu_size, tvb, curr_offset<<3, 16, ENC_NA); + proto_tree_add_bits_item(lb_setup_tree, hf_gsm_a_dtap_epc_ue_tl_a_ul_sdu_size, tvb, curr_offset<<3, 16, ENC_BIG_ENDIAN); curr_offset += 2; - proto_tree_add_bits_item(lb_setup_tree, hf_gsm_a_dtap_epc_ue_tl_a_drb, tvb, (curr_offset<<3)+3, 5, ENC_NA); + proto_tree_add_bits_item(lb_setup_tree, hf_gsm_a_dtap_epc_ue_tl_a_drb, tvb, (curr_offset<<3)+3, 5, ENC_BIG_ENDIAN); curr_offset++; count++; } @@ -4070,7 +4070,7 @@ de_tp_epc_ue_tl_b_lb_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ curr_offset = offset; - proto_tree_add_bits_item(tree, hf_gsm_a_dtap_epc_ue_tl_b_ip_pdu_delay, tvb, curr_offset<<3, 8, ENC_NA); + proto_tree_add_bits_item(tree, hf_gsm_a_dtap_epc_ue_tl_b_ip_pdu_delay, tvb, curr_offset<<3, 8, ENC_BIG_ENDIAN); curr_offset++; return(curr_offset - offset); diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c index c039951f6a..20fa91306d 100644 --- a/epan/dissectors/packet-gsm_a_gm.c +++ b/epan/dissectors/packet-gsm_a_gm.c @@ -4811,9 +4811,9 @@ de_sm_tflow_temp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 of case 0x02: proto_tree_add_text(tf_tree, tvb, curr_offset, 2, "Media Component number value: 0x%x", - tvb_get_bits16(tvb, curr_offset<<3, 16, FALSE)); + tvb_get_bits16(tvb, curr_offset<<3, 16, ENC_BIG_ENDIAN)); proto_tree_add_text(tf_tree, tvb, curr_offset+2, 2, "IP flow number: 0x%x", - tvb_get_bits16(tvb, (curr_offset+2)<<3, 16, FALSE)); + tvb_get_bits16(tvb, (curr_offset+2)<<3, 16, ENC_BIG_ENDIAN)); break; case 0x03: diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c index ce363ac848..f78c3a0d15 100644 --- a/epan/dissectors/packet-gsm_a_rr.c +++ b/epan/dissectors/packet-gsm_a_rr.c @@ -893,9 +893,9 @@ de_rr_ba_range(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 bit_offset = curr_offset << 3; while (value) { - proto_tree_add_bits_item(tree, hf_gsm_a_rr_range_lower, tvb, bit_offset, 10, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_range_lower, tvb, bit_offset, 10, ENC_BIG_ENDIAN); bit_offset += 10; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_range_higher, tvb, bit_offset, 10, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_range_higher, tvb, bit_offset, 10, ENC_BIG_ENDIAN); bit_offset += 10; value -= 1; } @@ -1194,9 +1194,9 @@ de_rr_ba_list_pref(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin bit_offset += 1; while (value) { - proto_tree_add_bits_item(tree, hf_gsm_a_rr_range_lower, tvb, bit_offset, 10, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_range_lower, tvb, bit_offset, 10, ENC_BIG_ENDIAN); bit_offset += 10; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_range_higher, tvb, bit_offset, 10, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_range_higher, tvb, bit_offset, 10, ENC_BIG_ENDIAN); bit_offset += 10; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; @@ -1205,7 +1205,7 @@ de_rr_ba_list_pref(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin bit_offset += 1; while (value) { - proto_tree_add_bits_item(tree, hf_gsm_a_rr_ba_freq, tvb, bit_offset, 10, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_ba_freq, tvb, bit_offset, 10, ENC_BIG_ENDIAN); bit_offset += 10; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; @@ -1232,7 +1232,7 @@ de_rr_utran_freq_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g bit_offset += 1; while (value) { - proto_tree_add_bits_item(tree, hf_gsm_a_rr_fdd_uarfcn, tvb, bit_offset, 14, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_fdd_uarfcn, tvb, bit_offset, 14, ENC_BIG_ENDIAN); bit_offset += 14; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; @@ -1241,7 +1241,7 @@ de_rr_utran_freq_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g bit_offset += 1; while (value) { - proto_tree_add_bits_item(tree, hf_gsm_a_rr_tdd_uarfcn, tvb, bit_offset, 14, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_tdd_uarfcn, tvb, bit_offset, 14, ENC_BIG_ENDIAN); bit_offset += 14; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; @@ -1290,9 +1290,9 @@ de_rr_cell_select_indic(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, { proto_tree_add_text(subtree,tvb, bit_offset>>3, 1, "Band Indicator: %s",tvb_get_bits8(tvb,bit_offset,1) ? "1900" : "1800"); bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_arfcn, tvb, bit_offset, 10, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_arfcn, tvb, bit_offset, 10, ENC_BIG_ENDIAN); bit_offset += 10; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bsic, tvb, bit_offset, 6, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bsic, tvb, bit_offset, 6, ENC_BIG_ENDIAN); bit_offset += 6; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; @@ -1311,12 +1311,12 @@ de_rr_cell_select_indic(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, if (tvb_get_bits8(tvb,bit_offset,1)) { bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bandwidth_fdd, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bandwidth_fdd, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; } else bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_fdd_uarfcn, tvb, bit_offset, 14, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_fdd_uarfcn, tvb, bit_offset, 14, ENC_BIG_ENDIAN); bit_offset += 14; if (tvb_get_bits8(tvb,bit_offset,1)) { @@ -1346,7 +1346,7 @@ de_rr_cell_select_indic(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, while (idx > 0) { - w[i] = tvb_get_bits(tvb, bit_offset, wsize, FALSE); + w[i] = tvb_get_bits(tvb, bit_offset, wsize, ENC_BIG_ENDIAN); bit_offset += wsize; idx -= wsize; if (w[i] == 0) @@ -1396,12 +1396,12 @@ de_rr_cell_select_indic(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, if (tvb_get_bits8(tvb,bit_offset,1)) { bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bandwidth_tdd, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bandwidth_tdd, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; } else bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tdd_uarfcn, tvb, bit_offset, 14, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tdd_uarfcn, tvb, bit_offset, 14, ENC_BIG_ENDIAN); bit_offset += 14; if (tvb_get_bits8(tvb,bit_offset,1)) { @@ -1432,7 +1432,7 @@ de_rr_cell_select_indic(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, while (idx > 0) { - w[i] = tvb_get_bits(tvb, bit_offset, wsize, FALSE); + w[i] = tvb_get_bits(tvb, bit_offset, wsize, ENC_BIG_ENDIAN); bit_offset += wsize; idx -= wsize; if (w[i] == 0) @@ -1555,7 +1555,7 @@ de_rr_cell_opt_bcch(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_CELL_OPT_BCCH]); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pwrc, tvb, (curr_offset<<3)+1, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pwrc, tvb, (curr_offset<<3)+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_a_rr_dtx_bcch, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_a_rr_radio_link_timeout, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -1596,7 +1596,7 @@ de_rr_cell_opt_sacch(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gu subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_CELL_OPT_SACCH]); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pwrc, tvb, (curr_offset<<3)+1, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pwrc, tvb, (curr_offset<<3)+1, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(subtree, hf_gsm_a_rr_dtx_sacch, tvb, curr_offset, 1, dtx); proto_tree_add_item(subtree, hf_gsm_a_rr_radio_link_timeout, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -2071,8 +2071,8 @@ de_rr_chnl_needed(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_CHNL_NEEDED]); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_chnl_needed_ch1, tvb, (curr_offset<<3)+bit_offset+2, 2, FALSE); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_chnl_needed_ch2, tvb, (curr_offset<<3)+bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_chnl_needed_ch1, tvb, (curr_offset<<3)+bit_offset+2, 2, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_chnl_needed_ch2, tvb, (curr_offset<<3)+bit_offset, 2, ENC_BIG_ENDIAN); curr_offset = curr_offset + 1; @@ -2114,10 +2114,10 @@ de_rr_cip_mode_set(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin else bit_offset = 0; - proto_tree_add_bits_ret_val(tree, hf_gsm_a_rr_sc, tvb, (curr_offset<<3)+bit_offset+3, 1, &value, FALSE); + proto_tree_add_bits_ret_val(tree, hf_gsm_a_rr_sc, tvb, (curr_offset<<3)+bit_offset+3, 1, &value, ENC_BIG_ENDIAN); if (value == 1){ /* Start ciphering */ /* algorithm identifier */ - proto_tree_add_bits_item(tree, hf_gsm_a_algorithm_id, tvb, (curr_offset<<3)+bit_offset, 3, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_algorithm_id, tvb, (curr_offset<<3)+bit_offset, 3, ENC_BIG_ENDIAN); } curr_offset = curr_offset + 1; @@ -2149,7 +2149,7 @@ de_rr_cip_mode_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui * Note: The coding of field CR is defined in [44.018] * as part of the Cipher Mode Response IE. */ - proto_tree_add_bits_item(tree, hf_gsm_a_rr_cr, tvb, (curr_offset<<3)+bit_offset+3, 1, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_cr, tvb, (curr_offset<<3)+bit_offset+3, 1, ENC_BIG_ENDIAN); curr_offset = curr_offset + 1; return(curr_offset - offset); @@ -2211,7 +2211,7 @@ de_rr_ctrl_ch_desc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin curr_offset = curr_offset + 1; oct = tvb_get_guint8(tvb, curr_offset); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_cbq3, tvb, (curr_offset<<3)+1, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_cbq3, tvb, (curr_offset<<3)+1, 2, ENC_BIG_ENDIAN); proto_tree_add_uint(subtree, hf_gsm_a_rr_bs_pa_mfrms, tvb, curr_offset, 1, (oct&0x07)+2); curr_offset = curr_offset + 1; @@ -2260,18 +2260,18 @@ de_rr_dyn_arfcn_map(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui curr_offset = offset; bit_offset = curr_offset << 3; - proto_tree_add_bits_ret_val(tree, hf_gsm_a_rr_dyn_arfcn_length, tvb, bit_offset, 8, &length, FALSE); + proto_tree_add_bits_ret_val(tree, hf_gsm_a_rr_dyn_arfcn_length, tvb, bit_offset, 8, &length, ENC_BIG_ENDIAN); value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; while (value && length) { - proto_tree_add_bits_item(tree, hf_gsm_a_rr_gsm_band, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_gsm_band, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_arfcn_first, tvb, bit_offset, 10, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_arfcn_first, tvb, bit_offset, 10, ENC_BIG_ENDIAN); bit_offset += 10; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_band_offset, tvb, bit_offset, 10, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_band_offset, tvb, bit_offset, 10, ENC_BIG_ENDIAN); bit_offset += 10; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_arfcn_range, tvb, bit_offset, 7, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_arfcn_range, tvb, bit_offset, 7, ENC_BIG_ENDIAN); bit_offset += 7; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; @@ -2298,7 +2298,7 @@ de_rr_freq_ch_seq(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint bit_offset = curr_offset << 3; for (i=0; i<16; i++) { - proto_tree_add_bits_item(tree, hf_gsm_a_rr_inc_skip_arfcn, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_inc_skip_arfcn, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; } @@ -2419,28 +2419,28 @@ de_rr_rest_oct_gprs_cell_options(tvbuff_t *tvb, proto_tree *tree, gint bit_offse item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_CELL_OPTIONS].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_GPRS_CELL_OPTIONS]); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_nmo, tvb, curr_bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_nmo, tvb, curr_bit_offset, 2, ENC_BIG_ENDIAN); curr_bit_offset += 2; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_t3168, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_t3168, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_t3192, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_t3192, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_drx_timer_max, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_drx_timer_max, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_access_burst_type, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_access_burst_type, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_control_ack_type, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_control_ack_type, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bs_cv_max, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bs_cv_max, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; if (tvb_get_bits8(tvb,curr_bit_offset,1)) { curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pan_dec, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pan_dec, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pan_inc, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pan_inc, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pan_max, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pan_max, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } else @@ -2460,43 +2460,43 @@ de_rr_rest_oct_gprs_cell_options(tvbuff_t *tvb, proto_tree *tree, gint bit_offse if (tvb_get_bits8(tvb,curr_bit_offset,1)) { curr_bit_offset += 1; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_egprs_packet_channel_request, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_egprs_packet_channel_request, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_bep_period, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_bep_period, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; value -= 5; } else curr_bit_offset += 1; value -= 1; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_pfc_feature_mode, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_pfc_feature_mode, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_dtm_support, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_dtm_support, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_bss_paging_coordination, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_bss_paging_coordination, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; value -= 3; if (value > 0) { /* Rel 4 extension */ - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_ccn_active, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_ccn_active, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_nw_ext_utbf, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_nw_ext_utbf, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; value -= 2; if (value > 0) { /* Rel 6 extension */ - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_multiple_tbf_capability, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_multiple_tbf_capability, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_ext_utbf_no_data, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_ext_utbf_no_data, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_dtm_enhancements_capability, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_dtm_enhancements_capability, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; value -= 3; if (tvb_get_bits8(tvb,curr_bit_offset,1)) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_dedicated_mode_mbms_notification_support, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_dedicated_mode_mbms_notification_support, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_mnci_support, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_mnci_support, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; value -= 2; } @@ -2505,7 +2505,7 @@ de_rr_rest_oct_gprs_cell_options(tvbuff_t *tvb, proto_tree *tree, gint bit_offse value -= 1; if (value > 0) { /* Rel 7 extension */ - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_reduced_latency_access, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_reduced_latency_access, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; value -= 1; } @@ -2531,15 +2531,15 @@ de_rr_rest_oct_gprs_power_control_parameters(tvbuff_t *tvb, proto_tree *tree, gi item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_POWER_CONTROL_PARAMS].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_GPRS_POWER_CONTROL_PARAMS]); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_alpha, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_alpha, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_t_avg_w, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_t_avg_w, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_t_avg_t, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_t_avg_t, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pc_meas_chan, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pc_meas_chan, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_n_avg_i, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_n_avg_i, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; proto_item_set_len(item,((curr_bit_offset-bit_offset)>>3)+1); @@ -2763,13 +2763,13 @@ de_rr_ia_rest_oct_egprs_packet_uplink_assignment(tvbuff_t *tvb, proto_tree *tree item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_EGPRS_PACKET_UPLINK_ASSIGNMENT].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_EGPRS_PACKET_UPLINK_ASSIGNMENT]); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_extended_ra, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_extended_ra, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; while ( value ) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_access_tech_type, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_access_tech_type, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; @@ -2779,61 +2779,61 @@ de_rr_ia_rest_oct_egprs_packet_uplink_assignment(tvbuff_t *tvb, proto_tree *tree curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tfi_assignment, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tfi_assignment, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_polling, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_polling, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; /* this bit is 0; The value '1' was allocated in an earlier version of the protocol and shall not be used */ curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_usf, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_usf, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_usf_granularity, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_usf_granularity, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_p0, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_p0, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pr_mode, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pr_mode, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; } - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_egprs_mcs, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_egprs_mcs, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tlli_block_channel_coding, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tlli_block_channel_coding, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bep_period2, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bep_period2, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; } - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_resegment, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_resegment, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_egprs_window_size, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_egprs_window_size, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_alpha, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_alpha, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; } - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_gamma, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_gamma, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_timing_adv_index, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_timing_adv_index, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; } value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tbf_starting_time, tvb, curr_bit_offset, 16, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tbf_starting_time, tvb, curr_bit_offset, 16, ENC_BIG_ENDIAN); curr_bit_offset += 16; } } @@ -2843,24 +2843,24 @@ de_rr_ia_rest_oct_egprs_packet_uplink_assignment(tvbuff_t *tvb, proto_tree *tree curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_alpha, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_alpha, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; } - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_gamma, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_gamma, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tbf_starting_time, tvb, curr_bit_offset, 16, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tbf_starting_time, tvb, curr_bit_offset, 16, ENC_BIG_ENDIAN); curr_bit_offset += 16; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_num_of_radio_block_allocated, tvb, curr_bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_num_of_radio_block_allocated, tvb, curr_bit_offset, 2, ENC_BIG_ENDIAN); curr_bit_offset += 2; value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_p0, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_p0, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; /* The value '1' was allocated in an earlier version of the protocol and shall not be used */ curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pr_mode, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pr_mode, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; } flag = gsm_a_rr_is_bit_high(tvb,curr_bit_offset); @@ -2871,7 +2871,7 @@ de_rr_ia_rest_oct_egprs_packet_uplink_assignment(tvbuff_t *tvb, proto_tree *tree curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pfi, tvb, curr_bit_offset, 7, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pfi, tvb, curr_bit_offset, 7, ENC_BIG_ENDIAN); curr_bit_offset += 7; } } @@ -2903,15 +2903,15 @@ de_rr_ia_rest_oct_tmgi(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) curr_bit_offset += 1; if (value == 0) /* without MCC and MNC parameters */ { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_mbms_service_id, tvb, curr_bit_offset, 24, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_mbms_service_id, tvb, curr_bit_offset, 24, ENC_BIG_ENDIAN); curr_bit_offset += 24; } else /* with MCC and MNC parameters */ { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_mbms_service_id, tvb, curr_bit_offset, 24, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_mbms_service_id, tvb, curr_bit_offset, 24, ENC_BIG_ENDIAN); curr_bit_offset += 24; - value16 = tvb_get_bits16(tvb,curr_bit_offset,12,FALSE); + value16 = tvb_get_bits16(tvb,curr_bit_offset,12,ENC_BIG_ENDIAN); mcc[0] = '0' + ((value16>>8)&0xf); mcc[1] = '0' + ((value16>>4)&0xf); mcc[2] = '0' + ((value16 )&0xf); @@ -2922,7 +2922,7 @@ de_rr_ia_rest_oct_tmgi(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) mcc); curr_bit_offset += 12; - value16 = tvb_get_bits16(tvb,curr_bit_offset,12,FALSE); + value16 = tvb_get_bits16(tvb,curr_bit_offset,12,ENC_BIG_ENDIAN); mnc[0] = '0' + ((value16>>8)&0xf); mnc[1] = '0' + ((value16>>4)&0xf); mnc[2] = '0' + ((value16 )&0xf); @@ -2959,7 +2959,7 @@ de_rr_ia_rest_oct_packet_timing_advance(tvbuff_t *tvb, proto_tree *tree, gint bi curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_timing_adv, tvb, curr_bit_offset, 6, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_timing_adv, tvb, curr_bit_offset, 6, ENC_BIG_ENDIAN); curr_bit_offset += 6; } @@ -2967,9 +2967,9 @@ de_rr_ia_rest_oct_packet_timing_advance(tvbuff_t *tvb, proto_tree *tree, gint bi curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_timing_adv_index, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_timing_adv_index, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_timing_adv_timeslot_num, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_timing_adv_timeslot_num, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } @@ -2993,9 +2993,9 @@ de_rr_ia_rest_oct_multiple_blocks_packet_downlink_assignment(tvbuff_t *tvb, prot item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_MULTIPLE_BLOCKS_PACKET_DOWNLINK_ASSIGNMENT].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_MULTIPLE_BLOCKS_PACKET_DOWNLINK_ASSIGNMENT]); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tbf_starting_time, tvb, curr_bit_offset, 16, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tbf_starting_time, tvb, curr_bit_offset, 16, ENC_BIG_ENDIAN); curr_bit_offset += 16; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_num_of_radio_block_allocated, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_num_of_radio_block_allocated, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; value = tvb_get_bits8(tvb,curr_bit_offset,1); @@ -3010,7 +3010,7 @@ de_rr_ia_rest_oct_multiple_blocks_packet_downlink_assignment(tvbuff_t *tvb, prot } else /* MBMS Assignment (Non-distribution) */ { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tlli, tvb, curr_bit_offset, 32, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tlli, tvb, curr_bit_offset, 32, ENC_BIG_ENDIAN); curr_bit_offset += 32; value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; @@ -3023,20 +3023,20 @@ de_rr_ia_rest_oct_multiple_blocks_packet_downlink_assignment(tvbuff_t *tvb, prot value); curr_bit_offset += 2; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_ms_id, tvb, curr_bit_offset, value+1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_ms_id, tvb, curr_bit_offset, value+1, ENC_BIG_ENDIAN); curr_bit_offset += value+1; curr_bit_offset += de_rr_ia_rest_oct_packet_timing_advance(tvb, tree, curr_bit_offset); value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_alpha, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_alpha, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_gamma, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_gamma, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; } } @@ -3071,50 +3071,50 @@ de_rr_ia_rest_oct_packet_uplink_assignment(tvbuff_t *tvb, proto_tree *tree, gint curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tfi_assignment, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tfi_assignment, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_polling, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_polling, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; /* The value '1' was allocated in an earlier version of the protocol and shall not be used */ curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_usf, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_usf, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_usf_granularity, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_usf_granularity, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_p0, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_p0, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pr_mode, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pr_mode, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; } - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_gprs_cs, tvb, curr_bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_gprs_cs, tvb, curr_bit_offset, 2, ENC_BIG_ENDIAN); curr_bit_offset += 2; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tlli_block_channel_coding, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tlli_block_channel_coding, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_alpha, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_alpha, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; } - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_gamma, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_gamma, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_timing_adv_index, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_timing_adv_index, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; } value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tbf_starting_time, tvb, curr_bit_offset, 16, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tbf_starting_time, tvb, curr_bit_offset, 16, ENC_BIG_ENDIAN); curr_bit_offset += 16; } } @@ -3124,24 +3124,24 @@ de_rr_ia_rest_oct_packet_uplink_assignment(tvbuff_t *tvb, proto_tree *tree, gint curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_alpha, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_alpha, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; } - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_gamma, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_gamma, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; /* fixed bits '01' */ curr_bit_offset += 2; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tbf_starting_time, tvb, curr_bit_offset, 16, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tbf_starting_time, tvb, curr_bit_offset, 16, ENC_BIG_ENDIAN); curr_bit_offset += 16; flag = gsm_a_rr_is_bit_high(tvb,curr_bit_offset); curr_bit_offset += 1; if (flag) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_p0, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_p0, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; /* The value '1' was allocated in an earlier version of the protocol and shall not be used */ curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pr_mode, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pr_mode, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; } } @@ -3154,7 +3154,7 @@ de_rr_ia_rest_oct_packet_uplink_assignment(tvbuff_t *tvb, proto_tree *tree, gint curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_extended_ra, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_extended_ra, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; } } @@ -3167,7 +3167,7 @@ de_rr_ia_rest_oct_packet_uplink_assignment(tvbuff_t *tvb, proto_tree *tree, gint curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pfi, tvb, curr_bit_offset, 7, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pfi, tvb, curr_bit_offset, 7, ENC_BIG_ENDIAN); curr_bit_offset += 7; } } @@ -3192,54 +3192,54 @@ de_rr_ia_rest_oct_packet_downlink_assignment(tvbuff_t *tvb, proto_tree *tree, gi item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_PACKET_DOWNLINK_ASSIGNMENT].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_PACKET_DOWNLINK_ASSIGNMENT]); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tlli, tvb, curr_bit_offset, 32, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tlli, tvb, curr_bit_offset, 32, ENC_BIG_ENDIAN); curr_bit_offset += 32; value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tfi_assignment, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tfi_assignment, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rlc_mode, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rlc_mode, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_alpha, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_alpha, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; } - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_gamma, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_gamma, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_polling, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_polling, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_ta_valid, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_ta_valid, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; } value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_timing_adv_index, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_timing_adv_index, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; } value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tbf_starting_time, tvb, curr_bit_offset, 16, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tbf_starting_time, tvb, curr_bit_offset, 16, ENC_BIG_ENDIAN); curr_bit_offset += 16; } value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_p0, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_p0, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; /* The value '1' was allocated in an earlier version of the protocol and shall not be used */ curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pr_mode, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pr_mode, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; } @@ -3247,15 +3247,15 @@ de_rr_ia_rest_oct_packet_downlink_assignment(tvbuff_t *tvb, proto_tree *tree, gi curr_bit_offset += 1; if (flag) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_egprs_window_size, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_egprs_window_size, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_link_quality_meas_mode, tvb, curr_bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_link_quality_meas_mode, tvb, curr_bit_offset, 2, ENC_BIG_ENDIAN); curr_bit_offset += 2; value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bep_period2, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bep_period2, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; } } @@ -3268,7 +3268,7 @@ de_rr_ia_rest_oct_packet_downlink_assignment(tvbuff_t *tvb, proto_tree *tree, gi curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pfi, tvb, curr_bit_offset, 7, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_pfi, tvb, curr_bit_offset, 7, ENC_BIG_ENDIAN); curr_bit_offset += 7; } } @@ -3304,7 +3304,7 @@ de_rr_ia_rest_oct_second_part_packet_assignment(tvbuff_t *tvb, proto_tree *tree, curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_extended_ra, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_extended_ra, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; } } @@ -3389,7 +3389,7 @@ de_rr_ia_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint bit_offset += 1; if (flag == FALSE) /* HL */ { - proto_tree_add_bits_ret_val(subtree, hf_gsm_a_rr_ma_length, tvb, bit_offset, 6, &ma_length, FALSE); + proto_tree_add_bits_ret_val(subtree, hf_gsm_a_rr_ma_length, tvb, bit_offset, 6, &ma_length, ENC_BIG_ENDIAN); bit_offset += 6; if (ma_length>0) { @@ -3471,7 +3471,7 @@ de_rr_iar_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin if (value) { proto_tree_add_text(subtree, tvb, curr_bit_offset>>3, 1, "Extended RA %d present", i); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_extended_ra, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_extended_ra, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; } else @@ -3600,16 +3600,16 @@ de_rr_meas_res(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 /* 2nd octet */ /* BA-USED */ - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_ba_used, tvb, curr_offset<<3, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_ba_used, tvb, curr_offset<<3, 1, ENC_BIG_ENDIAN); /* DTX USED */ - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_dtx_used, tvb, (curr_offset<<3)+1, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_dtx_used, tvb, (curr_offset<<3)+1, 1, ENC_BIG_ENDIAN); /* RXLEV-FULL-SERVING-CELL */ - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rxlev_full_serv_cell, tvb, (curr_offset<<3)+2, 6, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rxlev_full_serv_cell, tvb, (curr_offset<<3)+2, 6, ENC_BIG_ENDIAN); curr_offset++; /* 3rd octet */ /* 3G-BA-USED */ - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_ba_used, tvb, curr_offset<<3, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_ba_used, tvb, curr_offset<<3, 1, ENC_BIG_ENDIAN); /* MEAS-VALID */ proto_tree_add_item(subtree, hf_gsm_a_rr_meas_valid, tvb, curr_offset, 1, ENC_BIG_ENDIAN); /* RXLEV-SUB-SERVING-CELL */ @@ -3619,23 +3619,23 @@ de_rr_meas_res(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 /* 4th octet */ /* RXQUAL-FULL-SERVING-CELL */ - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rxqual_full_serv_cell, tvb, (curr_offset<<3)+1, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rxqual_full_serv_cell, tvb, (curr_offset<<3)+1, 3, ENC_BIG_ENDIAN); /* RXQUAL-SUB-SERVING-CELL */ proto_tree_add_item(subtree, hf_gsm_a_rr_rxqual_sub_serv_cell, tvb, curr_offset, 1, ENC_BIG_ENDIAN); /* NO-NCELL-M */ bit_offset = (curr_offset << 3) + 7; - proto_tree_add_bits_ret_val(subtree, hf_gsm_a_rr_no_ncell_m, tvb, bit_offset, 3, &no_ncell_m, FALSE); + proto_tree_add_bits_ret_val(subtree, hf_gsm_a_rr_no_ncell_m, tvb, bit_offset, 3, &no_ncell_m, ENC_BIG_ENDIAN); bit_offset += 3; if (no_ncell_m == 7) /* No neighbour cell information available) */ no_ncell_m = 0; while (no_ncell_m) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rxlev_ncell, tvb, bit_offset, 6, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rxlev_ncell, tvb, bit_offset, 6, ENC_BIG_ENDIAN); bit_offset += 6; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bcch_freq_ncell, tvb, bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bcch_freq_ncell, tvb, bit_offset, 5, ENC_BIG_ENDIAN); bit_offset += 5; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bsic_ncell, tvb, bit_offset, 6, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bsic_ncell, tvb, bit_offset, 6, ENC_BIG_ENDIAN); bit_offset += 6; no_ncell_m -= 1; } @@ -3865,9 +3865,9 @@ de_rr_multirate_conf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gu nb_of_params = remaining_length - 1; while (nb_of_params) { - proto_tree_add_bits_item(tree, hf_gsm_a_rr_amr_threshold, tvb, bit_offset, 6, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_amr_threshold, tvb, bit_offset, 6, ENC_BIG_ENDIAN); bit_offset += 6; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_amr_hysteresis, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_amr_hysteresis, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; nb_of_params -= 1; } @@ -3945,7 +3945,7 @@ de_rr_neigh_cell_desc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g curr_offset = offset; proto_tree_add_item(tree, hf_gsm_a_rr_ext_ind, tvb, curr_offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_bits_item(tree, hf_gsm_a_rr_ba_ind, tvb, (curr_offset<<3)+3, 1, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_ba_ind, tvb, (curr_offset<<3)+3, 1, ENC_BIG_ENDIAN); return dissect_arfcn_list(tvb, tree, pinfo, offset, 16, add_string, string_len); } @@ -3960,8 +3960,8 @@ de_rr_neigh_cell_desc2(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, curr_offset = offset; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_multiband_reporting, tvb, (curr_offset<<3)+1, 2, FALSE); - proto_tree_add_bits_item(tree, hf_gsm_a_rr_ba_ind, tvb, (curr_offset<<3)+3, 1, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_multiband_reporting, tvb, (curr_offset<<3)+1, 2, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_ba_ind, tvb, (curr_offset<<3)+3, 1, ENC_BIG_ENDIAN); return dissect_arfcn_list2(tvb, tree, pinfo, offset, 16, add_string, string_len); } @@ -3994,9 +3994,9 @@ de_rr_p1_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_nln_pch, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_nln_pch, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_nln_status_pch, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_nln_status_pch, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; } else @@ -4006,7 +4006,7 @@ de_rr_p1_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { bit_offset += 1; - item2 = proto_tree_add_bits_item(subtree, hf_gsm_a_call_prio, tvb, bit_offset, 3, FALSE); + item2 = proto_tree_add_bits_item(subtree, hf_gsm_a_call_prio, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; proto_item_append_text(item2, " for Mobile Identity %d", i); } @@ -4094,7 +4094,7 @@ de_rr_p2_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_chnl_needed_ch3, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_chnl_needed_ch3, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; } else @@ -4102,9 +4102,9 @@ de_rr_p2_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_nln_pch, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_nln_pch, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_nln_status_pch, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_nln_status_pch, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; } else @@ -4114,7 +4114,7 @@ de_rr_p2_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { bit_offset += 1; - item2 = proto_tree_add_bits_item(subtree, hf_gsm_a_call_prio, tvb, bit_offset, 3, FALSE); + item2 = proto_tree_add_bits_item(subtree, hf_gsm_a_call_prio, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; proto_item_append_text(item2, " for Mobile Identity %d", i); } @@ -4167,9 +4167,9 @@ de_rr_p3_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_chnl_needed_ch3, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_chnl_needed_ch3, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_chnl_needed_ch4, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_chnl_needed_ch4, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; } else @@ -4177,9 +4177,9 @@ de_rr_p3_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_nln_pch, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_nln_pch, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_nln_status_pch, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_nln_status_pch, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; } else @@ -4189,7 +4189,7 @@ de_rr_p3_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { bit_offset += 1; - item2 = proto_tree_add_bits_item(subtree, hf_gsm_a_call_prio, tvb, bit_offset, 3, FALSE); + item2 = proto_tree_add_bits_item(subtree, hf_gsm_a_call_prio, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; proto_item_append_text(item2, " for Mobile Identity %d", i); } @@ -4678,7 +4678,7 @@ de_rr_si1_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_nch_position, tvb, bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_nch_position, tvb, bit_offset, 5, ENC_BIG_ENDIAN); bit_offset += 5; } else @@ -4809,13 +4809,13 @@ de_rr_si2ter_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si2ter_mp_change_mark, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si2ter_mp_change_mark, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si2ter_3g_change_mark, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si2ter_3g_change_mark, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si2ter_index, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si2ter_index, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si2ter_count, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si2ter_count, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; @@ -4825,13 +4825,13 @@ de_rr_si2ter_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_UTRAN_FDD_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_UTRAN_FDD_DESC]); bit_offset += 2; /* skip '01' bits */ - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_uarfcn, tvb, bit_offset, 14, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_uarfcn, tvb, bit_offset, 14, ENC_BIG_ENDIAN); bit_offset += 14; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_bandwidth_fdd, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_bandwidth_fdd, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; } proto_item_set_len(item2,((bit_offset-bit_offset_sav)>>3)+1); @@ -4844,13 +4844,13 @@ de_rr_si2ter_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_UTRAN_TDD_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_UTRAN_TDD_DESC]); bit_offset += 2; /* skip '01' bits */ - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_tdd_uarfcn, tvb, bit_offset, 14, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_tdd_uarfcn, tvb, bit_offset, 14, ENC_BIG_ENDIAN); bit_offset += 14; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_bandwidth_tdd, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_bandwidth_tdd, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; } proto_item_set_len(item2,((bit_offset-bit_offset_sav)>>3)+1); @@ -4862,22 +4862,22 @@ de_rr_si2ter_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g bit_offset_sav = bit_offset; item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_3G_MEAS_PARAM_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_3G_MEAS_PARAM_DESC]); - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_qsearch_i, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_qsearch_i, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_qoffset, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_qoffset, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_qmin, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_qmin, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; } value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_tdd_qoffset, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_tdd_qoffset, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; } proto_item_set_len(item2,((bit_offset-bit_offset_sav)>>3)+1); @@ -4895,9 +4895,9 @@ de_rr_si2ter_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g bit_offset_sav = bit_offset; item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_3G_ADD_MEAS_PARAM_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_3G_ADD_MEAS_PARAM_DESC]); - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_qmin_offset, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_qmin_offset, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_rscpmin, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_rscpmin, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; proto_item_set_len(item2,((bit_offset-bit_offset_sav)>>3)+1); } @@ -5106,7 +5106,7 @@ de_rr_si2quater_meas_info_utran_fdd_desc(tvbuff_t *tvb, proto_tree *tree, gint b curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bandwidth_fdd, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bandwidth_fdd, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } value = tvb_get_bits8(tvb,curr_bit_offset,1); @@ -5114,7 +5114,7 @@ de_rr_si2quater_meas_info_utran_fdd_desc(tvbuff_t *tvb, proto_tree *tree, gint b while (value) { curr_bit_offset += 1; /* skip a 0 bit */ - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_fdd_uarfcn, tvb, curr_bit_offset, 14, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_fdd_uarfcn, tvb, curr_bit_offset, 14, ENC_BIG_ENDIAN); curr_bit_offset += 14; xdd_indic0 = tvb_get_bits8(tvb,curr_bit_offset,1); proto_tree_add_text(subtree,tvb, curr_bit_offset>>3, 1, "FDD Indic0: %d", xdd_indic0); @@ -5140,7 +5140,7 @@ de_rr_si2quater_meas_info_utran_fdd_desc(tvbuff_t *tvb, proto_tree *tree, gint b while (idx > 0) { - w[i] = tvb_get_bits(tvb, curr_bit_offset, wsize, FALSE); + w[i] = tvb_get_bits(tvb, curr_bit_offset, wsize, ENC_BIG_ENDIAN); curr_bit_offset += wsize; idx -= wsize; if (w[i] == 0) @@ -5194,7 +5194,7 @@ de_rr_si2quater_meas_info_utran_tdd_desc(tvbuff_t *tvb, proto_tree *tree, gint b curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bandwidth_tdd, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bandwidth_tdd, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } value = tvb_get_bits8(tvb,curr_bit_offset,1); @@ -5202,7 +5202,7 @@ de_rr_si2quater_meas_info_utran_tdd_desc(tvbuff_t *tvb, proto_tree *tree, gint b while (value) { curr_bit_offset += 1; /* skip a 0 bit */ - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tdd_uarfcn, tvb, curr_bit_offset, 14, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tdd_uarfcn, tvb, curr_bit_offset, 14, ENC_BIG_ENDIAN); curr_bit_offset += 14; xdd_indic0 = tvb_get_bits8(tvb,curr_bit_offset,1); proto_tree_add_text(subtree,tvb, curr_bit_offset>>3, 1, "TDD Indic0: %d", xdd_indic0); @@ -5229,7 +5229,7 @@ de_rr_si2quater_meas_info_utran_tdd_desc(tvbuff_t *tvb, proto_tree *tree, gint b while (idx > 0) { - w[i] = tvb_get_bits(tvb, curr_bit_offset, wsize, FALSE); + w[i] = tvb_get_bits(tvb, curr_bit_offset, wsize, ENC_BIG_ENDIAN); curr_bit_offset += wsize; idx -= wsize; if (w[i] == 0) @@ -5336,7 +5336,7 @@ de_rr_rtd_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_offset, rr_rest_octets_ curr_bit_offset += 1; while (value == 0) { - proto_tree_add_text(subtree,tvb, curr_bit_offset>>3, 2, "RTD index %d: %d/64 TDMA frame(s) modulo 51 TDMA frames", idx, tvb_get_bits16(tvb,curr_bit_offset,12,FALSE)); + proto_tree_add_text(subtree,tvb, curr_bit_offset>>3, 2, "RTD index %d: %d/64 TDMA frame(s) modulo 51 TDMA frames", idx, tvb_get_bits16(tvb,curr_bit_offset,12,ENC_BIG_ENDIAN)); curr_bit_offset += 12; value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; @@ -5350,7 +5350,7 @@ de_rr_rtd_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_offset, rr_rest_octets_ curr_bit_offset += 1; while (value == 0) { - proto_tree_add_text(subtree,tvb, curr_bit_offset>>3, 2, "RTD index %d: %d/64 TDMA frame(s) modulo 51 TDMA frames", idx, tvb_get_bits16(tvb,curr_bit_offset,12,FALSE)); + proto_tree_add_text(subtree,tvb, curr_bit_offset>>3, 2, "RTD index %d: %d/64 TDMA frame(s) modulo 51 TDMA frames", idx, tvb_get_bits16(tvb,curr_bit_offset,12,ENC_BIG_ENDIAN)); curr_bit_offset += 12; value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; @@ -5380,16 +5380,16 @@ de_rr_bsic_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_offset, rr_rest_octets proto_tree_add_text(subtree,tvb, curr_bit_offset>>3, 1, "BA Index Start BSIC: %d", tvb_get_bits8(tvb,curr_bit_offset,5)); curr_bit_offset += 5; } - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bsic, tvb, curr_bit_offset, 6, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bsic, tvb, curr_bit_offset, 6, ENC_BIG_ENDIAN); curr_bit_offset += 6; idx = tvb_get_bits8(tvb,curr_bit_offset,7); proto_tree_add_text(subtree,tvb, curr_bit_offset>>3, 1, "Number Remaining BSIC: %d", idx); curr_bit_offset += 7; while (idx) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_frequency_scrolling, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_frequency_scrolling, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bsic, tvb, curr_bit_offset, 6, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bsic, tvb, curr_bit_offset, 6, ENC_BIG_ENDIAN); curr_bit_offset += 6; idx -= 1; } @@ -5414,7 +5414,7 @@ de_rr_report_priority_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_offset, rr_ curr_bit_offset += 7; while (idx) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rep_priority, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rep_priority, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; idx -= 1; } @@ -5436,72 +5436,72 @@ de_rr_meas_param_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_offset, rr_rest_ subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[id]); if (id == DE_RR_REST_OCTETS_GPRS_MEAS_PARAM_DESC) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_report_type, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_report_type, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_reporting_rate, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_reporting_rate, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset +=1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_invalid_bsic_reporting, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_invalid_bsic_reporting, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset +=1; } value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_multiband_reporting, tvb, curr_bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_multiband_reporting, tvb, curr_bit_offset, 2, ENC_BIG_ENDIAN); curr_bit_offset += 2; } value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_serving_band_reporting, tvb, curr_bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_serving_band_reporting, tvb, curr_bit_offset, 2, ENC_BIG_ENDIAN); curr_bit_offset += 2; } - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_scale_ord, tvb, curr_bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_scale_ord, tvb, curr_bit_offset, 2, ENC_BIG_ENDIAN); curr_bit_offset += 2; value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_900_reporting_offset, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_900_reporting_offset, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_900_reporting_threshold, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_900_reporting_threshold, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_1800_reporting_offset, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_1800_reporting_offset, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_1800_reporting_threshold, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_1800_reporting_threshold, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_400_reporting_offset, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_400_reporting_offset, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_400_reporting_threshold, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_400_reporting_threshold, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_1900_reporting_offset, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_1900_reporting_offset, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_1900_reporting_threshold, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_1900_reporting_threshold, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } value = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_850_reporting_offset, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_850_reporting_offset, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_850_reporting_threshold, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_850_reporting_threshold, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } proto_item_set_len(item,((curr_bit_offset-bit_offset)>>3)+1); @@ -5524,7 +5524,7 @@ de_rr_3g_add_meas_param_desc2(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) curr_bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_fdd_reporting_threshold_2, tvb, curr_bit_offset, 6, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_fdd_reporting_threshold_2, tvb, curr_bit_offset, 6, ENC_BIG_ENDIAN); curr_bit_offset += 6; } proto_item_set_len(item,((curr_bit_offset-bit_offset)>>3)+1); @@ -5787,18 +5787,18 @@ de_rr_3g_priority_param_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_3G_PRIORITY_PARAM_DESC].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_3G_PRIORITY_PARAM_DESC]); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_priority_param_desc_utran_start, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_priority_param_desc_utran_start, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_priority_param_desc_utran_stop, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_priority_param_desc_utran_stop, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_priority_param_desc_default_utran_prio, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_priority_param_desc_default_utran_prio, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_priority_param_desc_default_threshold_utran, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_priority_param_desc_default_threshold_utran, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_priority_param_desc_default_utran_qrxlevmin, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_priority_param_desc_default_utran_qrxlevmin, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; } /* Repeated UTRAN Priority Parameters */ @@ -5813,27 +5813,27 @@ de_rr_3g_priority_param_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) while (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree_rep_utran_prio, hf_gsm_a_rr_utran_frequency_index, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree_rep_utran_prio, hf_gsm_a_rr_utran_frequency_index, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; } if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree_rep_utran_prio, hf_gsm_a_rr_utran_priority, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree_rep_utran_prio, hf_gsm_a_rr_utran_priority, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } - proto_tree_add_bits_item(subtree_rep_utran_prio, hf_gsm_a_rr_thresh_utran_high, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree_rep_utran_prio, hf_gsm_a_rr_thresh_utran_high, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree_rep_utran_prio, hf_gsm_a_rr_thresh_utran_low, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree_rep_utran_prio, hf_gsm_a_rr_thresh_utran_low, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; } if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree_rep_utran_prio, hf_gsm_a_rr_utran_qrxlevmin, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree_rep_utran_prio, hf_gsm_a_rr_utran_qrxlevmin, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; } proto_item_set_len(item_rep_utran_prio,((curr_bit_offset-rep_utran_prio_bit_offset)>>3)+1); @@ -5857,33 +5857,33 @@ de_rr_eutran_neighbour_cells(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) while (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_earfcn, tvb, curr_bit_offset, 16, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_earfcn, tvb, curr_bit_offset, 16, ENC_BIG_ENDIAN); curr_bit_offset += 16; if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_measurement_bandwidth, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_measurement_bandwidth, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } } if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_priority, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_priority, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_thresh_eutran_high, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_thresh_eutran_high, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_thresh_eutran_low, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_thresh_eutran_low, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; } if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_qrxlevmin, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_qrxlevmin, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; } @@ -5903,17 +5903,17 @@ de_rr_eutran_neighbour_cells_mi(tvbuff_t *tvb, proto_tree *tree, gint bit_offset item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_EUTRAN_NEIGHBOUR_CELLS].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_EUTRAN_NEIGHBOUR_CELLS]); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_earfcn, tvb, curr_bit_offset, 16, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_earfcn, tvb, curr_bit_offset, 16, ENC_BIG_ENDIAN); curr_bit_offset += 16; while (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_earfcn, tvb, curr_bit_offset, 16, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_earfcn, tvb, curr_bit_offset, 16, ENC_BIG_ENDIAN); curr_bit_offset += 16; } if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_measurement_bandwidth, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_measurement_bandwidth, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } @@ -5930,7 +5930,7 @@ de_rr_eutran_pcid(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) while (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_pcid, tvb, curr_bit_offset, 9, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_pcid, tvb, curr_bit_offset, 9, ENC_BIG_ENDIAN); curr_bit_offset += 9; } @@ -5938,7 +5938,7 @@ de_rr_eutran_pcid(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) { gint i; guint8 bitmap = tvb_get_bits8(tvb,curr_bit_offset,6); - item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_pcid_bitmap_group, tvb, curr_bit_offset, 6, FALSE); + item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_pcid_bitmap_group, tvb, curr_bit_offset, 6, ENC_BIG_ENDIAN); if (bitmap > 0) { proto_item_append_text(item, ": Cells IDs addressed by the bitmap:"); @@ -5964,7 +5964,7 @@ de_rr_eutran_pcid(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) gint i; pcid_pattern_length = tvb_get_bits8(tvb,curr_bit_offset,3) + 1; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_pcid_pattern_length, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_pcid_pattern_length, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; pcid_pattern = tvb_get_bits8(tvb,curr_bit_offset, pcid_pattern_length); @@ -5981,7 +5981,7 @@ de_rr_eutran_pcid(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) proto_item_append_text(item, ": Cells IDs addressed by the pattern: %d to %d", pattern_lower_bound, pattern_upper_bound); curr_bit_offset += pcid_pattern_length; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_pcid_pattern_sense, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_pcid_pattern_sense, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; } @@ -6004,7 +6004,7 @@ de_rr_eutran_not_allowed_cells(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) while (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_frequency_index, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_frequency_index, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } @@ -6045,12 +6045,12 @@ de_rr_eutran_measurement_param_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_of curr_bit_offset = bit_offset; /* E-UTRAN Measurement Parameters Description */ - proto_tree_add_bits_item(tree, hf_gsm_a_rr_qsearch_c_eutran_initial, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_qsearch_c_eutran_initial, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_rep_quant, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_rep_quant, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); rep_quant = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_multirat_reporting, tvb, curr_bit_offset, 2, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_multirat_reporting, tvb, curr_bit_offset, 2, ENC_BIG_ENDIAN); curr_bit_offset += 2; @@ -6060,17 +6060,17 @@ de_rr_eutran_measurement_param_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_of { if (rep_quant == 0) { - proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_fdd_reporting_threshold_rsrp, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_fdd_reporting_threshold_rsrp, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); } else { - proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_fdd_reporting_threshold_rsrq, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_fdd_reporting_threshold_rsrq, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); } curr_bit_offset += 3; if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_fdd_reporting_threshold_2, tvb, curr_bit_offset, 6, FALSE); + item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_fdd_reporting_threshold_2, tvb, curr_bit_offset, 6, ENC_BIG_ENDIAN); if (rep_quant == 0) { proto_item_append_text(item, " (%.1f dB)", (gfloat)tvb_get_bits8(tvb,curr_bit_offset,6)/2 - 19.5); @@ -6083,7 +6083,7 @@ de_rr_eutran_measurement_param_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_of } if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_fdd_reporting_offset, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_fdd_reporting_offset, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } @@ -6093,17 +6093,17 @@ de_rr_eutran_measurement_param_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_of { if (rep_quant == 0) { - proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_tdd_reporting_threshold_rsrp, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_tdd_reporting_threshold_rsrp, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); } else { - proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_tdd_reporting_threshold_rsrq, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_tdd_reporting_threshold_rsrq, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); } curr_bit_offset += 3; if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_tdd_reporting_threshold_2, tvb, curr_bit_offset, 6, FALSE); + item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_tdd_reporting_threshold_2, tvb, curr_bit_offset, 6, ENC_BIG_ENDIAN); if (rep_quant == 0) { proto_item_append_text(item, " (%.1f dB)", (gfloat)tvb_get_bits8(tvb,curr_bit_offset,6)/2 - 19.5); @@ -6116,7 +6116,7 @@ de_rr_eutran_measurement_param_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_of } if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_tdd_reporting_offset, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_tdd_reporting_offset, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } } @@ -6125,7 +6125,7 @@ de_rr_eutran_measurement_param_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_of { if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_fdd_measurement_report_offset, tvb, curr_bit_offset, 6, FALSE); + item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_fdd_measurement_report_offset, tvb, curr_bit_offset, 6, ENC_BIG_ENDIAN); if (rep_quant == 0) { proto_item_append_text(item, " (%d dBm)", tvb_get_bits8(tvb,curr_bit_offset,6) - 140); @@ -6138,7 +6138,7 @@ de_rr_eutran_measurement_param_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_of if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_fdd_reporting_threshold_2, tvb, curr_bit_offset, 6, FALSE); + item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_fdd_reporting_threshold_2, tvb, curr_bit_offset, 6, ENC_BIG_ENDIAN); if (rep_quant == 0) { proto_item_append_text(item, " (%.1f dB)", (gfloat)tvb_get_bits8(tvb,curr_bit_offset,6)/2 - 19.5); @@ -6151,14 +6151,14 @@ de_rr_eutran_measurement_param_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_of } if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_fdd_reporting_offset, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_fdd_reporting_offset, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } } if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_tdd_measurement_report_offset, tvb, curr_bit_offset, 6, FALSE); + item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_tdd_measurement_report_offset, tvb, curr_bit_offset, 6, ENC_BIG_ENDIAN); if (rep_quant == 0) { proto_item_append_text(item, " (%d dBm)", tvb_get_bits8(tvb,curr_bit_offset,6) - 140); @@ -6171,7 +6171,7 @@ de_rr_eutran_measurement_param_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_of if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_tdd_reporting_threshold_2, tvb, curr_bit_offset, 6, FALSE); + item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_tdd_reporting_threshold_2, tvb, curr_bit_offset, 6, ENC_BIG_ENDIAN); if (rep_quant == 0) { proto_item_append_text(item, " (%.1f dB)", (gfloat)tvb_get_bits8(tvb,curr_bit_offset,6)/2 - 19.5); @@ -6184,12 +6184,12 @@ de_rr_eutran_measurement_param_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_of } if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_tdd_reporting_offset, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_tdd_reporting_offset, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } } } - item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_reporting_granularity, tvb, curr_bit_offset, 1, FALSE); + item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_reporting_granularity, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); if (rep_quant == 0) { proto_item_append_text(item, " (%d dB step)", 2 + tvb_get_bits8(tvb,curr_bit_offset,1)); @@ -6215,11 +6215,11 @@ de_rr_eutran_param_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_EUTRAN_PARAM_DESC].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_EUTRAN_PARAM_DESC]); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_ccn_active, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_ccn_active, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_start, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_start, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_stop, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_stop, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; if (tvb_get_bits8(tvb,curr_bit_offset++,1)) @@ -6231,29 +6231,29 @@ de_rr_eutran_param_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { /* GPRS E-UTRAN Measurement Parameters Description */ - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_qsearch_p_eutran, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_qsearch_p_eutran, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_rep_quant, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_rep_quant, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); rep_quant = tvb_get_bits8(tvb,curr_bit_offset,1); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_multirat_reporting, tvb, curr_bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_multirat_reporting, tvb, curr_bit_offset, 2, ENC_BIG_ENDIAN); curr_bit_offset += 2; if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { if (rep_quant == 0) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_fdd_reporting_threshold_rsrp, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_fdd_reporting_threshold_rsrp, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); } else { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_fdd_reporting_threshold_rsrq, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_fdd_reporting_threshold_rsrq, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); } curr_bit_offset += 3; if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_fdd_reporting_threshold_2, tvb, curr_bit_offset, 6, FALSE); + item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_fdd_reporting_threshold_2, tvb, curr_bit_offset, 6, ENC_BIG_ENDIAN); if (rep_quant == 0) { proto_item_append_text(item, " (%.1f dB)", (gfloat)tvb_get_bits8(tvb,curr_bit_offset,6)/2 - 19.5); @@ -6266,7 +6266,7 @@ de_rr_eutran_param_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) } if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_fdd_reporting_offset, tvb, curr_bit_offset, 3, FALSE); + item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_fdd_reporting_offset, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } } @@ -6275,17 +6275,17 @@ de_rr_eutran_param_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) { if (rep_quant == 0) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_tdd_reporting_threshold_rsrp, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_tdd_reporting_threshold_rsrp, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); } else { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_tdd_reporting_threshold_rsrq, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_tdd_reporting_threshold_rsrq, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); } curr_bit_offset += 3; if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_tdd_reporting_threshold_2, tvb, curr_bit_offset, 6, FALSE); + item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_tdd_reporting_threshold_2, tvb, curr_bit_offset, 6, ENC_BIG_ENDIAN); if (rep_quant == 0) { proto_item_append_text(item, " (%.1f dB)", (gfloat)tvb_get_bits8(tvb,curr_bit_offset,6)/2 - 19.5); @@ -6298,7 +6298,7 @@ de_rr_eutran_param_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) } if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_tdd_reporting_offset, tvb, curr_bit_offset, 3, FALSE); + item = proto_tree_add_bits_item(tree, hf_gsm_a_rr_eutran_tdd_reporting_offset, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } } @@ -6338,9 +6338,9 @@ de_rr_eutran_param_desc_mi(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_EUTRAN_PARAM_DESC].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_EUTRAN_PARAM_DESC]); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_start, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_start, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_stop, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_stop, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; if (tvb_get_bits8(tvb,curr_bit_offset++,1)) @@ -6366,17 +6366,17 @@ de_rr_eutran_param_desc_mi(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) { if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_default_measurement_control_eutran, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_default_measurement_control_eutran, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; } while (tvb_get_bits8(tvb,curr_bit_offset++,1) == 1) { while (tvb_get_bits8(tvb,curr_bit_offset++,1) == 1) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_frequency_index, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_frequency_index, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; } - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_measurement_control_eutran, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_measurement_control_eutran, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; } } @@ -6408,15 +6408,15 @@ de_rr_priority_and_eutran_param_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_o item_serv = proto_tree_add_text(subtree, tvb, curr_bit_offset>>3, ((curr_bit_offset+15)>>3)-(curr_bit_offset>>3) + 1 , "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_SERVING_CELL_PRIORITY_PARAM_DESC].strptr); subtree_serv = proto_item_add_subtree(item_serv, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_SERVING_CELL_PRIORITY_PARAM_DESC]); - proto_tree_add_bits_item(subtree_serv, hf_gsm_a_rr_serving_cell_priority_param_geran_priority, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree_serv, hf_gsm_a_rr_serving_cell_priority_param_geran_priority, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; - proto_tree_add_bits_item(subtree_serv, hf_gsm_a_rr_serving_cell_priority_param_thresh_prio_search, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree_serv, hf_gsm_a_rr_serving_cell_priority_param_thresh_prio_search, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; - proto_tree_add_bits_item(subtree_serv, hf_gsm_a_rr_serving_cell_priority_param_thresh_gsm_low, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree_serv, hf_gsm_a_rr_serving_cell_priority_param_thresh_gsm_low, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; - proto_tree_add_bits_item(subtree_serv, hf_gsm_a_rr_serving_cell_priority_param_h_prio, tvb, curr_bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree_serv, hf_gsm_a_rr_serving_cell_priority_param_h_prio, tvb, curr_bit_offset, 2, ENC_BIG_ENDIAN); curr_bit_offset += 2; - proto_tree_add_bits_item(subtree_serv, hf_gsm_a_rr_serving_cell_priority_param_t_reselection, tvb, curr_bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree_serv, hf_gsm_a_rr_serving_cell_priority_param_t_reselection, tvb, curr_bit_offset, 2, ENC_BIG_ENDIAN); curr_bit_offset += 2; proto_item_set_len(item_serv,((curr_bit_offset-serv_bit_offset)>>3)+1); } @@ -6454,7 +6454,7 @@ de_rr_3g_csg_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) /* CSG_PSC_SPLIT struct */ while (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_psc, tvb, curr_bit_offset, 9, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_psc, tvb, curr_bit_offset, 9, ENC_BIG_ENDIAN); curr_bit_offset += 9; } while (tvb_get_bits8(tvb,curr_bit_offset++,1)) @@ -6463,7 +6463,7 @@ de_rr_3g_csg_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) gint psc_pattern; psc_pattern_length = tvb_get_bits8(tvb,curr_bit_offset,3) + 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_utran_psc_pattern_length, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_utran_psc_pattern_length, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; psc_pattern = tvb_get_bits8(tvb,curr_bit_offset, psc_pattern_length); @@ -6472,13 +6472,13 @@ de_rr_3g_csg_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) psc_pattern); curr_bit_offset += psc_pattern_length; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_utran_psc_pattern_sense, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_utran_psc_pattern_sense, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; } while (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_utran_frequency_index, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_utran_frequency_index, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; } } @@ -6488,12 +6488,12 @@ de_rr_3g_csg_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) /* CSG_FDD_UARFCN */ if (!tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_utran_csg_fdd_uarfcn, tvb, curr_bit_offset, 14, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_utran_csg_fdd_uarfcn, tvb, curr_bit_offset, 14, ENC_BIG_ENDIAN); curr_bit_offset += 14; } else { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_utran_csg_tdd_uarfcn, tvb, curr_bit_offset, 14, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_utran_csg_tdd_uarfcn, tvb, curr_bit_offset, 14, ENC_BIG_ENDIAN); curr_bit_offset += 14; } } @@ -6522,7 +6522,7 @@ de_rr_eutran_csg_desc(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) while (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_csg_earfcn, tvb, curr_bit_offset, 16, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_csg_earfcn, tvb, curr_bit_offset, 16, ENC_BIG_ENDIAN); curr_bit_offset += 16; } @@ -6566,10 +6566,10 @@ de_rr_utran_measurement_control_param_mi(tvbuff_t *tvb, proto_tree *tree, gint b while (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_utran_frequency_index, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_utran_frequency_index, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; } - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_control_param_desc_meas_ctrl_utran, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_control_param_desc_meas_ctrl_utran, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; proto_item_set_len(item,((curr_bit_offset-bit_offset)>>3)+1); @@ -6588,9 +6588,9 @@ de_rr_3g_supplementary_param_desc_mi(tvbuff_t *tvb, proto_tree *tree, gint bit_o item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_3G_SUPPLEMENTARY_PARAM_DESC].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_3G_SUPPLEMENTARY_PARAM_DESC]); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_priority_param_desc_utran_start, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_priority_param_desc_utran_start, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_priority_param_desc_utran_stop, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_priority_param_desc_utran_stop, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; /* 3G Measurement Control Parameters Description */ @@ -6599,7 +6599,7 @@ de_rr_3g_supplementary_param_desc_mi(tvbuff_t *tvb, proto_tree *tree, gint bit_o /* 3G Measurement Control Parameters Description struct */ if (tvb_get_bits8(tvb,curr_bit_offset++,1)) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_control_param_desc_meas_ctrl_utran, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_control_param_desc_meas_ctrl_utran, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; } while (tvb_get_bits8(tvb,curr_bit_offset++,1)) @@ -6631,15 +6631,15 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_SI2QUATER_REST_OCT]); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_ba_ind, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_ba_ind, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_ba_ind, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_ba_ind, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_mp_change_mark, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_mp_change_mark, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si2quater_index, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si2quater_index, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si2quater_count, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si2quater_count, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; @@ -6648,9 +6648,9 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ bit_offset_sav = bit_offset; item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_MEAS_PARAM_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_MEAS_PARAM_DESC]); - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_gsm_report_type, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_gsm_report_type, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_serving_band_reporting, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_serving_band_reporting, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; proto_item_set_len(item2,((bit_offset-bit_offset_sav)>>3)+1); } @@ -6686,17 +6686,17 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ bit_offset_sav = bit_offset; item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_NC_MEAS_PARAM].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_NC_MEAS_PARAM]); - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_network_control_order, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_network_control_order, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_nc_non_drx_period, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_nc_non_drx_period, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_nc_reporting_period_i, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_nc_reporting_period_i, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_nc_reporting_period_t, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_nc_reporting_period_t, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; } proto_item_set_len(item2,((bit_offset-bit_offset_sav)>>3)+1); @@ -6746,14 +6746,14 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_index_start_3g, tvb, bit_offset, 7, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_index_start_3g, tvb, bit_offset, 7, ENC_BIG_ENDIAN); bit_offset += 7; } value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_absolute_index_start_emr, tvb, bit_offset, 7, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_absolute_index_start_emr, tvb, bit_offset, 7, ENC_BIG_ENDIAN); bit_offset += 7; } value = tvb_get_bits8(tvb,bit_offset,1); @@ -6777,30 +6777,30 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ bit_offset_sav = bit_offset; item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_3G_MEAS_PARAM_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_3G_MEAS_PARAM_DESC]); - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_qsearch_i, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_qsearch_i, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_qsearch_c_initial, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_qsearch_c_initial, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_qoffset, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_qoffset, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_rep_quant, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_rep_quant, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_multirat_reporting, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_multirat_reporting, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_qmin, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_qmin, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; } value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_tdd_qoffset, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_tdd_qoffset, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_tdd_multirat_reporting, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_tdd_multirat_reporting, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; } proto_item_set_len(item2,((bit_offset-bit_offset_sav)>>3)+1); @@ -6813,33 +6813,33 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ bit_offset_sav = bit_offset; item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_3G_MEAS_PARAM_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_GPRS_3G_MEAS_PARAM_DESC]); - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_qsearch_p, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_qsearch_p, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_3g_search_prio, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_3g_search_prio, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_rep_quant, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_rep_quant, tvb, bit_offset, 1, ENC_BIG_ENDIAN); reporting_quant = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_multirat_reporting, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_multirat_reporting, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; } value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_reporting_offset, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_reporting_offset, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; if (reporting_quant == 0) { - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_reporting_threshold_rscp, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_reporting_threshold_rscp, tvb, bit_offset, 3, ENC_BIG_ENDIAN); } else { - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_reporting_threshold_ecn0, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_reporting_threshold_ecn0, tvb, bit_offset, 3, ENC_BIG_ENDIAN); } bit_offset += 3; } @@ -6847,22 +6847,22 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_tdd_multirat_reporting, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_tdd_multirat_reporting, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; } value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_tdd_reporting_offset, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_tdd_reporting_offset, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; if (reporting_quant == 0) { - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_tdd_reporting_threshold_rscp, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_tdd_reporting_threshold_rscp, tvb, bit_offset, 3, ENC_BIG_ENDIAN); } else { - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_tdd_reporting_threshold_ecn0, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_tdd_reporting_threshold_ecn0, tvb, bit_offset, 3, ENC_BIG_ENDIAN); } bit_offset += 3; } @@ -6881,9 +6881,9 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ bit_offset_sav = bit_offset; item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_3G_ADD_MEAS_PARAM_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_3G_ADD_MEAS_PARAM_DESC]); - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_qmin_offset, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_qmin_offset, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_rscpmin, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_rscpmin, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; proto_item_set_len(item2,((bit_offset-bit_offset_sav)>>3)+1); } @@ -6899,7 +6899,7 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { /* Additions in Rel-6 */ bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_ccn_active, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_ccn_active, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; if (((curr_offset + len)<<3) - bit_offset > 0) { @@ -6911,18 +6911,18 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_700_reporting_offset, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_700_reporting_offset, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_700_reporting_threshold, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_700_reporting_threshold, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; } value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_810_reporting_offset, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_810_reporting_offset, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_810_reporting_threshold, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_810_reporting_threshold, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; } /* Additions in Rel-8 */ @@ -7102,13 +7102,13 @@ de_rr_rest_oct_opt_sel_param(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) curr_bit_offset += 1; item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_OPTIONAL_SEL_PARAM].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_OPTIONAL_SEL_PARAM]); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_cbq, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_cbq, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_cell_reselect_offset, tvb, curr_bit_offset, 6, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_cell_reselect_offset, tvb, curr_bit_offset, 6, ENC_BIG_ENDIAN); curr_bit_offset += 6; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_temporary_offset, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_temporary_offset, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_penalty_time, tvb, curr_bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_penalty_time, tvb, curr_bit_offset, 5, ENC_BIG_ENDIAN); curr_bit_offset += 5; proto_item_set_len(item,((curr_bit_offset-bit_offset)>>3)+1); } @@ -7137,7 +7137,7 @@ de_rr_rest_oct_gprs_indicator(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_GPRS_INDICATOR]); proto_tree_add_text(subtree, tvb, curr_bit_offset>>3, 1, "RA Colour: %d",tvb_get_bits8(tvb,curr_bit_offset,3)); curr_bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si13_position, tvb, curr_bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si13_position, tvb, curr_bit_offset, 1, ENC_BIG_ENDIAN); curr_bit_offset += 1; return (curr_bit_offset - bit_offset); @@ -7184,7 +7184,7 @@ de_rr_si3_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { /* Optional Power Offset */ bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_power_offset, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_power_offset, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; } else @@ -7223,14 +7223,14 @@ de_rr_si3_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { /* SI2quater Indicator */ bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si2quater_position, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si2quater_position, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; } else bit_offset += 1; if (gprs_indicator == FALSE) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si13alt_position, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si13alt_position, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; } @@ -7296,7 +7296,7 @@ de_rr_si4_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { /* Optional Power Offset */ bit_offset += 1; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_power_offset, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_power_offset, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; } else @@ -7321,17 +7321,17 @@ de_rr_si4_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin bit_offset_sav2 = bit_offset; item3 = proto_tree_add_text(subtree2, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_LSA_PARAMETERS].strptr); subtree3 = proto_item_add_subtree(item3, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_LSA_PARAMETERS]); - proto_tree_add_bits_item(subtree3, hf_gsm_a_rr_prio_thr, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree3, hf_gsm_a_rr_prio_thr, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; - proto_tree_add_bits_item(subtree3, hf_gsm_a_rr_lsa_offset, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree3, hf_gsm_a_rr_lsa_offset, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_text(subtree3, tvb, bit_offset>>3, 2, "MCC: %d", tvb_get_bits16(tvb,bit_offset,12,FALSE)); + proto_tree_add_text(subtree3, tvb, bit_offset>>3, 2, "MCC: %d", tvb_get_bits16(tvb,bit_offset,12,ENC_BIG_ENDIAN)); bit_offset += 12; - proto_tree_add_text(subtree3, tvb, bit_offset>>3, 2, "MNC: %d", tvb_get_bits16(tvb,bit_offset,12,FALSE)); + proto_tree_add_text(subtree3, tvb, bit_offset>>3, 2, "MNC: %d", tvb_get_bits16(tvb,bit_offset,12,ENC_BIG_ENDIAN)); bit_offset += 12; } proto_item_set_len(item2,((bit_offset-bit_offset_sav2)>>3)+1); @@ -7341,7 +7341,7 @@ de_rr_si4_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { /* Cell Identity */ bit_offset += 1; - value = tvb_get_bits16(tvb, bit_offset, 16, FALSE); + value = tvb_get_bits16(tvb, bit_offset, 16, ENC_BIG_ENDIAN); proto_tree_add_uint(subtree2, hf_gsm_a_bssmap_cell_ci, tvb, bit_offset>>3, 2, value); bit_offset += 16; } @@ -7359,12 +7359,12 @@ de_rr_si4_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin bit_offset += 1; if (value) { - proto_tree_add_text(subtree3, tvb, bit_offset>>3, 3, "Short LSA ID: %d",tvb_get_bits16(tvb,bit_offset,10,FALSE)); + proto_tree_add_text(subtree3, tvb, bit_offset>>3, 3, "Short LSA ID: %d",tvb_get_bits16(tvb,bit_offset,10,ENC_BIG_ENDIAN)); bit_offset += 10; } else { - proto_tree_add_text(subtree3, tvb, bit_offset>>3, 3, "LSA ID: %d",tvb_get_bits32(tvb,bit_offset,24,FALSE)); + proto_tree_add_text(subtree3, tvb, bit_offset>>3, 3, "LSA ID: %d",tvb_get_bits32(tvb,bit_offset,24,ENC_BIG_ENDIAN)); bit_offset += 24; } value = tvb_get_bits8(tvb,bit_offset,1); @@ -7376,7 +7376,7 @@ de_rr_si4_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_cbq3, tvb, (curr_offset<<3)+1, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_cbq3, tvb, (curr_offset<<3)+1, 2, ENC_BIG_ENDIAN); bit_offset += 3; } else @@ -7385,7 +7385,7 @@ de_rr_si4_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si13alt_position, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si13alt_position, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; } proto_item_set_len(item2,((bit_offset-bit_offset_sav)>>3)+1); @@ -7469,18 +7469,18 @@ de_rr_si6_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin bit_offset_sav = bit_offset; item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_PCH_AND_NCH_INFO].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_PCH_AND_NCH_INFO]); - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_paging_channel_restructuring, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_paging_channel_restructuring, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_nln_sacch, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_nln_sacch, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree2, hf_gsm_a_call_prio, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_call_prio, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; } - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_nln_status_sacch, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_nln_status_sacch, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; proto_item_set_len(item2,((bit_offset-bit_offset_sav)>>3)+1); } @@ -7492,9 +7492,9 @@ de_rr_si6_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin bit_offset_sav = bit_offset; item2 = proto_tree_add_text(subtree, tvb,bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_VBS_VGCS_OPTIONS].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_VBS_VGCS_OPTIONS]); - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_vbs_vgcs_inband_notifications, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_vbs_vgcs_inband_notifications, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_vbs_vgcs_inband_pagings, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_vbs_vgcs_inband_pagings, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; proto_item_set_len(item2,((bit_offset-bit_offset_sav)>>3)+1); } @@ -7505,9 +7505,9 @@ de_rr_si6_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin { proto_tree_add_text(subtree, tvb, bit_offset>>3, 1, "DTM is supported in the serving cell"); bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rac, tvb, bit_offset, 8, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rac, tvb, bit_offset, 8, ENC_BIG_ENDIAN); bit_offset += 8; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_max_lapdm, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_max_lapdm, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; } else @@ -7523,7 +7523,7 @@ de_rr_si6_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_gprs_ms_txpwr_max_ccch, tvb, bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_gprs_ms_txpwr_max_ccch, tvb, bit_offset, 5, ENC_BIG_ENDIAN); bit_offset += 5; } else @@ -7531,9 +7531,9 @@ de_rr_si6_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { /* MBMS Procedures */ bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_dedicated_mode_mbms_notification_support, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_dedicated_mode_mbms_notification_support, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_mnci_support, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_mnci_support, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; } else @@ -7545,7 +7545,7 @@ de_rr_si6_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_amr_config, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_amr_config, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; } } @@ -7655,12 +7655,12 @@ de_rr_rest_oct_gprs_mobile_allocation(tvbuff_t *tvb, proto_tree *tree, gint bit_ item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_MOBILE_ALLOC].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_GPRS_MOBILE_ALLOC]); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_hsn, tvb, curr_bit_offset, 6, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_hsn, tvb, curr_bit_offset, 6, ENC_BIG_ENDIAN); curr_bit_offset += 6; while (tvb_get_bits8(tvb,curr_bit_offset,1)) { curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rfl_number, tvb, curr_bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rfl_number, tvb, curr_bit_offset, 4, ENC_BIG_ENDIAN); curr_bit_offset += 4; } curr_bit_offset += 1; @@ -7670,7 +7670,7 @@ de_rr_rest_oct_gprs_mobile_allocation(tvbuff_t *tvb, proto_tree *tree, gint bit_ while (tvb_get_bits8(tvb,curr_bit_offset,1)) { curr_bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_arfcn_index, tvb, curr_bit_offset, 6, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_arfcn_index, tvb, curr_bit_offset, 6, ENC_BIG_ENDIAN); curr_bit_offset += 6; } curr_bit_offset += 1; @@ -7678,7 +7678,7 @@ de_rr_rest_oct_gprs_mobile_allocation(tvbuff_t *tvb, proto_tree *tree, gint bit_ else { curr_bit_offset += 1; - proto_tree_add_bits_ret_val(subtree, hf_gsm_a_rr_ma_length, tvb, curr_bit_offset, 6, &ma_length, FALSE); + proto_tree_add_bits_ret_val(subtree, hf_gsm_a_rr_ma_length, tvb, curr_bit_offset, 6, &ma_length, ENC_BIG_ENDIAN); curr_bit_offset += 6; value = (gint)ma_length + 1; item = proto_tree_add_text(subtree,tvb, curr_bit_offset>>3, (value>>3)+1, "MA Bitmap: "); @@ -7986,15 +7986,15 @@ de_rr_si13_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bcch_change_mark, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bcch_change_mark, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si_change_field, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si_change_field, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si13_change_mark, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si13_change_mark, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; bit_offset += de_rr_rest_oct_gprs_mobile_allocation(tvb, subtree, bit_offset); } @@ -8002,16 +8002,16 @@ de_rr_si13_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui bit_offset += 1; if (value) { /* PBCCH present in the cell */ - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_psi1_repeat_period, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_psi1_repeat_period, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; bit_offset_sav = bit_offset; item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_PBCCH_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_PBCCH_DESC]); - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_pbcch_pb, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_pbcch_pb, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_pbcch_tsc, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_pbcch_tsc, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_pbcch_tn, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_pbcch_tn, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; @@ -8026,7 +8026,7 @@ de_rr_si13_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_arfcn, tvb, bit_offset, 10, FALSE); + proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_arfcn, tvb, bit_offset, 10, ENC_BIG_ENDIAN); bit_offset += 10; } else @@ -8036,13 +8036,13 @@ de_rr_si13_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui } else { /* PBCCH not present in the cell */ - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rac, tvb, bit_offset, 8, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rac, tvb, bit_offset, 8, ENC_BIG_ENDIAN); bit_offset += 8; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_spgc_ccch_sup, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_spgc_ccch_sup, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_priority_access_thr, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_priority_access_thr, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_network_control_order, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_network_control_order, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; bit_offset += de_rr_rest_oct_gprs_cell_options(tvb, subtree, bit_offset); bit_offset += de_rr_rest_oct_gprs_power_control_parameters(tvb, subtree, bit_offset); @@ -8050,12 +8050,12 @@ de_rr_si13_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { /* Additions in release 99 */ bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_sgsnr, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_sgsnr, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { /* Additions in release Rel-4 */ bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si_status_ind, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si_status_ind, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { /* Additions in release Rel-6 */ @@ -8064,10 +8064,10 @@ de_rr_si13_rest_oct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_lb_ms_txpwr_max_cch, tvb, bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_lb_ms_txpwr_max_cch, tvb, bit_offset, 5, ENC_BIG_ENDIAN); bit_offset += 5; } - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si2n_support, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_si2n_support, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; } else @@ -8320,9 +8320,9 @@ de_rr_ext_meas_result(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g len = 16; bit_offset = curr_offset << 3; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_seq_code, tvb,bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_seq_code, tvb,bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_dtx_used, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_dtx_used, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; for (i=0; i<21; i++) { @@ -8346,7 +8346,7 @@ de_rr_ext_meas_freq_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ curr_offset = offset; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_seq_code, tvb,(curr_offset<<3)+3, 1, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_seq_code, tvb,(curr_offset<<3)+3, 1, ENC_BIG_ENDIAN); return dissect_arfcn_list(tvb, tree, pinfo, offset, 16, add_string, string_len); } @@ -10093,23 +10093,23 @@ sacch_rr_meas_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin curr_offset = offset; bit_offset = curr_offset << 3; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_ba_ind, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_ba_ind, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_3g_ba_ind, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_3g_ba_ind, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_mp_change_mark, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_mp_change_mark, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_mi_index, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_mi_index, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_mi_count, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_mi_count, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_pwrc, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_pwrc, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_gsm_report_type, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_gsm_report_type, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_reporting_rate, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_reporting_rate, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset +=1; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_invalid_bsic_reporting, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_invalid_bsic_reporting, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset +=1; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; @@ -10153,21 +10153,21 @@ sacch_rr_meas_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_wait, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_wait, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; } value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_index_start_3g, tvb, bit_offset, 7, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_index_start_3g, tvb, bit_offset, 7, ENC_BIG_ENDIAN); bit_offset += 7; } value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_absolute_index_start_emr, tvb, bit_offset, 7, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_absolute_index_start_emr, tvb, bit_offset, 7, ENC_BIG_ENDIAN); bit_offset += 7; } value = tvb_get_bits8(tvb,bit_offset,1); @@ -10256,33 +10256,33 @@ sacch_rr_meas_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin bit_offset_sav = bit_offset; item = proto_tree_add_text(tree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_3G_MEAS_PARAM_DESC].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_3G_MEAS_PARAM_DESC]); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_qsearch_c, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_qsearch_c, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_search_prio, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_3g_search_prio, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_fdd_rep_quant, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_fdd_rep_quant, tvb, bit_offset, 1, ENC_BIG_ENDIAN); reporting_quant = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_fdd_multirat_reporting, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_fdd_multirat_reporting, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; } value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_fdd_reporting_offset, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_fdd_reporting_offset, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; if (reporting_quant == 0) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_fdd_reporting_threshold_rscp, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_fdd_reporting_threshold_rscp, tvb, bit_offset, 3, ENC_BIG_ENDIAN); } else { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_fdd_reporting_threshold_ecn0, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_fdd_reporting_threshold_ecn0, tvb, bit_offset, 3, ENC_BIG_ENDIAN); } bit_offset += 3; } @@ -10290,22 +10290,22 @@ sacch_rr_meas_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tdd_multirat_reporting, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tdd_multirat_reporting, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset += 2; } value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tdd_reporting_offset, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tdd_reporting_offset, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; if (reporting_quant == 0) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tdd_reporting_threshold_rscp, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tdd_reporting_threshold_rscp, tvb, bit_offset, 3, ENC_BIG_ENDIAN); } else { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tdd_reporting_threshold_ecn0, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_tdd_reporting_threshold_ecn0, tvb, bit_offset, 3, ENC_BIG_ENDIAN); } bit_offset += 3; } @@ -10341,18 +10341,18 @@ sacch_rr_meas_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin bit_offset += 1; if (value) { - proto_tree_add_bits_item(tree, hf_gsm_a_rr_700_reporting_offset, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_700_reporting_offset, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_700_reporting_threshold, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_700_reporting_threshold, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; } value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; if (value) { - proto_tree_add_bits_item(tree, hf_gsm_a_rr_810_reporting_offset, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_810_reporting_offset, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_810_reporting_threshold, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_810_reporting_threshold, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; } /* Additions in Rel-8 */ @@ -10407,16 +10407,16 @@ sacch_rr_eutran_meas_report(tvbuff_t *tvb, proto_tree *tree, guint32 bit_offset, n_eutran = tvb_get_bits8(tvb,curr_bit_offset,2); n_eutran += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_mr_n_eutran, tvb, curr_bit_offset, 2, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_mr_n_eutran, tvb, curr_bit_offset, 2, ENC_BIG_ENDIAN); curr_bit_offset += 2; while ( (n_eutran > 0) && (curr_bit_offset - bit_offset < len_in_bit) ) { - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_mr_freq_idx, tvb, curr_bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_mr_freq_idx, tvb, curr_bit_offset, 3, ENC_BIG_ENDIAN); curr_bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_mr_cell_id, tvb, curr_bit_offset, 9, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_mr_cell_id, tvb, curr_bit_offset, 9, ENC_BIG_ENDIAN); curr_bit_offset += 9; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_mr_rpt_quantity, tvb, curr_bit_offset, 6, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_eutran_mr_rpt_quantity, tvb, curr_bit_offset, 6, ENC_BIG_ENDIAN); curr_bit_offset += 6; n_eutran -= 1; } @@ -10498,13 +10498,13 @@ sacch_rr_enh_meas_report(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ curr_offset = offset; bit_offset = curr_offset << 3; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_ba_used, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_ba_used, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_3g_ba_used, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_3g_ba_used, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_bsic_seen, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_bsic_seen, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(tree, hf_gsm_a_rr_scale, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_gsm_a_rr_scale, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; @@ -10513,17 +10513,17 @@ sacch_rr_enh_meas_report(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ bit_offset_sav = bit_offset; item = proto_tree_add_text(tree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_SERVING_CELL_DATA].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_SERVING_CELL_DATA]); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_dtx_used, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_dtx_used, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rxlev_full_serv_cell, tvb, bit_offset, 6, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rxlev_full_serv_cell, tvb, bit_offset, 6, ENC_BIG_ENDIAN); bit_offset += 6; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rxqual_full_serv_cell, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rxqual_full_serv_cell, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_mean_bep_gmsk, tvb, bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_mean_bep_gmsk, tvb, bit_offset, 5, ENC_BIG_ENDIAN); bit_offset += 5; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_mean_cv_bep, tvb, bit_offset, 3, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_mean_cv_bep, tvb, bit_offset, 3, ENC_BIG_ENDIAN); bit_offset += 3; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_nbr_rcvd_blocks, tvb, bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_nbr_rcvd_blocks, tvb, bit_offset, 5, ENC_BIG_ENDIAN); bit_offset += 5; proto_item_set_len(item,((bit_offset-bit_offset_sav)>>3)+1); } @@ -10534,11 +10534,11 @@ sacch_rr_enh_meas_report(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ bit_offset_sav = bit_offset; item = proto_tree_add_text(tree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_REPEAT_INV_BSIC_INFO].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_REPEAT_INV_BSIC_INFO]); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bcch_freq_ncell, tvb, bit_offset, 5, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bcch_freq_ncell, tvb, bit_offset, 5, ENC_BIG_ENDIAN); bit_offset += 5; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bsic_ncell, tvb, bit_offset, 6, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_bsic_ncell, tvb, bit_offset, 6, ENC_BIG_ENDIAN); bit_offset += 6; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rxlev_ncell, tvb, bit_offset, 6, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_rxlev_ncell, tvb, bit_offset, 6, ENC_BIG_ENDIAN); bit_offset += 6; proto_item_set_len(item,((bit_offset-bit_offset_sav)>>3)+1); value = tvb_get_bits8(tvb,bit_offset,1); @@ -10559,7 +10559,7 @@ sacch_rr_enh_meas_report(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ if (value) { proto_tree_add_text(subtree, tvb, bit_offset>>3, 1, "Neighbour Cell List index: %u", idx); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_reporting_quantity, tvb, bit_offset, 6, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_reporting_quantity, tvb, bit_offset, 6, ENC_BIG_ENDIAN); bit_offset += 6; } idx += 1; @@ -10577,7 +10577,7 @@ sacch_rr_enh_meas_report(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ bitmap_length = tvb_get_bits8(tvb,bit_offset,7); bitmap_length += 1; - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_emr_bitmap_length, tvb, bit_offset, 7, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_emr_bitmap_length, tvb, bit_offset, 7, ENC_BIG_ENDIAN); bit_offset += 7; /* REPORTING_QUANTITY */ @@ -10589,7 +10589,7 @@ sacch_rr_enh_meas_report(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ if (value) { proto_tree_add_text(subtree, tvb, bit_offset>>3, 1, "Neighbour Cell List index: %u", idx); - proto_tree_add_bits_item(subtree, hf_gsm_a_rr_reporting_quantity, tvb, bit_offset, 6, FALSE); + proto_tree_add_bits_item(subtree, hf_gsm_a_rr_reporting_quantity, tvb, bit_offset, 6, ENC_BIG_ENDIAN); bit_offset += 6; } idx += 1; diff --git a/epan/dissectors/packet-h263.c b/epan/dissectors/packet-h263.c index c89c128bba..e41ce4ca53 100644 --- a/epan/dissectors/packet-h263.c +++ b/epan/dissectors/packet-h263.c @@ -372,7 +372,7 @@ dissect_h263_picture_layer( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * Bit 18 Reserved, shall be equal to "0". */ offset_in_bits++; - proto_tree_add_bits_item( h263_opptype_tree, hf_h263_not_dissected, tvb, saved_bit_offset, offset_in_bits-saved_bit_offset, ENC_NA); + proto_tree_add_bits_item( h263_opptype_tree, hf_h263_not_dissected, tvb, saved_bit_offset, offset_in_bits-saved_bit_offset, ENC_BIG_ENDIAN); } /* @@ -415,7 +415,7 @@ dissect_h263_picture_layer( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * Bit 9 Equal to "1" to prevent start code emulation. */ offset_in_bits++; - proto_tree_add_bits_item( tree, hf_h263_not_dissected, tvb, saved_bit_offset, offset_in_bits-saved_bit_offset, ENC_NA); + proto_tree_add_bits_item( tree, hf_h263_not_dissected, tvb, saved_bit_offset, offset_in_bits-saved_bit_offset, ENC_BIG_ENDIAN); /* The picture header location of CPM (1 bit) and PSBI (2 bits) * the picture header depends on whether or not PLUSPTYPE is present * (see 5.1.20 and 5.1.21). If PLUSPTYPE is present, then CPM follows diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c index 23f662356f..b9a23e23c3 100644 --- a/epan/dissectors/packet-h264.c +++ b/epan/dissectors/packet-h264.c @@ -519,9 +519,9 @@ dissect_h264_exp_golomb_code(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint if (leading_zero_bits > 32) DISSECTOR_ASSERT_NOT_REACHED(); else if (leading_zero_bits > 16) - value = tvb_get_bits32(tvb, bit_offset,leading_zero_bits, FALSE); + value = tvb_get_bits32(tvb, bit_offset,leading_zero_bits, ENC_BIG_ENDIAN); else if (leading_zero_bits > 8) - value = tvb_get_bits16(tvb, bit_offset,leading_zero_bits, FALSE); + value = tvb_get_bits16(tvb, bit_offset,leading_zero_bits, ENC_BIG_ENDIAN); else value = tvb_get_bits8(tvb, bit_offset,leading_zero_bits ); codenum = (codenum-1) + value; @@ -1698,7 +1698,7 @@ startover: /* In decoder configuration start code may be pressent * B.1.1 Byte stream NAL unit syntax */ - dword = tvb_get_bits32(tvb, offset<<3, 32, FALSE); + dword = tvb_get_bits32(tvb, offset<<3, 32, ENC_BIG_ENDIAN); if(dword==1){ /* zero_byte + start_code_prefix_one_3bytes */ offset+=4; @@ -1902,7 +1902,7 @@ dissect_h264_par_profile(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree proto_tree_add_bitmask(tree, tvb, offset, hf_h264_par_profile, ett_h264_par_profile, - profile_fields, FALSE); + profile_fields, ENC_BIG_ENDIAN); offset += 1; return offset; } @@ -1918,7 +1918,7 @@ dissect_h264_par_AdditionalModesSupported(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_bitmask(tree, tvb, offset, hf_h264_par_AdditionalModesSupported, ett_h264_par_AdditionalModesSupported, - AdditionalModesSupported_fields, FALSE); + AdditionalModesSupported_fields, ENC_BIG_ENDIAN); offset += 1; return offset; } @@ -1939,7 +1939,7 @@ dissect_h264_ProfileIOP(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) proto_tree_add_bitmask(tree, tvb, offset, hf_h264_par_ProfileIOP, ett_h264_par_ProfileIOP, - ProfileIOP_fields, FALSE); + ProfileIOP_fields, ENC_BIG_ENDIAN); offset += 1; return offset; } diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index bc449df147..d1a5e6f3ab 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -4899,8 +4899,8 @@ static void parse_PERF_PortCounters(proto_tree* parentTree, tvbuff_t* tvb, packe proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortXmitConstraintErrors, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortRcvConstraintErrors, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; local_offset += 1; /* skip reserved field */ - proto_tree_add_bits_item(perf_tree, hf_infiniband_PortCounters_LocalLinkIntegrityErrors, tvb, local_offset*8, 4, FALSE); - proto_tree_add_bits_item(perf_tree, hf_infiniband_PortCounters_ExcessiveBufferOverrunErrors, tvb, local_offset*8 + 4, 4, FALSE); local_offset += 1; + proto_tree_add_bits_item(perf_tree, hf_infiniband_PortCounters_LocalLinkIntegrityErrors, tvb, local_offset*8, 4, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(perf_tree, hf_infiniband_PortCounters_ExcessiveBufferOverrunErrors, tvb, local_offset*8 + 4, 4, ENC_BIG_ENDIAN); local_offset += 1; local_offset += 2; /* skip reserved field */ proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_VL15Dropped, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortXmitData, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index d2e82505ae..620e1da7c5 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -1488,18 +1488,18 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) field_tree = proto_item_add_subtree(tf, ett_ip_off); if (ip_security_flag) { proto_item *sf; - sf = proto_tree_add_bits_item(field_tree, hf_ip_flags_sf, tvb, bit_offset + 0, 1, FALSE); + sf = proto_tree_add_bits_item(field_tree, hf_ip_flags_sf, tvb, bit_offset + 0, 1, ENC_BIG_ENDIAN); if (iph->ip_off & IP_RF) { proto_item_append_text(tf, " (Evil packet!)"); expert_add_info_format(pinfo, sf, PI_SECURITY, PI_WARN, "This is an Evil packet (RFC 3514)"); } } else { - proto_tree_add_bits_item(field_tree, hf_ip_flags_rf, tvb, bit_offset + 0, 1, TRUE); + proto_tree_add_bits_item(field_tree, hf_ip_flags_rf, tvb, bit_offset + 0, 1, ENC_LITTLE_ENDIAN); } if (iph->ip_off & IP_DF) proto_item_append_text(tf, " (Don't Fragment)"); - proto_tree_add_bits_item(field_tree, hf_ip_flags_df, tvb, bit_offset + 1, 1, FALSE); + proto_tree_add_bits_item(field_tree, hf_ip_flags_df, tvb, bit_offset + 1, 1, ENC_BIG_ENDIAN); if (iph->ip_off & IP_MF) proto_item_append_text(tf, " (More Fragments)"); - proto_tree_add_bits_item(field_tree, hf_ip_flags_mf, tvb, bit_offset + 2, 1, FALSE); + proto_tree_add_bits_item(field_tree, hf_ip_flags_mf, tvb, bit_offset + 2, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(ip_tree, hf_ip_frag_offset, tvb, offset + 6, 2, (iph->ip_off & IP_OFFSET)*8); diff --git a/epan/dissectors/packet-ipmi-app.c b/epan/dissectors/packet-ipmi-app.c index c575090ea8..a34da3ebca 100644 --- a/epan/dissectors/packet-ipmi-app.c +++ b/epan/dissectors/packet-ipmi-app.c @@ -480,7 +480,7 @@ rs04(tvbuff_t *tvb, proto_tree *tree) return; } - proto_tree_add_bitmask(tree, tvb, 1, hf_ipmi_app_04_fail, ett_ipmi_app_04_byte2, byte2, TRUE); + proto_tree_add_bitmask(tree, tvb, 1, hf_ipmi_app_04_fail, ett_ipmi_app_04_byte2, byte2, ENC_LITTLE_ENDIAN); } /* Manufacturing Test On. diff --git a/epan/dissectors/packet-ipmi-picmg.c b/epan/dissectors/packet-ipmi-picmg.c index b0abb4b9d7..dca5858118 100644 --- a/epan/dissectors/packet-ipmi-picmg.c +++ b/epan/dissectors/packet-ipmi-picmg.c @@ -1537,7 +1537,7 @@ rs36(tvbuff_t *tvb, proto_tree *tree) fail, "0x%02x (must be 0x00)", fail); } else if (res == 0x57) { - proto_tree_add_bitmask(tree, tvb, 1, hf_ipmi_picmg_36_fail, ett_ipmi_picmg_36_byte2, byte2, TRUE); + proto_tree_add_bitmask(tree, tvb, 1, hf_ipmi_picmg_36_fail, ett_ipmi_picmg_36_byte2, byte2, ENC_LITTLE_ENDIAN); } else if (res == 0x60) { add_component_bits(tree, tvb, 1, "Failed components: "); } else { diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c index e1800ff684..a654b78981 100644 --- a/epan/dissectors/packet-ismacryp.c +++ b/epan/dissectors/packet-ismacryp.c @@ -381,7 +381,7 @@ static void dissect_ismacryp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tre totalbit_offset = (poffset->offset_bytes)*8+poffset->offset_bits; /* offset in bits */ nbpadding_bits = (8-poffset->offset_bits); /* number of padding bits for byte alignment */ ismacryp_item = proto_tree_add_bits_item(ismacryp_tree, hf_ismacryp_padding, - tvb, totalbit_offset, nbpadding_bits , FALSE); /* padding bits */ + tvb, totalbit_offset, nbpadding_bits , ENC_BIG_ENDIAN); /* padding bits */ proto_item_append_text(ismacryp_item, ": Length=%d bits",nbpadding_bits); /* add padding info */ add_bits(poffset, nbpadding_bits); } @@ -506,11 +506,11 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p bit_offset = (poffset->offset_bytes)*8+poffset->offset_bits; /* offset in bits */ if (selective_encryption){ /* bit used */ proto_tree_add_bits_item(ismacryp_header_byte_tree, hf_ismacryp_au_is_encrypted, - tvb, bit_offset, 1, FALSE); /*fetch 1 bit AU_is_encrypted */ + tvb, bit_offset, 1, ENC_BIG_ENDIAN); /*fetch 1 bit AU_is_encrypted */ } else { /* bit unused */ proto_tree_add_bits_item(ismacryp_header_byte_tree, hf_ismacryp_unused_bits, - tvb, bit_offset, 1, FALSE); /*fetch 1 bit unused */ + tvb, bit_offset, 1, ENC_BIG_ENDIAN); /*fetch 1 bit unused */ } switch (set_version){ /* ISMACryp version? */ case V11: @@ -518,7 +518,7 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p add_bits(poffset, -7); /* move back 7 bits for reserved bits */ bit_offset = (poffset->offset_bytes)*8+poffset->offset_bits; /* offset in bits */ proto_tree_add_bits_item(ismacryp_header_byte_tree, hf_ismacryp_reserved_bits, - tvb, bit_offset, 7, FALSE); /*fetch 7 bits reserved */ + tvb, bit_offset, 7, ENC_BIG_ENDIAN); /*fetch 7 bits reserved */ add_bits(poffset,8); /* offset to next byte */ break; case V20: @@ -527,11 +527,11 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p bit_offset = (poffset->offset_bytes)*8+poffset->offset_bits; /* offset in bits */ if (slice_indication){ proto_tree_add_bits_item(ismacryp_header_byte_tree, hf_ismacryp_slice_start, - tvb, bit_offset, 1, FALSE); /*fetch 1 bit slice_start */ + tvb, bit_offset, 1, ENC_BIG_ENDIAN); /*fetch 1 bit slice_start */ } else { /* bit unused */ proto_tree_add_bits_item(ismacryp_header_byte_tree, hf_ismacryp_unused_bits, - tvb, bit_offset, 1, FALSE); /*fetch 1 bit unused */ + tvb, bit_offset, 1, ENC_BIG_ENDIAN); /*fetch 1 bit unused */ } add_bits(poffset, -1); /* move back 1 bit for slice_end */ @@ -539,11 +539,11 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p bit_offset = (poffset->offset_bytes)*8+poffset->offset_bits; /* offset in bits */ if (slice_indication){ proto_tree_add_bits_item(ismacryp_header_byte_tree, hf_ismacryp_slice_end, - tvb, bit_offset, 1, FALSE); /*fetch 1 bit Slice_end */ + tvb, bit_offset, 1, ENC_BIG_ENDIAN); /*fetch 1 bit Slice_end */ } else { /* bit unused */ proto_tree_add_bits_item(ismacryp_header_byte_tree, hf_ismacryp_unused_bits, - tvb, bit_offset, 1, FALSE); /*fetch 1 bit unused */ + tvb, bit_offset, 1, ENC_BIG_ENDIAN); /*fetch 1 bit unused */ } add_bits(poffset, -3); /* move back 3 bits for padding_bitcount */ @@ -551,18 +551,18 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p bit_offset = (poffset->offset_bytes)*8+poffset->offset_bits; /* offset in bits */ if (padding_indication){ proto_tree_add_bits_item(ismacryp_header_byte_tree, hf_ismacryp_padding_bitcount, - tvb, bit_offset, 3, FALSE); /*fetch 3 bits padding_bitcount */ + tvb, bit_offset, 3, ENC_BIG_ENDIAN); /*fetch 3 bits padding_bitcount */ } else { /* bits unused */ proto_tree_add_bits_item(ismacryp_header_byte_tree, hf_ismacryp_unused_bits, - tvb, bit_offset, 3, FALSE); /*fetch 3 bits unused */ + tvb, bit_offset, 3, ENC_BIG_ENDIAN); /*fetch 3 bits unused */ } add_bits(poffset, -2); /* move back 2 bits for reserved bits */ /* Reserved bits */ bit_offset = (poffset->offset_bytes)*8+poffset->offset_bits; /* offset in bits */ proto_tree_add_bits_item(ismacryp_header_byte_tree, hf_ismacryp_reserved_bits, - tvb, bit_offset, 2, FALSE); /*fetch 2 bits reserved */ + tvb, bit_offset, 2, ENC_BIG_ENDIAN); /*fetch 2 bits reserved */ add_bits(poffset,8); /* offset to next byte */ break; default: @@ -611,7 +611,7 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p { bit_offset = (poffset->offset_bytes)*8+poffset->offset_bits; /* offset in bits */ ismacryp_item = proto_tree_add_bits_item(ismacryp_header_tree,hf_ismacryp_au_size, - tvb, bit_offset, au_size_length, FALSE); + tvb, bit_offset, au_size_length, ENC_BIG_ENDIAN); proto_item_append_text(ismacryp_item, " bytes: Length=%d bits",au_size_length); /* add AU size info */ bit_offset+=au_size_length; add_bits(poffset, au_size_length); @@ -621,7 +621,7 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p { bit_offset = (poffset->offset_bytes)*8+poffset->offset_bits; /* offset in bits */ ismacryp_item = proto_tree_add_bits_item(ismacryp_header_tree,hf_ismacryp_au_index, - tvb, bit_offset, au_index_length, FALSE); + tvb, bit_offset, au_index_length, ENC_BIG_ENDIAN); proto_item_append_text(ismacryp_item, " bits: Length=%d bits",au_index_length); /* add AU index info */ bit_offset+=au_index_length; add_bits(poffset, au_index_length); @@ -631,7 +631,7 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p { bit_offset = (poffset->offset_bytes)*8+poffset->offset_bits; /* offset in bits */ ismacryp_item = proto_tree_add_bits_item(ismacryp_header_tree,hf_ismacryp_au_index_delta, - tvb, bit_offset, au_index_delta_length, FALSE); + tvb, bit_offset, au_index_delta_length, ENC_BIG_ENDIAN); proto_item_append_text(ismacryp_item, ": Length=%d bits", au_index_delta_length); /* add AU index info */ bit_offset+=au_index_delta_length; add_bits(poffset, au_index_delta_length); @@ -641,14 +641,14 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p { bit_offset = (poffset->offset_bytes)*8+poffset->offset_bits; /* offset in bits */ proto_tree_add_bits_item(ismacryp_header_tree, hf_ismacryp_cts_flag, - tvb, bit_offset, 1, FALSE); /* read CTS flag */ + tvb, bit_offset, 1, ENC_BIG_ENDIAN); /* read CTS flag */ add_bits(poffset, 1); if (cts_flag==1) { /* now fetch CTS delta value (remember offset 1 bit due to CTS flag) */ bit_offset = (poffset->offset_bytes)*8+poffset->offset_bits; /* offset in bits */ ismacryp_item = proto_tree_add_bits_item(ismacryp_header_tree, hf_ismacryp_cts_delta, - tvb, bit_offset, cts_delta_length, FALSE); /* read CTS delta value */ + tvb, bit_offset, cts_delta_length, ENC_BIG_ENDIAN); /* read CTS delta value */ proto_item_append_text(ismacryp_item, ": Length=%d bits",cts_delta_length); /* add CTS delta info */ add_bits(poffset, cts_delta_length); } @@ -658,7 +658,7 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p { bit_offset = (poffset->offset_bytes)*8+poffset->offset_bits; /* offset in bits */ proto_tree_add_bits_item(ismacryp_header_tree, hf_ismacryp_dts_flag, - tvb, bit_offset, 1, FALSE); /* read DTS flag */ + tvb, bit_offset, 1, ENC_BIG_ENDIAN); /* read DTS flag */ add_bits(poffset, 1); /* now fetch DTS delta value (remember offset x bits due to DTS flag) */ @@ -666,7 +666,7 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p { bit_offset = (poffset->offset_bytes)*8+poffset->offset_bits; /* offset in bits */ ismacryp_item = proto_tree_add_bits_item(ismacryp_header_tree, hf_ismacryp_dts_delta, - tvb, bit_offset, dts_delta_length, FALSE); /* read DTS delta value */ + tvb, bit_offset, dts_delta_length, ENC_BIG_ENDIAN); /* read DTS delta value */ proto_item_append_text(ismacryp_item, ": Length=%d bits",dts_delta_length); /* add DTS delta info */ add_bits(poffset, dts_delta_length); } @@ -676,7 +676,7 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p { bit_offset = (poffset->offset_bytes)*8+poffset->offset_bits; /* offset in bits */ proto_tree_add_bits_item(ismacryp_header_tree, hf_ismacryp_rap_flag, - tvb, bit_offset, 1, FALSE); /* read RAP flag */ + tvb, bit_offset, 1, ENC_BIG_ENDIAN); /* read RAP flag */ add_bits(poffset, 1); } /*STREAM STATE */ @@ -684,7 +684,7 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p { bit_offset = (poffset->offset_bytes)*8+poffset->offset_bits; /* offset in bits */ proto_tree_add_bits_item(ismacryp_header_tree, hf_ismacryp_stream_state, - tvb, bit_offset, stream_state_indication, FALSE); /* read stream state */ + tvb, bit_offset, stream_state_indication, ENC_BIG_ENDIAN); /* read stream state */ add_bits(poffset, stream_state_indication); } /* end header details */ diff --git a/epan/dissectors/packet-lon.c b/epan/dissectors/packet-lon.c index 5785051113..20a17cd877 100644 --- a/epan/dissectors/packet-lon.c +++ b/epan/dissectors/packet-lon.c @@ -231,7 +231,7 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) NULL }; proto_tree_add_bitmask(lon_tree, tvb, offset, hf_lon_ppdu, - ett_ppdu, ppdu_fields, ENC_NA); + ett_ppdu, ppdu_fields, ENC_BIG_ENDIAN); offset++; } { @@ -243,7 +243,7 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) NULL }; proto_tree_add_bitmask(lon_tree, tvb, offset, hf_lon_npdu, - ett_npdu, npdu_fields, ENC_NA); + ett_npdu, npdu_fields, ENC_BIG_ENDIAN); pdu_fmt = (tvb_get_guint8(tvb, offset) >> 4) & 0x03; addr_fmt = (tvb_get_guint8(tvb, offset) >> 2) & 0x03; @@ -319,7 +319,7 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) NULL }; proto_tree_add_bitmask(lon_tree, tvb, offset, hf_lon_tpdu, - ett_tpdu, tpdu_fields, ENC_NA); + ett_tpdu, tpdu_fields, ENC_BIG_ENDIAN); pdutype = (tvb_get_guint8(tvb, offset)>>4)& 0x07; offset++; @@ -351,7 +351,7 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) NULL }; proto_tree_add_bitmask(lon_tree, tvb, offset, hf_lon_spdu, - ett_spdu, spdu_fields, ENC_NA); + ett_spdu, spdu_fields, ENC_BIG_ENDIAN); pdutype = (tvb_get_guint8(tvb, offset)>>4)& 0x07; offset++; if (pdutype == 0) { /* REQUEST */ @@ -383,7 +383,7 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) NULL }; proto_tree_add_bitmask(lon_tree, tvb, offset, hf_lon_authpdu, - ett_authpdu, authpdu_fields, ENC_NA); + ett_authpdu, authpdu_fields, ENC_BIG_ENDIAN); pdutype = (tvb_get_guint8(tvb, offset)>>4)& 0x03; offset++; @@ -427,7 +427,7 @@ dissect_apdu(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, NULL }; proto_tree_add_bitmask(tree, tvb, offset, hf_lon_app, - ett_app, app_fields, ENC_NA); + ett_app, app_fields, ENC_BIG_ENDIAN); offset++; } else if ((dest_type&0xe0) == 0x60) { /* Network Management */ static const gint *nm_fields[] = { @@ -435,7 +435,7 @@ dissect_apdu(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, NULL }; proto_tree_add_bitmask(tree, tvb, offset, hf_lon_nm, - ett_nm, nm_fields, ENC_NA); + ett_nm, nm_fields, ENC_BIG_ENDIAN); offset++; if (dest_type == 0x7F) { @@ -451,7 +451,7 @@ dissect_apdu(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, NULL }; proto_tree_add_bitmask(tree, tvb, offset, hf_lon_nd, - ett_nd, nd_fields, ENC_NA); + ett_nd, nd_fields, ENC_BIG_ENDIAN); offset++; } else if ((dest_type&0xf0) == 0x40) { /* Foreign Frame */ static const gint *ff_fields[] = { @@ -459,7 +459,7 @@ dissect_apdu(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, NULL }; proto_tree_add_bitmask(tree, tvb, offset, hf_lon_ff, - ett_ff, ff_fields, ENC_NA); + ett_ff, ff_fields, ENC_BIG_ENDIAN); offset++; } else { /* Shouldn't get here */ expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_WARN, "Malformed APDU destin&type %i", dest_type); diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index e585fc20e0..0266b03a00 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -2539,14 +2539,14 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree if (format) { /* >= 128 - use 15 bits */ proto_tree_add_bits_ret_val(pdu_subheader_tree, hf_mac_lte_sch_length, - tvb, offset*8 + 1, 15, &length, FALSE); + tvb, offset*8 + 1, 15, &length, ENC_BIG_ENDIAN); offset += 2; } else { /* Less than 128 - only 7 bits */ proto_tree_add_bits_ret_val(pdu_subheader_tree, hf_mac_lte_sch_length, - tvb, offset*8 + 1, 7, &length, FALSE); + tvb, offset*8 + 1, 7, &length, ENC_BIG_ENDIAN); offset++; } pdu_lengths[number_of_headers] = (gint16)length; diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c index d4e9137d9a..a97f71500e 100644 --- a/epan/dissectors/packet-maccontrol.c +++ b/epan/dissectors/packet-maccontrol.c @@ -131,7 +131,7 @@ dissect_macctrl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { int i; proto_tree_add_bitmask(macctrl_tree, tvb, 2, hf_macctrl_cbfc_enbv, - ett_macctrl_cbfc_enbv, macctrl_cbfc_enbv_list, FALSE); + ett_macctrl_cbfc_enbv, macctrl_cbfc_enbv_list, ENC_BIG_ENDIAN); ti = proto_tree_add_text(macctrl_tree, tvb, 4, 8*2, "CBFC Class Pause Times"); pause_times_tree = proto_item_add_subtree(ti, ett_macctrl_cbfc_pause_times); diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c index 9ec83a392f..e2a008b081 100644 --- a/epan/dissectors/packet-mp4ves.c +++ b/epan/dissectors/packet-mp4ves.c @@ -261,13 +261,13 @@ dissect_mp4ves_user_data(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree int start_bit_offset; /* user_data_start_code */ - proto_tree_add_bits_item(tree, hf_mp4ves_start_code_prefix, tvb, bit_offset, 24, FALSE); + proto_tree_add_bits_item(tree, hf_mp4ves_start_code_prefix, tvb, bit_offset, 24, ENC_BIG_ENDIAN); bit_offset+=24; - proto_tree_add_bits_item(tree, hf_mp4ves_start_code, tvb, bit_offset, 8, FALSE); + proto_tree_add_bits_item(tree, hf_mp4ves_start_code, tvb, bit_offset, 8, ENC_BIG_ENDIAN); bit_offset+=8; start_bit_offset = bit_offset; /* while( next_bits() != '000 0000 0000 0000 0000 0001') { */ - while ( tvb_get_bits32(tvb,bit_offset, 24, FALSE) != 1){ + while ( tvb_get_bits32(tvb,bit_offset, 24, ENC_BIG_ENDIAN) != 1){ bit_offset+=8; /* user_data 8 bits */ } @@ -304,7 +304,7 @@ dissect_mp4ves_next_start_code(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree bit_offset++; } - proto_tree_add_bits_item(tree, hf_mp4ves_stuffing, tvb, start_bit_offset, bit_offset-start_bit_offset, FALSE); + proto_tree_add_bits_item(tree, hf_mp4ves_stuffing, tvb, start_bit_offset, bit_offset-start_bit_offset, ENC_BIG_ENDIAN); return bit_offset; } @@ -331,7 +331,7 @@ dissect_mp4ves_visual_object_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t guint8 video_signal_type, colour_description; video_signal_type = tvb_get_bits8(tvb,bit_offset,1); - proto_tree_add_bits_item(tree, hf_mp4ves_video_signal_type, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_mp4ves_video_signal_type, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset++; if (video_signal_type) { /* video_format 3 bits */ @@ -399,7 +399,7 @@ dissect_mp4ves_VideoObjectLayer(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre guint8 video_object_layer_shape, video_object_layer_verid = 0; /* if(next_bits() == video_object_layer_start_code) { */ - dword = tvb_get_bits32(tvb,bit_offset, 24, FALSE); + dword = tvb_get_bits32(tvb,bit_offset, 24, ENC_BIG_ENDIAN); if (dword != 1){ return bit_offset; } @@ -410,21 +410,21 @@ dissect_mp4ves_VideoObjectLayer(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre return bit_offset; } /* video_object_layer_start_code */ - proto_tree_add_bits_item(tree, hf_mp4ves_start_code_prefix, tvb, bit_offset, 24, FALSE); + proto_tree_add_bits_item(tree, hf_mp4ves_start_code_prefix, tvb, bit_offset, 24, ENC_BIG_ENDIAN); bit_offset+=24; - proto_tree_add_bits_item(tree, hf_mp4ves_start_code, tvb, bit_offset, 8, FALSE); + proto_tree_add_bits_item(tree, hf_mp4ves_start_code, tvb, bit_offset, 8, ENC_BIG_ENDIAN); bit_offset+= 8; /* short_video_header = 0 */ /* random_accessible_vol 1 */ - proto_tree_add_bits_item(tree, hf_mp4ves_random_accessible_vol, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_mp4ves_random_accessible_vol, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset++; /* video_object_type_indication 8 */ - proto_tree_add_bits_item(tree, hf_mp4ves_video_object_type_indication, tvb, bit_offset, 8, FALSE); + proto_tree_add_bits_item(tree, hf_mp4ves_video_object_type_indication, tvb, bit_offset, 8, ENC_BIG_ENDIAN); bit_offset+= 8; /* is_object_layer_identifier 1 */ is_object_layer_identifier = tvb_get_bits8(tvb,bit_offset, 1); - proto_tree_add_bits_item(tree, hf_mp4ves_is_object_layer_identifier, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_mp4ves_is_object_layer_identifier, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset++; if(is_object_layer_identifier) { /* video_object_layer_verid 4 uimsbf */ @@ -434,7 +434,7 @@ dissect_mp4ves_VideoObjectLayer(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre } /* aspect_ratio_info 4 uimsbf */ aspect_ratio_info = tvb_get_bits8(tvb,bit_offset, 1); - proto_tree_add_bits_item(tree, hf_mp4ves_aspect_ratio_info, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(tree, hf_mp4ves_aspect_ratio_info, tvb, bit_offset, 4, ENC_BIG_ENDIAN); if (aspect_ratio_info == 0xf /*"extended_PAR"*/ ) { /* par_width 8 uimsbf */ bit_offset+=8; @@ -444,7 +444,7 @@ dissect_mp4ves_VideoObjectLayer(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre /* vol_control_parameters 1 bslbf */ /* vol_control_parameters 1 bslbf */ vol_control_parameters = tvb_get_bits8(tvb,bit_offset, 1); - proto_tree_add_bits_item(tree, hf_mp4ves_vol_control_parameters, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_mp4ves_vol_control_parameters, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset++; current_bit_offset = bit_offset; if (vol_control_parameters) { @@ -484,7 +484,7 @@ dissect_mp4ves_VideoObjectLayer(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre proto_tree_add_text(tree, tvb, current_bit_offset>>3, (bit_offset+7)>>3, "Not dissected bits"); /* video_object_layer_shape 2 uimsbf */ video_object_layer_shape = tvb_get_bits8(tvb,bit_offset, 2); - proto_tree_add_bits_item(tree, hf_mp4ves_video_object_layer_shape, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(tree, hf_mp4ves_video_object_layer_shape, tvb, bit_offset, 2, ENC_BIG_ENDIAN); bit_offset+=2; if (video_object_layer_shape == 3/*"grayscale"*/&& video_object_layer_verid != 1){ /* video_object_layer_shape_extension 4 uimsbf */ @@ -548,7 +548,7 @@ dissect_mp4ves_VisualObject(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 octet; is_visual_object_identifier = tvb_get_bits8(tvb,bit_offset,1); - proto_tree_add_bits_item(tree, hf_mp4ves_is_visual_object_identifier, tvb, bit_offset, 1, FALSE); + proto_tree_add_bits_item(tree, hf_mp4ves_is_visual_object_identifier, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset++; if(is_visual_object_identifier){ /* visual_object_verid 4 bits*/ @@ -558,7 +558,7 @@ dissect_mp4ves_VisualObject(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } /* visual_object_type 4 bits*/ visual_object_type = tvb_get_bits8(tvb,bit_offset,4); - proto_tree_add_bits_item(tree, hf_mp4ves_visual_object_type, tvb, bit_offset, 4, FALSE); + proto_tree_add_bits_item(tree, hf_mp4ves_visual_object_type, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset+=4; if ((visual_object_type == 1/*"Video ID"*/) || (visual_object_type == 2/*"still textureID"*/)) { /* video_signal_type() */ @@ -566,7 +566,7 @@ dissect_mp4ves_VisualObject(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } /* next_start_code() */ bit_offset = dissect_mp4ves_next_start_code(tvb, pinfo, tree, bit_offset); - dword = tvb_get_bits32(tvb,bit_offset, 32, FALSE); + dword = tvb_get_bits32(tvb,bit_offset, 32, ENC_BIG_ENDIAN); /* while ( next_bits()== user_data_start_code){ user_data() @@ -574,13 +574,13 @@ dissect_mp4ves_VisualObject(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, */ while(dword==0x1b2){ bit_offset = dissect_mp4ves_user_data(tvb, pinfo, tree, bit_offset); - dword = tvb_get_bits32(tvb,bit_offset, 32, FALSE); + dword = tvb_get_bits32(tvb,bit_offset, 32, ENC_BIG_ENDIAN); } if (visual_object_type == 1/*"Video ID"*/) { /* * video_object_start_code */ - dword = tvb_get_bits32(tvb,bit_offset, 24, FALSE); + dword = tvb_get_bits32(tvb,bit_offset, 24, ENC_BIG_ENDIAN); if (dword != 1){ /* no start code */ return -1; @@ -590,9 +590,9 @@ dissect_mp4ves_VisualObject(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Error */ return -1; } - proto_tree_add_bits_item(tree, hf_mp4ves_start_code_prefix, tvb, bit_offset, 24, FALSE); + proto_tree_add_bits_item(tree, hf_mp4ves_start_code_prefix, tvb, bit_offset, 24, ENC_BIG_ENDIAN); bit_offset+=24; - proto_tree_add_bits_item(tree, hf_mp4ves_start_code, tvb, bit_offset, 8, FALSE); + proto_tree_add_bits_item(tree, hf_mp4ves_start_code, tvb, bit_offset, 8, ENC_BIG_ENDIAN); bit_offset+= 8; if(tvb_length_remaining(tvb,(bit_offset>>3))==0){ item = proto_tree_add_text(tree, tvb, 0, -1, "Config string to short"); @@ -619,29 +619,29 @@ dissect_mp4ves_VisualObjectSequence(tvbuff_t *tvb, packet_info *pinfo, proto_tre */ /* Get start code prefix */ - dword = tvb_get_bits32(tvb,bit_offset, 32, FALSE); + dword = tvb_get_bits32(tvb,bit_offset, 32, ENC_BIG_ENDIAN); if ((dword & 0x00000100) != 0x00000100){ /* No start code prefix */ return -1; } - proto_tree_add_bits_item(tree, hf_mp4ves_start_code_prefix, tvb, bit_offset, 24, FALSE); + proto_tree_add_bits_item(tree, hf_mp4ves_start_code_prefix, tvb, bit_offset, 24, ENC_BIG_ENDIAN); bit_offset+= 24; - proto_tree_add_bits_item(tree, hf_mp4ves_start_code, tvb, bit_offset, 8, FALSE); + proto_tree_add_bits_item(tree, hf_mp4ves_start_code, tvb, bit_offset, 8, ENC_BIG_ENDIAN); bit_offset+= 8; /* Expect visual_object_sequence_start_code */ if(dword != 0x1b0) return -1; /* profile_and_level_indication */ - proto_tree_add_bits_item(tree, hf_mp4ves_profile_and_level_indication, tvb, bit_offset, 8, FALSE); + proto_tree_add_bits_item(tree, hf_mp4ves_profile_and_level_indication, tvb, bit_offset, 8, ENC_BIG_ENDIAN); bit_offset+= 8; /* while ( next_bits()== user_data_start_code){ user_data() } */ - dword = tvb_get_bits32(tvb,bit_offset, 32, FALSE); + dword = tvb_get_bits32(tvb,bit_offset, 32, ENC_BIG_ENDIAN); bit_offset+= 32; if ((dword & 0x00000100) != 0x00000100){ /* No start code prefix */ @@ -747,7 +747,7 @@ dissect_mp4ves(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(mp4ves_tree, tvb, bit_offset>>3, -1, "Data"); return; } - dword = tvb_get_bits32(tvb,bit_offset, 24, FALSE); + dword = tvb_get_bits32(tvb,bit_offset, 24, ENC_BIG_ENDIAN); if (dword != 1){ /* if it's not 23 zeros followed by 1 it isn't a start code */ proto_tree_add_text(mp4ves_tree, tvb, bit_offset>>3, -1, "Data"); @@ -758,17 +758,17 @@ dissect_mp4ves(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch(dword){ /* vop_start_code */ case 0xb6: - proto_tree_add_bits_item(mp4ves_tree, hf_mp4ves_start_code_prefix, tvb, bit_offset, 24, FALSE); + proto_tree_add_bits_item(mp4ves_tree, hf_mp4ves_start_code_prefix, tvb, bit_offset, 24, ENC_BIG_ENDIAN); bit_offset = bit_offset+24; /* vop_coding_type 2 bits */ - proto_tree_add_bits_item(mp4ves_tree, hf_mp4ves_vop_coding_type, tvb, bit_offset, 2, FALSE); + proto_tree_add_bits_item(mp4ves_tree, hf_mp4ves_vop_coding_type, tvb, bit_offset, 2, ENC_BIG_ENDIAN); break; case 0xb0: /* VS start code */ bit_offset = dissect_mp4ves_VisualObjectSequence(tvb, pinfo, mp4ves_tree, 0); break; default: - proto_tree_add_bits_item(mp4ves_tree, hf_mp4ves_start_code_prefix, tvb, bit_offset, 24, FALSE); + proto_tree_add_bits_item(mp4ves_tree, hf_mp4ves_start_code_prefix, tvb, bit_offset, 24, ENC_BIG_ENDIAN); bit_offset = bit_offset+24; break; } diff --git a/epan/dissectors/packet-mrp-msrp.c b/epan/dissectors/packet-mrp-msrp.c index 8dc83c8e09..c5ae8b0e22 100644 --- a/epan/dissectors/packet-mrp-msrp.c +++ b/epan/dissectors/packet-mrp-msrp.c @@ -309,7 +309,7 @@ static void dissect_msrp_common2(proto_tree *vect_attr_tree, tvbuff_t *tvb, int msg_offset) { proto_tree_add_bitmask(vect_attr_tree, tvb, MSRP_VECTOR_HEADER_OFFSET + msg_offset, - hf_msrp_vector_header, ett_vector_header, vector_header_fields, FALSE); + hf_msrp_vector_header, ett_vector_header, vector_header_fields, ENC_BIG_ENDIAN); } @@ -337,7 +337,7 @@ dissect_msrp_talker_common(proto_tree *first_value_tree, tvbuff_t *tvb, int msg_ proto_tree_add_item(first_value_tree, hf_msrp_tspec_max_interval_frames, tvb, MSRP_TSPEC_MAX_INTERVAL_FRAMES_OFFSET + msg_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(first_value_tree, tvb, MSRP_PRIORITY_AND_RANK_OFFSET + msg_offset, - hf_msrp_priority_and_rank, ett_priority_and_rank, priority_and_rank_fields, FALSE); + hf_msrp_priority_and_rank, ett_priority_and_rank, priority_and_rank_fields, ENC_BIG_ENDIAN); proto_tree_add_item(first_value_tree, hf_msrp_accumulated_latency, tvb, MSRP_ACCUMULATED_LATENCY_OFFSET + msg_offset, 4, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 442c21eba5..f35a48ef82 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -3677,7 +3677,7 @@ dissect_mode3(tvbuff_t *tvb, int offset, proto_tree *tree, guint32 *mode) *mode=tvb_get_ntohl(tvb, offset+0); } - proto_tree_add_bitmask(tree, tvb, offset, hf_nfs_mode3, ett_nfs_mode3, mode_bits, FALSE); + proto_tree_add_bitmask(tree, tvb, offset, hf_nfs_mode3, ett_nfs_mode3, mode_bits, ENC_BIG_ENDIAN); offset += 4; return offset; diff --git a/epan/dissectors/packet-omron-fins.c b/epan/dissectors/packet-omron-fins.c index ea28137996..2641f28229 100644 --- a/epan/dissectors/packet-omron-fins.c +++ b/epan/dissectors/packet-omron-fins.c @@ -1147,7 +1147,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) omron_header_tree = proto_item_add_subtree(ti, ett_omron_header); proto_tree_add_bitmask(omron_header_tree, tvb, offset, hf_omron_icf, - ett_omron_icf_fields, omron_icf_fields, FALSE); + ett_omron_icf_fields, omron_icf_fields, ENC_BIG_ENDIAN); /* Byte 2 RSV */ offset = offset + 1; @@ -1900,7 +1900,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(io_data_tree, hf_omron_io_data_num_sysmac_2, tvb, (offset+67), 1, ENC_BIG_ENDIAN); /* PC status */ proto_tree_add_bitmask(command_tree, tvb, (offset+68), hf_omron_pc_status, - ett_pc_status_fields, pc_status_fields, FALSE); + ett_pc_status_fields, pc_status_fields, ENC_BIG_ENDIAN); offset = offset + 69; } @@ -1948,7 +1948,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(io_data_tree, hf_omron_io_data_num_sysmac_2, tvb, (offset+159), 1, ENC_BIG_ENDIAN); /* PC status */ proto_tree_add_bitmask(command_tree, tvb, (offset+160), hf_omron_pc_status, - ett_pc_status_fields, pc_status_fields, FALSE); + ett_pc_status_fields, pc_status_fields, ENC_BIG_ENDIAN); offset = offset + 161; } } @@ -2005,13 +2005,13 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(command_tree, hf_omron_mode_code, tvb, (offset+3), 1, ENC_BIG_ENDIAN); /* Add bitmask for Fatal error data */ proto_tree_add_bitmask(command_tree, tvb, (offset+4), hf_omron_fatal_error_data, - ett_fatal_fields, fatal_error_fields, FALSE); + ett_fatal_fields, fatal_error_fields, ENC_BIG_ENDIAN); /* Add bitmask for non fatal error data */ proto_tree_add_bitmask(command_tree, tvb, (offset+6), hf_omron_non_fatal_error_data, - ett_non_fatal_fields, non_fatal_error_fields, FALSE); + ett_non_fatal_fields, non_fatal_error_fields, ENC_BIG_ENDIAN); /* add bitmask for message yes/no data */ proto_tree_add_bitmask(command_tree, tvb, (offset+8), hf_omron_message, - ett_message_fields, message_fields, FALSE); + ett_message_fields, message_fields, ENC_BIG_ENDIAN); /* Add rest of fields */ proto_tree_add_item(command_tree, hf_omron_fals, tvb, (offset+10), 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_error_message, tvb, (offset+12), 16, ENC_ASCII|ENC_NA); @@ -2078,21 +2078,21 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item_add_subtree(netw_nodes_non_fatal_err_sts, ett_omron_netw_nodes_non_fatal_err_sts); proto_tree_add_bitmask(netw_nodes_non_fatal_err_sts_tree, tvb, (offset+0), hf_omron_cyclic_label_1, - ett_omron_cyclic_fields, cyclic_non_fatal_1_fields, FALSE); + ett_omron_cyclic_fields, cyclic_non_fatal_1_fields, ENC_BIG_ENDIAN); proto_tree_add_bitmask(netw_nodes_non_fatal_err_sts_tree, tvb, (offset+1), hf_omron_cyclic_label_2, - ett_omron_cyclic_fields, cyclic_non_fatal_2_fields, FALSE); + ett_omron_cyclic_fields, cyclic_non_fatal_2_fields, ENC_BIG_ENDIAN); proto_tree_add_bitmask(netw_nodes_non_fatal_err_sts_tree, tvb, (offset+2), hf_omron_cyclic_label_3, - ett_omron_cyclic_fields, cyclic_non_fatal_3_fields, FALSE); + ett_omron_cyclic_fields, cyclic_non_fatal_3_fields, ENC_BIG_ENDIAN); proto_tree_add_bitmask(netw_nodes_non_fatal_err_sts_tree, tvb, (offset+3), hf_omron_cyclic_label_4, - ett_omron_cyclic_fields, cyclic_non_fatal_4_fields, FALSE); + ett_omron_cyclic_fields, cyclic_non_fatal_4_fields, ENC_BIG_ENDIAN); proto_tree_add_bitmask(netw_nodes_non_fatal_err_sts_tree, tvb, (offset+4), hf_omron_cyclic_label_5, - ett_omron_cyclic_fields, cyclic_non_fatal_5_fields, FALSE); + ett_omron_cyclic_fields, cyclic_non_fatal_5_fields, ENC_BIG_ENDIAN); proto_tree_add_bitmask(netw_nodes_non_fatal_err_sts_tree, tvb, (offset+5), hf_omron_cyclic_label_6, - ett_omron_cyclic_fields, cyclic_non_fatal_6_fields, FALSE); + ett_omron_cyclic_fields, cyclic_non_fatal_6_fields, ENC_BIG_ENDIAN); proto_tree_add_bitmask(netw_nodes_non_fatal_err_sts_tree, tvb, (offset+6), hf_omron_cyclic_label_7, - ett_omron_cyclic_fields, cyclic_non_fatal_7_fields, FALSE); + ett_omron_cyclic_fields, cyclic_non_fatal_7_fields, ENC_BIG_ENDIAN); proto_tree_add_bitmask(netw_nodes_non_fatal_err_sts_tree, tvb, (offset+7), hf_omron_cyclic_label_8, - ett_omron_cyclic_fields, cyclic_non_fatal_8_fields, FALSE); + ett_omron_cyclic_fields, cyclic_non_fatal_8_fields, ENC_BIG_ENDIAN); offset = offset + 8; @@ -2435,7 +2435,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* "MESSAGE READ" / "MESSAGE CLEAR" */ /* add bitmask for message yes/no data */ proto_tree_add_bitmask(command_tree, tvb, offset, hf_omron_message, - ett_message_fields, message_yes_no_fields, FALSE); + ett_message_fields, message_yes_no_fields, ENC_BIG_ENDIAN); } offset = offset + 2; } @@ -2460,7 +2460,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); /* add bitmask for message yes/no data */ proto_tree_add_bitmask(command_tree, tvb, (offset+2), hf_omron_message, - ett_message_fields, message_yes_no_fields, FALSE); + ett_message_fields, message_yes_no_fields, ENC_BIG_ENDIAN); offset = offset + 4; reported_length_remaining = reported_length_remaining - 4; @@ -3037,7 +3037,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) while(reported_length_remaining >= 2) { proto_tree_add_bitmask(command_tree, tvb, offset, hf_omron_data_type, - ett_omron_data_type, data_type_fields, FALSE); + ett_omron_data_type, data_type_fields, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_control_data, tvb, (offset+1), 1, ENC_BIG_ENDIAN); offset = offset + 2; reported_length_remaining = reported_length_remaining - 2; @@ -3064,7 +3064,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(command_tree, tvb, (offset+2), hf_omron_data_type, - ett_omron_data_type, data_type_fields, FALSE); + ett_omron_data_type, data_type_fields, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_control_data, tvb, (offset+3), 1, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_data, tvb, (offset+4), -1, ENC_NA); offset = offset + reported_length_remaining; @@ -3080,7 +3080,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining >= 4) { proto_tree_add_bitmask(command_tree, tvb, offset, hf_omron_data_type, - ett_omron_data_type, data_type_fields, FALSE); + ett_omron_data_type, data_type_fields, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_control_data, tvb, (offset+1), 1, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_block_num, tvb, (offset+2), 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_data, tvb, (offset+4), -1, ENC_NA); diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index 13ccebd875..542e2bc7db 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -811,7 +811,7 @@ static int dissect_pdcp_dynamic_chain(proto_tree *tree, if (tis) { /* Assume encoded in two bytes for now... */ proto_tree_add_bits_ret_val(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_ts_stride, - tvb, offset*8 + 2, 14, &ts_stride, FALSE); + tvb, offset*8 + 2, 14, &ts_stride, ENC_BIG_ENDIAN); offset += 2; } diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index 0729da0aeb..60dd9c71b4 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -1474,7 +1474,7 @@ DEBUG_ENTRY("dissect_per_constrained_integer_64b"); num_bytes =tvb_get_bits8(tvb, offset, n_bits); num_bytes++; /* lower bound for length determinant is 1 */ if (display_internal_per_fields){ - int_item = proto_tree_add_bits_item(tree, hf_per_const_int_len, tvb, offset,n_bits, FALSE); + int_item = proto_tree_add_bits_item(tree, hf_per_const_int_len, tvb, offset,n_bits, ENC_BIG_ENDIAN); proto_item_append_text(int_item,"+1=%u bytes, Range = (%" G_GINT64_MODIFIER "u)",num_bytes, range); } offset = offset+n_bits; @@ -1995,29 +1995,29 @@ static tvbuff_t *dissect_per_bit_string_display(tvbuff_t *tvb, guint32 offset, a if (length<=8) { value = tvb_get_bits8(out_tvb, 0, length); }else if (length<=16) { - value = tvb_get_bits16(out_tvb, 0, length, FALSE); + value = tvb_get_bits16(out_tvb, 0, length, ENC_BIG_ENDIAN); }else if (length<=24) { /* first read 16 and then the remaining bits */ - value = tvb_get_bits16(out_tvb, 0, 16, FALSE); + value = tvb_get_bits16(out_tvb, 0, 16, ENC_BIG_ENDIAN); value <<= 8; value |= tvb_get_bits8(out_tvb, 16, length - 16); }else if (length<=32) { - value = tvb_get_bits32(out_tvb, 0, length, FALSE); + value = tvb_get_bits32(out_tvb, 0, length, ENC_BIG_ENDIAN); }else if (length<=40) { /* first read 32 and then the remaining bits */ - value = tvb_get_bits32(out_tvb, 0, 32, FALSE); + value = tvb_get_bits32(out_tvb, 0, 32, ENC_BIG_ENDIAN); value <<= 8; value |= tvb_get_bits8(out_tvb, 32, length - 32); }else if (length<=48) { /* first read 32 and then the remaining bits */ - value = tvb_get_bits32(out_tvb, 0, 32, FALSE); + value = tvb_get_bits32(out_tvb, 0, 32, ENC_BIG_ENDIAN); value <<= 16; - value |= tvb_get_bits16(out_tvb, 32, length - 32, FALSE); + value |= tvb_get_bits16(out_tvb, 32, length - 32, ENC_BIG_ENDIAN); }else if (length<=56) { /* first read 32 and 16 then the remaining bits */ - value = tvb_get_bits32(out_tvb, 0, 32, FALSE); + value = tvb_get_bits32(out_tvb, 0, 32, ENC_BIG_ENDIAN); value <<= 16; - value |= tvb_get_bits16(out_tvb, 32, 16, FALSE); + value |= tvb_get_bits16(out_tvb, 32, 16, ENC_BIG_ENDIAN); value <<= 8; value |= tvb_get_bits8(out_tvb, 48, length - 48); }else { - value = tvb_get_bits64(out_tvb, 0, length, FALSE); + value = tvb_get_bits64(out_tvb, 0, length, ENC_BIG_ENDIAN); } proto_item_append_text(actx->created_item, ", %s decimal value %" G_GINT64_MODIFIER "u", decode_bits_in_field(0, length, value), value); diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c index 73cd574d1a..f697d409b1 100644 --- a/epan/dissectors/packet-pnrp.c +++ b/epan/dissectors/packet-pnrp.c @@ -505,7 +505,7 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, ENC_BIG_ENDIAN); switch (message_type) { case INQUIRE: - proto_tree_add_bitmask(pnrp_message_tree, tvb, offset+4, hf_pnrp_message_inquire_flags, ett_pnrp_message_inquire_flags, inquire_flags, FALSE); + proto_tree_add_bitmask(pnrp_message_tree, tvb, offset+4, hf_pnrp_message_inquire_flags, ett_pnrp_message_inquire_flags, inquire_flags, ENC_BIG_ENDIAN); proto_tree_add_text(pnrp_message_tree, tvb, offset + 6, 2, "Padding : %d - 2 Bytes",tvb_get_ntohs(tvb,offset+6)); offset += data_length+2; @@ -513,13 +513,13 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case ACK: /* Reserved 0 - 14 bits */ - proto_tree_add_bits_item(pnrp_message_tree, hf_pnrp_message_ack_flags_reserved, tvb, (offset + 4)*8, 15, FALSE); + proto_tree_add_bits_item(pnrp_message_tree, hf_pnrp_message_ack_flags_reserved, tvb, (offset + 4)*8, 15, ENC_BIG_ENDIAN); /* N - Bit */ - proto_tree_add_bits_item(pnrp_message_tree, hf_pnrp_message_ack_flags_Nbit, tvb,((offset + 4)*8)+15, 1, FALSE); + proto_tree_add_bits_item(pnrp_message_tree, hf_pnrp_message_ack_flags_Nbit, tvb,((offset + 4)*8)+15, 1, ENC_BIG_ENDIAN); offset += data_length; break; case AUTHORITY: - proto_tree_add_bitmask(pnrp_message_tree, tvb, offset+4, hf_pnrp_message_authority_flags, ett_pnrp_message_authority_flags, authority_flags, FALSE); + proto_tree_add_bitmask(pnrp_message_tree, tvb, offset+4, hf_pnrp_message_authority_flags, ett_pnrp_message_authority_flags, authority_flags, ENC_BIG_ENDIAN); /* Check if the Flags Field is the last message part. If so, no padding of 2 bytes is added */ if(tvb_reported_length_remaining(tvb, offset+data_length)==0) { @@ -552,9 +552,9 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, ENC_BIG_ENDIAN); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, ENC_BIG_ENDIAN); /* Reserved 1 - 15 bits */ - proto_tree_add_bits_item(pnrp_message_tree, hf_pnrp_message_flood_flags_reserved1, tvb, (offset + 4)*8, 15, FALSE); + proto_tree_add_bits_item(pnrp_message_tree, hf_pnrp_message_flood_flags_reserved1, tvb, (offset + 4)*8, 15, ENC_BIG_ENDIAN); /* D - Bit */ - proto_tree_add_bits_item(pnrp_message_tree, hf_pnrp_message_flood_flags_Dbit, tvb,((offset + 4)*8)+15, 1, FALSE); + proto_tree_add_bits_item(pnrp_message_tree, hf_pnrp_message_flood_flags_Dbit, tvb,((offset + 4)*8)+15, 1, ENC_BIG_ENDIAN); /* Reserved 2 */ proto_tree_add_text(pnrp_message_tree, tvb, offset + 6, 1, "Reserved 2: %d",tvb_get_guint8(tvb,offset+6)); /* Padding 1 */ @@ -587,7 +587,7 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, ENC_BIG_ENDIAN); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, ENC_BIG_ENDIAN); /* 2 Bytes of Flags */ - proto_tree_add_bitmask(pnrp_message_tree, tvb, offset+4, hf_pnrp_message_lookupControls_flags, ett_pnrp_message_lookupControls_flags, lookupControls_flags, FALSE); + proto_tree_add_bitmask(pnrp_message_tree, tvb, offset+4, hf_pnrp_message_lookupControls_flags, ett_pnrp_message_lookupControls_flags, lookupControls_flags, ENC_BIG_ENDIAN); /* Precision Bytes */ proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_lookupControls_precision, tvb, offset + 6, 2, ENC_BIG_ENDIAN); /* Resolve Criteria */ @@ -924,7 +924,7 @@ static void dissect_encodedCPA_structure(tvbuff_t *tvb, gint offset, gint length /* PNRP Major Version */ proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_header_versionMajor, tvb, offset+5, 1, ENC_BIG_ENDIAN); /* Flags Field */ - proto_tree_add_bitmask(pnrp_encodedCPA_tree, tvb, offset+6, hf_pnrp_encodedCPA_flags, ett_pnrp_message_encodedCPA_flags, encodedCPA_flags, FALSE); + proto_tree_add_bitmask(pnrp_encodedCPA_tree, tvb, offset+6, hf_pnrp_encodedCPA_flags, ett_pnrp_message_encodedCPA_flags, encodedCPA_flags, ENC_BIG_ENDIAN); flagsField = tvb_get_guint8(tvb,offset+6); /* Reserved */ proto_tree_add_text(pnrp_encodedCPA_tree, tvb, offset + 7, 1, "Reserved"); diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c index 9a0ad4bbd8..a5d4c2dd6d 100644 --- a/epan/dissectors/packet-reload.c +++ b/epan/dissectors/packet-reload.c @@ -2897,10 +2897,10 @@ static int dissect_forwardingoption(tvbuff_t *tvb, packet_info *pinfo, proto_tre ti_flags = proto_tree_add_uint(option_tree, hf_reload_forwarding_option_flags, tvb, offset+local_offset+1, 1, option_flags); flags_tree = proto_item_add_subtree(ti_flags, ett_reload_forwarding_option_flags); bit_offset = 8*(offset+local_offset+1); - proto_tree_add_bits_item(flags_tree, hf_reload_forwarding_option_flag_ignore_state_keeping, tvb, bit_offset+4, 1, FALSE); - proto_tree_add_bits_item(flags_tree, hf_reload_forwarding_option_flag_response_copy, tvb, bit_offset+5, 1, FALSE); - proto_tree_add_bits_item(flags_tree, hf_reload_forwarding_option_flag_destination_critical, tvb, bit_offset+6, 1, FALSE); - proto_tree_add_bits_item(flags_tree, hf_reload_forwarding_option_flag_forward_critical, tvb, bit_offset+7, 1, FALSE); + proto_tree_add_bits_item(flags_tree, hf_reload_forwarding_option_flag_ignore_state_keeping, tvb, bit_offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(flags_tree, hf_reload_forwarding_option_flag_response_copy, tvb, bit_offset+5, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(flags_tree, hf_reload_forwarding_option_flag_destination_critical, tvb, bit_offset+6, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(flags_tree, hf_reload_forwarding_option_flag_forward_critical, tvb, bit_offset+7, 1, ENC_BIG_ENDIAN); } proto_tree_add_uint(option_tree, hf_reload_length_uint16, tvb, offset+local_offset+2, 2, option_length); local_offset += 4; @@ -2934,7 +2934,7 @@ static int dissect_dmflag(tvbuff_t *tvb, proto_tree *tree, guint16 offset) { for (i=0; i<(sizeof(reload_dmflag_items)/sizeof(gint *)); i++) { if (reload_dmflag_items[i]!=NULL) { - proto_tree_add_bits_item(local_tree, *(reload_dmflag_items[i]), tvb, bit_offset+63-i, 1, FALSE); + proto_tree_add_bits_item(local_tree, *(reload_dmflag_items[i]), tvb, bit_offset+63-i, 1, ENC_BIG_ENDIAN); } } return 8; @@ -4003,9 +4003,9 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item_append_text(ti_fragment, " (Last)"); last_fragment = TRUE; } - proto_tree_add_bits_item(fragment_tree, hf_reload_fragment_fragmented, tvb, bit_offset, 1, FALSE); - proto_tree_add_bits_item(fragment_tree, hf_reload_fragment_last_fragment, tvb, bit_offset+1, 1, FALSE); - proto_tree_add_bits_item(fragment_tree, hf_reload_fragment_reserved, tvb, bit_offset+2, 6, FALSE); + proto_tree_add_bits_item(fragment_tree, hf_reload_fragment_fragmented, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(fragment_tree, hf_reload_fragment_last_fragment, tvb, bit_offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(fragment_tree, hf_reload_fragment_reserved, tvb, bit_offset+2, 6, ENC_BIG_ENDIAN); fragment = fragment & 0x00ffffff; proto_tree_add_uint(fragment_tree, hf_reload_fragment_offset, tvb, 13, 3, fragment); } diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c index f606d1c877..4cba546f7f 100644 --- a/epan/dissectors/packet-rlc-lte.c +++ b/epan/dissectors/packet-rlc-lte.c @@ -637,13 +637,13 @@ static int dissect_rlc_lte_extension_header(tvbuff_t *tvb, packet_info *pinfo _U proto_tree_add_bits_ret_val(extension_part_tree, hf_rlc_lte_extension_e, tvb, (offset*8) + ((isOdd) ? 4 : 0), 1, - &extension, FALSE); + &extension, ENC_BIG_ENDIAN); /* Read length field */ proto_tree_add_bits_ret_val(extension_part_tree, hf_rlc_lte_extension_li, tvb, (offset*8) + ((isOdd) ? 5 : 1), 11, - &length, FALSE); + &length, ENC_BIG_ENDIAN); proto_item_append_text(extension_part_tree, " (length=%u)", (guint16)length); @@ -1758,17 +1758,17 @@ static void dissect_rlc_lte_um(tvbuff_t *tvb, packet_info *pinfo, /* Framing info (2 bits) */ proto_tree_add_bits_ret_val(um_header_tree, hf_rlc_lte_um_fi, tvb, offset*8, 2, - &framing_info, FALSE); + &framing_info, ENC_BIG_ENDIAN); /* Extension (1 bit) */ proto_tree_add_bits_ret_val(um_header_tree, hf_rlc_lte_um_fixed_e, tvb, (offset*8) + 2, 1, - &fixed_extension, FALSE); + &fixed_extension, ENC_BIG_ENDIAN); /* Sequence Number (5 bit) */ proto_tree_add_bits_ret_val(um_header_tree, hf_rlc_lte_um_sn, tvb, (offset*8) + 3, 5, - &sn, FALSE); + &sn, ENC_BIG_ENDIAN); offset++; } else if (p_rlc_lte_info->UMSequenceNumberLength == UM_SN_LENGTH_10_BITS) { @@ -1786,17 +1786,17 @@ static void dissect_rlc_lte_um(tvbuff_t *tvb, packet_info *pinfo, /* Framing info (2 bits) */ proto_tree_add_bits_ret_val(um_header_tree, hf_rlc_lte_um_fi, tvb, (offset*8)+3, 2, - &framing_info, FALSE); + &framing_info, ENC_BIG_ENDIAN); /* Extension (1 bit) */ proto_tree_add_bits_ret_val(um_header_tree, hf_rlc_lte_um_fixed_e, tvb, (offset*8) + 5, 1, - &fixed_extension, FALSE); + &fixed_extension, ENC_BIG_ENDIAN); /* Sequence Number (10 bits) */ proto_tree_add_bits_ret_val(um_header_tree, hf_rlc_lte_um_sn, tvb, (offset*8) + 6, 10, - &sn, FALSE); + &sn, ENC_BIG_ENDIAN); offset += 2; } else { @@ -1939,7 +1939,7 @@ static void dissect_rlc_lte_am_status_pdu(tvbuff_t *tvb, /* ACK SN */ proto_tree_add_bits_ret_val(tree, hf_rlc_lte_am_ack_sn, tvb, - bit_offset, 10, &ack_sn, FALSE); + bit_offset, 10, &ack_sn, ENC_BIG_ENDIAN); bit_offset += 10; write_pdu_label_and_info(top_ti, status_ti, pinfo, " ACK_SN=%-4u", (guint16)ack_sn); @@ -1947,7 +1947,7 @@ static void dissect_rlc_lte_am_status_pdu(tvbuff_t *tvb, /* E1 */ proto_tree_add_bits_ret_val(tree, hf_rlc_lte_am_e1, tvb, - bit_offset, 1, &e1, FALSE); + bit_offset, 1, &e1, ENC_BIG_ENDIAN); /* Skip another bit to byte-align the next bit... */ bit_offset++; @@ -1962,7 +1962,7 @@ static void dissect_rlc_lte_am_status_pdu(tvbuff_t *tvb, /* NACK_SN */ nack_ti = proto_tree_add_bits_ret_val(tree, hf_rlc_lte_am_nack_sn, tvb, - bit_offset, 10, &nack_sn, FALSE); + bit_offset, 10, &nack_sn, ENC_BIG_ENDIAN); bit_offset += 10; write_pdu_label_and_info(top_ti, NULL, pinfo, " NACK_SN=%-4u", (guint16)nack_sn); @@ -1984,12 +1984,12 @@ static void dissect_rlc_lte_am_status_pdu(tvbuff_t *tvb, /* E1 */ proto_tree_add_bits_ret_val(tree, hf_rlc_lte_am_e1, tvb, - bit_offset, 1, &e1, FALSE); + bit_offset, 1, &e1, ENC_BIG_ENDIAN); bit_offset++; /* E2 */ proto_tree_add_bits_ret_val(tree, hf_rlc_lte_am_e2, tvb, - bit_offset, 1, &e2, FALSE); + bit_offset, 1, &e2, ENC_BIG_ENDIAN); /* Report as expert info */ if (e2) { @@ -2011,11 +2011,11 @@ static void dissect_rlc_lte_am_status_pdu(tvbuff_t *tvb, if (e2) { /* Read SOstart, SOend */ proto_tree_add_bits_ret_val(tree, hf_rlc_lte_am_so_start, tvb, - bit_offset, 15, &so_start, FALSE); + bit_offset, 15, &so_start, ENC_BIG_ENDIAN); bit_offset += 15; proto_tree_add_bits_ret_val(tree, hf_rlc_lte_am_so_end, tvb, - bit_offset, 15, &so_end, FALSE); + bit_offset, 15, &so_end, ENC_BIG_ENDIAN); bit_offset += 15; diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c index 8d131dd9e6..a543737b74 100644 --- a/epan/dissectors/packet-scsi-mmc.c +++ b/epan/dissectors/packet-scsi-mmc.c @@ -370,7 +370,7 @@ dissect_mmc4_getconfiguration (tvbuff_t *tvb, packet_info *pinfo _U_, cdata->itlq->alloc_len=tvb_get_ntohs(tvb_v, offset_v+6); } proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } if(!isreq) { if(!cdata){ @@ -560,7 +560,7 @@ dissect_mmc4_readtocpmaatip (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } if(tree && (!isreq)) { len=tvb_get_ntohs(tvb, offset); @@ -639,7 +639,7 @@ dissect_mmc4_readdiscinformation (tvbuff_t *tvb, packet_info *pinfo _U_, proto_t if (tree && isreq && iscdb) { proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } if(tree && (!isreq)) { proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb, 0, 2, ENC_BIG_ENDIAN); @@ -695,7 +695,7 @@ dissect_mmc4_readdiscstructure (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre flags & 0xc0); proto_tree_add_bitmask(tree, tvb, offset+10, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } if(tree && (!isreq)) { proto_item *ti; @@ -807,7 +807,7 @@ proto_tree *tree, flags); proto_tree_add_bitmask(tree, tvb, offset+10, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -823,7 +823,7 @@ dissect_mmc4_synchronizecache (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree proto_tree_add_item (tree, hf_scsi_mmc_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_num_blocks, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -889,7 +889,7 @@ dissect_mmc4_reportkey (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, cdata->itlq->flags=(key_format<<8)|key_class; proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } if(tree && (!isreq)) { switch(cdata->itlq->flags){ @@ -946,7 +946,7 @@ dissect_mmc4_readtrackinformation (tvbuff_t *tvb, packet_info *pinfo _U_, proto_ proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } if(tree && (!isreq)) { proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb, 0, 2, ENC_BIG_ENDIAN); @@ -995,7 +995,7 @@ dissect_mmc4_geteventstatusnotification (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -1009,7 +1009,7 @@ dissect_mmc4_reservetrack (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr if (tree && isreq && iscdb) { proto_tree_add_item (tree, hf_scsi_mmc_reservation_size, tvb, offset+4, 4, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -1050,7 +1050,7 @@ dissect_mmc4_close_track (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre offset+=3; proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -1070,7 +1070,7 @@ dissect_mmc4_readbuffercapacity (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } if(tree && (!isreq)) { proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -1108,7 +1108,7 @@ dissect_mmc4_setcdspeed (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree "Logical Unit Write Speed(bytes/sec): %u", tvb_get_ntohs (tvb, offset+3)); proto_tree_add_bitmask(tree, tvb, offset+10, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -1134,7 +1134,7 @@ dissect_mmc4_setstreaming (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_type, tvb, offset+7, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_param_len, tvb, offset+8, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+10, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } if(tree && isreq && (!iscdb)) { switch(cdata->itlq->flags){ diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c index a5ebcd5090..d1bb876aa9 100644 --- a/epan/dissectors/packet-scsi-sbc.c +++ b/epan/dissectors/packet-scsi-sbc.c @@ -181,11 +181,11 @@ dissect_sbc_formatunit (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_formatunit_flags, - ett_scsi_format_unit, fuflags_fields, FALSE); + ett_scsi_format_unit, fuflags_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_formatunit_vendor, tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_formatunit_interleave, tvb, offset+2, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } /* TODO : add dissection of DATA */ } @@ -206,7 +206,7 @@ dissect_sbc_read6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item (tree, hf_scsi_sbc_rdwr6_lba, tvb, offset, 3, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr6_xferlen, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -226,7 +226,7 @@ dissect_sbc_write6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item (tree, hf_scsi_sbc_rdwr6_lba, tvb, offset, 3, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr6_xferlen, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -250,12 +250,12 @@ dissect_sbc_prefetch10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_prefetch_flags, - ett_scsi_prefetch, prefetch_fields, FALSE); + ett_scsi_prefetch, prefetch_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_xferlen, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -280,12 +280,12 @@ dissect_sbc_synchronizecache10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_synccache_flags, - ett_scsi_synccache, sync_fields, FALSE); + ett_scsi_synccache, sync_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_xferlen, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -310,12 +310,12 @@ dissect_sbc_synchronizecache16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_synccache_flags, - ett_scsi_synccache, sync_fields, FALSE); + ett_scsi_synccache, sync_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr16_lba, tvb, offset+1, 8, ENC_NA); proto_tree_add_item (tree, hf_scsi_sbc_rdwr12_xferlen, tvb, offset+9, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+13, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -339,12 +339,12 @@ dissect_sbc_prefetch16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_prefetch_flags, - ett_scsi_prefetch, prefetch_fields, FALSE); + ett_scsi_prefetch, prefetch_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr16_lba, tvb, offset+1, 8, ENC_NA); proto_tree_add_item (tree, hf_scsi_sbc_rdwr12_xferlen, tvb, offset+9, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+13, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -371,12 +371,12 @@ dissect_sbc_read10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_read_flags, - ett_scsi_rdwr, rdwr10_fields, FALSE); + ett_scsi_rdwr, rdwr10_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_xferlen, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -400,12 +400,12 @@ dissect_sbc_xdread10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_xdread_flags, - ett_scsi_xdread, xdread10_fields, FALSE); + ett_scsi_xdread, xdread10_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_xferlen, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -433,12 +433,12 @@ dissect_sbc_xdwrite10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_xdwrite_flags, - ett_scsi_xdwrite, xdwrite10_fields, FALSE); + ett_scsi_xdwrite, xdwrite10_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_xferlen, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -467,12 +467,12 @@ dissect_sbc_xdwriteread10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_xdwriteread_flags, - ett_scsi_xdwriteread, xdwriteread10_fields, FALSE); + ett_scsi_xdwriteread, xdwriteread10_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_xferlen, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -499,12 +499,12 @@ dissect_sbc_xpwrite10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_xpwrite_flags, - ett_scsi_xpwrite, xpwrite10_fields, FALSE); + ett_scsi_xpwrite, xpwrite10_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_xferlen, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -531,12 +531,12 @@ dissect_sbc_write10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_read_flags, - ett_scsi_rdwr, rdwr10_fields, FALSE); + ett_scsi_rdwr, rdwr10_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_xferlen, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -562,12 +562,12 @@ dissect_sbc_read12 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_read_flags, - ett_scsi_rdwr, rdwr12_fields, FALSE); + ett_scsi_rdwr, rdwr12_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr12_xferlen, tvb, offset+5, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+9, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+10, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } void @@ -592,12 +592,12 @@ dissect_sbc_write12 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_read_flags, - ett_scsi_rdwr, rdwr12_fields, FALSE); + ett_scsi_rdwr, rdwr12_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr12_xferlen, tvb, offset+5, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+9, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+10, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -623,12 +623,12 @@ dissect_sbc_read16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_read_flags, - ett_scsi_rdwr, rdwr16_fields, FALSE); + ett_scsi_rdwr, rdwr16_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr16_lba, tvb, offset+1, 8, ENC_NA); proto_tree_add_item (tree, hf_scsi_sbc_rdwr12_xferlen, tvb, offset+9, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+13, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } static void @@ -653,12 +653,12 @@ dissect_sbc_write16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_read_flags, - ett_scsi_rdwr, rdwr16_fields, FALSE); + ett_scsi_rdwr, rdwr16_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr16_lba, tvb, offset+1, 8, ENC_NA); proto_tree_add_item (tree, hf_scsi_sbc_rdwr12_xferlen, tvb, offset+9, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+13, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -700,11 +700,11 @@ dissect_sbc_startstopunit (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_ssu_immed_flags, - ett_scsi_ssu_immed, ssu_fields, FALSE); + ett_scsi_ssu_immed, ssu_fields, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+3, hf_scsi_sbc_ssu_pwr_flags, - ett_scsi_ssu_pwr, pwr_fields, FALSE); + ett_scsi_ssu_pwr, pwr_fields, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -730,12 +730,12 @@ dissect_sbc_verify10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_verify_flags, - ett_scsi_verify, verify10_fields, FALSE); + ett_scsi_verify, verify10_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_verify_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_verify_vlen, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -761,12 +761,12 @@ dissect_sbc_verify12 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_verify_flags, - ett_scsi_verify, verify12_fields, FALSE); + ett_scsi_verify, verify12_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_verify_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_verify_vlen32, tvb, offset+5, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+9, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+10, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -792,12 +792,12 @@ dissect_sbc_verify16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_verify_flags, - ett_scsi_verify, verify16_fields, FALSE); + ett_scsi_verify, verify16_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_verify_lba64, tvb, offset+1, 8, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_verify_vlen32, tvb, offset+9, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+13, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -825,12 +825,12 @@ dissect_sbc_wrverify10 (tvbuff_t *tvb, packet_info *pinfo _U_, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_wrverify_flags, - ett_scsi_wrverify, wrverify10_fields, FALSE); + ett_scsi_wrverify, wrverify10_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_wrverify_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_wrverify_xferlen, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -856,12 +856,12 @@ dissect_sbc_wrverify12 (tvbuff_t *tvb, packet_info *pinfo _U_, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_wrverify_flags, - ett_scsi_wrverify, wrverify12_fields, FALSE); + ett_scsi_wrverify, wrverify12_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_wrverify_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_wrverify_xferlen32, tvb, offset+5, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+9, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+10, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -887,12 +887,12 @@ dissect_sbc_wrverify16 (tvbuff_t *tvb, packet_info *pinfo _U_, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_wrverify_flags, - ett_scsi_wrverify, wrverify16_fields, FALSE); + ett_scsi_wrverify, wrverify16_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_wrverify_lba64, tvb, offset+1, 8, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_wrverify_xferlen32, tvb, offset+9, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+13, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -914,9 +914,9 @@ dissect_sbc_readcapacity10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t if (isreq && iscdb) { proto_tree_add_item (tree, hf_scsi_sbc_readcapacity_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+7, hf_scsi_sbc_pmi_flags, - ett_scsi_pmi, pmi_fields, FALSE); + ett_scsi_pmi, pmi_fields, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } else if (!iscdb) { len = tvb_get_ntohl (tvb, offset); @@ -950,10 +950,10 @@ dissect_sbc_readdefectdata10 (tvbuff_t *tvb, packet_info *pinfo _U_, if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset+1, hf_scsi_sbc_readdefdata_flags, - ett_scsi_defectdata, defect_fields, FALSE); + ett_scsi_defectdata, defect_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_alloclen16, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } /* TODO : add dissection of DATA */ } @@ -975,11 +975,11 @@ dissect_sbc_readlong10 (tvbuff_t *tvb, packet_info *pinfo _U_, if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_corrct_flags, - ett_scsi_corrct, corrct_fields, FALSE); + ett_scsi_corrct, corrct_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_alloclen16, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -997,7 +997,7 @@ dissect_sbc_writelong10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_alloclen16, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -1019,12 +1019,12 @@ dissect_sbc_writesame10 (tvbuff_t *tvb, packet_info *pinfo _U_, if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_writesame_flags, - ett_scsi_writesame, writesame10_fields, FALSE); + ett_scsi_writesame, writesame10_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_alloclen16, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -1046,12 +1046,12 @@ dissect_sbc_writesame16 (tvbuff_t *tvb, packet_info *pinfo _U_, if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_writesame_flags, - ett_scsi_writesame, writesame16_fields, FALSE); + ett_scsi_writesame, writesame16_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_rdwr16_lba, tvb, offset+1, 8, ENC_NA); proto_tree_add_item (tree, hf_scsi_sbc_rdwr12_xferlen, tvb, offset+9, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+13, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -1073,10 +1073,10 @@ dissect_sbc_readdefectdata12 (tvbuff_t *tvb, packet_info *pinfo _U_, if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_readdefdata_flags, - ett_scsi_defectdata, defect_fields, FALSE); + ett_scsi_defectdata, defect_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_sbc_alloclen32, tvb, offset+5, 4, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+10, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } /* TODO : add dissection of DATA */ } @@ -1099,9 +1099,9 @@ dissect_sbc_reassignblocks (tvbuff_t *tvb, packet_info *pinfo _U_, if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_reassignblks_flags, - ett_scsi_reassign_blocks, reassign_fields, FALSE); + ett_scsi_reassign_blocks, reassign_fields, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } /* TODO : add dissection of DATA */ } @@ -1161,11 +1161,11 @@ dissect_sbc_serviceactionin16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item (tree, hf_scsi_sbc_alloclen32, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_pmi_flags, ett_scsi_pmi, pmi_fields, FALSE); + proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_pmi_flags, ett_scsi_pmi, pmi_fields, ENC_BIG_ENDIAN); offset++; proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); offset++; break; @@ -1192,7 +1192,7 @@ dissect_sbc_serviceactionin16 (tvbuff_t *tvb, packet_info *pinfo _U_, offset++; proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); offset++; break; diff --git a/epan/dissectors/packet-scsi-smc.c b/epan/dissectors/packet-scsi-smc.c index d7c257c655..46913c70a4 100644 --- a/epan/dissectors/packet-scsi-smc.c +++ b/epan/dissectors/packet-scsi-smc.c @@ -84,9 +84,9 @@ dissect_smc_exchangemedium (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t proto_tree_add_item (tree, hf_scsi_smc_fda, tvb, offset+5, 2, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_smc_sda, tvb, offset+7, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+9, hf_scsi_smc_medium_flags, - ett_scsi_exchange_medium, exchg_fields, FALSE); + ett_scsi_exchange_medium, exchg_fields, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+10, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -107,9 +107,9 @@ dissect_smc_position_to_element (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr proto_tree_add_item (tree, hf_scsi_smc_mta, tvb, offset+1, 2, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_smc_da, tvb, offset+3, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+7, hf_scsi_smc_medium_flags, - ett_scsi_exchange_medium, pte_fields, FALSE); + ett_scsi_exchange_medium, pte_fields, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -123,7 +123,7 @@ dissect_smc_initialize_element_status (tvbuff_t *tvb, packet_info *pinfo _U_, pr if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -143,11 +143,11 @@ dissect_smc_initialize_element_status_with_range (tvbuff_t *tvb, packet_info *pi if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_smc_range_flags, - ett_scsi_range, range_fields, FALSE); + ett_scsi_range, range_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_smc_sa, tvb, offset+1, 2, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_smc_num_elements, tvb, offset+5, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -163,7 +163,7 @@ dissect_smc_openclose_importexport_element (tvbuff_t *tvb, packet_info *pinfo _U proto_tree_add_item (tree, hf_scsi_smc_ea, tvb, offset+1, 2, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_smc_action_code, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } void @@ -184,9 +184,9 @@ dissect_smc_movemedium (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item (tree, hf_scsi_smc_sa, tvb, offset+3, 2, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_smc_da, tvb, offset+5, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+9, hf_scsi_smc_range_flags, - ett_scsi_move, move_fields, FALSE); + ett_scsi_move, move_fields, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+10, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -495,7 +495,7 @@ dissect_smc_readelementstatus (tvbuff_t *tvb, packet_info *pinfo, "Allocation Length: %u", tvb_get_ntoh24 (tvb, offset+6)); proto_tree_add_bitmask(tree, tvb, offset+10, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } else if (!isreq) { proto_tree_add_text (tree, tvb, offset, 2, diff --git a/epan/dissectors/packet-scsi-ssc.c b/epan/dissectors/packet-scsi-ssc.c index 350ad5062d..55ba99de03 100644 --- a/epan/dissectors/packet-scsi-ssc.c +++ b/epan/dissectors/packet-scsi-ssc.c @@ -117,10 +117,10 @@ dissect_ssc_read6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_read6_flags, - ett_scsi_read6, read6_fields, FALSE); + ett_scsi_read6, read6_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+1, 3, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -143,10 +143,10 @@ dissect_ssc_recoverbuffereddata (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_read6_flags, - ett_scsi_read6, recover_fields, FALSE); + ett_scsi_read6, recover_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+1, 3, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -172,10 +172,10 @@ dissect_ssc_reportdensitysupport (tvbuff_t *tvb, packet_info *pinfo _U_, proto_t if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_read6_flags, - ett_scsi_read6, rd_fields, FALSE); + ett_scsi_read6, rd_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } else { /* XXX decode the data */ } @@ -201,10 +201,10 @@ dissect_ssc_readreverse6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_read6_flags, - ett_scsi_read6, rr6_fields, FALSE); + ett_scsi_read6, rr6_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+1, 3, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -227,12 +227,12 @@ dissect_ssc_read16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_read6_flags, - ett_scsi_read6, read6_fields, FALSE); + ett_scsi_read6, read6_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_locate16_loid, tvb, offset+3, 8, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+11, 3, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -256,12 +256,12 @@ dissect_ssc_write16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_read6_flags, - ett_scsi_read6, write16_fields, FALSE); + ett_scsi_read6, write16_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_locate16_loid, tvb, offset+3, 8, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+11, 3, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -285,12 +285,12 @@ dissect_ssc_writefilemarks16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_read6_flags, - ett_scsi_read6, wf16_fields, FALSE); + ett_scsi_read6, wf16_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_locate16_loid, tvb, offset+3, 8, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+11, 3, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -314,12 +314,12 @@ dissect_ssc_verify16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_read6_flags, - ett_scsi_read6, verify16_fields, FALSE); + ett_scsi_read6, verify16_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_locate16_loid, tvb, offset+3, 8, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_ver16_verlen, tvb, offset+11, 3, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -343,10 +343,10 @@ dissect_ssc_verify6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_read6_flags, - ett_scsi_read6, verify6_fields, FALSE); + ett_scsi_read6, verify6_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_ver16_verlen, tvb, offset+1, 3, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -370,12 +370,12 @@ dissect_ssc_readreverse16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_read6_flags, - ett_scsi_read6, rr16_fields, FALSE); + ett_scsi_read6, rr16_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_locate16_loid, tvb, offset+3, 8, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+11, 3, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -397,10 +397,10 @@ dissect_ssc_write6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_read6_flags, - ett_scsi_read6, write6_fields, FALSE); + ett_scsi_read6, write6_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+1, 3, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -422,10 +422,10 @@ dissect_ssc_writefilemarks6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_read6_flags, - ett_scsi_read6, wf6_fields, FALSE); + ett_scsi_read6, wf6_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+1, 3, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -458,11 +458,11 @@ dissect_ssc_loadunload (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_loadunload_immed_flags, - ett_scsi_loadunload_immed, loadunload_immed_fields, FALSE); + ett_scsi_loadunload_immed, loadunload_immed_fields, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+3, hf_scsi_ssc_loadunload_flags, - ett_scsi_loadunload, loadunload_fields, FALSE); + ett_scsi_loadunload, loadunload_fields, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -479,7 +479,7 @@ dissect_ssc_readblocklimits (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } else if (!iscdb) { granularity = tvb_get_guint8 (tvb, offset); @@ -511,9 +511,9 @@ dissect_ssc_rewind (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, col_append_fstr (pinfo->cinfo, COL_INFO, "(Immed: %u)", tvb_get_guint8 (tvb, offset) & 0x01); - proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_read6_flags, ett_scsi_read6, rewind_fields, FALSE); + proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_read6_flags, ett_scsi_read6, rewind_fields, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -532,10 +532,10 @@ dissect_ssc_setcapacity (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_read6_flags, - ett_scsi_read6, sc_fields, FALSE); + ett_scsi_read6, sc_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_capacity_prop_value, tvb, offset+2, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -557,11 +557,11 @@ dissect_ssc_locate10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_locate_flags, - ett_scsi_locate, locate_fields, FALSE); + ett_scsi_locate, locate_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_locate10_loid, tvb, offset+2, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset+7, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -587,13 +587,13 @@ dissect_ssc_locate16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_locate_flags, - ett_scsi_locate, locate_fields, FALSE); + ett_scsi_locate, locate_fields, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+1, hf_scsi_ssc_bam_flags, - ett_scsi_bam, bam_fields, FALSE); + ett_scsi_bam, bam_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_locate16_loid, tvb, offset+3, 8, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -616,7 +616,7 @@ dissect_ssc_erase6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, flags & 0x01); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -639,11 +639,11 @@ dissect_ssc_erase16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_erase_flags, - ett_scsi_erase, erase16_fields, FALSE); + ett_scsi_erase, erase16_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_lbi, tvb, offset+3, 8, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -659,7 +659,7 @@ dissect_ssc_space6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item (tree, hf_scsi_ssc_space6_code, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_space6_count, tvb, offset+1, 3, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -678,7 +678,7 @@ dissect_ssc_space16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, "Parameter Len: %u", tvb_get_ntohs (tvb, offset+11)); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -719,11 +719,11 @@ dissect_ssc_formatmedium (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_formatmedium_flags, - ett_scsi_formatmedium, formatmedium_fields, FALSE); + ett_scsi_formatmedium, formatmedium_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_format, tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_ssc_rdwr10_xferlen, tvb, offset+2, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -759,7 +759,7 @@ dissect_ssc_readposition (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre "Parameter Len: %u", tvb_get_ntohs (tvb, offset+6)); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } else if (!isreq) { if (cdata) diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 67fcb2c3e6..9be5a61064 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -2372,7 +2372,7 @@ dissect_spc_inquiry (tvbuff_t *tvb, packet_info *pinfo, cdata->itlq->alloc_len=tvb_get_guint8(tvb_v, offset_v+3); } proto_tree_add_bitmask(tree, tvb_v, offset_v+4, hf_scsi_inq_control, - ett_scsi_inq_control, inq_control_fields, FALSE); + ett_scsi_inq_control, inq_control_fields, ENC_BIG_ENDIAN); } else if (!isreq) { if (!cdata) { return; @@ -2393,11 +2393,11 @@ dissect_spc_inquiry (tvbuff_t *tvb, packet_info *pinfo, TRY_SCSI_CDB_ALLOC_LEN(pinfo, tvb_v, offset_v, cdata->itlq->alloc_len); /* Qualifier and DeviceType */ - proto_tree_add_bitmask(tree, tvb_v, offset_v, hf_scsi_inq_peripheral, ett_scsi_inq_peripheral, peripheral_fields, FALSE); + proto_tree_add_bitmask(tree, tvb_v, offset_v, hf_scsi_inq_peripheral, ett_scsi_inq_peripheral, peripheral_fields, ENC_BIG_ENDIAN); offset_v+=1; /* RMB */ - proto_tree_add_bitmask(tree, tvb_v, offset_v, hf_scsi_inq_rmbflags, ett_scsi_inq_rmbflags, rmb_fields, FALSE); + proto_tree_add_bitmask(tree, tvb_v, offset_v, hf_scsi_inq_rmbflags, ett_scsi_inq_rmbflags, rmb_fields, ENC_BIG_ENDIAN); offset_v+=1; /* Version */ @@ -2405,7 +2405,7 @@ dissect_spc_inquiry (tvbuff_t *tvb, packet_info *pinfo, offset_v+=1; /* aca flags */ - proto_tree_add_bitmask(tree, tvb_v, offset_v, hf_scsi_inq_acaflags, ett_scsi_inq_acaflags, aca_fields, FALSE); + proto_tree_add_bitmask(tree, tvb_v, offset_v, hf_scsi_inq_acaflags, ett_scsi_inq_acaflags, aca_fields, ENC_BIG_ENDIAN); offset_v+=1; /* Additional Length */ @@ -2497,7 +2497,7 @@ dissect_scsi_log_page (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } /* page code */ - proto_tree_add_bitmask(log_tree, tvb, offset, hf_scsi_log_pc_flags, ett_scsi_log_pc, pcflags_fields, FALSE); + proto_tree_add_bitmask(log_tree, tvb, offset, hf_scsi_log_pc_flags, ett_scsi_log_pc, pcflags_fields, ENC_BIG_ENDIAN); offset+=1; /* reserved byte */ @@ -2531,7 +2531,7 @@ dissect_scsi_log_page (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, offset+=2; /* flags */ - proto_tree_add_bitmask(log_tree, tvb, offset, hf_scsi_log_param_flags, ett_scsi_log_param, paramflags_fields, FALSE); + proto_tree_add_bitmask(log_tree, tvb, offset, hf_scsi_log_param_flags, ett_scsi_log_param, paramflags_fields, ENC_BIG_ENDIAN); offset+=1; /* parameter length */ @@ -2593,11 +2593,11 @@ dissect_spc_logselect (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_log_ppc_flags, - ett_scsi_log_ppc, ppcflags_fields, FALSE); - proto_tree_add_bitmask(tree, tvb, offset+1, hf_scsi_log_pc_flags, ett_scsi_log_pc, pcflags_fields, FALSE); + ett_scsi_log_ppc, ppcflags_fields, ENC_BIG_ENDIAN); + proto_tree_add_bitmask(tree, tvb, offset+1, hf_scsi_log_pc_flags, ett_scsi_log_pc, pcflags_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_paramlen16, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } else { } @@ -2637,14 +2637,14 @@ dissect_spc_logsense (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_log_ppc_flags, - ett_scsi_log_ppc, ppcflags_fields, FALSE); + ett_scsi_log_ppc, ppcflags_fields, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+1, hf_scsi_log_pc_flags, - ett_scsi_log_pc, pcflags_fields, FALSE); + ett_scsi_log_pc, pcflags_fields, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_log_parameter_ptr, tvb, offset+4, 2, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } else if (!isreq) { if (!cdata) { return; @@ -3463,7 +3463,7 @@ dissect_spc_modeselect6 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, flags & 0x1); proto_tree_add_item (tree, hf_scsi_paramlen, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } else { /* Mode Parameter has the following format: @@ -3557,7 +3557,7 @@ dissect_spc_modeselect10 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, flags & 0x1); proto_tree_add_item (tree, hf_scsi_paramlen16, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } else { /* Mode Parameter has the following format: @@ -3707,7 +3707,7 @@ dissect_spc_modesense6 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dissect_scsi_pagecode (tvb, pinfo, tree, offset+1, cdata); proto_tree_add_item (tree, hf_scsi_alloclen, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } else { /* Mode sense response has the following format: @@ -3797,7 +3797,7 @@ dissect_spc_modesense10 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dissect_scsi_pagecode (tvb, pinfo, tree, offset+1, cdata); proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } else { /* Mode sense response has the following format: @@ -3885,7 +3885,7 @@ dissect_spc_preventallowmediaremoval (tvbuff_t *tvb, packet_info *pinfo _U_, pro "Persistent: %u, Prevent: %u", flags & 0x02, flags & 0x01); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -3905,7 +3905,7 @@ dissect_spc_persistentreservein (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr proto_tree_add_item (tree, hf_scsi_persresvin_svcaction, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); /* We store the service action since we want to interpret the data */ cdata->itlq->flags = tvb_get_guint8 (tvb, offset); } @@ -3962,7 +3962,7 @@ dissect_spc_persistentreserveout (tvbuff_t *tvb, packet_info *pinfo _U_, proto_t proto_tree_add_item (tree, hf_scsi_persresv_type, tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_paramlen16, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); /* We store the service action since we want to interpret the params */ cdata->itlq->flags = tvb_get_guint8 (tvb, offset); } @@ -3982,7 +3982,7 @@ dissect_spc_persistentreserveout (tvbuff_t *tvb, packet_info *pinfo _U_, proto_t offset+16, 1, ENC_NA); proto_tree_add_bitmask(tree, tvb, offset+17, hf_scsi_persresvout_control, ett_persresv_control, - persresv_fields, FALSE); + persresv_fields, ENC_BIG_ENDIAN); } else { const int *persresv_fields[] = { @@ -3998,7 +3998,7 @@ dissect_spc_persistentreserveout (tvbuff_t *tvb, packet_info *pinfo _U_, proto_t offset+16, 4, ENC_NA); proto_tree_add_bitmask(tree, tvb, offset+20, hf_scsi_persresvout_control, ett_persresv_control, - persresv_fields, FALSE); + persresv_fields, ENC_BIG_ENDIAN); } } else { @@ -4015,7 +4015,7 @@ dissect_spc_release6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -4041,7 +4041,7 @@ dissect_spc_release10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } proto_tree_add_item (tree, hf_scsi_paramlen16, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -4071,7 +4071,7 @@ dissect_spc_reportluns (tvbuff_t *tvb, packet_info *pinfo _U_, cdata->itlq->alloc_len=tvb_get_ntohl(tvb_v, offset_v+5); } proto_tree_add_bitmask(tree, tvb, offset_v+10, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } else if (!isreq) { if (!cdata) { return; @@ -4141,7 +4141,7 @@ dissect_spc_requestsense (tvbuff_t * tvb, packet_info *pinfo _U_, proto_tree *tr if (isreq && iscdb) { proto_tree_add_item (tree, hf_scsi_alloclen, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } else if (!isreq) dissect_scsi_fix_snsinfo(tvb, tree, offset); @@ -4157,7 +4157,7 @@ dissect_spc_reserve6 (tvbuff_t * tvb, packet_info *pinfo _U_, proto_tree *tree, if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -4183,7 +4183,7 @@ dissect_spc_reserve10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } proto_tree_add_item (tree, hf_scsi_paramlen16, tvb, offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -4198,7 +4198,7 @@ dissect_spc_testunitready (tvbuff_t * tvb, packet_info *pinfo _U_, proto_tree *t if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } } @@ -4222,7 +4222,7 @@ dissect_spc_senddiagnostic (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t proto_tree_add_boolean (tree, hf_scsi_senddiag_unitoff, tvb, offset, 1, 0); proto_tree_add_uint (tree, hf_scsi_paramlen16, tvb, offset+2, 2, 0); proto_tree_add_bitmask(tree, tvb, offset+4, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } void @@ -4238,7 +4238,7 @@ dissect_spc_writebuffer (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree proto_tree_add_uint (tree, hf_scsi_wb_bufoffset, tvb, offset+2, 3, 0); proto_tree_add_uint (tree, hf_scsi_paramlen24, tvb, offset+5, 3, 0); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, - ett_scsi_control, cdb_control_fields, FALSE); + ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } static void diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 5f9ab1d83c..962f47f3a3 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -12544,7 +12544,7 @@ dissect_qspi_unix_acl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, COUNT_BYTES_SUBR(1); CHECK_BYTE_COUNT_SUBR(1); - proto_tree_add_bitmask(tr, tvb, offset, hf_smb_posix_ace_flags, ett_smb_posix_ace_perms, perm_fields, FALSE); + proto_tree_add_bitmask(tr, tvb, offset, hf_smb_posix_ace_flags, ett_smb_posix_ace_perms, perm_fields, ENC_BIG_ENDIAN); COUNT_BYTES_SUBR(1); switch(ace_type){ diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index f71d0f070e..12b142a8fe 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -2078,7 +2078,7 @@ dissect_smb2_share_flags(proto_tree *tree, tvbuff_t *tvb, int offset) proto_item *item; guint32 cp; - item = proto_tree_add_bitmask(tree, tvb, offset, hf_smb2_share_flags, ett_smb2_share_flags, sf_fields, TRUE); + item = proto_tree_add_bitmask(tree, tvb, offset, hf_smb2_share_flags, ett_smb2_share_flags, sf_fields, ENC_LITTLE_ENDIAN); cp = tvb_get_letohl(tvb, offset); cp &= 0x00000030; @@ -2102,7 +2102,7 @@ dissect_smb2_share_caps(proto_tree *tree, tvbuff_t *tvb, int offset) NULL }; - proto_tree_add_bitmask(tree, tvb, offset, hf_smb2_share_caps, ett_smb2_share_caps, sc_fields, TRUE); + proto_tree_add_bitmask(tree, tvb, offset, hf_smb2_share_caps, ett_smb2_share_caps, sc_fields, ENC_LITTLE_ENDIAN); offset += 4; @@ -2519,7 +2519,7 @@ dissect_smb2_find_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i offset += 1; /* find flags */ - proto_tree_add_bitmask(tree, tvb, offset, hf_smb2_find_flags, ett_smb2_find_flags, f_fields, TRUE); + proto_tree_add_bitmask(tree, tvb, offset, hf_smb2_find_flags, ett_smb2_find_flags, f_fields, ENC_LITTLE_ENDIAN); offset += 1; /* file index */ @@ -3674,7 +3674,7 @@ dissect_smb2_lock_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i offset += 8; /* flags */ - proto_tree_add_bitmask(lock_tree, tvb, offset, hf_smb2_lock_flags, ett_smb2_lock_flags, lf_fields, TRUE); + proto_tree_add_bitmask(lock_tree, tvb, offset, hf_smb2_lock_flags, ett_smb2_lock_flags, lf_fields, ENC_LITTLE_ENDIAN); offset += 4; /* reserved */ @@ -3783,7 +3783,7 @@ dissect_smb2_write_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 2; /* flags */ - proto_tree_add_bitmask(tree, tvb, offset, hf_smb2_write_flags, ett_smb2_write_flags, f_fields, TRUE); + proto_tree_add_bitmask(tree, tvb, offset, hf_smb2_write_flags, ett_smb2_write_flags, f_fields, ENC_LITTLE_ENDIAN); offset += 4; /* data or dcerpc ?*/ @@ -4730,7 +4730,7 @@ dissect_smb2_DH2Q_buffer_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr /* flags */ proto_tree_add_bitmask(sub_tree, tvb, offset, hf_smb2_dh2x_buffer_flags, - ett_smb2_dh2x_flags, dh2x_flags_fields, TRUE); + ett_smb2_dh2x_flags, dh2x_flags_fields, ENC_LITTLE_ENDIAN); offset += 4; /* reserved */ @@ -4942,11 +4942,11 @@ dissect_SMB2_CREATE_LEASE_VX(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * offset += 16; proto_tree_add_bitmask(sub_tree, tvb, offset, hf_smb2_lease_state, - ett_smb2_lease_state, lease_state_fields, TRUE); + ett_smb2_lease_state, lease_state_fields, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_bitmask(sub_tree, tvb, offset, hf_smb2_lease_flags, - ett_smb2_lease_flags, lease_flags_fields, TRUE); + ett_smb2_lease_flags, lease_flags_fields, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_item(sub_tree, hf_smb2_lease_duration, tvb, offset, 8, ENC_LITTLE_ENDIAN); @@ -5223,7 +5223,7 @@ dissect_smb2_create_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* reserved */ proto_tree_add_bitmask(tree, tvb, offset, hf_smb2_create_rep_flags, - ett_smb2_create_rep_flags, create_rep_flags_fields, TRUE); + ett_smb2_create_rep_flags, create_rep_flags_fields, ENC_LITTLE_ENDIAN); offset += 1; /* create action */ @@ -5370,7 +5370,7 @@ dissect_smb2_break_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* lease flags */ proto_tree_add_bitmask(tree, tvb, offset, hf_smb2_lease_flags, - ett_smb2_lease_flags, lease_flags_fields, TRUE); + ett_smb2_lease_flags, lease_flags_fields, ENC_LITTLE_ENDIAN); offset += 4; /* lease key */ @@ -5379,7 +5379,7 @@ dissect_smb2_break_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* lease state */ proto_tree_add_bitmask(tree, tvb, offset, hf_smb2_lease_state, - ett_smb2_lease_state, lease_state_fields, TRUE); + ett_smb2_lease_state, lease_state_fields, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_smb2_lease_duration, tvb, offset, 8, ENC_LITTLE_ENDIAN); @@ -5438,7 +5438,7 @@ dissect_smb2_break_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* lease flags */ proto_tree_add_bitmask(tree, tvb, offset, hf_smb2_lease_flags, - ett_smb2_lease_flags, lease_flags_fields, TRUE); + ett_smb2_lease_flags, lease_flags_fields, ENC_LITTLE_ENDIAN); offset += 4; /* lease key */ @@ -5447,7 +5447,7 @@ dissect_smb2_break_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* current lease state */ item = proto_tree_add_bitmask(tree, tvb, offset, hf_smb2_lease_state, - ett_smb2_lease_state, lease_state_fields, TRUE); + ett_smb2_lease_state, lease_state_fields, ENC_LITTLE_ENDIAN); if (item) { proto_item_prepend_text(item, "Current "); } @@ -5455,7 +5455,7 @@ dissect_smb2_break_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* new lease state */ item = proto_tree_add_bitmask(tree, tvb, offset, hf_smb2_lease_state, - ett_smb2_lease_state, lease_state_fields, TRUE); + ett_smb2_lease_state, lease_state_fields, ENC_LITTLE_ENDIAN); if (item) { proto_item_prepend_text(item, "New "); } @@ -5485,7 +5485,7 @@ dissect_smb2_break_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* lease flags */ proto_tree_add_bitmask(tree, tvb, offset, hf_smb2_lease_flags, - ett_smb2_lease_flags, lease_flags_fields, TRUE); + ett_smb2_lease_flags, lease_flags_fields, ENC_LITTLE_ENDIAN); offset += 4; /* lease key */ @@ -5494,7 +5494,7 @@ dissect_smb2_break_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* lease state */ proto_tree_add_bitmask(tree, tvb, offset, hf_smb2_lease_state, - ett_smb2_lease_state, lease_state_fields, TRUE); + ett_smb2_lease_state, lease_state_fields, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_smb2_lease_duration, tvb, offset, 8, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-tdmoe.c b/epan/dissectors/packet-tdmoe.c index 399c996f6c..500de7287d 100644 --- a/epan/dissectors/packet-tdmoe.c +++ b/epan/dissectors/packet-tdmoe.c @@ -93,7 +93,7 @@ dissect_tdmoe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; /* Yellow alarm & "Sig bits present" bits (1 byte) */ - proto_tree_add_bitmask(tdmoe_tree, tvb, offset, hf_tdmoe_flags, ett_tdmoe_flags, flags, ENC_NA/*??*/); + proto_tree_add_bitmask(tdmoe_tree, tvb, offset, hf_tdmoe_flags, ett_tdmoe_flags, flags, ENC_BIG_ENDIAN); offset++; /* Packet counter (2 bytes) */ diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c index 9d246e62da..67b448282d 100644 --- a/epan/dissectors/packet-tn3270.c +++ b/epan/dissectors/packet-tn3270.c @@ -1570,7 +1570,7 @@ tn3270_add_hf_items(proto_tree *tn3270_tree, tvbuff_t *tvb, gint offset, fields[i].encoding); } else { proto_tree_add_bitmask(tn3270_tree, tvb, offset, fields[i].hf, - fields[i].bitmask_ett, fields[i].bitmask, FALSE); + fields[i].bitmask_ett, fields[i].bitmask, ENC_BIG_ENDIAN); } offset+=fields[i].length; } @@ -1712,7 +1712,7 @@ dissect_3270_field_attribute(proto_tree *tn3270_tree, tvbuff_t *tvb, gint offset proto_tree_add_bitmask(tn3270_tree, tvb, offset, hf_tn3270_field_attribute, - ett_tn3270_field_attribute, byte, FALSE); + ett_tn3270_field_attribute, byte, ENC_BIG_ENDIAN); offset++; return (offset - start); @@ -1736,7 +1736,7 @@ dissect_ccc(proto_tree *tn3270_tree, tvbuff_t *tvb, gint offset) proto_tree_add_bitmask(tn3270_tree, tvb, offset, hf_tn3270_ccc, - ett_tn3270_ccc, byte, FALSE); + ett_tn3270_ccc, byte, ENC_BIG_ENDIAN); offset++; return (offset - start); diff --git a/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c index 239d51067e..e5dd579b4d 100644 --- a/epan/dissectors/packet-tn5250.c +++ b/epan/dissectors/packet-tn5250.c @@ -2977,7 +2977,7 @@ tn5250_add_hf_items(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset, fields[i].length, fields[i].encoding); } else { proto_tree_add_bitmask(tn5250_tree, tvb, offset, fields[i].hf, - fields[i].bitmask_ett, fields[i].bitmask, FALSE); + fields[i].bitmask_ett, fields[i].bitmask, ENC_BIG_ENDIAN); } DISSECTOR_ASSERT(fields[i].length > 0); offset+=fields[i].length; @@ -3166,7 +3166,7 @@ dissect_field_attribute_pair(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset switch (attribute_type) { case EXTENDED_PRIMARY_ATTRIBUTES: proto_tree_add_bitmask(tn5250_tree, tvb, offset, hf_tn5250_wea_prim_attr, - ett_tn5250_wea_prim_attr, byte, FALSE); + ett_tn5250_wea_prim_attr, byte, ENC_BIG_ENDIAN); offset++; break; case EXTENDED_FOREGROUND_COLOR_ATTRIBUTES: @@ -3260,7 +3260,7 @@ dissect_start_of_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) if (fa & FA_ID) { proto_tree_add_bitmask(tn5250_tree, tvb, offset, hf_tn5250_fa, - ett_tn5250_wea_prim_attr, fabyte, FALSE); + ett_tn5250_wea_prim_attr, fabyte, ENC_BIG_ENDIAN); offset++; } else { proto_tree_add_item(tn5250_tree, hf_tn5250_fa_color, tvb, offset, diff --git a/epan/dissectors/packet-trill.c b/epan/dissectors/packet-trill.c index 0ea57a88fb..0e3c2096e6 100644 --- a/epan/dissectors/packet-trill.c +++ b/epan/dissectors/packet-trill.c @@ -104,7 +104,7 @@ dissect_trill( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) col_set_str( pinfo->cinfo, COL_PROTOCOL, TRILL_PROTO_COL_NAME ) ; col_set_str( pinfo->cinfo, COL_INFO, TRILL_PROTO_COL_INFO ) ; - op_len = tvb_get_bits( tvb, 5, 5, FALSE ) * TRILL_OP_LENGTH_BYTE_UNITS ; + op_len = tvb_get_bits( tvb, 5, 5, ENC_BIG_ENDIAN ) * TRILL_OP_LENGTH_BYTE_UNITS ; if (tree) { ti = proto_tree_add_item( tree, proto_trill, tvb, 0, -1, ENC_NA ) ; trill_tree = proto_item_add_subtree( ti, ett_trill ) ; diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c index ffc7c73b9f..570732c3bc 100644 --- a/epan/dissectors/packet-turbocell.c +++ b/epan/dissectors/packet-turbocell.c @@ -155,7 +155,7 @@ static void dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* it seem when we have this magic number,that means an alternate header version */ - if (tvb_get_bits64(tvb, 64,48,FALSE) != G_GINT64_CONSTANT(0x000001fe23dc45ba)){ + if (tvb_get_bits64(tvb, 64,48,ENC_BIG_ENDIAN) != G_GINT64_CONSTANT(0x000001fe23dc45ba)){ proto_tree_add_item(turbocell_tree, hf_turbocell_counter, tvb, 0x02, 2, ENC_BIG_ENDIAN); proto_tree_add_item(turbocell_tree, hf_turbocell_dst, tvb, 0x04, 6, ENC_NA); proto_tree_add_item(turbocell_tree, hf_turbocell_timestamp, tvb, 0x0A, 3, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 746b08d41d..1f8d0133ff 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -1803,7 +1803,7 @@ dissect_linux_usb_pseudo_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t val_to_str(transfer_type_and_direction, usb_transfer_type_and_direction_vals, "Unknown type %x")); } - proto_tree_add_bitmask(tree, tvb, 10, hf_usb_endpoint_number, ett_usb_endpoint, usb_endpoint_fields, FALSE); + proto_tree_add_bitmask(tree, tvb, 10, hf_usb_endpoint_number, ett_usb_endpoint, usb_endpoint_fields, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_usb_device_address, tvb, 11, 1, ENC_BIG_ENDIAN); tvb_memcpy(tvb, (guint8 *)&val16, 12, 2); diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index f2a0da8c04..131d1fddd6 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -2216,13 +2216,13 @@ vnc_tight_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset, /* least significant bits 0-3 are "reset compression stream N" */ bit_offset = *offset * 8; - proto_tree_add_bits_item(tree, hf_vnc_tight_reset_stream0, tvb, bit_offset + 7, 1, FALSE); - proto_tree_add_bits_item(tree, hf_vnc_tight_reset_stream1, tvb, bit_offset + 6, 1, FALSE); - proto_tree_add_bits_item(tree, hf_vnc_tight_reset_stream2, tvb, bit_offset + 5, 1, FALSE); - proto_tree_add_bits_item(tree, hf_vnc_tight_reset_stream3, tvb, bit_offset + 4, 1, FALSE); + proto_tree_add_bits_item(tree, hf_vnc_tight_reset_stream0, tvb, bit_offset + 7, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(tree, hf_vnc_tight_reset_stream1, tvb, bit_offset + 6, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(tree, hf_vnc_tight_reset_stream2, tvb, bit_offset + 5, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(tree, hf_vnc_tight_reset_stream3, tvb, bit_offset + 4, 1, ENC_BIG_ENDIAN); /* most significant bits 4-7 are "compression type" */ - compression_type_ti = proto_tree_add_bits_item(tree, hf_vnc_tight_rect_type, tvb, bit_offset + 0, 4, FALSE); + compression_type_ti = proto_tree_add_bits_item(tree, hf_vnc_tight_rect_type, tvb, bit_offset + 0, 4, ENC_BIG_ENDIAN); comp_ctl = tvb_get_guint8(tvb, *offset); *offset += 1; @@ -2267,7 +2267,7 @@ vnc_tight_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset, proto_item_append_text(compression_type_ti, " (basic encoding)"); - proto_tree_add_bits_item(tree, hf_vnc_tight_filter_flag, tvb, bit_offset + 1, 1, FALSE); + proto_tree_add_bits_item(tree, hf_vnc_tight_filter_flag, tvb, bit_offset + 1, 1, ENC_BIG_ENDIAN); bits_per_pixel = per_packet_info->depth; diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c index f4d1fe30fd..bb4c6d63f0 100644 --- a/epan/dissectors/packet-xmcp.c +++ b/epan/dissectors/packet-xmcp.c @@ -934,7 +934,7 @@ dissect_xmcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) xmcp_tree = proto_item_add_subtree(ti, ett_xmcp); ti = proto_tree_add_bitmask(xmcp_tree, tvb, 0, hf_xmcp_type, ett_xmcp_type, - xmcp_type_fields, FALSE); + xmcp_type_fields, ENC_BIG_ENDIAN); if (msg_type & XMCP_TYPE_RESERVED) { expert_add_info_format(pinfo, ti, PI_PROTOCOL, PI_WARN, |